@dcrays/dcgchat-test 0.2.28 → 0.2.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -16,12 +16,6 @@
     "websocket",
     "ai"
   ],
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build:production": "npx tsx scripts/build.ts production",
-    "build:prod": "npx tsx scripts/build.ts production",
-    "build:test": "npx tsx scripts/build.ts test"
-  },
   "dependencies": {
     "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",

package/src/bot.ts

@@ -9,7 +9,7 @@ import { generateSignUrl } from './request/api.js'
 import { extractMobookFiles } from './utils/searchFile.js'
 import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError } from './transport.js'
 import { dcgLogger } from './utils/log.js'
-import { emptyToolText } from './utils/constant.js'
+import { channelInfo, systemCommand, interruptCommand, ENV } from './utils/constant.js'
 
 type MediaInfo = {
   path: string
@@ -229,7 +229,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       humanDelay: core.channel.reply.resolveHumanDelayConfig(config, route.agentId),
       onReplyStart: async () => {},
       deliver: async (payload: ReplyPayload, info) => {
-        dcgLogger(`[deliver]: kind=${info.kind}, text=${payload.text?.length ?? 0} chars`)
+        dcgLogger(`[deliver]: kind=${info.kind}, text=${payload.text?.length ?? 0} chars, ${payload.text?.slice(0, 100)}`)
         // Media from the outbound pipeline (post-streaming)
         const mediaList = resolveReplyMediaList(payload)
         for (const mediaUrl of mediaList) {
@@ -238,6 +238,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           sentMediaKeys.add(key)
           await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
         }
+        sendFinal(msgCtx)
       },
       onError: (err: unknown, info: { kind: string }) => {
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
@@ -247,7 +248,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
     let wasAborted = false
     try {
-      if (emptyToolText.includes(text?.trim())) {
+      if (systemCommand.includes(text?.trim())) {
         dcgLogger(`dispatching /new`)
         await core.channel.reply.dispatchReplyFromConfig({
           ctx: ctxPayload,
@@ -258,6 +259,11 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
             onModelSelected: prefixContext.onModelSelected
           }
         })
+      } else if (interruptCommand.includes(text?.trim())) {
+        dcgLogger(`interrupt command: ${text}`)
+        abortMobookappGeneration(conversationId)
+        sendFinal(msgCtx)
+        return
       } else {
         dcgLogger(`dispatching to agent (session=${route.sessionKey})`)
         await core.channel.reply.dispatchReplyFromConfig({
@@ -311,10 +317,13 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         activeGenerations.delete(conversationId)
       }
     }
-
-    markRunComplete()
+    try {
+      markRunComplete()
+    } catch (err) {
+      dcgLogger(` markRunComplete error: ${String(err)}`, 'error')
+    }
     markDispatchIdle()
-    if (!emptyToolText.includes(text?.trim())) {
+    if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
       for (const file of extractMobookFiles(completeText)) {
         let resolved = file
         if (!fs.existsSync(resolved)) {

package/src/monitor.ts

@@ -1,13 +1,13 @@
 import type { ClawdbotConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
 import WebSocket from 'ws'
-import { abortMobookappGeneration, handleDcgchatMessage } from './bot.js'
+import { handleDcgchatMessage } from './bot.js'
 import { resolveAccount } from './channel.js'
 import { setWsConnection, getOpenClawConfig } from './utils/global.js'
 import type { InboundMessage } from './types.js'
 import { setMsgParams, setMsgStatus } from './utils/global.js'
 import { installSkill, uninstallSkill } from './skill.js'
 import { dcgLogger } from './utils/log.js'
-import { emptyToolText } from './utils/constant.js'
+import { ignoreToolCommand } from './utils/constant.js'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -30,7 +30,7 @@ function buildConnectUrl(account: Record<string, string>): string {
 }
 
 export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<void> {
-  const { runtime, abortSignal, accountId } = opts
+  const { abortSignal, accountId } = opts
 
   const config = getOpenClawConfig()
   if (!config) {
@@ -110,16 +110,9 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
 
       if (parsed.messageType == 'openclaw_bot_chat') {
         const msg = parsed as unknown as InboundMessage
-        if (!emptyToolText.includes(msg.content.text?.trim())) {
+        if (!ignoreToolCommand.includes(msg.content.text?.trim())) {
           setMsgStatus('running')
         }
-        if (msg.content.text === '/stop') {
-          const rawConvId = msg.content.session_id as string | undefined
-          const conversationId = rawConvId || `${accountId}:${account.botToken}`
-          abortMobookappGeneration(conversationId)
-          dcgLogger(`abort conversationId=${conversationId}`)
-          return
-        }
         // 设置获取用户消息消息参数
         setMsgParams({
           userId: msg._userId,

package/src/tool.ts

@@ -83,7 +83,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
     api.on(item.event as PluginHookName, (event: any) => {
       const status = getMsgStatus()
       if (status === 'running') {
-        dcgLogger(`工具调用结果： ~ event:${item.event} ${JSON.stringify(event)}`)
+        dcgLogger(`工具调用结果： ~ event:${item.event}`)
         if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
           const { result: _result, ...rest } = event
           const text = JSON.stringify({

package/src/transport.ts

@@ -95,7 +95,7 @@ export function sendChunk(ctx: DcgchatMsgContext, text: string): boolean {
 }
 
 export function sendFinal(ctx: DcgchatMsgContext): boolean {
-  dcgLogger(` message handling complete`)
+  dcgLogger(` message handling complete state: final`)
   return wsSend(ctx, { response: '', state: 'final' })
 }
 

package/src/utils/constant.ts

@@ -1,4 +1,7 @@
 export const ENV: 'production' | 'test' | 'develop' = 'test'
 
 
-export const emptyToolText = ['/new', '/search', '/stop', '/abort', '/queue interrupt']
+export const systemCommand = ['/new', '/status']
+export const interruptCommand = ['/stop']
+
+export const ignoreToolCommand = ['/search', '/abort', '/queue interrupt', ...systemCommand, ...interruptCommand]