@dcrays/dcgchat-test 0.2.21 → 0.2.23

package/src/channel.ts

@@ -114,7 +114,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     id: "dcgchat-test",
     label: "书灵墨宝",
     selectionLabel: "书灵墨宝",
-    docsPath: "/channels/dcgchat",
+    docsPath: "/channels/dcgchat-test",
     docsLabel: "dcgchat-test",
     blurb: "连接 OpenClaw 与 书灵墨宝 产品",
     order: 80,
@@ -131,7 +131,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     effects: true,
     // blockStreaming: true,
   },
-  reload: { configPrefixes: ["channels.dcgchat"] },
+  reload: { configPrefixes: ["channels.dcgchat-test"] },
   configSchema: {
     schema: {
       type: "object",
@@ -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 {
+       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

@@ -1,10 +1,10 @@
 import type { ClawdbotConfig, RuntimeEnv } from "openclaw/plugin-sdk";
 import WebSocket from "ws";
-import { handleDcgchatMessage } from "./bot.js";
+import { abortMobookappGeneration, handleDcgchatMessage } from "./bot.js";
 import { resolveAccount } from "./channel.js";
 import { setWsConnection } from "./connection.js";
 import type { InboundMessage } from "./types.js";
-import { setMsgParams,setMsgStatus } from "./tool.js";
+import { setMsgParams, setMsgStatus } from "./tool.js";
 import { installSkill, uninstallSkill } from "./skill.js";
 
 export type MonitorDcgchatOpts = {
@@ -16,7 +16,13 @@ export type MonitorDcgchatOpts = {
 
 const RECONNECT_DELAY_MS = 3000;
 const HEARTBEAT_INTERVAL_MS = 30_000;
-const emptyToolText = ['/new', '/search','/stop', '/abort', '/queue interrupt']
+const emptyToolText = [
+  "/new",
+  "/search",
+  "/stop",
+  "/abort",
+  "/queue interrupt",
+];
 
 function buildConnectUrl(account: Record<string, string>): string {
   const { wsUrl, botToken, userId, domainId, appId } = account;
@@ -28,7 +34,9 @@ function buildConnectUrl(account: Record<string, string>): string {
   return url.toString();
 }
 
-export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<void> {
+export async function monitorDcgchatProvider(
+  opts: MonitorDcgchatOpts,
+): Promise<void> {
   const { config, runtime, abortSignal, accountId } = opts;
   // @ts-ignore
   const cfg = config ?? (runtime?.config?.() as ClawdbotConfig | undefined);
@@ -100,7 +108,9 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
       }
 
       if (parsed.messageType === "openclaw_bot_heartbeat") {
-        log(`dcgchat[${account.accountId}]: heartbeat ack received, ${data.toString()}`);
+        log(
+          `dcgchat[${account.accountId}]: heartbeat ack received, ${data.toString()}`,
+        );
         return;
       }
       try {
@@ -109,25 +119,36 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         err(`dcgchat[${account.accountId}]: invalid JSON received`);
         return;
       }
-      
+
       if (parsed.messageType == "openclaw_bot_chat") {
         const msg = parsed as unknown as InboundMessage;
         if (!emptyToolText.includes(msg.content.text?.trim())) {
-          setMsgStatus('running');
+          setMsgStatus("running");
+        }
+        log(
+          `dcgchat[${account.accountId}]: openclaw_bot_chat received, ${JSON.stringify(msg)}`,
+        );
+        if (msg.content.text === "/stop") {
+          const rawConvId = msg.content.session_id as string | undefined;
+          const conversationId =
+            rawConvId || `${accountId}:${account.botToken}`;
+          console.log("🚀 ~ connect ~ conversationId:", conversationId)
+          abortMobookappGeneration(conversationId);
+          log(`[dcgchat][in] abort conversationId=${conversationId}`);
+          return;
         }
-        log(`dcgchat[${account.accountId}]: openclaw_bot_chat received, ${JSON.stringify(msg)}`);
         setMsgParams({
           userId: msg._userId,
           token: msg.content.bot_token,
           sessionId: msg.content.session_id,
           messageId: msg.content.message_id,
-          domainId: account.domainId ||  1000,
-          appId: account.appId || '100',
+          domainId: account.domainId || 1000,
+          appId: account.appId || "100",
           botId: msg.content.bot_id,
           agentId: msg.content.agent_id,
         });
-        msg.content.app_id = account.appId || '100';
-        msg.content.domain_id = account.domainId || '1000';
+        msg.content.app_id = account.appId || "100";
+        msg.content.domain_id = account.domainId || "1000";
         await handleDcgchatMessage({
           cfg,
           msg,
@@ -140,24 +161,52 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
             }
           },
         });
-      }  else if (parsed.messageType == "openclaw_bot_event") {
-        const { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id } = parsed.content ? parsed.content : {} as Record<string, any>;
-        const content = { event_type, operation_type, skill_url, skill_code, skill_id, bot_token, websocket_trace_id };
+      } else if (parsed.messageType == "openclaw_bot_event") {
+        const {
+          event_type,
+          operation_type,
+          skill_url,
+          skill_code,
+          skill_id,
+          bot_token,
+          websocket_trace_id,
+        } = parsed.content ? parsed.content : ({} as Record<string, any>);
+        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") { 
+          if (
+            operation_type === "install" ||
+            operation_type === "enable" ||
+            operation_type === "update"
+          ) {
             installSkill({ path: skill_url, code: skill_code }, content);
-          } else if (operation_type === "remove" || operation_type === "disable") {
+          } else if (
+            operation_type === "remove" ||
+            operation_type === "disable"
+          ) {
             uninstallSkill({ code: skill_code }, content);
           } else {
-            log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`);
+            log(
+              `dcgchat[${account.accountId}]: openclaw_bot_event unknown event_type: ${event_type}, ${data.toString()}`,
+            );
           }
         } else {
-          log(`dcgchat[${account.accountId}]: openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`);
+          log(
+            `dcgchat[${account.accountId}]: openclaw_bot_event unknown operation_type: ${operation_type}, ${data.toString()}`,
+          );
         }
       } else {
-        log(`dcgchat[${account.accountId}]: ignoring unknown messageType: ${parsed.messageType}`);
+        log(
+          `dcgchat[${account.accountId}]: ignoring unknown messageType: ${parsed.messageType}`,
+        );
       }
-
     });
 
     ws.on("close", (code, reason) => {
@@ -167,7 +216,9 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         `dcgchat[${account.accountId}]: disconnected (code=${code}, reason=${reason?.toString() || ""})`,
       );
       if (shouldReconnect) {
-        log(`dcgchat[${account.accountId}]: reconnecting in ${RECONNECT_DELAY_MS}ms...`);
+        log(
+          `dcgchat[${account.accountId}]: reconnecting in ${RECONNECT_DELAY_MS}ms...`,
+        );
         setTimeout(connect, RECONNECT_DELAY_MS);
       }
     });

package/src/skill.ts

@@ -5,15 +5,24 @@ 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 { getWorkspaceDir } from './runtime.js';
+import { getDcgchatRuntime, 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) {
@@ -27,7 +36,77 @@ function sendEvent(msgContent: Record<string, any>) {
   }
 }
 
-export async function installSkill(params: ISkillParams, 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) {
   const { path: cdnUrl, code } = params;
   const workspacePath = getWorkspaceDir();
   
@@ -129,6 +208,9 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     });
   });
   sendEvent({ ...msgContent, status: 'ok' })
+  // if (ctx) {
+  //   await sendNewSessionCommand(ctx);
+  // }
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {

package/src/tool.ts

@@ -32,19 +32,20 @@ let toolCallId = '';
 let toolName = '';
 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: 'message_received', message: ''},
+  {event: 'before_model_resolve', 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: '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: 'message_sending', message: ''},
+  // {event: 'message_send', message: ''},
   {event: 'before_tool_call', message: ''},
   {event: 'after_tool_call', message: ''},
 ];

package/README.md

@@ -1,83 +0,0 @@
-# OpenClaw 书灵墨宝 插件
-
-连接 OpenClaw 与 书灵墨宝 产品的通道插件。
-
-## 架构
-
-```
-┌──────────┐      WebSocket       ┌──────────────┐      WebSocket      ┌─────────────────────┐
-│ Web 前端 │  ←───────────────→   │  公司后端服务  │  ←───────────────→  │ OpenClaw（工作电脑） │
-└──────────┘                      └──────────────┘   (OpenClaw 主动连)   └─────────────────────┘
-```
-
-- OpenClaw 插件**主动连接**后端的 WebSocket 服务（不需要公网 IP）
-- 后端收到用户消息后转发给 OpenClaw，OpenClaw 回复后发回后端
-
-## 快速开始
-
-### 1. 安装插件
-
-```bash
-pnpm openclaw plugins install -l /path/to/openclaw-dcgchat
-```
-
-### 2. 配置
-
-```bash
-openclaw config set channels.dcgchat.enabled true
-openclaw config set channels.dcgchat.wsUrl "ws://your-backend:8080/openclaw/ws"
-```
-
-### 3. 启动
-
-```bash
-pnpm openclaw gateway
-```
-
-## 消息协议（MVP）
-
-### 下行：后端 → OpenClaw（用户消息）
-
-```json
-{ "type": "message", "userId": "user_001", "text": "你好" }
-```
-
-### 上行：OpenClaw → 后端（Agent 回复）
-
-```json
-{ "type": "reply", "userId": "user_001", "text": "你好！有什么可以帮你的？" }
-```
-
-## 配置项
-
-| 配置键 | 类型 | 说明 |
-|--------|------|------|
-| `channels.dcgchat.enabled` | boolean | 是否启用 |
-| `channels.dcgchat.wsUrl` | string | 后端 WebSocket 地址 |
-
-## 开发
-
-```bash
-# 安装依赖
-pnpm install
-
-# 类型检查
-pnpm typecheck
-```
-
-## 文件结构
-
-- `index.ts` - 插件入口
-- `src/channel.ts` - ChannelPlugin 定义
-- `src/runtime.ts` - 插件 runtime
-- `src/types.ts` - 类型定义
-- `src/monitor.ts` - WebSocket 连接与断线重连
-- `src/bot.ts` - 消息处理与 Agent 调用
-
-## 后续迭代
-
-- [ ] Token 认证
-- [ ] 流式输出
-- [ ] Typing 指示
-- [ ] messageId 去重
-- [ ] 错误消息类型