@dcrays/dcgchat-test 0.2.19 → 0.2.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.2.19",
+  "version": "0.2.20",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -22,9 +22,9 @@
   "dependencies": {
     "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",
-    "ws": "file:src/libs/ws-8.19.0.tgz",
     "md5": "file:src/libs/md5-2.3.0.tgz",
-    "unzipper": "file:src/libs/unzipper-0.12.3.tgz"
+    "unzipper": "file:src/libs/unzipper-0.12.3.tgz",
+    "ws": "file:src/libs/ws-8.19.0.tgz"
   },
   "openclaw": {
     "extensions": [
@@ -44,5 +44,8 @@
       "localPath": "extensions/dcgchat",
       "defaultChoice": "npm"
     }
+  },
+  "devDependencies": {
+    "openclaw": "^2026.3.13"
   }
 }

package/src/bot.ts

@@ -316,7 +316,7 @@ export async function handleDcgchatMessage(params: {
 
     const route = core.channel.routing.resolveAgentRoute({
       cfg,
-      channel: "dcgchat-test",
+      channel: "dcgchat",
       accountId: account.accountId,
       peer: { kind: "direct", id: userId },
     });
@@ -353,13 +353,13 @@ export async function handleDcgchatMessage(params: {
       ChatType: "direct",
       SenderName: userId,
       SenderId: userId,
-      Provider: "dcgchat-test" as const,
-      Surface: "dcgchat-test" as const,
+      Provider: "dcgchat" as const,
+      Surface: "dcgchat" as const,
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: "dcgchat-test" as const,
+      OriginatingChannel: "dcgchat" as const,
       OriginatingTo: `user:${userId}`,
       ...mediaPayload,
     });

package/src/tool.ts

@@ -28,18 +28,20 @@ export function setMsgStatus(status: 'running' | 'finished' | '') {
 export function getMsgStatus() {
   return msgStatus;
 }
-let runId = '';
+let toolCallId = '';
 let toolName = '';
 export function monitoringToolMessage(api: OpenClawPluginApi) {
   api.on("after_tool_call", (event) => {
     const ws = getWsConnection()
     const params = getMsgParams();
     const status = getMsgStatus();
-    // 
+
+    // 去除重复的工具调用结果字段
+    const { result: _result, ...rest } = event;
+    const log = api.runtime?.log ?? api.log ?? console.log;
     if (ws?.readyState === WebSocket.OPEN && status === 'running') {
-      const log = api.runtime?.log ?? api.log;
       // @ts-ignore
-      if (!runId || runId !== event.runId || !toolName || toolName !== event.toolName) {
+      if (!toolCallId || toolCallId !== event.toolCallId || !toolName || toolName !== event.toolName) {
         ws.send(JSON.stringify({
           messageType: "openclaw_bot_chat",
           _userId: params?.userId,
@@ -55,7 +57,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
       const text = JSON.stringify({
         type: 'tool_call',
         specialIdentification: 'dcgchat_tool_call_special_identification',
-        ...event
+        ...rest
       });
       ws.send(JSON.stringify({
         messageType: "openclaw_bot_chat",
@@ -74,7 +76,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
         },
       }));
       // @ts-ignore
-      if (!runId || runId !== event.runId || !toolName || toolName !== event.toolName) {
+      if (!toolCallId || toolCallId !== event.toolCallId || !toolName || toolName !== event.toolName) {
         ws.send(JSON.stringify({
           messageType: "openclaw_bot_chat",
           _userId: params?.userId,
@@ -87,9 +89,11 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
           },
         }));
       }
-      runId = event.runId;
+      toolCallId = event.toolCallId;
       toolName = event.toolName;
-      log?.(`dcgchat[${params?.sessionId}]:11111111 tool message to ${params?.sessionId}, ${JSON.stringify(event)}`);
+      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)}`);
     }
   });
 }