@dcrays/dcgchat-test 0.3.28 → 0.3.32

package/package.json

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

package/src/bot.ts

@@ -166,7 +166,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   const effectiveAgentId = embeddedAgentId ?? route.agentId
   const effectiveSessionKey = getSessionKey(msg.content, account.accountId)
 
-  setParamsMessage(effectiveSessionKey, {
+  const mergedParams = {
     userId: msg._userId,
     botToken: msg.content.bot_token,
     sessionId: conversationId,
@@ -177,7 +177,14 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     agentId: msg.content.agent_id ?? '',
     sessionKey: effectiveSessionKey,
     real_mobook
-  })
+  }
+  setParamsMessage(effectiveSessionKey, mergedParams)
+  // 与 OpenClaw 会话投递里仍可能出现的 ctx.to=SenderId（userId）对齐，便于 getOutboundMsgParams 命中
+  dcgLogger(
+    `target normalize: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, conversationId=${conversationId ?? ''}, messageId=${msg.content.message_id}`
+  )
+  setParamsMessage(userId, mergedParams)
+  dcgLogger(`target alias bound: aliasTarget=${userId} -> sessionKey=${effectiveSessionKey}`)
   const outboundCtx = getEffectiveMsgParams(effectiveSessionKey)
   const agentEntry =
     effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
@@ -245,6 +252,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       OriginatingTo: effectiveSessionKey,
       ...mediaPayload
     })
+  dcgLogger(
+    `inbound context target: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, ctx.To=${String(ctxPayload.To ?? '')}, ctx.SessionKey=${String(ctxPayload.SessionKey ?? '')}, ctx.OriginatingTo=${String(ctxPayload.OriginatingTo ?? '')}`
+  )
 
     const sentMediaKeys = new Set<string>()
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
@@ -438,11 +448,21 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
     // Record session metadata
     const storePath = core.channel.session.resolveStorePath(config.session?.store)
+    dcgLogger(
+      `record session route: rawTarget=${userId}, normalizedTarget=${effectiveSessionKey}, updateLastRoute.to=${effectiveSessionKey}, accountId=${route.accountId}`
+    )
     core.channel.session
       .recordInboundSession({
         storePath,
         sessionKey: effectiveSessionKey,
         ctx: ctxPayload,
+        // 与 Telegram/Discord 等一致：写入 deliveryContext.to，否则投递可能回退为 From（userId），channel sendMedia 里 ctx.to 会变成数字 userId
+        updateLastRoute: {
+          sessionKey: effectiveSessionKey,
+          channel: "dcgchat-test",
+          to: effectiveSessionKey,
+          accountId: route.accountId
+        },
         onRecordError: (err) => {
           dcgLogger(` session record error: ${String(err)}`, 'error')
         }

package/src/channel.ts

@@ -5,7 +5,7 @@ import { ossUpload } from './request/oss.js'
 import { addSentMediaKey, getCronMessageId, getOpenClawConfig, hasSentMediaKey } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
 import { dcgLogger, setLogger } from './utils/log.js'
-import { getOutboundMsgParams } from './utils/params.js'
+import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
 
 export type DcgchatMediaSendOptions = {
@@ -15,8 +15,15 @@ export type DcgchatMediaSendOptions = {
   text?: string
 }
 
+function normalizeSessionTarget(rawTo: string): string {
+  const cleaned = rawTo.replace('dcg-cron:', '').trim()
+  if (!cleaned) return ''
+  return getParamsMessage(cleaned)?.sessionKey?.trim() || cleaned
+}
+
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
-  const msgCtx = getOutboundMsgParams(opts.sessionKey ?? '')
+  const sessionKey = normalizeSessionTarget(opts.sessionKey ?? '')
+  const msgCtx = getOutboundMsgParams(sessionKey)
   if (!isWsOpen()) {
     dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
     return
@@ -36,21 +43,20 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
 
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
-    console.log('🚀 ~ sendDcgchatMedia ~ botToken:', botToken)
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       message_tags: { source: 'file' },
       files: [{ url, name: fileName }]
     })
-    dcgLogger(`dcgchat: sendMedia to user ${msgCtx.userId}, file=${fileName}`)
+    dcgLogger(`dcgchat: sendMedia session=${sessionKey}, file=${fileName}`)
   } catch (error) {
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
       message_tags: { source: 'file' },
       files: [{ url: opts.mediaUrl ?? '', name: fileName }]
     })
