@dcrays/dcgchat-test 0.3.39 → 0.3.41

package/index.ts

@@ -4,8 +4,7 @@ import { dcgchatPlugin } from './src/channel.js'
 import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
 import { setOpenClawConfig } from './src/utils/global.js'
-import { startDcgchatGatewaySocket } from './src/gateway/socket.js'
-import { createDcgchatMessageTool } from './src/tools/meeageToll.js'
+import { createDcgchatMessageTool } from './src/tools/messageTool.js'
 
 const plugin = {
   id: "dcgchat-test",

package/package.json

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

package/src/bot.ts

@@ -1,8 +1,6 @@
 import path from 'node:path'
-import fs from 'node:fs'
-import os from 'node:os'
-import type { PluginRuntime, ReplyPayload } from 'openclaw/plugin-sdk'
-import { createPluginRuntimeStore, createReplyPrefixContext, createTypingCallbacks } from 'openclaw/plugin-sdk'
+import type { ReplyPayload } from 'openclaw/plugin-sdk'
+import { createReplyPrefixContext, createTypingCallbacks } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
 import {
   clearSentMediaKeys,
@@ -14,7 +12,6 @@ import {
 } 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, wsSendRaw, sendText } from './transport.js'
 import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV, ignoreToolCommand } from './utils/constant.js'
@@ -126,20 +123,18 @@ function resolveReplyMediaList(payload: ReplyPayload): string[] {
   if (payload.mediaUrls?.length) return payload.mediaUrls.filter(Boolean)
   return payload.mediaUrl ? [payload.mediaUrl] : []
 }
+
 const typingCallbacks = createTypingCallbacks({
-  start: async () => {
-    console.log('typing start')
-  },
+  start: async () => {},
   onStartError: (err) => {
-    console.log('typing start error', err)
+    dcgLogger(`typing start error: ${String(err)}`, 'error')
   }
 })
+
 /**
  * 处理一条用户消息，调用 Agent 并返回回复
  */
 export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
-  let finalSent = false
-
   let completeText = ''
   const config = getOpenClawConfig()
   if (!config) {
@@ -164,7 +159,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   const embeddedAgentId = extractAgentIdFromConversationId(conversationId)
 
   const effectiveAgentId = embeddedAgentId ?? route.agentId
-  const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
+  const dcgSessionKey = getSessionKey(msg.content, account.accountId)
 
   const mergedParams = {
     userId: msg._userId,
@@ -175,18 +170,17 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     appId: msg.content.app_id,
     botId: msg.content.bot_id ?? '',
     agentId: msg.content.agent_id ?? '',
-    sessionKey: effectiveSessionKey,
+    sessionKey: dcgSessionKey,
     real_mobook
   }
-  setParamsMessage(effectiveSessionKey, mergedParams)
-  setParamsMessage(userId, mergedParams)
-  dcgLogger(`target alias bound: aliasTarget=${userId} -> sessionKey=${effectiveSessionKey}`)
-  const outboundCtx = getEffectiveMsgParams(effectiveSessionKey)
+  setParamsMessage(dcgSessionKey, mergedParams)
+  dcgLogger(`target alias bound: aliasTarget=${userId} -> sessionKey=${dcgSessionKey}`)
+  const outboundCtx = getEffectiveMsgParams(dcgSessionKey)
   const agentEntry =
     effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
   const agentDisplayName = agentEntry?.name ?? (effectiveAgentId && effectiveAgentId !== 'main' ? effectiveAgentId : undefined)
 
-  const text = msg.content.text?.trim()
+  let text = msg.content.text?.trim()
 
   if (!text) {
     sendTextMsg('你需要我帮你做什么呢？', outboundCtx)
@@ -218,8 +212,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       RawBody: text,
       CommandBody: text,
       From: userId,
-      To: effectiveSessionKey,
-      SessionKey: effectiveSessionKey,
+      To: dcgSessionKey,
+      SessionKey: dcgSessionKey,
       AccountId: route.accountId,
       ChatType: 'direct',
       SenderName: agentDisplayName,
@@ -231,9 +225,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       WasMentioned: true,
       CommandAuthorized: true,
       OriginatingChannel: "dcgchat-test",
-      OriginatingTo: effectiveSessionKey,
-      Target: effectiveSessionKey,
-      SourceTarget: effectiveSessionKey,
+      OriginatingTo: dcgSessionKey,
+      Target: dcgSessionKey,
+      SourceTarget: dcgSessionKey,
       ...mediaPayload
     })
 
