@dcrays/dcgchat-test 0.3.40 → 0.3.41

package/package.json

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

package/src/bot.ts

@@ -12,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'
@@ -181,7 +180,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     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)
@@ -236,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 ?? '',
@@ -298,10 +303,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        sendFinal(outboundCtx, 'abort')
+        sendFinal({ ...outboundCtx, messageId: `${Date.now()}` }, 'abort')
         sendText('会话已终止', outboundCtx)
         sessionStreamSuppressed.add(dcgSessionKey)
-
         const abortOneSession = async (sessionKey: string) => {
           try {
             await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey } })
@@ -309,7 +313,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
             dcgLogger(`chat.abort ${sessionKey}: ${String(e)}`, 'error')
           }
         }
-
         const keysToAbort = new Set<string>(getChildSessionKeysTrackedForRequester(dcgSessionKey))
         try {
           const listed = await sendGatewayRpc<{ sessions?: Array<{ key?: string }> }>({
@@ -327,17 +330,6 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           await abortOneSession(sk)
         }
         await abortOneSession(dcgSessionKey)
-
-        try {
-          await sendGatewayRpc({
-            method: 'sessions.reset',
-            params: { key: dcgSessionKey, reason: 'reset' }
-          })
-        } catch (e) {
-          dcgLogger(`sessions.reset: ${String(e)}`, 'error')
-        }
-
-        activeRunIdBySessionKey.delete(dcgSessionKey)
         streamChunkIdxBySessionKey.delete(dcgSessionKey)
         resetSubagentStateForRequesterSession(dcgSessionKey)
         setMsgStatus(dcgSessionKey, 'finished')
@@ -393,7 +385,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                       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 {
@@ -425,9 +417,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     const storePath = core.channel.session.resolveStorePath(config.session?.store)
     await waitUntilSubagentsIdle(dcgSessionKey, { timeoutMs: 600_000 })
     sendFinal(outboundCtx, 'end')
-    dcgLogger(
-      `record session route: rawTarget=${userId}, normalizedTarget=${dcgSessionKey}, updateLastRoute.to=${dcgSessionKey}, accountId=${route.accountId}`
-    )
+    dcgLogger(`record session route: updateLastRoute.to=${dcgSessionKey}, accountId=${route.accountId}`)
     core.channel.session
       .recordInboundSession({
         storePath,

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
@@ -115,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（dcgSessionKey）无关' },
+        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。发消息请使用 dcgSessionKey（与入站上下文 SessionKey 相同）。'
+      },
+      strictMessageToolTarget: {
+        label: '严格 message.target',
+        help: '开启后由通道目标解析层拒绝纯数字等非 sessionKey 的 target（推荐开启）；关闭则与旧版行为一致。'
       }
     }
   },
@@ -134,8 +184,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     defaultAccountId: () => DEFAULT_ACCOUNT_ID,
     setAccountEnabled: ({ cfg, enabled }) => {
       const channelKey = "dcgchat-test"
-      const prev =
-        (cfg.channels?.[channelKey as keyof NonNullable<typeof cfg.channels>] as Record<string, unknown> | undefined) ?? {}
+      const prev = (cfg.channels?.[channelKey as keyof NonNullable<typeof cfg.channels>] as Record<string, unknown> | undefined) ?? {}
       return {
         ...cfg,
         channels: {
@@ -159,16 +208,26 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   messaging: {
     normalizeTarget: (raw) => raw || undefined,
     targetResolver: {
-      looksLikeId: (raw) => Boolean(raw?.trim()),
-      hint: 'dcgSessionKey（与 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 工具时，target 必须填写 dcgSessionKey（即 SessionKey），绝不能填写 WS userId。',
-      '生成文件后，必须调用 message 工具发送文件，不可以直接在文本回复里包含文件路径、文件名、地址。'
+      '使用内置 `message` 或 `dcgchat_message` 发消息时，target 必须是完整 dcgSessionKey（与上下文 SessionKey 相同），禁止填 From、SenderId、WS userId 等纯数字。',
+      '生成文件后，须通过工具发送文件，勿在文本里直接输出路径或地址。'
     ]
   },
   outbound: {

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

@@ -349,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/messageTool.ts

@@ -72,13 +72,14 @@ 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 {
   return {
-    name: 'message',
-    label: 'message',
+    name: 'dcgchat_message',
+    label: 'dcgchat_message',
     description: `
       向用户发送消息。
       若传 target，target 必须是 sessionKey，不能是 userId。

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/params.ts

@@ -47,9 +47,8 @@ export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
 }
 
 /**
- * Agent `message` 工具的 `target` 应为 `dcgSessionKey`（如 `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()