-    dcgLogger(`dcgchat: error sendMedia to user ${msgCtx.userId}: ${String(error)}`, 'error')
+    dcgLogger(`dcgchat: error sendMedia session=${sessionKey}: ${String(error)}`, 'error')
   }
 }
 
@@ -101,11 +107,17 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         enabled: { type: 'boolean' },
         wsUrl: { type: 'string' },
         botToken: { type: 'string' },
-        userId: { type: 'string' },
+        userId: { type: 'string', description: 'WebSocket 连接参数 _userId，与 message 工具的 target（effectiveSessionKey）无关' },
         appId: { type: 'string' },
         domainId: { type: 'string' },
         capabilities: { type: 'array', items: { type: 'string' } }
       }
+    },
+    uiHints: {
+      userId: {
+        label: 'WS 连接 _userId',
+        help: '仅用于拼接网关 WebSocket URL 的查询参数，不是 Agent 发消息时的 target。发消息请使用 effectiveSessionKey（与入站上下文 SessionKey 相同，格式如 agent:main:mobook:direct:…）。'
+      }
     }
   },
   config: {
@@ -135,26 +147,44 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     })
   },
   messaging: {
-    normalizeTarget: (raw) => raw?.trim() || undefined,
+    normalizeTarget: (raw) => normalizeSessionTarget(raw ?? '') || undefined,
     targetResolver: {
       looksLikeId: (raw) => Boolean(raw?.trim()),
-      hint: 'userId'
+      hint: 'effectiveSessionKey（与 SessionKey 一致；勿填配置里的 WS userId）'
     }
   },
+  agentPrompt: {
+    messageToolHints: () => [
+      '书灵墨宝：message 工具的 target 必须填 effectiveSessionKey（与当前会话 SessionKey / OriginatingTo 相同），形如 agent:main:mobook:direct:<agent_id>:<session_id>；不要填 channels.dcgchat.userId 或纯数字 userId。',
+      'OpenClaw 自带的 target 字段说明里仍可能出现 “user id”，在本频道请忽略该字样，一律按 effectiveSessionKey 理解。'
+    ]
+  },
   outbound: {
     deliveryMode: 'direct',
+    resolveTarget: ({ to }) => {
+      const normalized = normalizeSessionTarget(to ?? '')
+      if (!normalized) {
+        return { ok: false, error: new Error('target is empty') }
+      }
+      return { ok: true, to: normalized }
+    },
     textChunkLimit: 4000,
     sendText: async (ctx) => {
       const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const to = ctx.to.replace('dcg-cron:', '')
+      const to = normalizeSessionTarget(ctx.to)
       dcgLogger(`channel sendText to ${ctx.to} `)
       const outboundCtx = getOutboundMsgParams(to)
       const cronMsgId = getCronMessageId(to)
       const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : outboundCtx?.messageId
+      const content: Record<string, unknown> = { response: ctx.text }
+      if (isCron || !outboundCtx?.messageId) {
+        content.is_finish = -1
+        content.message_tags = { source: 'cron' }
+      }
       if (isWsOpen()) {
         if (outboundCtx?.sessionId) {
           const newCtx = { ...outboundCtx, messageId }
-          wsSendRaw(newCtx, { response: ctx.text, is_finish: -1, message_tags: { source: 'channel' } })
+          wsSendRaw(newCtx, content)
         } else {
           const sessionInfo = to.split(':')
           const sessionId = sessionInfo.at(-1) ?? ''
@@ -163,10 +193,9 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
             agentId: agentId,
             sessionId: `${sessionId}`,
             messageId: messageId,
-            is_finish: -1,
             real_mobook: !sessionId ? 1 : ''
           })
-          wsSendRaw(merged, { response: ctx.text, message_tags: { source: 'channel' } })
+          wsSendRaw(merged, content)
         }
       }
       return {
@@ -176,17 +205,29 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       }
     },
     sendMedia: async (ctx) => {
-      const to = ctx.to.replace('dcg-cron:', '')
-      const msgCtx = getOutboundMsgParams(to)
-      const cronMsgId = getCronMessageId(to)
       const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const messageId = !!cronMsgId ? cronMsgId : isCron ? `${Date.now()}` : msgCtx?.messageId
+      const to = normalizeSessionTarget(ctx.to)
+      const outboundCtx = getOutboundMsgParams(to)
+      const msgCtx = getParamsMessage(to) ?? outboundCtx
+      const cronMsgId = getCronMessageId(to)
+      const fallbackMessageId = `${Date.now()}`
+      const messageId = cronMsgId || (isCron ? fallbackMessageId : msgCtx?.messageId || fallbackMessageId)
+
+      if (!outboundCtx?.sessionId) {
+        dcgLogger(`channel sendMedia to ${ctx.to} -> sessionId not found`, 'error')
+        return {
+          channel: "dcgchat-test",
+          messageId,
+          chatId: to || ''
+        }
+      }
+
       dcgLogger(`channel sendMedia to ${ctx.to}`)
-      await sendDcgchatMedia({ sessionKey: to ?? '', mediaUrl: ctx.mediaUrl ?? '' })
+      await sendDcgchatMedia({ sessionKey: to || '', mediaUrl: ctx.mediaUrl || '' })
       return {
         channel: "dcgchat-test",
-        messageId: `${messageId}`,
-        chatId: msgCtx.userId?.toString()
+        messageId,
+        chatId: to || ''
       }
     }
   },

