@dcrays/dcgchat-test 0.4.15 → 0.4.17

package/package.json

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

package/src/bot.ts

@@ -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,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')
+          dcgLogger(`chat.abort ${dcgSessionKey}: ${String(e)}`, 'error')
         }
-        for (const sk of keysToAbort) {
-          await abortOneSession(sk)
-        }
-        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 {
@@ -394,22 +375,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/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)
 }
@@ -306,14 +328,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 +364,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 +381,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)}`)

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