@dcrays/dcgchat-test 0.4.19 → 0.4.20

package/package.json

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

package/src/bot.ts

@@ -14,7 +14,7 @@ import { resolveAccount, sendDcgchatMedia } from './channel.js'
 import { generateSignUrl } from './request/api.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'
+import { channelInfo, systemCommand, stopCommand, ENV, ignoreToolCommand } from './utils/constant.js'
 import { sendGatewayRpc } from './gateway/socket.js'
 import { clearParamsMessage, getEffectiveMsgParams, setParamsMessage } from './utils/params.js'
 import { getDescendantSessionKeysForRequester, resetSubagentStateForRequesterSession, waitUntilSubagentsIdle } from './tool.js'
@@ -33,12 +33,21 @@ const mediaMaxBytes = 300 * 1024 * 1024
 /** 当前会话最近一次 agent run 的 runId（供观测；/stop 时对子会话与主会话使用不传 runId 的 chat.abort 以终止该键下全部活跃 run） */
 const activeRunIdBySessionKey = new Map<string, string>()
 
+/** 本通道用 dispatchReplyFromConfig 在进程内跑 agent，网关 chat.abort 往往碰不到该 run；靠 AbortSignal 才能真正停工具与模型调用。 */
+const dispatchAbortBySessionKey = new Map<string, AbortController>()
+
 /**
  * 用户在该 sessionKey 上触发打断后，旧 run 的流式/投递不再下发；与 sessionKey 一一对应，支持多会话。
  * 清除时机：① 下一条非打断用户消息开始处理时；② 旧 run 收尾到 mobook 段时若仍抑制则跳过并发后删除。
  */
 const sessionStreamSuppressed = new Set<string>()
 
+/**
+ * 每次 /stop 递增。用于丢弃「已被后续打断」的那条入站处理在 dispatch 结束后的尾部逻辑
+ *（否则旧 handler 会删掉 sessionStreamSuppressed、再发 sendFinal(end)/recordInboundSession，导致旧回复复活、新消息异常）。
+ */
+const replyAbortEpochBySessionKey = new Map<string, number>()
+
 /** 各 sessionKey 当前轮回复的流式分片序号（仅统计实际下发的文本 chunk）；每轮非打断消息开始时置 0 */
 const streamChunkIdxBySessionKey = new Map<string, number>()
 
@@ -167,6 +176,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   const effectiveAgentId = embeddedAgentId ?? route.agentId
   const dcgSessionKey = getSessionKey(msg.content, account.accountId)
+  const replyAbortEpochAtStart = replyAbortEpochBySessionKey.get(dcgSessionKey) ?? 0
 
   const mergedParams = {
     userId: msg._userId,
@@ -297,10 +307,14 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       }
     })
 
+    let dispatchAbort: AbortController | undefined
     try {
-      if (!interruptCommand.includes(text?.trim())) {
+      if (!stopCommand.includes(text?.trim())) {
         sessionStreamSuppressed.delete(dcgSessionKey)
         streamChunkIdxBySessionKey.set(dcgSessionKey, 0)
+        dispatchAbortBySessionKey.get(dcgSessionKey)?.abort()
+        dispatchAbort = new AbortController()
+        dispatchAbortBySessionKey.set(dcgSessionKey, dispatchAbort)
       }
 
       if (systemCommand.includes(text?.trim())) {
@@ -315,6 +329,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
               dispatcher,
               replyOptions: {
                 ...replyOptions,
+                abortSignal: dispatchAbort!.signal,
                 onModelSelected: prefixContext.onModelSelected,
                 onAgentRunStart: (runId) => {
                   activeRunIdBySessionKey.set(dcgSessionKey, runId)
@@ -322,12 +337,22 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
               }
             })
         })
