@dcrays/dcgchat-test 0.2.16 → 0.2.18

package/index.ts

@@ -2,7 +2,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { dcgchatPlugin } from "./src/channel.js";
 import { setDcgchatRuntime, setWorkspaceDir } from "./src/runtime.js";
-import { monitoringToolMessage } from "./src/tool.js";
+// import { monitoringToolMessage } from "./src/tool.js";
 
 const plugin = {
   id: "dcgchat-test",
@@ -11,7 +11,7 @@ const plugin = {
   configSchema: emptyPluginConfigSchema(),
   register(api: OpenClawPluginApi) {
     setDcgchatRuntime(api.runtime);
-    monitoringToolMessage(api);
+    // monitoringToolMessage(api);
     api.registerChannel({ plugin: dcgchatPlugin });
     api.registerTool((ctx) => {
       const workspaceDir = ctx.workspaceDir;

package/package.json

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

package/src/bot.ts

@@ -367,7 +367,7 @@ export async function handleDcgchatMessage(params: {
     log(`dcgchat[${accountId}]: ctxPayload=${JSON.stringify(ctxPayload)}`);
 
     const sentMediaKeys = new Set<string>()
-    const getMediaKey = (url: string) => url.split(/[\\/]/).slice(-2).join('/')
+    const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
     let textChunk = ''
 
     const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
@@ -388,8 +388,7 @@ export async function handleDcgchatMessage(params: {
       });
 
     if (text === '/new') {
-      log(`dcgchat[${accountId}]: skipping agent dispatch for /new`);
-       await core.channel.reply.dispatchReplyFromConfig({
+      await core.channel.reply.dispatchReplyFromConfig({
         ctx: ctxPayload,
         cfg,
         dispatcher,
@@ -398,6 +397,39 @@ export async function handleDcgchatMessage(params: {
           onModelSelected: prefixContext.onModelSelected
         },
       });
+      log(`dcgchat[${accountId}]: skipping agent dispatch for /new`);
+      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: '好呀～我不会忘记我们之前的聊天，只是暂时翻篇，让我们更轻松地开启新话题。',
+          state: 'chunk',
+        },
+      });
+      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: '',
+          state: 'final',
+        },
+      });
     } else {
       log(`dcgchat[${accountId}]: dispatching to agent (session=${route.sessionKey})`);
       await core.channel.reply.dispatchReplyFromConfig({
@@ -418,10 +450,6 @@ export async function handleDcgchatMessage(params: {
                 const mediaUrl = mediaList[i];
                 const key = getMediaKey(mediaUrl);
                 if (sentMediaKeys.has(key)) continue;
-                 if (!/^https?:\/\//i.test(mediaUrl) && !fs.existsSync(mediaUrl)) {
-                  log(`dcgchat[${accountId}][deliver]: media file not found, skipping: ${mediaUrl}`);
-                  continue;
-                }
                 sentMediaKeys.add(key);
                 await sendDcgchatMedia({
                   cfg,

package/src/channel.ts

@@ -185,47 +185,47 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     // textChunkLimit: 25,
     textChunkLimit: 4000,
     sendText: async (ctx) => {
-      const ws = getWsConnection()
+      // const ws = getWsConnection()
       const params = getMsgParams();
       const log = console.log;
-       if (ws?.readyState === WebSocket.OPEN) {
-        const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
-        const content = {
-          messageType: "openclaw_bot_chat",
-          _userId: params.userId,
-          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,
-            session_id: params.sessionId,
-            message_id: params.messageId || Date.now().toString(),
-          },
-        };
-        ws.send(JSON.stringify(content));
-        ws.send(JSON.stringify({
-           messageType: "openclaw_bot_chat",
-          _userId: params.userId,
-          source: "client",
-          content: {
-            bot_token: botToken,
-            domain_id: params.domainId,
-            app_id: params.appId,
-            bot_id: params.botId,
-            agent_id: params.agentId,
-            ssession_id: params.sessionId,
-            message_id: params.messageId || Date.now().toString(),
-            response: '',
-            state: 'final',
-          },
-        }));
-        log(`dcgchat[${ctx.accountId}]: channel sendText to ${params.userId}, ${JSON.stringify(content)}`);
-      } else {
-        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> ${ws?.readyState}: ${ctx.text}`);
-      }
+      //  if (ws?.readyState === WebSocket.OPEN) {
+      //   const {botToken} = resolveAccount(ctx.cfg, ctx.accountId);
+      //   const content = {
+      //     messageType: "openclaw_bot_chat",
+      //     _userId: params.userId,
+      //     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,
+      //       session_id: params.sessionId,
+      //       message_id: params.messageId || Date.now().toString(),
+      //     },
+      //   };
+      //   ws.send(JSON.stringify(content));
+      //   ws.send(JSON.stringify({
+      //      messageType: "openclaw_bot_chat",
+      //     _userId: params.userId,
+      //     source: "client",
+      //     content: {
+      //       bot_token: botToken,
+      //       domain_id: params.domainId,
+      //       app_id: params.appId,
+      //       bot_id: params.botId,
+      //       agent_id: params.agentId,
+      //       ssession_id: params.sessionId,
+      //       message_id: params.messageId || Date.now().toString(),
+      //       response: '',
+      //       state: 'final',
+      //     },
+      //   }));
+      //   log(`dcgchat[${ctx.accountId}]: channel sendText to ${params.userId}, ${JSON.stringify(content)}`);
+      // } else {
+        log(`[dcgchat][${ctx.accountId ?? DEFAULT_ACCOUNT_ID}] outbound -> : ${ctx.text}`);
+      // }
       return {
         channel: "dcgchat-test",
         messageId: `dcg-${Date.now()}`,

package/src/monitor.ts

@@ -140,7 +140,7 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id };
         if (event_type === "skill") {
           if (operation_type === "install" || operation_type === "enable" || operation_type === "update") { 
-            installSkill({ path: skill_url, code: skill_code }, content, { cfg, accountId: account.accountId, runtime });
+            installSkill({ path: skill_url, code: skill_code }, content);
           } else if (operation_type === "remove" || operation_type === "disable") {
             uninstallSkill({ code: skill_code }, content);
           } else {

package/src/skill.ts

@@ -5,24 +5,15 @@ import unzipper from 'unzipper';
 import { pipeline } from "stream/promises";
 import fs from 'fs';
 import path from 'path';
-import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
 import { logDcgchat } from './log.js';
-import { getDcgchatRuntime, getWorkspaceDir } from './runtime.js';
+import { getWorkspaceDir } from './runtime.js';
 import { getWsConnection } from './connection.js';
-import { resolveAccount } from './channel.js';
-import { getMsgParams } from './tool.js';
 
 type ISkillParams = {
   path: string;
   code: string;
 }
 
-type SkillContext = {
-  cfg: ClawdbotConfig;
-  accountId: string;
-  runtime?: RuntimeEnv;
-}
-
 function sendEvent(msgContent: Record<string, any>) {
   const ws = getWsConnection()
   if (ws?.readyState === WebSocket.OPEN) {
@@ -36,77 +27,7 @@ function sendEvent(msgContent: Record<string, any>) {
   }
 }
 
-async function sendNewSessionCommand(ctx: SkillContext) {
-  try {
-    const core = getDcgchatRuntime();
-    const log = ctx.runtime?.log ?? console.log;
-    const params = getMsgParams();
-    const account = resolveAccount(ctx.cfg, ctx.accountId);
-    const userId = String(params.userId);
-
-    const route = core.channel.routing.resolveAgentRoute({
-      cfg: ctx.cfg,
-      channel: "dcgchat-test",
-      accountId: account.accountId,
-      peer: { kind: "direct", id: userId },
-    });
-
-    const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(ctx.cfg);
-    const bodyFormatted = core.channel.reply.formatAgentEnvelope({
-      channel: "书灵墨宝",
-      from: userId,
-      timestamp: new Date(),
-      envelope: envelopeOptions,
-      body: "/new",
-    });
-
-    const ctxPayload = core.channel.reply.finalizeInboundContext({
-      Body: bodyFormatted,
-      RawBody: "/new",
-      CommandBody: "/new",
-      From: userId,
-      To: userId,
-      SessionKey: route.sessionKey,
-      AccountId: params.sessionId,
-      ChatType: "direct",
-      SenderName: userId,
-      SenderId: userId,
-      Provider: "dcgchat-test" as const,
-      Surface: "dcgchat-test" as const,
-      MessageSid: Date.now().toString(),
-      Timestamp: Date.now(),
-      WasMentioned: true,
-      CommandAuthorized: true,
-      OriginatingChannel: "dcgchat-test" as const,
-      OriginatingTo: `user:${userId}`,
-    });
-
-    const noopDispatcher = {
-      sendToolResult: () => false,
-      sendBlockReply: () => false,
-      sendFinalReply: () => false,
-      waitForIdle: async () => {},
-      getQueuedCounts: () => ({ tool: 0, block: 0, final: 0 }),
-      markComplete: () => {},
-    };
-
-    await core.channel.reply.withReplyDispatcher({
-      dispatcher: noopDispatcher,
-      run: () =>
-        core.channel.reply.dispatchReplyFromConfig({
-          ctx: ctxPayload,
-          cfg: ctx.cfg,
-          dispatcher: noopDispatcher,
-        }),
-    });
-
-    log(`dcgchat: /new command dispatched silently after skill install`);
-  } catch (err) {
-    logDcgchat.error(`sendNewSessionCommand failed: ${err}`);
-  }
-}
-
-export async function installSkill(params: ISkillParams, msgContent: Record<string, any>, ctx?: SkillContext) {
+export async function installSkill(params: ISkillParams, msgContent: Record<string, any>) {
   const { path: cdnUrl, code } = params;
   const workspacePath = getWorkspaceDir();
   
@@ -208,9 +129,6 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     });
   });
   sendEvent({ ...msgContent, status: 'ok' })
-  if (ctx) {
-    await sendNewSessionCommand(ctx);
-  }
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {