@dcrays/dcgchat-test 0.4.16 → 0.4.17

package/package.json

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

package/src/bot.ts

@@ -326,38 +326,19 @@ 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) => {
-          try {
-            await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey } })
-          } catch (e) {
-            dcgLogger(`chat.abort ${sessionKey}: ${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)
-          }
+          const runId = activeRunIdBySessionKey.get(dcgSessionKey)
+          await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey: dcgSessionKey, runId } })
         } catch (e) {
-          dcgLogger(`sessions.list spawnedBy: ${String(e)}`, 'error')
-        }
-        for (const sk of keysToAbort) {
-          await abortOneSession(sk)
+          dcgLogger(`chat.abort ${dcgSessionKey}: ${String(e)}`, 'error')
         }
-        await abortOneSession(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/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)}`)

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 配对使用 */