-      } else if (interruptCommand.includes(text?.trim())) {
+      } else if (stopCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
+        const inFlightAbort = dispatchAbortBySessionKey.get(dcgSessionKey)
+        if (inFlightAbort) {
+          dcgLogger(`interrupt: AbortController.abort() in-process run sessionKey=${dcgSessionKey}`)
+          inFlightAbort.abort()
+          dispatchAbortBySessionKey.delete(dcgSessionKey)
+        }
         const ctxForAbort = priorOutboundCtx.messageId?.trim() || priorOutboundCtx.sessionId?.trim() ? priorOutboundCtx : outboundCtx
         sendFinal(ctxForAbort.messageId?.trim() ? ctxForAbort : { ...ctxForAbort, messageId: `${Date.now()}` }, 'abort')
         sessionStreamSuppressed.add(dcgSessionKey)
-        // 网关侧彻底中止：子 agent 使用独立 sessionKey，仅 abort 主会话不会停子 run；自深到浅 abort 后代，再 abort 主会话；不传 runId 以终止该键下全部活跃 chat run
+        replyAbortEpochBySessionKey.set(
+          dcgSessionKey,
+          (replyAbortEpochBySessionKey.get(dcgSessionKey) ?? 0) + 1
+        )
+        // 网关侧：子 agent 独立 sessionKey，自深到浅 abort 后再 abort 主会话；主会话有 runId 时带上以便网关侧若有登记可一并取消
         const descendantKeys = getDescendantSessionKeysForRequester(dcgSessionKey)
         const abortSubKeys = [...descendantKeys].reverse()
         if (abortSubKeys.length > 0) {
@@ -341,7 +366,13 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           }
         }
         try {
-          await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey: dcgSessionKey } })
+          const mainRunId = activeRunIdBySessionKey.get(dcgSessionKey)
+          await sendGatewayRpc({
+            method: 'chat.abort',
+            params: mainRunId
+              ? { sessionKey: dcgSessionKey, runId: mainRunId }
+              : { sessionKey: dcgSessionKey }
+          })
         } catch (e) {
           dcgLogger(`chat.abort main ${dcgSessionKey}: ${String(e)}`, 'error')
         }
@@ -381,6 +412,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
               dispatcher,
               replyOptions: {
                 ...replyOptions,
+                abortSignal: dispatchAbort!.signal,
                 onModelSelected: prefixContext.onModelSelected,
                 onAgentRunStart: (runId) => {
                   activeRunIdBySessionKey.set(dcgSessionKey, runId)
@@ -425,9 +457,21 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       }
     } catch (err: unknown) {
       dcgLogger(` dispatchReplyFromConfig error: ${String(err)}`, 'error')
+    } finally {
+      if (dispatchAbort && dispatchAbortBySessionKey.get(dcgSessionKey) === dispatchAbort) {
+        dispatchAbortBySessionKey.delete(dcgSessionKey)
+      }
+    }
+
+    const replyAbortEpochNow = replyAbortEpochBySessionKey.get(dcgSessionKey) ?? 0
+    if (replyAbortEpochNow !== replyAbortEpochAtStart) {
+      dcgLogger(
+        `skip post-reply tail: sessionKey=${dcgSessionKey} (abort epoch ${replyAbortEpochAtStart}→${replyAbortEpochNow}, stale handler after interrupt)`
+      )
+      return
     }
 
-    if (![...systemCommand, ...interruptCommand].includes(text?.trim())) {
+    if (![...systemCommand, ...stopCommand].includes(text?.trim())) {
       if (sessionStreamSuppressed.has(dcgSessionKey)) {
         sessionStreamSuppressed.delete(dcgSessionKey)
       }

package/src/channel.ts

@@ -129,9 +129,8 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
     return
   }
-
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
-
+  const notMessageId = `${msgCtx?.messageId}`?.length !== 13 || !msgCtx?.messageId
   try {
     const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
@@ -140,14 +139,16 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     }
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
-      is_finish: `${msgCtx?.messageId}`?.length === 13 ? -1 : 0,
+      is_finish: notMessageId ? -1 : 0,
+      message_tags: notMessageId ? { mark: 'empty_text_file' } : {},
       files: [{ url, name: fileName }]
     })
     dcgLogger(`dcgchat: sendMedia session=${sessionKey}, file=${fileName}`)
   } catch (error) {
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
-      is_finish: `${msgCtx?.messageId}`?.length === 13 ? -1 : 0,
+      message_tags: notMessageId ? { mark: 'empty_text_file' } : {},
+      is_finish: notMessageId ? -1 : 0,
       files: [{ url: opts.mediaUrl ?? '', name: fileName }]
     })
     dcgLogger(`dcgchat: error sendMedia session=${sessionKey}: ${String(error)}`, 'error')
@@ -295,24 +296,10 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         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 (outboundCtx?.sessionId) {
             messageId = outboundCtx?.messageId || `${Date.now()}`
             const newCtx = { ...outboundCtx, messageId }
             wsSendRaw(newCtx, content)
-          } else {
-            dcgLogger(`channel sendText to ${ctx.to} -> sessionId not found`, 'error')
           }
         }
       }
@@ -331,8 +318,8 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       const cronMsgId = getCronMessageId(to)
       const fallbackMessageId = `${Date.now()}`
       const messageId = cronMsgId || (isCron ? fallbackMessageId : msgCtx?.messageId || fallbackMessageId)