package/src/cron.ts

@@ -6,7 +6,7 @@ import { getCronMessageId, getWorkspaceDir, getWsConnection, removeCronMessageId
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
-import { getEffectiveMsgParams } from './utils/params.js'
+import { getEffectiveMsgParams, getParamsDefaults } from './utils/params.js'
 
 export function getCronJobsPath(): string {
   const workspaceDir = getWorkspaceDir()
@@ -51,17 +51,27 @@ const CRON_UPLOAD_DEBOUNCE_MS = 6600
 let pendingCronUploadCtx: IMsgParams | null = null
 let cronUploadFlushTimer: ReturnType<typeof setTimeout> | null = null
 
-async function runCronJobsUpload(msgCtx: IMsgParams): Promise<void> {
+async function runCronJobsUpload(sessionKey: string): Promise<void> {
   const jobPath = getCronJobsPath()
+  const botToken = getParamsDefaults().botToken
   if (fs.existsSync(jobPath)) {
     try {
-      const url = await ossUpload(jobPath, msgCtx.botToken ?? '', 0)
+      const url = await ossUpload(jobPath, botToken ?? '', 0)
       dcgLogger(`定时任务创建成功: ${url}`)
-      if (!msgCtx.sessionKey) {
-        dcgLogger(`runCronJobsUpload: missing sessionKey ${JSON.stringify(msgCtx)} on msgCtx`, 'error')
+      if (!sessionKey) {
+        dcgLogger(`runCronJobsUpload: missing sessionKey  on msgCtx`, 'error')
         return
       }
-      sendEventMessage(url, msgCtx.sessionKey)
+      const sessionInfo = sessionKey.split(':')
+      const sessionId = sessionInfo.at(-1) ?? ''
+      const agentId = sessionInfo.at(-2) ?? ''
+      const params = {
+        event_type: 'cron',
+        operation_type: 'install',
+        session_id: sessionId,
+        agent_id: agentId
+      }
+      sendEventMessage(url, params)
     } catch (error) {
       dcgLogger(`${jobPath} upload failed: ${error}`, 'error')
     }
@@ -70,14 +80,6 @@ async function runCronJobsUpload(msgCtx: IMsgParams): Promise<void> {
   }
 }
 
-function flushCronUploadQueue(): void {
-  cronUploadFlushTimer = null
-  const ctx = pendingCronUploadCtx
-  pendingCronUploadCtx = null
-  if (!ctx) return
-  void runCronJobsUpload(ctx)
-}
-
 /**
  * 将 jobs.json 同步到 OSS 并推送事件。30s 内多次调用合并为一次上传；定时触发后清空待处理项，避免重复执行。
  * @param msgCtx 可选；省略时使用当前会话 getEffectiveMsgParams(sessionKey) 快照
@@ -85,17 +87,17 @@ function flushCronUploadQueue(): void {
 export function sendDcgchatCron(jobId: string): void {
   const jobPath = getCronJobsPath()
   const { sessionKey } = readCronJob(jobPath, jobId) || {}
-  const ctx = msgParamsToCtx(getEffectiveMsgParams(sessionKey))
-  if (!ctx) {
+  if (!sessionKey) {
     dcgLogger('sendDcgchatCron: no message context (missing token / params)', 'error')
     return
   }
   dcgLogger(`sessionKey: ${sessionKey}, jobId: ${jobId}`)
-  pendingCronUploadCtx = ctx
   if (cronUploadFlushTimer !== null) {
     clearTimeout(cronUploadFlushTimer)
   }
-  cronUploadFlushTimer = setTimeout(flushCronUploadQueue, CRON_UPLOAD_DEBOUNCE_MS)
+  cronUploadFlushTimer = setTimeout(() => {
+    runCronJobsUpload(sessionKey)
+  }, CRON_UPLOAD_DEBOUNCE_MS)
 }
 
 /**

package/src/gateway/index.ts

@@ -363,10 +363,10 @@ export class GatewayConnection {
         if (msg.event === 'cron') {
           dcgLogger(`[Gateway] 收到事件: ${JSON.stringify(msg)}`)
           if (msg.payload?.action === 'added') {
-            sendDcgchatCron()
+            sendDcgchatCron(msg.payload?.jobId)
           }
           if (msg.payload?.action === 'updated') {
-            sendDcgchatCron()
+            sendDcgchatCron(msg.payload?.jobId as string)
           }
           if (msg.payload?.action === 'finished') {
             finishedDcgchatCron(msg.payload?.jobId as string)

package/src/request/api.ts

@@ -40,7 +40,7 @@ export const queryUserTokenByBotToken = async (botToken: string): Promise<string
   const response = await post<{ botToken: string }, { token: string }>('/organization/queryUserTokenByBotToken', { botToken })
 
   if (!response || !response.data || !response.data.token) {
-    dcgLogger('获取绑定的用户信息失败: ' + JSON.stringify(response), 'error')
+    dcgLogger('获取绑定的用户信息失败: token:' + botToken + '|' + JSON.stringify(response), 'error')
     return ''
   }
 

package/src/transport.ts

@@ -178,8 +178,8 @@ export function sendError(errorMsg: string, ctx: IMsgParams): boolean {
   return wsSend(ctx, { response: `[错误] ${errorMsg}`, state: 'final' })
 }
 
-export function sendEventMessage(url: string, sessionKey: string) {
-  const ctx = getEffectiveMsgParams(sessionKey)
+export function sendEventMessage(url: string, params: Record<string, string> = {}) {
+  const ctx = getParamsDefaults()
   const ws = getWsConnection()
   if (isWsOpen()) {
     ws?.send(
@@ -187,16 +187,12 @@ export function sendEventMessage(url: string, sessionKey: string) {
         messageType: 'openclaw_bot_event',
         source: 'client',
         content: {
-          event_type: 'cron',
-          operation_type: 'install',
           bot_token: ctx.botToken,
           domain_id: ctx.domainId,
           app_id: ctx.appId,
           oss_url: url,
           bot_id: ctx.botId,
-          agent_id: ctx.agentId,
-          session_id: ctx.sessionId,
-          message_id: Date.now().toString()
+          ...params
         }
       })
     )

package/src/utils/params.ts

@@ -9,7 +9,7 @@ const paramsMessageMap = new Map<string, IMsgParams>()
 
 /** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
 export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.['dcgchat'] as DcgchatConfig | undefined) ?? {}
+  const ch = (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     userId: Number(ch.userId ?? 0),
     botToken: ch.botToken ?? '',
@@ -47,8 +47,8 @@ export function getEffectiveMsgParams(sessionKey?: string): IMsgParams {
 }
 
 /**
- * Agent `message` 工具常把 `target` 设为用户 ID（如 "150"），而 `setParamsMessage` 使用的 key 是
- * `effectiveSessionKey`（如 `agent:main:mobook:direct:...`）。若按 preferredKey 查不到 map，
+ * Agent `message` 工具的 `target` 应为 `effectiveSessionKey`（如 `agent:main:mobook:direct:...`）。
+ * `setParamsMessage` 使用的 key 与此一致。若按 preferredKey 查不到 map，
  * 则回落到当前会话 `currentSessionKey`，避免拿到空 `messageId` / `sessionId` 导致无文件卡片、WS 上下文错误。
  */
 export function getOutboundMsgParams(preferredKey: string): IMsgParams {