@dcrays/dcgchat-test 0.3.2 → 0.3.3

package/package.json

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

package/src/bot.ts

@@ -3,13 +3,20 @@ import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
-import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getWorkspaceDir, setMsgStatus } from './utils/global.js'
+import {
+  clearSentMediaKeys,
+  getDcgchatRuntime,
+  getOpenClawConfig,
+  getSessionKey,
+  getWorkspaceDir,
+  setMsgStatus
+} from './utils/global.js'
 import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.js'
 import { extractMobookFiles } from './utils/searchFile.js'
-import { sendChunk, sendFinal, sendText as sendTextMsg, sendError } from './transport.js'
+import { sendChunk, sendFinal, sendText as sendTextMsg, sendError, wsSendRaw, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
-import { channelInfo, systemCommand, interruptCommand, ENV } from './utils/constant.js'
+import { channelInfo, systemCommand, interruptCommand, ENV, ignoreToolCommand } from './utils/constant.js'
 import { sendMessageToGateway } from './gateway/socket.js'
 import { getEffectiveMsgParams, setParamsMessage } from './utils/params.js'
 
@@ -24,6 +31,18 @@ type TFileInfo = { name: string; url: string }
 
 const mediaMaxBytes = 300 * 1024 * 1024
 
+/** 当前会话最近一次 agent run 的 runId（供 chat.abort 精确打断；无则仅传 sessionKey 仍会中止该会话全部活动运行） */
+const activeRunIdBySessionKey = new Map<string, string>()
+
+/**
+ * 用户在该 sessionKey 上触发打断后，旧 run 的流式/投递不再下发；与 sessionKey 一一对应，支持多会话。
+ * 清除时机：① 下一条非打断用户消息开始处理时；② 旧 run 收尾到 mobook 段时若仍抑制则跳过并发后删除。
+ */
+const sessionStreamSuppressed = new Set<string>()
+
+/** 各 sessionKey 当前轮回复的流式分片序号（仅统计实际下发的文本 chunk）；每轮非打断消息开始时置 0 */
+const streamChunkIdxBySessionKey = new Map<string, number>()
+
 /** Active LLM generation abort controllers, keyed by conversationId */
 // const activeGenerations = new Map<string, AbortController>()
 
@@ -144,8 +163,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   const embeddedAgentId = extractAgentIdFromConversationId(conversationId)
 
   const effectiveAgentId = embeddedAgentId ?? route.agentId
-  const effectiveSessionKey =
-    real_mobook === '1' ? route.sessionKey : `agent:main:mobook:direct:${agentId}:${conversationId}`.toLowerCase()
+  const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
+  console.log('🚀 ~ handleDcgchatMessage ~ effectiveSessionKey:', effectiveSessionKey)
 
   setParamsMessage(effectiveSessionKey, {
     userId: msg._userId,
@@ -168,6 +187,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     if (finalSent) return
     finalSent = true
     sendFinal(outboundCtx)
+    setMsgStatus(effectiveSessionKey, 'finished')
   }
 
   const text = msg.content.text?.trim()
@@ -243,6 +263,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       humanDelay: core.channel.reply.resolveHumanDelayConfig(config, route.agentId),
       onReplyStart: async () => {},
       deliver: async (payload: ReplyPayload, info) => {
+        if (sessionStreamSuppressed.has(effectiveSessionKey)) return
         const mediaList = resolveReplyMediaList(payload)
         for (const mediaUrl of mediaList) {
           const key = getMediaKey(mediaUrl)
@@ -252,15 +273,29 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
+        activeRunIdBySessionKey.delete(effectiveSessionKey)
+        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
+        if (sessionStreamSuppressed.has(effectiveSessionKey)) {
+          dcgLogger(`${info.kind} reply failed (stream suppressed): ${String(err)}`, 'error')
+          return
+        }
         safeSendFinal()
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
       onIdle: () => {
+        activeRunIdBySessionKey.delete(effectiveSessionKey)
+        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
+        if (sessionStreamSuppressed.has(effectiveSessionKey)) return
         safeSendFinal()
       }
     })
 
     try {
+      if (!interruptCommand.includes(text?.trim())) {
+        sessionStreamSuppressed.delete(effectiveSessionKey)
+        streamChunkIdxBySessionKey.set(effectiveSessionKey, 0)
+      }
+
       if (systemCommand.includes(text?.trim())) {
         dcgLogger(`dispatching /new`)
         await core.channel.reply.dispatchReplyFromConfig({
@@ -269,21 +304,48 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           dispatcher,
           replyOptions: {
             ...replyOptions,
-            onModelSelected: prefixContext.onModelSelected
+            onModelSelected: prefixContext.onModelSelected,
+            onAgentRunStart: (runId) => {
+              activeRunIdBySessionKey.set(effectiveSessionKey, runId)
+            }
           }
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
+        sendText('会话已终止', outboundCtx)
+        safeSendFinal()
+        sessionStreamSuppressed.add(effectiveSessionKey)
+        const runId = activeRunIdBySessionKey.get(effectiveSessionKey)
         sendMessageToGateway(
           JSON.stringify({
             method: 'chat.abort',
-            params: { sessionKey: effectiveSessionKey }
+            params: {
+              sessionKey: effectiveSessionKey,
+              ...(runId ? { runId } : {})
+            }
           })
         )
-        safeSendFinal()
+        if (runId) activeRunIdBySessionKey.delete(effectiveSessionKey)
         return
       } else {
         dcgLogger(`dispatching to agent (session=${route.sessionKey})`)
+        const params = getEffectiveMsgParams(effectiveSessionKey)
+        if (!ignoreToolCommand.includes(text?.trim())) {
+          // message_received 没有 sessionKey 前置到bot中执行
+          wsSendRaw(params, {
+            is_finish: -1,
+            tool_call_id: Date.now().toString(),
+            is_cover: 0,
+            thinking_content: JSON.stringify({
+              type: 'message_received',
+              specialIdentification: 'dcgchat_tool_call_special_identification',
+              toolName: '',
+              callId: Date.now().toString(),
+              params: ''
+            }),
+            response: ''
+          })
+        }
         await core.channel.reply.dispatchReplyFromConfig({
           ctx: ctxPayload,
           cfg: config,
@@ -292,7 +354,15 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
             ...replyOptions,
             // abortSignal: genSignal,
             onModelSelected: prefixContext.onModelSelected,
+            onAgentRunStart: (runId) => {
+              activeRunIdBySessionKey.set(effectiveSessionKey, runId)
+            },
             onPartialReply: async (payload: ReplyPayload) => {
+              if (sessionStreamSuppressed.has(effectiveSessionKey)) return
+              console.log(
+                '🚀 ~ handleDcgchatMessage ~ sessionStreamSuppressed.has(effectiveSessionKey):',
+                sessionStreamSuppressed.has(effectiveSessionKey)
+              )
               // Accumulate full text
               if (payload.text) {
                 completeText = payload.text
@@ -303,8 +373,10 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                   ? payload.text.slice(streamedTextLen)
                   : payload.text
                 if (delta.trim()) {
-                  sendChunk(delta, outboundCtx)
-                  dcgLogger(`[stream]: chunk ${delta.length} chars to user ${msg._userId} ${delta.slice(0, 100)}`)
+                  const prev = streamChunkIdxBySessionKey.get(effectiveSessionKey) ?? 0
+                  streamChunkIdxBySessionKey.set(effectiveSessionKey, prev + 1)
+                  sendChunk(delta, outboundCtx, prev)
+                  dcgLogger(`[stream]: chunkIdx=${prev} len=${delta.length} user=${msg._userId} ${delta.slice(0, 100)}`)
                 }
                 streamedTextLen = payload.text.length
               }
@@ -342,28 +414,31 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       dcgLogger(` markRunComplete||markRunComplete error: ${String(err)}`, 'error')
     }
     if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
-      for (const file of extractMobookFiles(completeText)) {
-        const candidates: string[] = [file]
-        candidates.push(path.join(getWorkspaceDir(), file))
-        candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
-        if (process.platform === 'win32') {
-          const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
-          if (underMobook) {
-            candidates.push(path.join('C:\\', 'mobook', underMobook))
+      if (sessionStreamSuppressed.has(effectiveSessionKey)) {
+        sessionStreamSuppressed.delete(effectiveSessionKey)
+      } else {
+        for (const file of extractMobookFiles(completeText)) {
+          const candidates: string[] = [file]
+          candidates.push(path.join(getWorkspaceDir(), file))
+          candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
+          if (process.platform === 'win32') {
+            const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
+            if (underMobook) {
+              candidates.push(path.join('C:\\', 'mobook', underMobook))
+            }
+          }
+          const resolved = candidates.find((p) => fs.existsSync(p))
+          if (!resolved) continue
+          try {
+            await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })
+          } catch (err) {
+            dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
           }
-        }
-        const resolved = candidates.find((p) => fs.existsSync(p))
-        if (!resolved) continue
-        try {
-          await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl: resolved, text: '' })
-        } catch (err) {
-          dcgLogger(` sendDcgchatMedia error: ${String(err)}`, 'error')
         }
       }
     }
     safeSendFinal()
     clearSentMediaKeys(msg.content.message_id)
-    setMsgStatus('finished')
 
     // Record session metadata
     const storePath = core.channel.session.resolveStorePath(config.session?.store)

package/src/channel.ts

@@ -5,7 +5,7 @@ import { ossUpload } from './request/oss.js'
 import { addSentMediaKey, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
-import { getParamsDefaults, getEffectiveMsgParams, getCurrentSessionKey } from './utils/params.js'
+import { getEffectiveMsgParams, getCurrentSessionKey } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
 
 export type DcgchatMediaSendOptions = {
@@ -146,7 +146,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         const merged = mergeDefaultParams({
           agentId: ctx.accountId ?? '',
           sessionId: ctx.to,
-          messageId: `${Date.now()}`
+          messageId: `${Date.now()}`,
+          is_finish: -1
         })
         wsSendRaw(merged, { response: ctx.text })
         sendFinal(merged)

package/src/gateway/socket.ts

@@ -230,10 +230,8 @@ export function startDcgchatGatewaySocket(): void {
   socketStopped = false
   clearReconnectTimer()
   if (startupConnectTimer != null) return
-  startupConnectTimer = setTimeout(() => {
-    startupConnectTimer = null
-    void connectPersistentGateway()
-  }, 10000)
+  startupConnectTimer = null
+  void connectPersistentGateway()
 }
 
 /**

package/src/monitor.ts

@@ -2,12 +2,12 @@ import type { ClawdbotConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
 import WebSocket from 'ws'
 import { handleDcgchatMessage } from './bot.js'
 import { resolveAccount } from './channel.js'
-import { setWsConnection, getOpenClawConfig, setMsgStatus } from './utils/global.js'
+import { setWsConnection, getOpenClawConfig, setMsgStatus, getSessionKey } from './utils/global.js'
 import type { InboundMessage } from './types.js'
 import { installSkill, uninstallSkill } from './skill.js'
 import { dcgLogger } from './utils/log.js'
-import { ignoreToolCommand } from './utils/constant.js'
 import { onDisabledCronJob, onEnabledCronJob, onRemoveCronJob, onRunCronJob } from './cron.js'
+import { ignoreToolCommand } from './utils/constant.js'
 
 export type MonitorDcgchatOpts = {
   config?: ClawdbotConfig
@@ -126,10 +126,14 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
 
       if (parsed.messageType == 'openclaw_bot_chat') {
         const msg = parsed as unknown as InboundMessage
-        if (!ignoreToolCommand.includes(msg.content.text?.trim())) {
-          setMsgStatus('running')
+        // 与 monitor 原逻辑一致：工具类指令不进入 running，避免误触工具链监控
+        const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
+        console.log('🚀 ~ connect ~ effectiveSessionKey:', effectiveSessionKey)
+        if (!ignoreToolCommand.includes(msg.content.text?.trim() ?? '')) {
+          setMsgStatus(effectiveSessionKey, 'running')
+        } else {
+          setMsgStatus(effectiveSessionKey, 'finished')
         }
-
         await handleDcgchatMessage(msg, account.accountId)
       } else if (parsed.messageType == 'openclaw_bot_event') {
         const { event_type, operation_type } = parsed.content ? parsed.content : ({} as Record<string, any>)

package/src/tool.ts

@@ -1,7 +1,7 @@
 import type { OpenClawPluginApi } from 'openclaw/plugin-sdk'
-import { getMsgStatus, getWsConnection } from './utils/global.js'
+import { getMsgStatus } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
-import { isWsOpen, sendFinal, sendText } from './transport.js'
+import { sendFinal, sendText, wsSendRaw } from './transport.js'
 import { getCurrentSessionKey, getEffectiveMsgParams } from './utils/params.js'
 
 let toolCallId = ''
@@ -31,8 +31,10 @@ type PluginHookName =
   | 'subagent_ended'
   | 'gateway_start'
   | 'gateway_stop'
+
+// message_received 没有 sessionKey 前置到bot中执行
 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: '书灵墨宝已就位，准备开始执行任务'},
@@ -50,75 +52,63 @@ const eventList = [
   { event: 'after_tool_call', message: '' }
 ]
 
-function sendToolCallMessage(text: string, toolCallId: string, isCover: number) {
-  const ws = getWsConnection()
-  const sk = getCurrentSessionKey()
-  if (!sk) return
+function sendToolCallMessage(sk: string, text: string, toolCallId: string, isCover: number) {
   const params = getEffectiveMsgParams(sk)
-  if (isWsOpen()) {
-    ws?.send(
-      JSON.stringify({
-        messageType: 'openclaw_bot_chat',
-        _userId: params?.userId,
-        source: 'client',
-        is_finish: -1,
-        content: {
-          is_finish: -1,
-          bot_token: params?.botToken,
-          domain_id: params?.domainId,
-          app_id: params?.appId,
-          bot_id: params?.botId,
-          agent_id: params?.agentId,
-          tool_call_id: toolCallId,
-          is_cover: isCover,
-          thinking_content: text,
-          response: '',
-          session_id: params?.sessionId,
-          message_id: params?.messageId || Date.now().toString()
-        }
-      })
-    )
-  }
+  wsSendRaw(params, {
+    is_finish: -1,
+    tool_call_id: toolCallId,
+    is_cover: isCover,
+    thinking_content: text,
+    response: ''
+  })
 }
 
 export function monitoringToolMessage(api: OpenClawPluginApi) {
   for (const item of eventList) {
     api.on(item.event as PluginHookName, (event: any, args: any) => {
-      const status = getMsgStatus()
-      if (status === 'running') {
-        if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
-          const { result: _result, ...rest } = event
-          dcgLogger(`工具调用结果： ~ event:${item.event} ~ params:${JSON.stringify(rest)}`)
-          const text = JSON.stringify({
-            type: item.event,
-            specialIdentification: 'dcgchat_tool_call_special_identification',
-            callId: event.toolCallId || event.runId || Date.now().toString(),
-            ...rest,
-            status: item.event === 'after_tool_call' ? 'finished' : 'running'
-          })
-          sendToolCallMessage(text, event.toolCallId || event.runId || Date.now().toString(), item.event === 'after_tool_call' ? 1 : 0)
-        } else if (item.event) {
-          dcgLogger(`工具调用结果： ~ event:${item.event}`)
-          if (item.event === 'llm_output') {
-            if (event.lastAssistant?.errorMessage === '429-账户额度耗尽') {
-              const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
-              const sk = ((args?.sessionKey as string | undefined) ?? getCurrentSessionKey()) || ''
-              if (!sk) return
-              const msgCtx = getEffectiveMsgParams(sk)
-              sendText(message, msgCtx, { message_tags: { insufficient_balance: 1 }, is_finish: -1 })
-              sendFinal(msgCtx)
-              return
+      const sk = args?.sessionKey as string
+      if (sk) {
+        const status = getMsgStatus(sk)
+        if (status === 'running') {
+          if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
+            const { result: _result, ...rest } = event
+            dcgLogger(`工具调用结果： ~ event:${item.event} ~ params:${JSON.stringify(rest)}`)
+            const text = JSON.stringify({
+              type: item.event,
+              specialIdentification: 'dcgchat_tool_call_special_identification',
+              callId: event.toolCallId || event.runId || Date.now().toString(),
+              ...rest,
+              status: item.event === 'after_tool_call' ? 'finished' : 'running'
+            })
+            sendToolCallMessage(
+              sk,
+              text,
+              event.toolCallId || event.runId || Date.now().toString(),
+              item.event === 'after_tool_call' ? 1 : 0
+            )
+          } else if (item.event) {
+            const msgCtx = getEffectiveMsgParams(sk)
+            if (item.event === 'llm_output') {
+              if (event.lastAssistant?.errorMessage === '429-账户额度耗尽') {
+                const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
+                sendText(message, msgCtx, { message_tags: { insufficient_balance: 1 }, is_finish: -1 })
+                sendFinal(msgCtx)
+                return
+              }
             }
+            const text = JSON.stringify({
+              type: item.event,
+              specialIdentification: 'dcgchat_tool_call_special_identification',
+              toolName: '',
+              callId: event.runId || Date.now().toString(),
+              params: item.message
+            })
+            sendToolCallMessage(sk, text, event.runId || Date.now().toString(), 0)
+            dcgLogger(`工具调用结果： ~ event:${item.event} ${status}`)
           }
-          const text = JSON.stringify({
-            type: item.event,
-            specialIdentification: 'dcgchat_tool_call_special_identification',
-            toolName: '',
-            callId: event.runId || Date.now().toString(),
-            params: item.message
-          })
-          sendToolCallMessage(text, event.runId || Date.now().toString(), 0)
         }
+      } else {
+        dcgLogger(`工具调用结果： ~ event:${item.event} ~ 没有sessionKey 为执行`)
       }
     })
   }

package/src/transport.ts

@@ -158,8 +158,8 @@ export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>): bo
   return true
 }
 
-export function sendChunk(text: string, ctx: IMsgParams): boolean {
-  return wsSend(ctx, { response: text, state: 'chunk' })
+export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): boolean {
+  return wsSend(ctx, { response: text, state: 'chunk', chunk_idx: chunkIdx })
 }
 
 export function sendFinal(ctx: IMsgParams): boolean {

package/src/types.ts

@@ -127,4 +127,5 @@ export interface IMsgParams {
   /** 与 OpenClaw 路由一致，用于 map 与异步链路（工具 / HTTP / cron）对齐当前会话 */
   sessionKey?: string
   real_mobook?: string | number
+  is_finish?: number
 }

package/src/utils/constant.ts

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

package/src/utils/global.ts

@@ -68,12 +68,22 @@ export function getDcgchatRuntime(): PluginRuntime {
   return runtime as PluginRuntime
 }
 
-let msgStatus: 'running' | 'finished' | '' = ''
-export function setMsgStatus(status: 'running' | 'finished' | '') {
-  msgStatus = status
+export type MsgSessionStatus = 'running' | 'finished' | ''
+
+const msgStatusBySessionKey = new Map<string, MsgSessionStatus>()
+
+export function setMsgStatus(sessionKey: string, status: MsgSessionStatus) {
+  if (!sessionKey?.trim()) return
+  if (status === '') {
+    msgStatusBySessionKey.delete(sessionKey)
+  } else {
+    msgStatusBySessionKey.set(sessionKey, status)
+  }
 }
-export function getMsgStatus() {
-  return msgStatus
+
+export function getMsgStatus(sessionKey: string): MsgSessionStatus {
+  if (!sessionKey?.trim()) return ''
+  return msgStatusBySessionKey.get(sessionKey) ?? ''
 }
 
 const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
@@ -106,3 +116,16 @@ export function clearSentMediaKeys(messageId?: string) {
     sentMediaKeysBySession.clear()
   }
 }
+
+export const getSessionKey = (content: any, accountId: string) => {
+  const { real_mobook, agent_id, conversation_id, session_id } = content
+  const core = getDcgchatRuntime()
+
+  const route = core.channel.routing.resolveAgentRoute({
+    cfg: getOpenClawConfig() as OpenClawConfig,
+    channel: "dcgchat-test",
+    accountId: accountId || 'default',
+    peer: { kind: 'direct', id: session_id }
+  })
+  return real_mobook === '1' ? route.sessionKey : `agent:main:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
+}