@dcrays/dcgchat-test 0.4.16 → 0.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.16",
+  "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>()
 
 /**
@@ -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 {

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-test"] 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-test"]?.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}`)
@@ -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-test",
         messageId,

package/src/tool.ts

@@ -180,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，避免永久挂起。
  */

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,7 +35,7 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
       if (p?.action === 'removed') {
         sendDcgchatCron(p?.jobId as string)
       }
-      if (p?.action === 'finished') {
+      if (p?.action === 'finished' && p?.status === 'ok') {
         finishedDcgchatCron(p?.jobId as string, p?.summary as string)
       }
     }

package/src/utils/global.ts

@@ -111,14 +111,15 @@ export function clearSentMediaKeys(messageId?: string) {
 /** 每个 sessionKey 下多个定时任务 messageId，入队在尾、出队在头（FIFO） */
 const cronMessageIdMap = new Map<string, string[]>()
 
-export function setCronMessageId(sk: string, messageId: string) {
-  if (!sk?.trim() || !messageId?.trim()) return
+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(messageId)
+  q.push(mid)
 }
 
 /** 窥视队首 messageId（不移除），供发送中与 finished 配对使用 */