@dcrays/dcgchat-test 0.4.18 → 0.4.19

package/package.json

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

package/src/bot.ts

@@ -174,7 +174,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     sessionId: conversationId,
     messageId: msg.content.message_id,
     domainId: msg.content.domain_id,
-    appId: msg.content.app_id,
+    appId: config.channels?.["dcgchat-test"]?.appId || 100,
     botId: msg.content.bot_id ?? '',
     agentId: msg.content.agent_id ?? '',
     sessionKey: dcgSessionKey,

package/src/channel.ts

@@ -107,18 +107,27 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   const baseCtx = getOutboundMsgParams(sessionKey)
   const msgCtx = opts.messageId?.trim() ? { ...baseCtx, messageId: opts.messageId.trim() } : baseCtx
   if (!isWsOpen()) {
-    dcgLogger(`outbound media skipped -> ws not open: ${opts.mediaUrl ?? ''}`)
+    dcgLogger(`outbound media skipped -> ws not isWsOpen failed open: ${opts.mediaUrl ?? ''}`)
     return
   }
 
   const mediaUrl = opts.mediaUrl
-  const dedupeId = msgCtx.messageId
-  if (mediaUrl && dedupeId && hasSentMediaKey(dedupeId, mediaUrl)) {
-    dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl}`)
-    return
+
+  if (mediaUrl && msgCtx.sessionId) {
+    if (hasSentMediaKey(msgCtx.sessionId, mediaUrl)) {
+      dcgLogger(`dcgchat: sendMedia skipped (hasSentMediaKey): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
+      return
+    }
+    addSentMediaKey(msgCtx.sessionId, mediaUrl)
   }
-  if (mediaUrl && dedupeId) {
-    addSentMediaKey(dedupeId, mediaUrl)
+
+  const { sessionId, agentId } = getInfoBySessionKey(sessionKey)
+  if (!msgCtx.sessionId) {
+    msgCtx.sessionId = sessionId
+  }
+  if (!mediaUrl || !msgCtx.sessionId) {
+    dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
+    return
   }
 
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
@@ -126,20 +135,19 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
-    if (!msgCtx.sessionId) {
-      const { sessionId, agentId } = getInfoBySessionKey(sessionKey)
-      msgCtx.sessionId = sessionId
+    if (!msgCtx.agentId) {
       msgCtx.agentId = agentId
     }
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
+      is_finish: `${msgCtx?.messageId}`?.length === 13 ? -1 : 0,
       files: [{ url, name: fileName }]
     })
     dcgLogger(`dcgchat: sendMedia session=${sessionKey}, file=${fileName}`)
   } catch (error) {
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
-      message_tags: { source: 'file' },
+      is_finish: `${msgCtx?.messageId}`?.length === 13 ? -1 : 0,
       files: [{ url: opts.mediaUrl ?? '', name: fileName }]
     })
     dcgLogger(`dcgchat: error sendMedia session=${sessionKey}: ${String(error)}`, 'error')

package/src/cron.ts

@@ -135,7 +135,7 @@ export const onRunCronJob = async (jobId: string, messageId: string) => {
   )
   sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId, mode: 'force' } }))
 }
