@dcrays/dcgchat-test 0.5.0-alpha.1 → 0.5.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.5.0-alpha.1",
+  "version": "0.5.0-alpha.2",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -18,7 +18,7 @@
     "ai"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.4.11"
+    "openclaw": ">=2026.4.12"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -49,10 +49,10 @@
       "npmSpec": "@dcrays/dcgchat-test",
       "localPath": "extensions/dcgchat-test",
       "defaultChoice": "npm",
-      "minHostVersion": ">=2026.4.11"
+      "minHostVersion": ">=2026.4.12"
     },
     "compat": {
-      "pluginApi": ">=2026.4.11"
+      "pluginApi": ">=2026.4.12"
     }
   }
 }

package/src/bot.ts

@@ -316,6 +316,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
       humanDelay: core.channel.reply.resolveHumanDelayConfig(config, route.agentId),
       onReplyStart: async () => {},
       deliver: async (payload: ReplyPayload, info) => {
+        if ((inboundGenerationBySessionKey.get(dcgSessionKey) ?? 0) !== inboundGenAtStart) return
         if (isSessionStreamSuppressed(dcgSessionKey)) return
         const mediaList = resolveReplyMediaList(payload)
         for (const mediaUrl of mediaList) {
@@ -332,6 +333,10 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
         )
       },
       onError: (err: unknown, info: { kind: string }) => {
+        if ((inboundGenerationBySessionKey.get(dcgSessionKey) ?? 0) !== inboundGenAtStart) {
+          dcgLogger(`${info.kind} reply failed (stale handler, ignored): ${String(err)}`, 'error')
+          return
+        }
         dispatchReplyErrorHandledByOnError = true
         setMsgStatus(dcgSessionKey, 'finished')
         const suppressed = isSessionStreamSuppressed(dcgSessionKey)
@@ -419,6 +424,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
                   setActiveRunIdForSession(dcgSessionKey, runId)
                 },
                 onPartialReply: async (payload: ReplyPayload) => {
+                  if ((inboundGenerationBySessionKey.get(dcgSessionKey) ?? 0) !== inboundGenAtStart) return
                   if (isSessionStreamSuppressed(dcgSessionKey)) return
                   // --- Streaming text chunks ---
                   if (payload.text) {

package/src/sessionTermination.ts

@@ -59,6 +59,13 @@ export function preemptInboundQueueForStop(sessionKey: string): void {
     dispatchAbortBySessionKey.delete(sessionKey)
   }
   inboundTurnTailBySessionKey.set(sessionKey, Promise.resolve())
+  // 立即标记流抑制，防止 /stop 到 interruptLocalDispatchAndGateway 之间网关事件仍能推送
+  markSessionStreamSuppressed(sessionKey)
+  // 队尾被重置后旧 handler 会变成「僵尸」与后续 /stop 并发；仅靠后续 interrupt 晚一拍时网关 run 仍占位。
+  // 尽早对网关发 interrupt 级 abort（与 /stop 内 interrupt 重复无害），缩短僵尸窗口。
+  void abortGatewayRunsForSession(sessionKey, 'interrupt').catch((e) =>
+    dcgLogger(`preempt: gateway abort: ${String(e)}`, 'error')
+  )
   dcgLogger(`inbound queue: reset tail for /stop sessionKey=${sessionKey}`)
 }
 
@@ -123,6 +130,13 @@ export async function beginSupersedingUserTurn(sessionKey: string): Promise<Abor
   sessionStreamSuppressed.delete(sessionKey)
   dispatchAbortBySessionKey.get(sessionKey)?.abort()
   await abortGatewayRunsForSession(sessionKey, 'supersede')
+  // `/stop` 的 interrupt 会先清空 activeRunId；此时 supersede 可能整段跳过主会话 abort，网关仍跑着僵尸 run，
+  // 新一轮会「秒结束」且无回复。再发一次无 runId 的 main abort 作为兜底（幂等）。
+  try {
+    await sendGatewayRpc({ method: 'chat.abort', params: { sessionKey } })
+  } catch (e) {
+    dcgLogger(`supersede: best-effort main chat.abort ${sessionKey}: ${String(e)}`, 'error')
+  }
   const ac = new AbortController()
   dispatchAbortBySessionKey.set(sessionKey, ac)
   return ac

package/src/skill.ts

@@ -19,14 +19,13 @@ type ISkillParams = {
 function sendEvent(msgContent: Record<string, any>) {
   const ws = getWsConnection()
   if (isWsOpen()) {
-    ws?.send(
-      JSON.stringify({
-        messageType: 'openclaw_bot_event',
-        source: 'client',
-        content: msgContent
-      })
-    )
-    dcgLogger(`技能安装: ${JSON.stringify(msgContent)}`)
+    const msg =     JSON.stringify({
+      messageType: 'openclaw_bot_event',
+      source: 'client',
+      content: msgContent
+    });
+    ws?.send(msg);
+    dcgLogger(`[Send]技能安装: ${msg}`)
   }
 }
 
@@ -137,16 +136,11 @@ export function uninstallSkill(params: Omit<ISkillParams, 'path'>, msgContent: R
   const { code } = params
 
   const workspacePath = getWorkspaceDir()
-  if (!workspacePath) {
-    sendEvent({ ...msgContent, status: 'ok' })
-  }
-
-  const skillDir = path.join(workspacePath, 'skills', code)
-
-  if (fs.existsSync(skillDir)) {
-    fs.rmSync(skillDir, { recursive: true, force: true })
-    sendEvent({ ...msgContent, status: 'ok' })
-  } else {
-    sendEvent({ ...msgContent, status: 'ok' })
+  if (workspacePath) {
+    const skillDir = path.join(workspacePath, 'skills', code)
+    if (fs.existsSync(skillDir)) {
+      fs.rmSync(skillDir, { recursive: true, force: true })
+    }
   }
+  sendEvent({ ...msgContent, status: 'ok' })
 }

package/src/transport.ts

@@ -1,4 +1,5 @@
 import { clearSentMediaKeys, getWsConnection } from './utils/global.js'
+import { isSessionStreamSuppressed } from './sessionTermination.js'
 import { dcgLogger } from './utils/log.js'
 import type { IMsgParams } from './types.js'
 import { getEffectiveMsgParams, getParamsDefaults } from './utils/params.js'
@@ -139,6 +140,7 @@ export function isWsOpen(): boolean {
  * `ctx` 须由调用方用 getEffectiveMsgParams(sessionKey) 等解析好；`content` 为完整业务 payload。
  */
 export function wsSend(ctx: IMsgParams, content: Record<string, unknown>): boolean {
+  if (ctx.sessionKey && isSessionStreamSuppressed(ctx.sessionKey)) return false
   const ws = getWsConnection()
   if (ws?.readyState !== WebSocket.OPEN) return false
   const envelope = buildOpenclawBotChat(ctx, content)
@@ -151,6 +153,7 @@ export function wsSend(ctx: IMsgParams, content: Record<string, unknown>): boole
  * `ctx` 须由调用方解析（如需合并覆盖可先 mergeSessionParams）。
  */
 export function wsSendRaw(ctx: IMsgParams, content: Record<string, unknown>, isLog = true): boolean {
+  if (ctx.sessionKey && isSessionStreamSuppressed(ctx.sessionKey)) return false
   const ws = getWsConnection()
   if (ws?.readyState !== WebSocket.OPEN) {
     dcgLogger(`server socket not ready ${ws?.readyState}`, 'error')