@@ -241,6 +235,12 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
     let streamedTextLen = 0
 
+    if (msg.content.skills_scope.length > 0) {
+      const workspaceDir = getWorkspaceDir()
+      const skillCode = msg.content.skills_scope.map((skill) => `${workspaceDir}/skills/${skill.skill_code}`).join('\n')
+      const skillText = `在这个目录${skillCode}下有你需要的技能，`
+      text = skillText ? `${skillText} \n ${text}` : text
+    }
     const prefixContext = createReplyPrefixContext({
       cfg: config,
       agentId: effectiveAgentId ?? '',
@@ -254,26 +254,22 @@ 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
+        if (sessionStreamSuppressed.has(dcgSessionKey)) return
         const mediaList = resolveReplyMediaList(payload)
         for (const mediaUrl of mediaList) {
           const key = getMediaKey(mediaUrl)
           if (sentMediaKeys.has(key)) continue
           sentMediaKeys.add(key)
-          await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl, text: '' })
+          await sendDcgchatMedia({ sessionKey: dcgSessionKey, mediaUrl, text: '' })
         }
       },
       onError: (err: unknown, info: { kind: string }) => {
-        setMsgStatus(effectiveSessionKey, 'finished')
+        setMsgStatus(dcgSessionKey, 'finished')
         sendFinal(outboundCtx, 'error')
-        dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
-        activeRunIdBySessionKey.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
-        if (sessionStreamSuppressed.has(effectiveSessionKey)) {
-          dcgLogger(`${info.kind} reply failed (stream suppressed): ${String(err)}`, 'error')
-          return
-        }
-        dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
+        activeRunIdBySessionKey.delete(dcgSessionKey)
+        streamChunkIdxBySessionKey.delete(dcgSessionKey)
+        const suppressed = sessionStreamSuppressed.has(dcgSessionKey)
+        dcgLogger(`${info.kind} reply failed${suppressed ? ' (stream suppressed)' : ''}: ${String(err)}`, 'error')
       },
       onIdle: () => {
         typingCallbacks.onIdle?.()
@@ -282,8 +278,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
     try {
       if (!interruptCommand.includes(text?.trim())) {
-        sessionStreamSuppressed.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.set(effectiveSessionKey, 0)
+        sessionStreamSuppressed.delete(dcgSessionKey)
+        streamChunkIdxBySessionKey.set(dcgSessionKey, 0)
       }
 
       if (systemCommand.includes(text?.trim())) {
@@ -300,17 +296,16 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                 ...replyOptions,
                 onModelSelected: prefixContext.onModelSelected,
                 onAgentRunStart: (runId) => {
-                  activeRunIdBySessionKey.set(effectiveSessionKey, runId)
+                  activeRunIdBySessionKey.set(dcgSessionKey, runId)
                 }
               }
             })
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        sendFinal(outboundCtx, 'abort')
+        sendFinal({ ...outboundCtx, messageId: `${Date.now()}` }, 'abort')
         sendText('会话已终止', outboundCtx)
-        sessionStreamSuppressed.add(effectiveSessionKey)
-
+        sessionStreamSuppressed.add(dcgSessionKey)
         const abortOneSession = async (sessionKey: string) => {
           try {
             await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey } })
@@ -318,12 +313,11 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
             dcgLogger(`chat.abort ${sessionKey}: ${String(e)}`, 'error')
           }
         }
