@dcrays/dcgchat 0.2.16 → 0.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.2.16",
+  "version": "0.2.19",
   "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({

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",
         messageId: `dcg-${Date.now()}`,

package/src/skill.ts

@@ -36,75 +36,75 @@ 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",
-      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" as const,
-      Surface: "dcgchat" as const,
-      MessageSid: Date.now().toString(),
-      Timestamp: Date.now(),
-      WasMentioned: true,
-      CommandAuthorized: true,
-      OriginatingChannel: "dcgchat" 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}`);
-  }
-}
+// 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",
+//       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" as const,
+//       Surface: "dcgchat" as const,
+//       MessageSid: Date.now().toString(),
+//       Timestamp: Date.now(),
+//       WasMentioned: true,
+//       CommandAuthorized: true,
+//       OriginatingChannel: "dcgchat" 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) {
   const { path: cdnUrl, code } = params;
@@ -208,9 +208,9 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     });
   });
   sendEvent({ ...msgContent, status: 'ok' })
-  if (ctx) {
-    await sendNewSessionCommand(ctx);
-  }
+  // if (ctx) {
+  //   await sendNewSessionCommand(ctx);
+  // }
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {