@dcrays/dcgchat 0.4.13 → 0.4.18

package/package.json

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

package/src/bot.ts

@@ -17,7 +17,7 @@ import { dcgLogger } from './utils/log.js'
 import { channelInfo, systemCommand, interruptCommand, ENV, ignoreToolCommand } from './utils/constant.js'
 import { sendGatewayRpc } from './gateway/socket.js'
 import { clearParamsMessage, getEffectiveMsgParams, setParamsMessage } from './utils/params.js'
-import { getChildSessionKeysTrackedForRequester, resetSubagentStateForRequesterSession, waitUntilSubagentsIdle } from './tool.js'
+import { getDescendantSessionKeysForRequester, resetSubagentStateForRequesterSession, waitUntilSubagentsIdle } from './tool.js'
 
 type MediaInfo = {
   path: string
@@ -30,7 +30,7 @@ type TFileInfo = { name: string; url: string }
 
 const mediaMaxBytes = 300 * 1024 * 1024
 
-/** 当前会话最近一次 agent run 的 runId（供 chat.abort 精确打断；无则仅传 sessionKey 仍会中止该会话全部活动运行） */
+/** 当前会话最近一次 agent run 的 runId（供观测；/stop 时对子会话与主会话使用不传 runId 的 chat.abort 以终止该键下全部活跃 run） */
 const activeRunIdBySessionKey = new Map<string, string>()
 
 /**
@@ -143,7 +143,6 @@ const typingCallbacks = createTypingCallbacks({
  * 处理一条用户消息，调用 Agent 并返回回复
  */
 export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
-  let completeText = ''
   const config = getOpenClawConfig()
   if (!config) {
     dcgLogger('no config available', 'error')
@@ -251,7 +250,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
     const sentMediaKeys = new Set<string>()
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
-    let streamedTextLen = 0
+    /** 与 Feishu snapshot 模式一致：payload.text 为当前轮助手全文快照，据此算增量，避免工具前后快照变短或非单调时丢字 */
+    let lastStreamSnapshot = ''
 
     if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code && !ignoreToolCommand.includes(text?.trim())) {
       const workspaceDir = getWorkspaceDir()
@@ -326,38 +326,32 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         dcgLogger(`interrupt command: ${text}`)
         const ctxForAbort = priorOutboundCtx.messageId?.trim() || priorOutboundCtx.sessionId?.trim() ? priorOutboundCtx : outboundCtx
         sendFinal(ctxForAbort.messageId?.trim() ? ctxForAbort : { ...ctxForAbort, messageId: `${Date.now()}` }, 'abort')
-        sendText('会话已终止', outboundCtx)
         sessionStreamSuppressed.add(dcgSessionKey)
-        const abortOneSession = async (sessionKey: string) => {
+        // 网关侧彻底中止：子 agent 使用独立 sessionKey，仅 abort 主会话不会停子 run；自深到浅 abort 后代，再 abort 主会话；不传 runId 以终止该键下全部活跃 chat run
+        const descendantKeys = getDescendantSessionKeysForRequester(dcgSessionKey)
+        const abortSubKeys = [...descendantKeys].reverse()
+        if (abortSubKeys.length > 0) {
+          dcgLogger(`interrupt: chat.abort ${abortSubKeys.length} subagent session(s) (nested incl.)`)
+        }
+        for (const subKey of abortSubKeys) {
           try {
-            await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey } })
+            await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey: subKey } })
           } catch (e) {
-            dcgLogger(`chat.abort ${sessionKey}: ${String(e)}`, 'error')
+            dcgLogger(`chat.abort subagent ${subKey}: ${String(e)}`, 'error')
           }
         }
-        const keysToAbort = new Set<string>(getChildSessionKeysTrackedForRequester(dcgSessionKey))
         try {
-          const listed = await sendGatewayRpc<{ sessions?: Array<{ key?: string }> }>({
-            method: 'sessions.list',
-            params: { spawnedBy: dcgSessionKey, limit: 256 }
-          })
-          for (const s of listed?.sessions ?? []) {
-            const k = typeof s?.key === 'string' ? s.key.trim() : ''
-            if (k) keysToAbort.add(k)
-          }
+          await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey: dcgSessionKey } })
         } catch (e) {
-          dcgLogger(`sessions.list spawnedBy: ${String(e)}`, 'error')
-        }
-        for (const sk of keysToAbort) {
-          await abortOneSession(sk)
+          dcgLogger(`chat.abort main ${dcgSessionKey}: ${String(e)}`, 'error')
         }
-        await abortOneSession(dcgSessionKey)
+        activeRunIdBySessionKey.delete(dcgSessionKey)
         streamChunkIdxBySessionKey.delete(dcgSessionKey)
+        clearSentMediaKeys(msg.content.message_id)
         resetSubagentStateForRequesterSession(dcgSessionKey)
         setMsgStatus(dcgSessionKey, 'finished')
-        clearSentMediaKeys(msg.content.message_id)
         clearParamsMessage(dcgSessionKey)