-
-        const keysToAbort = new Set<string>(getChildSessionKeysTrackedForRequester(effectiveSessionKey))
+        const keysToAbort = new Set<string>(getChildSessionKeysTrackedForRequester(dcgSessionKey))
         try {
           const listed = await sendGatewayRpc<{ sessions?: Array<{ key?: string }> }>({
             method: 'sessions.list',
-            params: { spawnedBy: effectiveSessionKey, limit: 256 }
+            params: { spawnedBy: dcgSessionKey, limit: 256 }
           })
           for (const s of listed?.sessions ?? []) {
             const k = typeof s?.key === 'string' ? s.key.trim() : ''
@@ -335,29 +329,18 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         for (const sk of keysToAbort) {
           await abortOneSession(sk)
         }
-        await abortOneSession(effectiveSessionKey)
-
-        try {
-          await sendGatewayRpc({
-            method: 'sessions.reset',
-            params: { key: effectiveSessionKey, reason: 'reset' }
-          })
-        } catch (e) {
-          dcgLogger(`sessions.reset: ${String(e)}`, 'error')
-        }
-
-        activeRunIdBySessionKey.delete(effectiveSessionKey)
-        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
-        resetSubagentStateForRequesterSession(effectiveSessionKey)
-        setMsgStatus(effectiveSessionKey, 'finished')
+        await abortOneSession(dcgSessionKey)
+        streamChunkIdxBySessionKey.delete(dcgSessionKey)
+        resetSubagentStateForRequesterSession(dcgSessionKey)
+        setMsgStatus(dcgSessionKey, 'finished')
         clearSentMediaKeys(msg.content.message_id)
-        clearParamsMessage(effectiveSessionKey)
+        clearParamsMessage(dcgSessionKey)
         clearParamsMessage(userId)
 
         sendFinal(outboundCtx, 'stop')
         return
       } else {
-        const params = getEffectiveMsgParams(effectiveSessionKey)
+        const params = getEffectiveMsgParams(dcgSessionKey)
         if (!ignoreToolCommand.includes(text?.trim())) {
           wsSendRaw(params, {
             is_finish: -1,
@@ -385,10 +368,10 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                 ...replyOptions,
                 onModelSelected: prefixContext.onModelSelected,
                 onAgentRunStart: (runId) => {
-                  activeRunIdBySessionKey.set(effectiveSessionKey, runId)
+                  activeRunIdBySessionKey.set(dcgSessionKey, runId)
                 },
                 onPartialReply: async (payload: ReplyPayload) => {
-                  if (sessionStreamSuppressed.has(effectiveSessionKey)) return
+                  if (sessionStreamSuppressed.has(dcgSessionKey)) return
 
                   if (payload.text) {
                     completeText = payload.text
@@ -399,10 +382,10 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                       ? payload.text.slice(streamedTextLen)
                       : payload.text
                     if (delta.trim()) {
-                      const prev = streamChunkIdxBySessionKey.get(effectiveSessionKey) ?? 0
-                      streamChunkIdxBySessionKey.set(effectiveSessionKey, prev + 1)
+                      const prev = streamChunkIdxBySessionKey.get(dcgSessionKey) ?? 0
+                      streamChunkIdxBySessionKey.set(dcgSessionKey, prev + 1)
                       sendChunk(delta, outboundCtx, prev)
-                      dcgLogger(`[stream]: chunkIdx=${prev} len=${delta.length} user=${msg._userId} ${delta.slice(0, 100)}`)
+                      dcgLogger(`[stream]: chunkIdx=${prev} len=${delta.length} user=${outboundCtx.sessionId} ${delta.slice(0, 100)}`)
                     }
                     streamedTextLen = payload.text.length
                   } else {
@@ -414,7 +397,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                     const key = getMediaKey(mediaUrl)
                     if (sentMediaKeys.has(key)) continue
                     sentMediaKeys.add(key)
-                    await sendDcgchatMedia({ sessionKey: effectiveSessionKey, mediaUrl, text: '' })
+                    await sendDcgchatMedia({ sessionKey: dcgSessionKey, mediaUrl, text: '' })
                   }
                 }
               }
@@ -426,26 +409,24 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     }
 
     if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
-      if (sessionStreamSuppressed.has(effectiveSessionKey)) {
-        sessionStreamSuppressed.delete(effectiveSessionKey)
+      if (sessionStreamSuppressed.has(dcgSessionKey)) {
+        sessionStreamSuppressed.delete(dcgSessionKey)
       }
     }
     clearSentMediaKeys(msg.content.message_id)
     const storePath = core.channel.session.resolveStorePath(config.session?.store)
-    await waitUntilSubagentsIdle(effectiveSessionKey, { timeoutMs: 600_000 })
+    await waitUntilSubagentsIdle(dcgSessionKey, { timeoutMs: 600_000 })
     sendFinal(outboundCtx, 'end')
-    dcgLogger(
-      `record session route: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, updateLastRoute.to=${effectiveSessionKey}, accountId=${route.accountId}`
-    )
+    dcgLogger(`record session route: updateLastRoute.to=${dcgSessionKey}, accountId=${route.accountId}`)
     core.channel.session
       .recordInboundSession({
         storePath,
-        sessionKey: effectiveSessionKey,
+        sessionKey: dcgSessionKey,
         ctx: ctxPayload,
         updateLastRoute: {
-          sessionKey: effectiveSessionKey,
+          sessionKey: dcgSessionKey,
           channel: "dcgchat-test",
-          to: effectiveSessionKey,
+          to: dcgSessionKey,
           accountId: route.accountId
         },
         onRecordError: (err) => {

package/src/channel.ts

@@ -15,6 +15,47 @@ import { dcgLogger, setLogger } from './utils/log.js'
 import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
 
+function dcgchatChannelCfg(): DcgchatConfig {
+  return (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
+}
+
+/** `agent:<code>:mobook:direct:<agentId>:<sessionId>`（与 getSessionKey 非 real_mobook 分支一致） */
+function isMobookDirectSessionKey(s: string): boolean {
+  const parts = s.split(':').filter((p) => p.length > 0)
+  const low = parts.map((p) => p.toLowerCase())
+  return parts.length >= 6 && low[0] === 'agent' && low[2] === 'mobook' && low[3] === 'direct'
+}
+
+/** real_mobook 等线路下 Core 分配的 `agent:<agentId>:…` sessionKey */
+function isAgentPrefixedSessionKey(s: string): boolean {
+  const parts = s.split(':').filter((p) => p.length > 0)
+  return parts.length >= 3 && parts[0].toLowerCase() === 'agent'
+}
+
+/**
+ * 供 `messaging.targetResolver.looksLikeId` 使用：与 OpenClaw `resolveMessagingTarget` 对齐，
+ * 仅当 target「像合法会话路由键」时才走 id 类解析；纯数字不会命中，从而在系统层拒绝误填 userId。
+ */
+function looksLikeDcgchatMessageToolTarget(raw: string): boolean {
+  let s = raw.trim()
+  if (!s) return false
+  const prefix = 'dcg-cron:'
+  if (s.startsWith(prefix)) {
+    s = s.slice(prefix.length).trim()
+    if (!s) return false
+  }
+  if (isMobookDirectSessionKey(s)) return true
+  if (isAgentPrefixedSessionKey(s)) return true
+  return false
+}
+
+function dcgchatMessageTargetLooksLikeId(raw: string, _normalized?: string): boolean {
+  if (dcgchatChannelCfg().strictMessageToolTarget === false) {
+    return Boolean(raw?.trim())
+  }
+  return looksLikeDcgchatMessageToolTarget(raw)
+}
+
 export type DcgchatMediaSendOptions = {
   /** 与 setParamsMessage / map 一致，用于 getOutboundMsgParams */
   sessionKey: string
@@ -105,7 +146,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     effects: true
     // blockStreaming: true,
   },
-  reload: { configPrefixes: ['channels.dcgchat'] },
+  /** 当前构建的 channel id + 兼容旧配置键 `channels.dcgchat` */
+  reload: { configPrefixes: [`channels.${"dcgchat-test"}`, 'channels.dcgchat'] },
   configSchema: {
     schema: {
       type: 'object',
@@ -114,16 +156,25 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         enabled: { type: 'boolean' },
         wsUrl: { type: 'string' },
         botToken: { type: 'string' },
-        userId: { type: 'string', description: 'WebSocket 连接参数 _userId，与 message 工具的 target（effectiveSessionKey）无关' },
+        userId: { type: 'string', description: 'WebSocket 连接参数 _userId，与 dcgchat_message 工具的 target（dcgSessionKey）无关' },
         appId: { type: 'string' },
         domainId: { type: 'string' },
-        capabilities: { type: 'array', items: { type: 'string' } }
+        capabilities: { type: 'array', items: { type: 'string' } },
+        strictMessageToolTarget: {
+          type: 'boolean',
+          description:
+            '默认 true：内置 message 工具的 target 须为 sessionKey 形态（如 agent:…:mobook:direct:… 或 agent: 前缀多段），禁止纯数字 WS userId。设为 false 关闭此校验。'
+        }
       }
     },
     uiHints: {
       userId: {
         label: 'WS 连接 _userId',
-        help: '仅用于拼接网关 WebSocket URL 的查询参数，不是 Agent 发消息时的 target。发消息请使用 effectiveSessionKey（与入站上下文 SessionKey 相同，格式如 agent:main:mobook:direct:<agent_id>:<session_id>）。'
+        help: '仅用于拼接网关 WebSocket URL 的查询参数，不是 Agent 发消息时的 target。发消息请使用 dcgSessionKey（与入站上下文 SessionKey 相同）。'
+      },
+      strictMessageToolTarget: {
+        label: '严格 message.target',
+        help: '开启后由通道目标解析层拒绝纯数字等非 sessionKey 的 target（推荐开启）；关闭则与旧版行为一致。'
       }
     }
   },
@@ -131,16 +182,17 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     listAccountIds: () => [DEFAULT_ACCOUNT_ID],
     resolveAccount: (cfg, accountId) => resolveAccount(cfg, accountId),
     defaultAccountId: () => DEFAULT_ACCOUNT_ID,
-    setAccountEnabled: ({ cfg, enabled }) => ({
-      ...cfg,
-      channels: {
-        ...cfg.channels,
-        dcgchat: {
-          ...(cfg.channels?.["dcgchat-test"] as Record<string, unknown> | undefined),
-          enabled
+    setAccountEnabled: ({ cfg, enabled }) => {
+      const channelKey = "dcgchat-test"
+      const prev = (cfg.channels?.[channelKey as keyof NonNullable<typeof cfg.channels>] as Record<string, unknown> | undefined) ?? {}
+      return {
+        ...cfg,
+        channels: {
+          ...cfg.channels,
+          [channelKey]: { ...prev, enabled }
         }
       }
-    }),
+    },
     isConfigured: (account) => account.configured,
     describeAccount: (account) => ({
       accountId: account.accountId,
@@ -156,15 +208,26 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   messaging: {
     normalizeTarget: (raw) => raw || undefined,
     targetResolver: {
-      looksLikeId: (raw) => Boolean(raw?.trim()),
-      hint: 'effectiveSessionKey（与 SessionKey 一致；勿填配置里的 WS userId）'
+      looksLikeId: dcgchatMessageTargetLooksLikeId,
+      hint: '须为完整 dcgSessionKey（与 SessionKey 一致，形如 agent:…:mobook:direct:… 或 agent: 前缀路由键）；禁止填 WS userId 等纯数字。可在通道配置 strictMessageToolTarget=false 关闭校验。'
     }
   },
+  /**
+   * 与 Telegram 等通道一致：用入站路由键 `To`（即 SessionKey / OriginatingTo）作为 message 工具默认 `currentChannelId`。
+   * 显式 target 由 `messaging.targetResolver.looksLikeId` + OpenClaw `resolveMessagingTarget` 校验（见 strictMessageToolTarget）。
+   */
+  threading: {
+    buildToolContext: ({ context, hasRepliedRef }) => ({
+      currentChannelId: context.To?.trim() || undefined,
+      hasRepliedRef
+    })
+  },
   agentPrompt: {
     messageToolHints: () => [
       '生成文件后，**尽可能不要**把文件路径、地址直接告诉用户。',
       '生成文件后，把文件名告诉用户。',
-      '生成文件后，必须调用 message 工具发送文件，不可以直接在文本回复里包含文件路径、文件名、地址。'
+      '使用内置 `message` 或 `dcgchat_message` 发消息时，target 必须是完整 dcgSessionKey（与上下文 SessionKey 相同），禁止填 From、SenderId、WS userId 等纯数字。',
+      '生成文件后，须通过工具发送文件，勿在文本里直接输出路径或地址。'
     ]
   },
   outbound: {

package/src/gateway/socket.ts

@@ -212,7 +212,7 @@ async function connectPersistentGateway(): Promise<void> {
     startPingTimer(gw)
     dcgLogger(`Gateway 持久连接成功 connId=${gw.getConnId() ?? '?'}`)
   } catch (e) {
-    dcgLogger(`Gateway 连接失败11: ${e}`, 'error')
+    dcgLogger(`Gateway 连接失败: ${e}`, 'error')
     persistentConn = null
     clearPingTimer()
     if (!socketStopped) {
@@ -230,8 +230,10 @@ export function startDcgchatGatewaySocket(): void {
   socketStopped = false
   clearReconnectTimer()
   if (startupConnectTimer != null) return
-  startupConnectTimer = null
-  void connectPersistentGateway()
+  startupConnectTimer = setTimeout(() => {
+    startupConnectTimer = null
+    void connectPersistentGateway()
+  }, 0)
 }
 
 /**

package/src/monitor.ts

@@ -123,7 +123,6 @@ export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<
         dcgLogger(`用户消息content字段解析失败: invalid JSON received`, 'error')
         return
       }
-
       await handleParsedWsMessage(parsed, payloadStr, account.accountId)
     })
 

package/src/tool.ts

@@ -205,7 +205,6 @@ export function getActiveSubagentCount(sessionKey: string): number {
  * 注意：须在收到 `subagent_spawned` 之后才会计入；仅 spawning 未 spawned 的不会阻塞。
  */
 export function waitUntilSubagentsIdle(sessionKey: string, opts?: { timeoutMs?: number; signal?: AbortSignal }): Promise<void> {
-  console.log('🚀 ~ waitUntilSubagentsIdle ~ sessionKey:', sessionKey)
   const sk = sessionKey?.trim()
   if (!sk) return Promise.resolve()
 
@@ -350,7 +349,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
             dcgLogger(`工具调用结果： ~ event:${item.event} ${status}`)
           }
         }
-      } else {
+      } else if (item.event !== 'before_tool_call') {
         dcgLogger(`工具调用结果： ~ event:${item.event} ~ 没有sessionKey 为执行`)
       }
     })

package/src/tools/{meeageToll.ts → messageTool.ts}

@@ -2,15 +2,15 @@ import fs from 'node:fs'
 import path from 'node:path'
 import type { AnyAgentTool } from 'openclaw/plugin-sdk'
 import { jsonResult } from 'openclaw/plugin-sdk'
+import { sendDcgchatMedia } from '../channel.js'
+import { getOutboundMsgParams } from '../utils/params.js'
+import { sendText } from '../transport.js'
 
 /** 与 `registerTool` 工厂入参一致（主包未导出 `OpenClawPluginToolContext` 时仅用所需字段）。 */
 export type DcgchatMessageToolContext = {
   sessionKey?: string
   workspaceDir?: string
 }
-import { sendDcgchatMedia } from '../channel.js'
-import { getOutboundMsgParams } from '../utils/params.js'
-import { sendText } from '../transport.js'
 
 const SAFE_PREFIXES = ['/workspace/', '/mobook/']
 
@@ -22,7 +22,13 @@ const SAFE_EXTENSIONS = new Set([...fileType1, ...fileType2, ...fileType3, ...fi
 
 const messageToolParameters = {
   type: 'object',
+  additionalProperties: false,
   properties: {
+    target: {
+      type: 'string',
+      description:
+        '目标会话键（sessionKey），必须与当前会话 SessionKey 一致，禁止填写 userId。'
+    },
     content: {
       type: 'string',
       description: '发送文本内容'
@@ -32,6 +38,7 @@ const messageToolParameters = {
       description: '发送附件',
       items: {
         type: 'object',
+        additionalProperties: false,
         properties: {
           file: {
             type: 'string',
@@ -41,7 +48,8 @@ const messageToolParameters = {
         required: ['file']
       }
     }
-  }
+  },
+  oneOf: [{ required: ['content'] }, { required: ['media'] }]
 }
 
 function extractPaths(text?: string) {
@@ -64,16 +72,17 @@ function isSafeFile(filepath: string) {
 }
 
 /**
- * 书灵墨宝 message 工具：须符合 OpenClaw `AgentTool`（execute 返回 `AgentToolResult`）。
+ * 书灵墨宝出站消息工具：须符合 OpenClaw `AgentTool`（execute 返回 `AgentToolResult`）。
+ * 工具名使用 `dcgchat_message`，避免与核心内置 `message` 冲突。
  * 通过注册时的 `OpenClawPluginToolContext.sessionKey` 出站，不再使用非标准的 `execute(args, ctx)`。
  */
 export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext): AnyAgentTool {
-  console.log('🚀 ~ createDcgchatMessageTool ~ pluginCtx:', pluginCtx)
   return {
-    name: 'message',
-    label: 'message',
+    name: 'dcgchat_message',
+    label: 'dcgchat_message',
     description: `
       向用户发送消息。
+      若传 target，target 必须是 sessionKey，不能是 userId。
       如果发送附件：必须使用 media 字段
       支持路径目录：
       /workspace/

package/src/transport.ts

@@ -152,11 +152,14 @@ export function wsSend(ctx: IMsgParams, content: Record<string, unknown>): boole
  */
 export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>, isLog = true): boolean {
   const ws = getWsConnection()
-  if (isWsOpen()) {
-    ws?.send(JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
-    if (isLog) {
-      dcgLogger('已发送：' + JSON.stringify(buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })))
-    }
+  if (ws?.readyState !== WebSocket.OPEN) {
+    dcgLogger(`server socket not ready ${ws?.readyState}`, 'error')
+    return false
+  }
+  const envelope = buildOpenclawBotChat(ctx, content, { mergeChannelDefaults: true })
+  ws.send(JSON.stringify(envelope))
+  if (isLog) {
+    dcgLogger('已发送：' + JSON.stringify(envelope))
   }
   return true
 }

package/src/types.ts

@@ -11,6 +11,11 @@ export type DcgchatConfig = {
   userId?: string
   domainId?: string
   appId?: string
+  /**
+   * 内置 `message` 工具走 OpenClaw 目标解析：`true`（默认）时仅将符合 sessionKey 形态的字符串视为合法 target，
+   * 纯数字（WS userId 等）会解析失败；设为 `false` 恢复旧版宽松行为（不推荐）。
+   */
+  strictMessageToolTarget?: boolean
 }
 
 export type ResolvedDcgchatAccount = {
@@ -38,6 +43,7 @@ export type InboundMessage = {
   source: string // 'server',
   // content: string;
   content: {
+    skills_scope: Record<string, any>[]
     bot_token: string
     agent_clone_code?: string
     domain_id?: string

package/src/utils/gatewayMsgHanlder.ts

@@ -10,11 +10,13 @@ import { sendChunk } from '../transport.js'
 export function handleGatewayEventMessage(msg: { event?: string; payload?: Record<string, unknown>; seq?: number }): GatewayEvent {
   try {
     if (msg.event === 'agent') {
-      dcgLogger(`[Gateway] 收到agent事件: ${JSON.stringify(msg).slice(0, 100)}`)
       const pl = msg.payload as { runId: string; data?: { delta?: unknown } }
       const sessionKey = getSessionKeyBySubAgentRunId(pl.runId)
       const outboundCtx = getEffectiveMsgParams(sessionKey)
-      if (outboundCtx.sessionId && pl.data?.delta) sendChunk(pl.data.delta as string, outboundCtx, 0)
+      if (pl.data?.delta) {
+        dcgLogger(`[Gateway] 收到agent事件: ${JSON.stringify(msg).slice(0, 100)}`)
+        if (outboundCtx.sessionId) sendChunk(pl.data.delta as string, outboundCtx, 0)
+      }
     }
     if (msg.event === 'cron') {
       const p = msg.payload

package/src/utils/global.ts

@@ -1,6 +1,12 @@
-/** socket connection */
 import type WebSocket from 'ws'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+import { createPluginRuntimeStore, type OpenClawConfig, type PluginRuntime } from 'openclaw/plugin-sdk'
+import { channelInfo, ENV } from './constant.js'
+import { dcgLogger } from './log.js'
 
+/** socket connection */
 let ws: WebSocket | null = null
 
 export function setWsConnection(next: WebSocket | null) {
@@ -11,7 +17,6 @@ export function getWsConnection(): WebSocket | null {
   return ws
 }
 
-// OpenClawConfig
 let config: OpenClawConfig | null = null
 
 export function setOpenClawConfig(next: OpenClawConfig | null) {
@@ -22,15 +27,7 @@ export function getOpenClawConfig(): OpenClawConfig | null {
   return config
 }
 
-import { createPluginRuntimeStore, type OpenClawConfig, type PluginRuntime } from 'openclaw/plugin-sdk'
-import { dcgLogger } from './log.js'
-import { channelInfo, ENV } from './constant.js'
-
-const path = require('path')
-const fs = require('fs')
-const os = require('os')
-
-function getWorkspacePath() {
+function getWorkspacePath(): string | null {
   const workspacePath = path.join(
     os.homedir(),
     config?.channels?.["dcgchat-test"]?.appId == 110 ? '.mobook' : '.openclaw',
@@ -42,19 +39,21 @@ function getWorkspacePath() {
   return null
 }
 
-let workspaceDir: string = getWorkspacePath()
+let workspaceDir: string = getWorkspacePath() ?? ''
 
 export function setWorkspaceDir(dir?: string) {
   if (dir) {
     workspaceDir = dir
   }
 }
+
 export function getWorkspaceDir(): string {
   if (!workspaceDir) {
     dcgLogger?.('Workspace directory not initialized', 'error')
   }
   return workspaceDir
 }
+
 const { setRuntime: setDcgchatRuntime, getRuntime: getDcgchatRuntime } = createPluginRuntimeStore<PluginRuntime>(
   `${"dcgchat-test"} runtime not initialized`
 )
@@ -127,7 +126,7 @@ export const getSessionKey = (content: any, accountId: string) => {
   const { real_mobook, agent_id, agent_clone_code, session_id } = content
   const core = getDcgchatRuntime()
 
-  const anentCode = agent_clone_code || 'main'
+  const agentCode = agent_clone_code || 'main'
 
   const route = core.channel.routing.resolveAgentRoute({
     cfg: getOpenClawConfig() as OpenClawConfig,
@@ -135,7 +134,7 @@ export const getSessionKey = (content: any, accountId: string) => {
     accountId: accountId || 'default',
     peer: { kind: 'direct', id: session_id }
   })
-  return real_mobook == '1' ? route.sessionKey : `agent:${anentCode}:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
+  return real_mobook == '1' ? route.sessionKey : `agent:${agentCode}:mobook:direct:${agent_id}:${session_id}`.toLowerCase()
 }
 
 export function getInfoBySessionKey(sk: string): { sessionId: string; agentId: string } {

package/src/utils/params.ts

@@ -47,9 +47,8 @@ export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
 }
 
 /**
- * Agent `message` 工具的 `target` 应为 `effectiveSessionKey`（如 `agent:main:mobook:direct:...`）。
- * `setParamsMessage` 使用的 key 与此一致。若按 preferredKey 查不到 map，
- * 则回落到当前会话 `currentSessionKey`，避免拿到空 `messageId` / `sessionId` 导致无文件卡片、WS 上下文错误。
+ * Agent `dcgchat_message` / 出站 `target` 应为 `dcgSessionKey`（如 `agent:main:mobook:direct:...`）。
+ * `setParamsMessage` 的 key 与此一致；查不到 map 时回落到配置缺省（无会话级 messageId/sessionId）。
  */
 export function getOutboundMsgParams(preferredKey: string): IMsgParams {
   const k = preferredKey?.trim()