@dcrays/dcgchat-test 0.1.25 → 0.2.1

package/package.json

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

package/src/bot.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import os from "node:os";
-import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
+import type { ClawdbotConfig, ReplyPayload, RuntimeEnv } from "openclaw/plugin-sdk";
 import { createReplyPrefixContext } from "openclaw/plugin-sdk";
 import type { InboundMessage, OutboundReply } from "./types.js";
 import { getDcgchatRuntime } from "./runtime.js";
@@ -89,6 +89,10 @@ export async function handleDcgchatMessage(params: {
       // @ts-ignore
       content: {
         bot_token: msg.content.bot_token,
+        domain_id: msg.content.domain_id,
+        app_id: msg.content.app_id,
+        bot_id: msg.content.bot_id,
+        agent_id: msg.content.agent_id,
         session_id: msg.content.session_id,
         message_id: msg.content.message_id,
         response: "[错误] 消息格式不正确",
@@ -160,6 +164,8 @@ export async function handleDcgchatMessage(params: {
 
     log(`dcgchat[${accountId}]: ctxPayload=${JSON.stringify(ctxPayload)}`);
 
+    let textChunk = ''
+
     const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
 
     const { dispatcher, replyOptions, markDispatchIdle } =
@@ -169,7 +175,51 @@ export async function handleDcgchatMessage(params: {
         humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
         onReplyStart: async () => {},
         deliver: async (payload) => {
-          log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
+          // log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
+          // const t = payload.text?.trim().replaceAll(
+          //       "/root/.openclaw/workspace/moBooksAgentGenerate",
+          //       "/upload"
+          //     );
+          // if (t) {
+          //   log(`dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${t.slice(0, 50)}..."`);
+          //   params.onChunk({
+          //     messageType: "openclaw_bot_chat",
+          //     _userId: msg._userId,
+          //     source: "client",
+          //     content: {
+          //       bot_token: msg.content.bot_token,
+          //       domain_id: msg.content.domain_id,
+          //       app_id: msg.content.app_id,
+          //       bot_id: msg.content.bot_id,
+          //       agent_id: msg.content.agent_id,
+          //       session_id: msg.content.session_id,
+          //       message_id: msg.content.message_id,
+          //       response: t,
+          //       state: 'chunk',
+          //     },
+          //   });
+          //   log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
+          // } else {
+          //   log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
+          // }
+        },
+        onError: (err, info) => {
+          error(`dcgchat[${accountId}] ${info.kind} reply failed: ${String(err)}`);
+        },
+        onIdle: () => {},
+      });
+
+    log(`dcgchat[${accountId}]: dispatching to agent (session=${route.sessionKey})`);
+
+    await core.channel.reply.dispatchReplyFromConfig({
+      ctx: ctxPayload,
+      cfg,
+      dispatcher,
+      replyOptions: {
+        ...replyOptions,
+        onModelSelected: prefixContext.onModelSelected,
+        onPartialReply: (payload: ReplyPayload) => {
+         log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
           const t = payload.text?.trim().replaceAll(
                 "/root/.openclaw/workspace/moBooksAgentGenerate",
                 "/upload"
@@ -182,32 +232,22 @@ export async function handleDcgchatMessage(params: {
               source: "client",
               content: {
                 bot_token: msg.content.bot_token,
+                domain_id: msg.content.domain_id,
+                app_id: msg.content.app_id,
+                bot_id: msg.content.bot_id,
+                agent_id: msg.content.agent_id,
                 session_id: msg.content.session_id,
                 message_id: msg.content.message_id,
-                response: t,
+                response: t.replace(textChunk, ''),
                 state: 'chunk',
               },
             });
+            textChunk = t
             log(`dcgchat[${accountId}][deliver]: chunk sent successfully`);
           } else {
             log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
           }
         },
-        onError: (err, info) => {
-          error(`dcgchat[${accountId}] ${info.kind} reply failed: ${String(err)}`);
-        },
-        onIdle: () => {},
-      });
-
-    log(`dcgchat[${accountId}]: dispatching to agent (session=${route.sessionKey})`);
-
-    await core.channel.reply.dispatchReplyFromConfig({
-      ctx: ctxPayload,
-      cfg,
-      dispatcher,
-      replyOptions: {
-        ...replyOptions,
-        onModelSelected: prefixContext.onModelSelected,
       },
     });
 
@@ -218,6 +258,10 @@ export async function handleDcgchatMessage(params: {
       source: "client",
       content: {
         bot_token: msg.content.bot_token,
+        domain_id: msg.content.domain_id,
+        app_id: msg.content.app_id,
+        bot_id: msg.content.bot_id,
+        agent_id: msg.content.agent_id,
         session_id: msg.content.session_id,
         message_id: msg.content.message_id,
         response: '',
@@ -225,6 +269,7 @@ export async function handleDcgchatMessage(params: {
       },
     });
     setMsgStatus('finished');
+    textChunk = ''
     log(`dcgchat[${accountId}]: final state sent`);
 
     markDispatchIdle();
@@ -238,6 +283,10 @@ export async function handleDcgchatMessage(params: {
       source: "client",
       content: {
         bot_token: msg.content.bot_token,
+        domain_id: msg.content.domain_id,
+        app_id: msg.content.app_id,
+        bot_id: msg.content.bot_id,
+        agent_id: msg.content.agent_id,
         session_id: msg.content.session_id,
         message_id: msg.content.message_id,
         response: `[错误] ${err instanceof Error ? err.message : String(err)}`,

package/src/channel.ts

@@ -153,6 +153,10 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
           source: "client",
           content: {
             bot_token: botToken,
+            domain_id: params.domainId,
+            app_id: params.appId,
+            bot_id: params.botId,
+            agent_id: params.agentId,
             response: ctx.text.replaceAll(
               "/root/.openclaw/workspace/moBooksAgentGenerate",
               "/upload"
@@ -188,6 +192,10 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             source: "client",
             content: {
               bot_token: botToken,
+              domain_id: params.domainId,
+              app_id: params.appId,
+              bot_id: params.botId,
+              agent_id: params.agentId,
               response: ctx.text.replaceAll(
                 "/root/.openclaw/workspace/moBooksAgentGenerate",
                 "/upload"

package/src/monitor.ts

@@ -117,6 +117,10 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
           token: msg.content.bot_token,
           sessionId: msg.content.session_id,
           messageId: msg.content.message_id,
+          domainId: msg.content.domain_id,
+          appId: msg.content.app_id,
+          botId: msg.content.bot_id,
+          agentId: msg.content.agent_id,
         });
         await handleDcgchatMessage({
           cfg,

package/src/tool.ts

@@ -5,9 +5,13 @@ import { logDcgchat } from "./log.js";
 
 let msgParams = {} as {
   userId: number;
-  token: string
-  sessionId: string
-  messageId: string
+  token: string;
+  sessionId: string;
+  messageId: string;
+  domainId: string;
+  appId: string;
+  botId: string;
+  agentId: string;
 }
 let msgStatus: 'running' | 'finished' | '' = '';
 export function setMsgParams(params: any) {
@@ -57,6 +61,10 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
         source: "client",
         content: {
           bot_token: params?.token,
+          domain_id: params?.domainId,
+          app_id: params?.appId,
+          bot_id: params?.botId,
+          agent_id: params?.agentId,
           response: text,
           session_id:params?.sessionId,
           message_id: params?.messageId || Date.now().toString()

package/src/types.ts

@@ -39,6 +39,10 @@ export type InboundMessage = {
   // content: string;
   content: {
     bot_token: string;
+    domain_id?: string;
+    app_id?: string;
+    bot_id?: string;
+    agent_id?: string;
     session_id: string;
     message_id: string;
     text: string;
@@ -71,6 +75,10 @@ export type OutboundReply = {
     message_id: string; // ""
     response: string; // ""
     state: string; // final, chunk
+    domain_id?: string;
+    app_id?: string;
+    bot_id?: string;
+    agent_id?: string;
   };
 };