@dcrays/dcgchat-test 0.3.14 → 0.3.16

package/package.json

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

package/src/bot.ts

@@ -3,6 +3,7 @@ import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
 import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
 import type { InboundMessage } from './types.js'
+import os from 'node:os'
 import {
   clearSentMediaKeys,
   getDcgchatRuntime,
@@ -274,10 +275,15 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       onError: (err: unknown, info: { kind: string }) => {
         safeSendFinal('error')
         dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
+        activeRunIdBySessionKey.delete(effectiveSessionKey)
+        streamChunkIdxBySessionKey.delete(effectiveSessionKey)
+        if (sessionStreamSuppressed.has(effectiveSessionKey)) {
+          dcgLogger(`${info.kind} reply failed (stream suppressed): ${String(err)}`, 'error')
+          return
+        }
+        dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
       },
-      onIdle: () => {
-        // safeSendFinal()
-      }
+      onIdle: () => {}
     })
 
     try {
@@ -409,10 +415,12 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
           const candidates: string[] = [file]
           candidates.push(path.join(getWorkspaceDir(), file))
           candidates.push(path.join(getWorkspaceDir(), file.replace(/^\//, '')))
-          if (process.platform === 'win32') {
-            const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
-            if (underMobook) {
+          const underMobook = file.replace(/^\/mobook\//i, '').replace(/^mobook[\\/]/i, '')
+          if (underMobook) {
+            if (process.platform === 'win32') {
               candidates.push(path.join('C:\\', 'mobook', underMobook))
+            } else if (process.platform === 'darwin') {
+              candidates.push(path.join(os.homedir(), 'mobook', underMobook))
             }
           }
           const resolved = candidates.find((p) => fs.existsSync(p))

package/src/cron.ts

@@ -1,8 +1,8 @@
 import path from 'node:path'
 import fs from 'node:fs'
 import type { IMsgParams } from './types.js'
-import { sendEventMessage, sendFinal } from './transport.js'
-import { getWorkspaceDir, removeCronMessageId, setCronMessageId, setMsgStatus } from './utils/global.js'
+import { mergeDefaultParams, sendEventMessage, sendFinal } from './transport.js'
+import { getCronMessageId, getWorkspaceDir, removeCronMessageId, setCronMessageId, setMsgStatus } from './utils/global.js'
 import { ossUpload } from './request/oss.js'
 import { dcgLogger } from './utils/log.js'
 import { sendMessageToGateway } from './gateway/socket.js'
@@ -152,7 +152,23 @@ export const finishedDcgchatCron = async (jobId: string) => {
     return
   }
   const outboundCtx = getEffectiveMsgParams(sessionKey)
-  sendFinal(outboundCtx)
+  const messageId = getCronMessageId(sessionKey)
+  if (outboundCtx?.sessionId) {
+    const newCtx = messageId ? { ...outboundCtx, messageId } : outboundCtx
+    sendFinal(newCtx)
+  } else {
+    const sessionInfo = sessionKey.split(':')
+    const sessionId = sessionInfo.at(-1) ?? ''
+    const agentId = sessionInfo.at(-2) ?? ''
+    const merged = mergeDefaultParams({
+      agentId: agentId,
+      sessionId: `${sessionId}`,
+      messageId: messageId,
+      is_finish: -1,
+      real_mobook: !sessionId ? 1 : ''
+    })
+    sendFinal(merged, 'cron send')
+  }
   removeCronMessageId(sessionKey)
   dcgLogger(`finishedDcgchatCron: job=${id} sessionKey=${sessionKey}`)
 }