-        clearParamsMessage(userId)
+        sendText('会话已终止', outboundCtx)
         sendFinal(outboundCtx, 'stop')
         return
       } else {
@@ -394,22 +388,27 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                 onPartialReply: async (payload: ReplyPayload) => {
                   if (sessionStreamSuppressed.has(dcgSessionKey)) return
 
-                  if (payload.text) {
-                    completeText = payload.text
-                  }
                   // --- Streaming text chunks ---
                   if (payload.text) {
-                    const delta = payload.text.startsWith(completeText.slice(0, streamedTextLen))
-                      ? payload.text.slice(streamedTextLen)
-                      : payload.text
+                    const t = payload.text
+                    let delta = ''
+                    if (t.startsWith(lastStreamSnapshot)) {
+                      delta = t.slice(lastStreamSnapshot.length)
+                      lastStreamSnapshot = t
+                    } else if (lastStreamSnapshot.startsWith(t)) {
+                      // 快照缩短（模型修订等）：不重复下发
+                    } else {
+                      // 与上一轮快照不衔接（常见于工具后快照从新的助手片段重新开始）：整段下发
+                      delta = t
+                      lastStreamSnapshot = t
+                    }
                     if (delta.trim()) {
                       const prev = streamChunkIdxBySessionKey.get(dcgSessionKey) ?? 0
                       streamChunkIdxBySessionKey.set(dcgSessionKey, prev + 1)
                       sendChunk(delta, outboundCtx, prev)
                     }
-                    streamedTextLen = payload.text.length
                   } else {
-                    dcgLogger(`onPartialReply no text: ${JSON.stringify(payload)}`, 'error')
+                    dcgLogger(`onPartialReply no text (media/tool metadata): ${JSON.stringify(payload)}`)
                   }
                   // --- Media from payload ---
                   const mediaList = resolveReplyMediaList(payload)

package/src/channel.ts

@@ -14,6 +14,7 @@ import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw
 import { dcgLogger, setLogger } from './utils/log.js'
 import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
+import { getCronJobsPath, readCronJob } from './cron.js'
 
 function dcgchatChannelCfg(): DcgchatConfig {
   return (getOpenClawConfig()?.channels?.["dcgchat"] as DcgchatConfig | undefined) ?? {}
@@ -61,6 +62,8 @@ export type DcgchatMediaSendOptions = {
   sessionKey: string
   mediaUrl?: string
   text?: string
+  /** 定时任务等场景须与 `getCronMessageId` 一致，避免沿用 map 里上一条用户消息的 messageId */
+  messageId?: string
 }
 
 function normalizeSessionTarget(rawTo: string): string {
@@ -69,6 +72,29 @@ function normalizeSessionTarget(rawTo: string): string {
   return getParamsMessage(cleaned)?.sessionKey?.trim() || cleaned
 }
 
+/**
+ * OpenClaw 定时任务 `sessionTarget: isolated` 时，出站 `to` 常为 `agent:<code>:cron:<jobId>[:run:…]`，
+ * 与 `paramsMessageMap` / `getCronMessageId` 使用的 jobs.json `sessionKey`（mobook 用户会话）不一致，导致发文件时 sessionId、messageId 错位或缺省。
+ */
+function extractCronJobIdFromIsolatedSessionKey(sessionKey: string): string | null {
+  const parts = sessionKey.split(':').filter((p) => p.length > 0)
+  const i = parts.findIndex((p) => p.toLowerCase() === 'cron')
+  if (i < 0 || i + 1 >= parts.length) return null
+  return parts[i + 1] ?? null
+}
+
+function resolveIsolatedCronSessionToJobSessionKey(sessionKey: string): string {
+  const jobId = extractCronJobIdFromIsolatedSessionKey(sessionKey)
+  if (!jobId) return sessionKey
+  const job = readCronJob(getCronJobsPath(), jobId)
+  const sk = job && typeof job.sessionKey === 'string' ? job.sessionKey.trim() : ''
+  if (!sk) {
+    dcgLogger(`dcgchat: cron job ${jobId} has no sessionKey in jobs.json, keep outbound key=${sessionKey}`, 'error')
+    return sessionKey
+  }
+  return sk
+}
+
 /** 出站返回的 chatId：含 `dcg-cron:` 时保留原始 `to`，便于下游识别定时投递 */
 function outboundChatId(rawTo: string | undefined, normalizedTo: string): string {
   const raw = rawTo?.trim() ?? ''
@@ -76,8 +102,10 @@ function outboundChatId(rawTo: string | undefined, normalizedTo: string): string
 }
 
 export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<void> {
-  const sessionKey = normalizeSessionTarget(opts.sessionKey ?? '')
-  const msgCtx = getOutboundMsgParams(sessionKey)
+  let sessionKey = normalizeSessionTarget(opts.sessionKey ?? '')
+  sessionKey = resolveIsolatedCronSessionToJobSessionKey(sessionKey)
+  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 ?? ''}`)
     return
@@ -98,9 +126,13 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat"]?.botToken ?? ''
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
+    if (!msgCtx.sessionId) {
+      const { sessionId, agentId } = getInfoBySessionKey(sessionKey)
+      msgCtx.sessionId = sessionId
+      msgCtx.agentId = agentId
+    }
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
-      message_tags: { source: 'file' },
       files: [{ url, name: fileName }]
     })
     dcgLogger(`dcgchat: sendMedia session=${sessionKey}, file=${fileName}`)
@@ -254,19 +286,19 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         const isCron = ctx.to.indexOf('dcg-cron:') >= 0
         const outboundCtx = getOutboundMsgParams(to)
         const content: Record<string, unknown> = { response: ctx.text }
-        if (isCron) {
-          messageId = getCronMessageId(to) || `${Date.now()}`
-          const { sessionId, agentId } = getInfoBySessionKey(to)
-          content.is_finish = -1
-          content.message_tags = { source: 'cron' }
-          const merged = mergeDefaultParams({
-            agentId: agentId,
-            sessionId: `${sessionId}`,
-            messageId: messageId,
-            real_mobook: !sessionId ? 1 : ''
-          })
-          wsSendRaw(merged, content)
-        } else {
+        if (!isCron) {
+          // messageId = getCronMessageId(to) || `${Date.now()}`
+          // const { sessionId, agentId } = getInfoBySessionKey(to)
+          // content.is_finish = -1
+          // content.message_tags = { source: 'cron' }
+          // const merged = mergeDefaultParams({
+          //   agentId: agentId,
+          //   sessionId: `${sessionId}`,
+          //   messageId: messageId,
+          //   real_mobook: !sessionId ? 1 : ''
+          // })
+          // wsSendRaw(merged, content)
+          // } else {
           if (outboundCtx?.sessionId) {
             messageId = outboundCtx?.messageId || `${Date.now()}`
             const newCtx = { ...outboundCtx, messageId }
@@ -283,8 +315,9 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       }
     },
     sendMedia: async (ctx) => {
-      const isCron = ctx.to.indexOf('dcg-cron:') >= 0
-      const to = normalizeSessionTarget(ctx.to)
+      const normalizedFromTo = normalizeSessionTarget(ctx.to)
+      const isCron = ctx.to.indexOf('dcg-cron:') >= 0 || extractCronJobIdFromIsolatedSessionKey(normalizedFromTo) !== null
+      const to = resolveIsolatedCronSessionToJobSessionKey(normalizedFromTo)
       const outboundCtx = getOutboundMsgParams(to)
       const msgCtx = getParamsMessage(to) ?? outboundCtx
       const cronMsgId = getCronMessageId(to)
@@ -301,7 +334,11 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       }
 
       dcgLogger(`channel sendMedia to ${ctx.to}`)
-      await sendDcgchatMedia({ sessionKey: to || '', mediaUrl: ctx.mediaUrl || '' })
+      await sendDcgchatMedia({
+        sessionKey: to || '',
+        mediaUrl: ctx.mediaUrl || '',
+        ...(isCron ? { messageId } : {})
+      })
       return {
         channel: "dcgchat",
         messageId,

package/src/cron.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import fs from 'node:fs'
 import type { IMsgParams } from './types.js'
-import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
+import { isWsOpen, mergeDefaultParams, sendEventMessage, sendFinal, wsSendRaw } from './transport.js'
 import { getCronMessageId, getWorkspaceDir, getWsConnection, removeCronMessageId, setCronMessageId } from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
@@ -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) => {
+export const finishedDcgchatCron = async (jobId: string, summary: string) => {
   const id = jobId?.trim()
   if (!id) {
     dcgLogger('finishedDcgchatCron: empty jobId', 'error')
@@ -147,24 +147,23 @@ export const finishedDcgchatCron = async (jobId: string) => {
     dcgLogger(`finishedDcgchatCron: no sessionKey for job id=${id}`, 'error')
     return
   }
-  const outboundCtx = getEffectiveMsgParams(sessionKey)
-  const messageId = getCronMessageId(sessionKey)
+  const messageId = getCronMessageId(sessionKey) || `${Date.now()}`
   const sessionInfo = sessionKey.split(':')
   const sessionId = sessionInfo.at(-1) ?? ''
   const agentId = sessionInfo.at(-2) ?? ''
-  if (outboundCtx?.sessionId) {
-    const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
-    sendFinal(newCtx, 'cron send')
-  } else {
-    const merged = mergeDefaultParams({
-      agentId: agentId,
-      sessionId: `${sessionId}`,
-      messageId: messageId,
-      is_finish: -1,
-      real_mobook: !sessionId ? 1 : ''
-    })
+  // if (outboundCtx?.sessionId) {
+
+  const merged = mergeDefaultParams({
+    agentId: agentId,
+    sessionId: `${sessionId}`,
+    messageId: messageId || `${Date.now()}`,
+    real_mobook: !sessionId ? 1 : ''
+  })
+  wsSendRaw(merged, { response: summary, message_tags: { source: 'cron' }, is_finish: -1 })
+  setTimeout(() => {
     sendFinal(merged, 'cron send')
-  }
+  }, 200)
+  // }
   const ws = getWsConnection()
   const baseContent = getParamsDefaults()
   if (isWsOpen()) {

package/src/cronToolCall.ts

@@ -132,14 +132,13 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
     return newParams
   }
 
-  // job.delivery（须改 job 内对象，勿写 newParams.delivery——顶层可能不存在）
+  // job.delivery
   const job = newParams.job as Record<string, unknown> | undefined
   if (job?.delivery && typeof job.delivery === 'object') {
-    const del = job.delivery as CronDelivery
-    del.bestEffort = true
-    del.to = `dcg-cron:${sk}`
-    del.accountId = agentId
-    del.channel = "dcgchat"
+    ;(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"
     newParams.sessionKey = sk
     return newParams
   }

package/src/tool.ts

@@ -51,8 +51,30 @@ const eventList = [
   { event: 'after_tool_call', message: '' }
 ]
 
+/** 子 agent 的 sessionKey 往往未写入 params map，回落到主会话 outbound 参数避免 messageId 缺失 */
+function resolveOutboundParamsForSession(sk: string) {
+  const k = sk.trim()
+  let params = getEffectiveMsgParams(k)
+  if (params.messageId?.trim() || params.sessionId?.trim()) return params
+  const parent = requesterByChildSessionKey.get(k)
+  if (parent) {
+    const parentParams = getEffectiveMsgParams(parent)
+    if (parentParams.messageId?.trim() || parentParams.sessionId?.trim()) return parentParams
+  }
+  return params
+}
+
+/** 主会话已 running 时，子会话上的工具/事件也应下发（否则子 key 无 running 状态会整段丢消息） */
+function isSessionActiveForTool(sk: string): boolean {
+  const k = sk.trim()
+  if (!k) return false
+  if (getMsgStatus(k) === 'running') return true
+  const parent = requesterByChildSessionKey.get(k)
+  return parent ? getMsgStatus(parent) === 'running' : false
+}
+
 function sendToolCallMessage(sk: string, text: string, toolCallId: string, isCover: number) {
-  const params = getEffectiveMsgParams(sk)
+  const params = resolveOutboundParamsForSession(sk)
   const content = { is_finish: -1, tool_call_id: toolCallId, is_cover: isCover, thinking_content: text, response: '' }
   wsSendRaw(params, content, false)
 }
@@ -158,6 +180,29 @@ export function getChildSessionKeysTrackedForRequester(requesterSessionKey: stri
   return out
 }
 
+/**
+ * 自根 requester 起 BFS 收集所有已跟踪后代子会话（含嵌套）。网关 abort 时宜自深到浅，调用方对结果 `.reverse()` 后再逐个 chat.abort。
+ */
+export function getDescendantSessionKeysForRequester(rootRequesterSessionKey: string): string[] {
+  const root = rootRequesterSessionKey.trim()
+  if (!root) return []
+  const ordered: string[] = []
+  const seen = new Set<string>()
+  let frontier = getChildSessionKeysTrackedForRequester(root)
+  while (frontier.length > 0) {
+    const next: string[] = []
+    for (const sk of frontier) {
+      const k = sk.trim()
+      if (!k || seen.has(k)) continue
+      seen.add(k)
+      ordered.push(k)
+      next.push(...getChildSessionKeysTrackedForRequester(k))
+    }
+    frontier = next
+  }
+  return ordered
+}
+
 /**
  * 打断后清空本地子 agent 跟踪（runId、父子映射、子 runId→sessionKey），并唤醒 waitUntilSubagentsIdle，避免永久挂起。
  */
@@ -306,14 +351,27 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
       trackSubagentLifecycle(item.event, event, args)
       const sk = resolveHookSessionKey(item.event, args ?? {})
       if (sk) {
-        const status = getMsgStatus(sk)
-        if (status === 'running') {
+        if (isSessionActiveForTool(sk)) {
           if (['after_tool_call', 'before_tool_call'].includes(item.event)) {
             const { result: _result, ...rest } = event
             dcgLogger(`工具调用结果： ~ event:${item.event} ~ params:${JSON.stringify(rest)}`)
 
             if (item.event === 'before_tool_call') {
-              return cronToolCall(rest, sk)
+              const hookResult = cronToolCall(rest, sk)
+              const text = JSON.stringify({
+                type: item.event,
+                specialIdentification: 'dcgchat_tool_call_special_identification',
+                callId: event.toolCallId || event.runId || Date.now().toString(),
+                ...rest,
+                status: 'running'
+              })
+              sendToolCallMessage(
+                sk,
+                text,
+                event.toolCallId || event.runId || Date.now().toString(),
+                0
+              )
+              return hookResult
             }
             const text = JSON.stringify({
               type: item.event,
@@ -329,7 +387,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
               item.event === 'after_tool_call' ? 1 : 0
             )
           } else if (item.event) {
-            const msgCtx = getEffectiveMsgParams(sk)
+            const msgCtx = resolveOutboundParamsForSession(sk)
             if (item.event === 'llm_output') {
               if (event.lastAssistant?.errorMessage === '1003-额度不足请充值') {
                 const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
@@ -346,7 +404,7 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
               params: item.message
             })
             sendToolCallMessage(sk, text, event.runId || Date.now().toString(), 0)
-            dcgLogger(`工具调用结果： ~ event:${item.event} ${status}`)
+            dcgLogger(`工具调用结果： ~ event:${item.event}`)
           }
         }
       } else if (item.event !== 'before_tool_call') {

package/src/utils/gatewayMsgHanlder.ts

@@ -1,14 +1,17 @@
 import type { GatewayEvent } from '../gateway/index.js'
 import { finishedDcgchatCron, sendDcgchatCron } from '../cron.js'
 import { dcgLogger } from './log.js'
-import { getEffectiveMsgParams, getSessionKeyBySubAgentRunId } from './params.js'
-import { sendChunk } from '../transport.js'
+import { clearParamsMessage, getEffectiveMsgParams, getSessionKeyBySubAgentRunId } from './params.js'
+import { sendChunk, sendFinal, sendText } from '../transport.js'
+import { resetSubagentStateForRequesterSession } from '../tool.js'
+import { setMsgStatus } from './global.js'
 
 /**
  * 处理网关 event 帧的副作用（agent 流式输出、cron 同步），并构造供上层分发的 GatewayEvent。
  */
 export function handleGatewayEventMessage(msg: { event?: string; payload?: Record<string, unknown>; seq?: number }): GatewayEvent {
   try {
+    // 子agent消息输出
     if (msg.event === 'agent') {
       const pl = msg.payload as { runId: string; data?: { delta?: unknown } }
       const sessionKey = getSessionKeyBySubAgentRunId(pl.runId)
@@ -19,6 +22,7 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
         }
       }
     }
+    // 定时任务
     if (msg.event === 'cron') {
       const p = msg.payload
       dcgLogger(`[Gateway] 收到定时任务事件: ${JSON.stringify(p)}`)
@@ -31,8 +35,8 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
       if (p?.action === 'removed') {
         sendDcgchatCron(p?.jobId as string)
       }
-      if (p?.action === 'finished') {
-        finishedDcgchatCron(p?.jobId as string)
+      if (p?.action === 'finished' && p?.status === 'ok') {
+        finishedDcgchatCron(p?.jobId as string, p?.summary as string)
       }
     }
   } catch (error) {

package/src/utils/global.ts

@@ -108,18 +108,35 @@ export function clearSentMediaKeys(messageId?: string) {
   }
 }
 
-const cronMessageIdMap = new Map<string, string>()
-
-export function setCronMessageId(sk: string, messageId: string) {
-  cronMessageIdMap.set(sk, messageId)
+/** 每个 sessionKey 下多个定时任务 messageId，入队在尾、出队在头（FIFO） */
+const cronMessageIdMap = new Map<string, string[]>()
+
+export function setCronMessageId(sk: string, messageId: string | number | null | undefined) {
+  const mid = messageId != null && messageId !== '' ? String(messageId).trim() : ''
+  if (!sk?.trim() || !mid) return
+  let q = cronMessageIdMap.get(sk)
+  if (!q) {
+    q = []
+    cronMessageIdMap.set(sk, q)
+  }
+  q.push(mid)
 }
 
+/** 窥视队首 messageId（不移除），供发送中与 finished 配对使用 */
 export function getCronMessageId(sk: string): string {
-  return cronMessageIdMap.get(sk) ?? ''
+  if (!sk?.trim()) return ''
+  return cronMessageIdMap.get(sk)?.[0] ?? ''
 }
 
+/** 弹出队首一条，与一次 finished 对应；队列为空时移除 key */
 export function removeCronMessageId(sk: string) {
-  cronMessageIdMap.delete(sk)
+  if (!sk?.trim()) return
+  const q = cronMessageIdMap.get(sk)
+  if (!q?.length) return
+  q.shift()
+  if (q.length === 0) {
+    cronMessageIdMap.delete(sk)
+  }
 }
 
 export const getSessionKey = (content: any, accountId: string) => {