-export const finishedDcgchatCron = async (jobId: string, summary: string) => {
+export const finishedDcgchatCron = async (jobId: string, summary: string, hasFileOutput?: boolean) => {
   const id = jobId?.trim()
   if (!id) {
     dcgLogger('finishedDcgchatCron: empty jobId', 'error')
@@ -159,7 +159,11 @@ export const finishedDcgchatCron = async (jobId: string, summary: string) => {
     messageId: messageId || `${Date.now()}`,
     real_mobook: !sessionId ? 1 : ''
   })
-  wsSendRaw(merged, { response: summary, message_tags: { source: 'cron' }, is_finish: -1 })
+  const message_tags = { source: 'cron' } as Record<string, string | boolean>
+  if (hasFileOutput) {
+    message_tags.hasFile = true
+  }
+  wsSendRaw(merged, { response: summary, message_tags, is_finish: -1 })
   setTimeout(() => {
     sendFinal(merged, 'cron send')
   }, 200)

package/src/cronToolCall.ts

@@ -135,10 +135,11 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
   // job.delivery
   const job = newParams.job as Record<string, unknown> | undefined
   if (job?.delivery && typeof job.delivery === 'object') {
-    ;(job.delivery as CronDelivery).bestEffort = true
-    ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
-    ;(newParams.delivery as CronDelivery).accountId = agentId
-    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
+    const jd = job.delivery as CronDelivery
+    jd.bestEffort = true
+    jd.to = `dcg-cron:${sk}`
+    jd.accountId = agentId
+    jd.channel = "dcgchat-test"
     newParams.sessionKey = sk
     return newParams
   }
@@ -154,14 +155,14 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
     const delivery = extractDelivery(params)
     if (!delivery) {
       dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) has no delivery config, skip.`)
-      return params
+      return undefined
     }
     if (!needsBestEffort(delivery)) {
       dcgLogger(
         `[${LOG_TAG}] cron call (${toolCallId}) delivery does not need bestEffort ` +
           `(mode=${String(delivery.mode)}, channel=${String(delivery.channel)}, bestEffort=${String(delivery.bestEffort)}), skip.`
       )
-      return params
+      return undefined
     }
 
     // ★ 核心：注入 bestEffort: true
@@ -179,9 +180,9 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
         params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
     } else {
-      return params
+      return undefined
     }
   }
 
-  return params
+  return undefined
 }

package/src/tool.ts

@@ -325,6 +325,16 @@ function resolveHookSessionKey(
   return (args?.sessionKey || '').trim()
 }
 
+/** 定时触发时会话往往非 running，但仍需跑 before_tool_call 以注入 sessionKey / delivery（见 cronToolCall） */
+function shouldRunBeforeToolCallWithoutRunningSession(event: { toolName?: string; params?: { command?: string } }): boolean {
+  if (event?.toolName === 'cron') return true
+  const cmd = event?.params?.command
+  if (event?.toolName === 'exec' && typeof cmd === 'string') {
+    return cmd.includes('cron create') || cmd.includes('cron add')
+  }
+  return false
+}
+
 function trackSubagentLifecycle(eventName: string, event: any, args: any): void {
   if (eventName === 'subagent_spawned') {
     const runId = typeof event?.runId === 'string' ? event.runId : ''
@@ -351,7 +361,10 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
       trackSubagentLifecycle(item.event, event, args)
       const sk = resolveHookSessionKey(item.event, args ?? {})
       if (sk) {
-        if (isSessionActiveForTool(sk)) {
+        const toolHooksOk =
+          isSessionActiveForTool(sk) ||
+          (item.event === 'before_tool_call' && shouldRunBeforeToolCallWithoutRunningSession(event))
+        if (toolHooksOk) {
           if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
             const { result: _result, ...rest } = event
             dcgLogger(`工具调用结果： ~ event:${item.event} ~ params:${JSON.stringify(rest)}`)

package/src/transport.ts

@@ -1,4 +1,4 @@
-import { getWsConnection } from './utils/global.js'
+import { clearSentMediaKeys, getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import type { IMsgParams } from './types.js'
 import { getEffectiveMsgParams, getParamsDefaults } from './utils/params.js'
@@ -170,6 +170,7 @@ export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): bool
 
 export function sendFinal(ctx: IMsgParams, tag: string): boolean {
   dcgLogger(` message handling complete state: to=${ctx.sessionId} final tag:${tag}`)
+  clearSentMediaKeys(ctx.sessionId)
   return wsSend(ctx, { response: '', state: 'final' })
 }
 

package/src/utils/gatewayMsgHanlder.ts

@@ -36,7 +36,12 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
         sendDcgchatCron(p?.jobId as string)
       }
       if (p?.action === 'finished' && p?.status === 'ok') {
-        finishedDcgchatCron(p?.jobId as string, p?.summary as string)
+        const hasFileOutput = p.delivered === true && p.deliveryStatus === 'delivered'
+        let summary = p?.summary as string
+        if (summary.indexOf('HEARTBEAT_OK') >= 0 && summary !== 'HEARTBEAT_OK') {
+          summary = summary.replace('HEARTBEAT_OK', '')
+        }
+        finishedDcgchatCron(p?.jobId as string, summary, hasFileOutput)
       }
     }
   } catch (error) {

package/src/utils/global.ts

@@ -82,11 +82,11 @@ const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
 /** 已发送媒体去重：外层 messageId → 内层该会话下已发送的媒体 key（文件名） */
 const sentMediaKeysBySession = new Map<string, Set<string>>()
 
-function getSessionMediaSet(messageId: string): Set<string> {
-  let set = sentMediaKeysBySession.get(messageId)
+function getSessionMediaSet(sessionId: string): Set<string> {
+  let set = sentMediaKeysBySession.get(sessionId)
   if (!set) {
     set = new Set<string>()
-    sentMediaKeysBySession.set(messageId, set)
+    sentMediaKeysBySession.set(sessionId, set)
   }
   return set
 }
@@ -95,14 +95,14 @@ export function addSentMediaKey(messageId: string, url: string) {
   getSessionMediaSet(messageId).add(getMediaKey(url))
 }
 
-export function hasSentMediaKey(messageId: string, url: string): boolean {
-  return sentMediaKeysBySession.get(messageId)?.has(getMediaKey(url)) ?? false
+export function hasSentMediaKey(sessionId: string, url: string): boolean {
+  return sentMediaKeysBySession.get(sessionId)?.has(getMediaKey(url)) ?? false
 }
 
 /** 不传 messageId 时清空全部会话；传入则只清空该会话 */
-export function clearSentMediaKeys(messageId?: string) {
-  if (messageId) {
-    sentMediaKeysBySession.delete(messageId)
+export function clearSentMediaKeys(sessionId?: string) {
+  if (sessionId) {
+    sentMediaKeysBySession.delete(sessionId)
   } else {
     sentMediaKeysBySession.clear()
   }