-
-      if (!outboundCtx?.sessionId) {
+      const { sessionId } = getInfoBySessionKey(to)
+      if (!sessionId) {
         dcgLogger(`channel sendMedia to ${ctx.to} -> sessionId not found`, 'error')
         return {
           channel: "dcgchat-test",

package/src/cronToolCall.ts

@@ -117,34 +117,44 @@ function needsBestEffort(delivery: CronDelivery): boolean {
 }
 
 /**
- * 深拷贝 params 并注入 bestEffort: true
+ * 深拷贝 params，在 delivery 上写入 dcg 路由（to / accountId / sessionKey）。
+ * bestEffort + 默认 channel 仅在 needsBestEffort 为真时写入（announce 且无 channel）。
+ *
+ * 说明：原先仅在 needsBestEffort 为真时才改 delivery，若 jobs 里已有 channel 会整段跳过，
+ * 导致 `delivery.to` 永远不会被本钩子写入；运行时若缺 to 就会一直 not-delivered。
  */
-function injectBestEffort(params: Record<string, unknown>, sk: string): Record<string, unknown> {
+function patchCronDeliveryInParams(
+  params: Record<string, unknown>,
+  sk: string,
+  deliverySnapshot: CronDelivery
+): Record<string, unknown> | null {
   const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
-  const { agentId, sessionId } = formatterSessionKey(sk)
-  // 顶层 delivery
+  const { agentId } = formatterSessionKey(sk)
+  const announceNoChannel = needsBestEffort(deliverySnapshot)
+
+  const apply = (d: CronDelivery) => {
+    d.to = `dcg-cron:${sk}`
+    if (agentId) d.accountId = agentId
+    if (announceNoChannel) {
+      d.bestEffort = true
+      d.channel = "dcgchat-test"
+    }
+  }
+
   if (newParams.delivery && typeof newParams.delivery === 'object') {
-    ;(newParams.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"
+    apply(newParams.delivery as CronDelivery)
     newParams.sessionKey = sk
     return newParams
   }
 
-  // job.delivery
   const job = newParams.job as Record<string, unknown> | undefined
   if (job?.delivery && typeof job.delivery === 'object') {
-    const jd = job.delivery as CronDelivery
-    jd.bestEffort = true
-    jd.to = `dcg-cron:${sk}`
-    jd.accountId = agentId
-    jd.channel = "dcgchat-test"
+    apply(job.delivery as CronDelivery)
     newParams.sessionKey = sk
     return newParams
   }
 
-  return newParams
+  return null
 }
 
 export function cronToolCall(event: { toolName: any; params: any; toolCallId: any }, sk: string) {
@@ -157,20 +167,24 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
       dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) has no delivery config, skip.`)
       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.`
-      )
+    const newParams = patchCronDeliveryInParams(params, sk, delivery)
+    if (!newParams) {
+      dcgLogger(`[${LOG_TAG}] cron call (${toolCallId}) could not locate delivery on params clone, skip.`)
       return undefined
     }
 
-    // ★ 核心：注入 bestEffort: true
-    const newParams = injectBestEffort(params, sk)
-    dcgLogger(
-      `[${LOG_TAG}] cron call (${toolCallId}) injected bestEffort=true ` +
-        `(mode=announce, no channel). delivery=${JSON.stringify(newParams.delivery || (newParams.job as Record<string, unknown>)?.delivery)}`
-    )
+    const patched = newParams.delivery ?? (newParams.job as Record<string, unknown>)?.delivery
+    if (needsBestEffort(delivery)) {
+      dcgLogger(
+        `[${LOG_TAG}] cron call (${toolCallId}) patched delivery (announce, no channel): bestEffort=true, ` +
+          `delivery=${JSON.stringify(patched)}`
+      )
+    } else {
+      dcgLogger(
+        `[${LOG_TAG}] cron call (${toolCallId}) patched delivery.to / accountId (sessionKey=${sk}), ` +
+          `delivery=${JSON.stringify(patched)}`
+      )
+    }
 
     return { params: newParams }
   } else if (toolName === 'exec') {

package/src/utils/constant.ts

@@ -2,6 +2,6 @@ export const ENV: 'production' | 'test' | 'develop' = 'test'
 
 
 export const systemCommand = ['/new', '/status']
-export const interruptCommand = ['/stop']
+export const stopCommand = ['/stop']
 
-export const ignoreToolCommand = ['/search', '/abort', '/queue interrupt', ...systemCommand, ...interruptCommand]
+export const ignoreToolCommand = ['/search', '/abort', '/queue interrupt', ...systemCommand, ...stopCommand]