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

package/index.ts

@@ -1,26 +1,24 @@
-import type { OpenClawPluginApi } from 'openclaw/plugin-sdk'
-import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk'
+import { defineChannelPluginEntry } from 'openclaw/plugin-sdk/core'
 import { dcgchatPlugin } from './src/channel.js'
 import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
 import { setOpenClawConfig } from './src/utils/global.js'
 import { createDcgchatMessageTool } from './src/tools/messageTool.js'
 
-const plugin = {
+export default defineChannelPluginEntry({
   id: "dcgchat-test",
   name: '书灵墨宝',
   description: '连接 OpenClaw 与 书灵墨宝 产品（WebSocket）',
-  configSchema: emptyPluginConfigSchema(),
-  register(api: OpenClawPluginApi) {
-    setDcgchatRuntime(api.runtime)
+  plugin: dcgchatPlugin,
+  setRuntime: (runtime) => {
+    setDcgchatRuntime(runtime)
+  },
+  registerFull: (api) => {
     monitoringToolMessage(api)
     setOpenClawConfig(api.config)
-    api.registerChannel({ plugin: dcgchatPlugin })
     setWorkspaceDir(api.config?.agents?.defaults?.workspace)
     api.registerTool((ctx) => {
       return createDcgchatMessageTool(ctx)
     })
   }
-}
-
-export default plugin
+})

package/openclaw.plugin.json

@@ -3,9 +3,25 @@
   "channels": [
     "dcgchat-test"
   ],
+  "description": "Gateway `event=cron` + `action=finished` 时：优先在 payload 中按 schemas/gateway-cron-finished.payload.json 提供 `attachments`；若缺省，插件在工作区规则下从 summary 回退提取路径并经 sendMedia 发送。",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
-    "properties": {}
+    "properties": {
+      "allowedPaths": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        },
+        "description": "允许发送文件的额外路径列表"
+      },
+      "allowedAttachmentExtensions": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        },
+        "description": "在插件默认附件扩展名之外额外允许的后缀，如 [\".go\", \".rs\"]。默认已含常见办公/媒体及 .py/.ipynb 等；可省略本项。"
+      }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.29",
+  "version": "0.5.0-alpha.1",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -8,6 +8,7 @@
   "files": [
     "index.ts",
     "src",
+    "schemas",
     "openclaw.plugin.json"
   ],
   "keywords": [
@@ -16,6 +17,14 @@
     "websocket",
     "ai"
   ],
+  "peerDependencies": {
+    "openclaw": ">=2026.4.11"
+  },
+  "peerDependenciesMeta": {
+    "openclaw": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",
@@ -39,7 +48,11 @@
     "install": {
       "npmSpec": "@dcrays/dcgchat-test",
       "localPath": "extensions/dcgchat-test",
-      "defaultChoice": "npm"
+      "defaultChoice": "npm",
+      "minHostVersion": ">=2026.4.11"
+    },
+    "compat": {
+      "pluginApi": ">=2026.4.11"
     }
   }
 }

package/src/bot.ts

@@ -1,34 +1,20 @@
-import { randomUUID } from 'node:crypto'
 import path from 'node:path'
 import type { ReplyPayload } from 'openclaw/plugin-sdk'
-import { createReplyPrefixContext, createTypingCallbacks } from 'openclaw/plugin-sdk'
+import { createReplyPrefixContext, createTypingCallbacks } from 'openclaw/plugin-sdk/channel-reply-pipeline'
 import type { InboundMessage } from './types.js'
-import {
-  clearSentMediaKeys,
-  getDcgchatRuntime,
-  getOpenClawConfig,
-  getSessionKey,
-  getWorkspaceDir,
-  setMsgStatus
-} from './utils/global.js'
+import { getSessionKey, getWorkspaceDir, setMsgStatus } from './utils/global.js'
+import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig } from './utils/global.js'
 import { normalizeOutboundMediaPaths, 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 { contextOverflowUserHint, isContextOverflowError } from './utils/agentErrors.js'
 import { channelInfo, systemCommand, stopCommand, ENV, ignoreToolCommand } from './utils/constant.js'
 import { clearParamsMessage, getEffectiveMsgParams, setParamsMessage } from './utils/params.js'
 import { waitUntilSubagentsIdle } from './tool.js'
-import {
-  beginSupersedingUserTurn,
-  clearActiveRunIdForSession,
-  clearSessionStreamSuppression,
-  interruptLocalDispatchAndGateway,
-  isSessionStreamSuppressed,
-  preemptInboundQueueForStop,
-  releaseDispatchAbortIfCurrent,
-  runInboundTurnSequenced,
-  setActiveRunIdForSession
-} from './sessionTermination.js'
+import { beginSupersedingUserTurn, clearActiveRunIdForSession, clearSessionStreamSuppression } from './sessionTermination.js'
+import { interruptLocalDispatchAndGateway, isSessionStreamSuppressed, preemptInboundQueueForStop } from './sessionTermination.js'
+import { releaseDispatchAbortIfCurrent, runInboundTurnSequenced, setActiveRunIdForSession } from './sessionTermination.js'
 
 type MediaInfo = {
   path: string
@@ -75,7 +61,6 @@ async function resolveMediaFromUrls(files: TFileInfo[], botToken: string): Promi
   const core = getDcgchatRuntime()
   const out: MediaInfo[] = []
   dcgLogger(`media: user upload files: ${JSON.stringify(files)}`)
-
   for (let i = 0; i < files.length; i++) {
     const file = files[i]
     try {
@@ -232,6 +217,8 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
   }
 
   try {
+    /** 为 true 表示 createReplyDispatcherWithTyping 的 onError 已执行（含 sendFinal），内部 catch 勿再收尾 */
+    let dispatchReplyErrorHandledByOnError = false
     if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code && !ignoreToolCommand.includes(text?.trim())) {
       const workspaceDir = getWorkspaceDir()
       const skill = msg.content.skills_scope[0]
@@ -287,6 +274,27 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
     /** 与 Feishu snapshot 模式一致：payload.text 为当前轮助手全文快照，据此算增量，避免工具前后快照变短或非单调时丢字 */
     let lastStreamSnapshot = ''
 
+    /** Core 在 block/final（及可选 tool）路径走 `deliver`，流式 token 才走 `onPartialReply`；二者需共用快照，避免双发或漏发 */
+    const emitAssistantTextChunkFromSnapshot = (raw: string | undefined) => {
+      if (!raw) return
+      const t = raw
+      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)
+      }
+    }
+
     if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code && !ignoreToolCommand.includes(text?.trim())) {
       const workspaceDir = getWorkspaceDir()
       const skill = msg.content.skills_scope[0]
@@ -316,14 +324,23 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
           sentMediaKeys.add(key)
           await sendDcgchatMedia({ sessionKey: dcgSessionKey, mediaUrl, text: '' })
         }
-        dcgLogger(`[deliver]: len=${payload?.text?.length} sessionId=${outboundCtx.sessionId} ${formatText(payload?.text ?? '')}`)
+        if (payload?.text?.trim()) {
+          emitAssistantTextChunkFromSnapshot(payload.text)
+        }
+        dcgLogger(
+          `[deliver]: kind=${info.kind} len=${payload?.text?.length} sessionId=${outboundCtx.sessionId} ${formatText(payload?.text ?? '')}`
+        )
       },
       onError: (err: unknown, info: { kind: string }) => {
+        dispatchReplyErrorHandledByOnError = true
         setMsgStatus(dcgSessionKey, 'finished')
+        const suppressed = isSessionStreamSuppressed(dcgSessionKey)
+        if (!suppressed && isContextOverflowError(err)) {
+          sendText(contextOverflowUserHint(), outboundCtx)
+        }
         sendFinal(outboundCtx, 'error')
         clearActiveRunIdForSession(dcgSessionKey)
         streamChunkIdxBySessionKey.delete(dcgSessionKey)
-        const suppressed = isSessionStreamSuppressed(dcgSessionKey)
         dcgLogger(`${info.kind} reply failed${suppressed ? ' (stream suppressed)' : ''}: ${String(err)}`, 'error')
       },
       onIdle: () => {
@@ -338,27 +355,28 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
         dispatchAbort = await beginSupersedingUserTurn(dcgSessionKey)
       }
 
-      if (systemCommand.includes(text?.trim())) {
-        dcgLogger(`dispatching ${text?.trim()}`)
-        await core.channel.reply.withReplyDispatcher({
-          dispatcher,
-          onSettled: () => markDispatchIdle(),
-          run: () =>
-            core.channel.reply.dispatchReplyFromConfig({
-              ctx: ctxPayload,
-              cfg: config,
-              dispatcher,
-              replyOptions: {
-                ...replyOptions,
-                abortSignal: dispatchAbort!.signal,
-                onModelSelected: prefixContext.onModelSelected,
-                onAgentRunStart: (runId) => {
-                  setActiveRunIdForSession(dcgSessionKey, runId)
-                }
-              }
-            })
-        })
-      } else if (stopCommand.includes(text?.trim())) {
+      // if (systemCommand.includes(text?.trim())) {
+      //   dcgLogger(`dispatching ${text?.trim()}`)
+      //   await core.channel.reply.withReplyDispatcher({
+      //     dispatcher,
+      //     onSettled: () => markDispatchIdle(),
+      //     run: () =>
+      //       core.channel.reply.dispatchReplyFromConfig({
+      //         ctx: ctxPayload,
+      //         cfg: config,
+      //         dispatcher,
+      //         replyOptions: {
+      //           ...replyOptions,
+      //           abortSignal: dispatchAbort!.signal,
+      //           onModelSelected: prefixContext.onModelSelected,
+      //           onAgentRunStart: (runId) => {
+      //             setActiveRunIdForSession(dcgSessionKey, runId)
+      //           }
+      //         }
+      //       })
+      //   })
+      // } else
+      if (stopCommand.includes(text?.trim())) {
         const ctxForAbort = priorOutboundCtx.messageId?.trim() || priorOutboundCtx.sessionId?.trim() ? priorOutboundCtx : outboundCtx
         await interruptLocalDispatchAndGateway(dcgSessionKey, ctxForAbort)
         streamChunkIdxBySessionKey.delete(dcgSessionKey)
@@ -402,26 +420,9 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
                 },
                 onPartialReply: async (payload: ReplyPayload) => {
                   if (isSessionStreamSuppressed(dcgSessionKey)) return
-
                   // --- Streaming text chunks ---
                   if (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)
-                    }
+                    emitAssistantTextChunkFromSnapshot(payload.text)
                   } else {
                     dcgLogger(`onPartialReply no text (media/tool metadata): ${JSON.stringify(payload)}`)
                   }
@@ -442,6 +443,13 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
       dcgLogger(`handleDcgchatMessage error: ${String(err)}`, 'error')
       if ((inboundGenerationBySessionKey.get(dcgSessionKey) ?? 0) === inboundGenAtStart) {
         setMsgStatus(dcgSessionKey, 'finished')
+        if (!dispatchReplyErrorHandledByOnError && isContextOverflowError(err) && !isSessionStreamSuppressed(dcgSessionKey)) {
+          sendText(contextOverflowUserHint(), outboundCtx)
+          sendFinal(outboundCtx, 'error')
+          clearActiveRunIdForSession(dcgSessionKey)
+          streamChunkIdxBySessionKey.delete(dcgSessionKey)
+          return
+        }
       }
     } finally {
       releaseDispatchAbortIfCurrent(dcgSessionKey, dispatchAbort)
@@ -495,6 +503,7 @@ async function handleDcgchatMessageInboundTurn(msg: InboundMessage, accountId: s
     if ((inboundGenerationBySessionKey.get(dcgSessionKey) ?? 0) === inboundGenAtStart) {
       setMsgStatus(dcgSessionKey, 'finished')
     }
-    sendError(err instanceof Error ? err.message : String(err), outboundCtx)
+    const rawErr = err instanceof Error ? err.message : String(err)
+    sendError(isContextOverflowError(err) ? contextOverflowUserHint() : rawErr, outboundCtx)
   }
 }

package/src/channel.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
-import type { ChannelPlugin, OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
-import { createPluginRuntimeStore, DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk'
+import type { ChannelPlugin, OpenClawConfig } from 'openclaw/plugin-sdk'
+import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id'
 import type { ResolvedDcgchatAccount, DcgchatConfig } from './types.js'
 import { ossUpload } from './request/oss.js'
 import {
@@ -204,14 +204,17 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
     dcgLogger(`dcgchat: sendMedia skipped (duplicate in session): ${mediaUrl} sessionId=${msgCtx.sessionId} sessionKey=${sessionKey}`)
     return
   }
-  // 判断文件存在
+  let mediaStat: fs.Stats
   try {
-    if (!fs.existsSync(mediaUrl)) {
-      dcgLogger(`dcgchat: sendMedia skipped (file not found): ${mediaUrl} sessionKey=${sessionKey}`, 'error')
-      return
-    }
+    mediaStat = fs.statSync(mediaUrl)
   } catch (err) {
     dcgLogger(`dcgchat: sendMedia skipped (cannot stat path): ${mediaUrl} ${String(err)} sessionKey=${sessionKey}`, 'error')
+    return
+  }
+  if (!mediaStat.isFile()) {
+    const kind = mediaStat.isDirectory() ? 'directory' : 'non-regular'
+    dcgLogger(`dcgchat: sendMedia skipped (not a regular file, ${kind}): ${mediaUrl} sessionKey=${sessionKey}`, 'error')
+    return
   }
 
   if (mediaUrl && msgCtx.sessionId) {
@@ -363,6 +366,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       '书灵墨宝 / 内置 `message`：回复当前会话时 **不要传 `target`**，由 OpenClaw 使用工具上下文里的 `currentChannelId`（来自入站 `To`，即当前 SessionKey）。',
       '必须指定会话时：`target` 须为上下文中出现的 **整段 SessionKey，逐字一致**（如 `agent:…:mobook:direct:…` 或以 `agent:` 开头的路由键）；**禁止**使用 `userId`、`From`、纯数字会话号等代替。',
       '生成文件后，**尽可能不要**把文件路径、地址直接告诉用户；把文件名告诉用户；须通过工具发文件，勿在正文里直接输出可访问路径。',
+      '用户待发送文件若**不在**兼容挂载 **`/workspace/`**、**`/mobook/`**（及 Windows 下 `workspace`、`mobook` 盘符路径），且也不在 **当前 Agent 工作区** 或通道 **`allowedPaths`** 所列目录内：**建议**用户「先复制进工作区再发」作为首选。',
       '使用 `dcgchat_message` 时同样遵守上述 SessionKey 规则（该工具通常由插件注入当前会话，一般无需自造 target）。'
     ]
   },

package/src/cron.ts

@@ -135,7 +135,12 @@ export const onRunCronJob = async (jobId: string, messageId: string) => {
   )
   sendMessageToGateway(JSON.stringify({ method: 'cron.run', params: { id: jobId, mode: 'force' } }))
 }
-export const finishedDcgchatCron = async (jobId: string, summary: string, hasFileOutput?: boolean) => {
+/**
+ * 发送定时完成摘要（纯文本）。附件须由网关在 `payload.attachments` 中给出，
+ * 并由 `gatewayMsgHanlder` 在调用本函数前经 `sendDcgchatMedia` 发送。
+ * @param hasSchemaAttachments `payload.attachments` 非空时为 true，用于 `message_tags.hasFile`
+ */
+export const finishedDcgchatCron = async (jobId: string, summary: string, hasSchemaAttachments?: boolean) => {
   const id = jobId?.trim()
   if (!id) {
     dcgLogger('finishedDcgchatCron: empty jobId', 'error')
@@ -160,7 +165,7 @@ export const finishedDcgchatCron = async (jobId: string, summary: string, hasFil
     real_mobook: !sessionId ? 1 : ''
   })
   const message_tags = { source: 'cron' } as Record<string, string | boolean>
-  if (hasFileOutput) {
+  if (hasSchemaAttachments) {
     message_tags.hasFile = true
   }
   wsSendRaw(merged, { response: summary, message_tags, is_finish: -1 })

package/src/gateway/cronFinishedPayload.ts

@@ -0,0 +1,118 @@
+/**
+ * 与 `schemas/gateway-cron-finished.payload.json` 对齐：`attachments` 为首选。
+ * 若宿主未下发 `attachments`（当前 Gateway 常见情况），则仅在 `summary` 中按工作区规则提取路径（见 `resolveCronFinishedLocalPaths`），仍经 `sendDcgchatMedia` 发送。
+ */
+
+import {
+  expandTildePath,
+  extractWorkspaceFilePathsFromText,
+  isAllowedSendPath,
+  trimArtifactPathCandidate
+} from '../utils/workspaceFilePaths.js'
+
+export type CronFinishedAttachmentItem = string | { path?: string; file?: string }
+
+/** 网关 `event: "cron"` 且 `action === "finished"` 时插件消费的 payload 子集 */
+export type CronGatewayFinishedPayload = {
+  jobId?: string
+  action?: string
+  status?: string
+  summary?: string
+  delivered?: boolean
+  deliveryStatus?: string
+  sessionId?: string
+  sessionKey?: string
+  attachments?: CronFinishedAttachmentItem[]
+}
+
+/** JSON Schema 中 `attachments` 数组片段（便于在代码里引用、与仓库内 JSON 文件保持语义一致） */
+export const CRON_FINISHED_ATTACHMENTS_ITEMS_SCHEMA = {
+  type: 'array',
+  description: '本轮定时任务产出的本地文件路径，按顺序经通道发送为附件',
+  items: {
+    oneOf: [
+      { type: 'string', minLength: 1, description: '绝对路径' },
+      {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          path: { type: 'string', minLength: 1 },
+          file: { type: 'string', minLength: 1 }
+        },
+        description: '优先 path，否则 file'
+      }
+    ]
+  }
+} as const
+
+function pushAttachmentItem(item: unknown, out: string[]): void {
+  if (typeof item === 'string') {
+    const s = item.trim()
+    if (s) out.push(s)
+    return
+  }
+  if (item && typeof item === 'object') {
+    const o = item as Record<string, unknown>
+    const p = typeof o.path === 'string' ? o.path.trim() : ''
+    const f = typeof o.file === 'string' ? o.file.trim() : ''
+    const s = p || f
+    if (s) out.push(s)
+  }
+}
+
+/**
+ * 从网关 payload 取出 `attachments` 中的路径字符串（去重保序）。
+ * 不解析 `summary`、不扫描 Markdown。
+ */
+export function normalizeCronFinishedAttachmentPaths(payload: unknown): string[] {
+  if (payload == null || typeof payload !== 'object') return []
+  const p = payload as CronGatewayFinishedPayload
+  const raw = p.attachments
+  if (!Array.isArray(raw)) return []
+  const acc: string[] = []
+  for (const item of raw) {
+    pushAttachmentItem(item, acc)
+  }
+  const seen = new Set<string>()
+  const deduped: string[] = []
+  for (const s of acc) {
+    if (seen.has(s)) continue
+    seen.add(s)
+    deduped.push(s)
+  }
+  return deduped
+}
+
+function dedupePaths(paths: string[]): string[] {
+  const seen = new Set<string>()
+  const out: string[] = []
+  for (const s of paths) {
+    if (!s || seen.has(s)) continue
+    seen.add(s)
+    out.push(s)
+  }
+  return out
+}
+
+/**
+ * 解析本轮待经通道发送的本地路径：优先 `payload.attachments`；
+ * 若为空则用 `summary` 与 `extractWorkspaceFilePathsFromText` 一致的工作区/挂载规则提取（非任意全文扫描）。
+ */
+export function resolveCronFinishedLocalPaths(
+  payload: unknown,
+  summary: string | undefined,
+  workspaceDir: string,
+  allowedPaths?: string[]
+): string[] {
+  const fromSchema = normalizeCronFinishedAttachmentPaths(payload)
+    .map((s) => expandTildePath(trimArtifactPathCandidate(s)))
+    .filter(Boolean)
+  const schemaOk = fromSchema.filter((p: string) => isAllowedSendPath(p, workspaceDir, allowedPaths))
+  if (schemaOk.length > 0) {
+    return dedupePaths(schemaOk)
+  }
+  const fromSummary = extractWorkspaceFilePathsFromText(summary, workspaceDir).filter((p: string) =>
+    isAllowedSendPath(p, workspaceDir, allowedPaths)
+  )
+  return dedupePaths(fromSummary)
+}

package/src/gateway/index.ts

@@ -358,8 +358,13 @@ export class GatewayConnection {
     }
 
     if (msg.type === 'event') {
-      const event = handleGatewayEventMessage(msg)
-      this.eventHandlers.forEach((h) => h(event))
+      void handleGatewayEventMessage(msg)
+        .then((event) => {
+          this.eventHandlers.forEach((h) => h(event))
+        })
+        .catch((err) => {
+          dcgLogger(`[Gateway] event 处理异步失败: ${String(err)}`, 'error')
+        })
     }
   }
 

package/src/monitor.ts

@@ -1,4 +1,4 @@
-import type { ClawdbotConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
+import type { OpenClawConfig, RuntimeEnv } from 'openclaw/plugin-sdk'
 import WebSocket from 'ws'
 import { resolveAccount } from './channel.js'
 import { setWsConnection, getOpenClawConfig } from './utils/global.js'
@@ -7,15 +7,12 @@ import { isWsOpen } from './transport.js'
 import { handleParsedWsMessage } from './utils/wsMessageHandler.js'
 
 export type MonitorDcgchatOpts = {
-  config?: ClawdbotConfig
+  config?: OpenClawConfig
   runtime?: RuntimeEnv
   abortSignal?: AbortSignal
   accountId?: string
 }
 
-const RECONNECT_DELAY_MS = 3000
-const HEARTBEAT_INTERVAL_MS = 30_000
-
 function buildConnectUrl(account: Record<string, string>): string {
   const { wsUrl, botToken, userId, domainId, appId } = account
   const url = new URL(wsUrl)
@@ -27,6 +24,9 @@ function buildConnectUrl(account: Record<string, string>): string {
 }
 
 export async function monitorDcgchatProvider(opts: MonitorDcgchatOpts): Promise<void> {
+  // WebSocket `open` 可能在 connect() 同 tick 内同步触发，间隔须在此行之前完成初始化
+  const RECONNECT_DELAY_MS = 3000
+  const HEARTBEAT_INTERVAL_MS = 30_000
   const { abortSignal, accountId } = opts
 
   const config = getOpenClawConfig()

package/src/request/userInfo.ts

@@ -24,9 +24,7 @@ const tokenCache = new Map<string, TokenCacheEntry>()
 export function setUserTokenCache(botToken: string, userToken: string): void {
   const expiresAt = Date.now() + TOKEN_CACHE_DURATION
   tokenCache.set(botToken, { token: userToken, expiresAt })
-  dcgLogger(
-    `[token-cache] cached userToken for botToken=${botToken.slice(0, 10)}..., expires at ${new Date(expiresAt).toISOString()}`
-  )
+  dcgLogger(`[token-cache] cached userToken for botToken=${botToken.slice(0, 10)}..., expires at ${new Date(expiresAt).toISOString()}`)
 }
 
 /**
@@ -47,10 +45,6 @@ export function getUserTokenCache(botToken: string): string | null {
     tokenCache.delete(botToken)
     return null
   }
-
-  dcgLogger(
-    `[token-cache] cache hit for botToken=${botToken.slice(0, 10)}..., valid until ${new Date(entry.expiresAt).toISOString()}`
-  )
   return entry.token
 }
 

package/src/skill.ts

@@ -55,7 +55,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     // 创建目标目录
     fs.mkdirSync(skillDir, { recursive: true })
     // 解压文件到目标目录，跳过顶层文件夹
-    await new Promise((resolve, reject) => {
+    const result = await new Promise((resolve, reject) => {
       const tasks: Promise<void>[] = []
       let rootDir: string | null = null
       let hasError = false
@@ -64,7 +64,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
         .pipe(unzipper.Parse())
         .on('entry', (entry: any) => {
           if (hasError) {
-            entry.autodrain()
+            entry.autodrain() // 消耗并丢弃当前 zip 条目的数据流
             return
           }
           try {
@@ -113,6 +113,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
             await Promise.all(tasks)
             resolve(null)
           } catch (err) {
+            hasError = true
             reject(err)
           }
         })
@@ -121,7 +122,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
           reject(new Error(`解压流错误: ${err.message}`))
         })
     })
-    sendEvent({ ...msgContent, status: 'ok' })
+    sendEvent({ ...msgContent, status: result === null ? 'ok' : 'fail' })
     sendMessageToGateway(JSON.stringify({ method: 'skills.status', params: {} }))
   } catch (error) {
     // 如果安装失败，清理目录

package/src/tool.ts

@@ -5,34 +5,11 @@ import { sendFinal, sendText, wsSendRaw } from './transport.js'
 import { getEffectiveMsgParams, deleteSessionKeyBySubAgentRunId, setSessionKeyBySubAgentRunId } from './utils/params.js'
 import { cronToolCall } from './cronToolCall.js'
 
-type PluginHookName =
-  | 'before_model_resolve'
-  | 'before_prompt_build'
-  | 'before_agent_start'
-  | 'llm_input'
-  | 'llm_output'
-  | 'agent_end'
-  | 'before_compaction'
-  | 'after_compaction'
-  | 'before_reset'
-  | 'message_received'
-  | 'message_sending'
-  | 'message_sent'
-  | 'before_tool_call'
-  | 'after_tool_call'
-  | 'tool_result_persist'
-  | 'before_message_write'
-  | 'session_start'
-  | 'session_end'
-  | 'subagent_spawning'
-  | 'subagent_delivery_target'
-  | 'subagent_spawned'
-  | 'subagent_ended'
-  | 'gateway_start'
-  | 'gateway_stop'
+/** 与 `OpenClawPluginApi['on']` 对齐，随宿主 SDK 扩展钩子名时自动一致 */
+type PluginHookName = Parameters<OpenClawPluginApi['on']>[0]
 
 // message_received 没有 sessionKey 前置到bot中执行
-const eventList = [
+const eventList: ReadonlyArray<{ event: PluginHookName; message: string }> = [
   // { event: 'message_received', message: '' },
   // {event: 'before_model_resolve', message: ''},
   // {event: 'before_prompt_build', message: '正在查阅背景资料，构建思考逻辑'},
@@ -357,7 +334,11 @@ function trackSubagentLifecycle(eventName: string, event: any, args: any): void
 
 export function monitoringToolMessage(api: OpenClawPluginApi) {
   for (const item of eventList) {
-    api.on(item.event as PluginHookName, (event: any, args: any) => {
+    api.on(item.event, (event: any, args: any) => {
+      // ACP 等非 subagent 的 ended 事件不应驱动书灵子会话状态机（见 SDK PluginHookSubagentEndedEvent.targetKind）
+      if (item.event === 'subagent_ended' && event?.targetKind === 'acp') {
+        return
+      }
       trackSubagentLifecycle(item.event, event, args)
       const sk = resolveHookSessionKey(item.event, args ?? {})
       if (sk) {
@@ -397,9 +378,9 @@ export function monitoringToolMessage(api: OpenClawPluginApi) {
             const msgCtx = resolveOutboundParamsForSession(sk)
             if (item.event === 'llm_output') {
               if (event.lastAssistant?.errorMessage === '1003-额度不足请充值') {
-                const message = '您的积分已消耗完，您可以通过充值积分来继续使用'
+                const message = '您的墨滴已消耗完，您可以通过充值墨滴来继续使用'
                 sendText(message, msgCtx, { message_tags: { insufficient_balance: 1 }, is_finish: -1 })
-                sendFinal(msgCtx, '积分不足')
+                sendFinal(msgCtx, '墨滴不足')
                 return
               }
             }

package/src/tools/messageTool.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import type { AnyAgentTool } from 'openclaw/plugin-sdk'
-import { jsonResult } from 'openclaw/plugin-sdk'
+import { jsonResult } from 'openclaw/plugin-sdk/channel-actions'
 import { sendDcgchatMedia } from '../channel.js'
 import { getOutboundMsgParams } from '../utils/params.js'
 import { sendText } from '../transport.js'
@@ -11,6 +11,9 @@ import { sendText } from '../transport.js'
 export type DcgchatMessageToolContext = {
   sessionKey?: string
   workspaceDir?: string
+  allowedPaths?: string[]
+  /** 通道配置 `allowedAttachmentExtensions`：在插件内置扩展名之外额外允许发送的附件后缀（如 `.py`、`.ipynb`），项可写 `.py` 或 `py`。 */
+  allowedAttachmentExtensions?: string[]
 }
 
 /** 统一为 POSIX 风格斜杠，便于跨平台判断（不改变语义，仅用于匹配）。 */
@@ -32,9 +35,19 @@ function isPathInsideDir(filepath: string, rootDir: string): boolean {
  * - 当前 Agent 工作区根及其子路径（`workspaceDir`，如 ~/.openclaw/workspace-xxx/output/...）；
  * - 兼容旧挂载：Unix `/workspace`、`/mobook`；Windows 盘符下 `workspace`、`mobook`。
  */
-function isSafePath(filepath: string, workspaceDir?: string): boolean {
+function isSafePath(filepath: string, workspaceDir?: string, allowedPaths?: string[]): boolean {
+  // Check workspaceDir
   const ws = workspaceDir?.trim()
   if (ws && isPathInsideDir(filepath, ws)) return true
+
+  // Check allowedPaths from config
+  if (allowedPaths?.length) {
+    for (const allowed of allowedPaths) {
+      if (isPathInsideDir(filepath, allowed)) return true
+    }
+  }
+
+  // Check legacy mounts
   const p = toPosixPath(filepath)
   if (p.startsWith('/workspace/') || p === '/workspace') return true
   if (p.startsWith('/mobook/') || p === '/mobook') return true
@@ -48,10 +61,43 @@ function pathKey(filepath: string): string {
 }
 
 const fileType1 = ['.webp', '.gif', '.bmp', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.pdf', '.txt', '.rtf', '.odt', '.json']
-const fileType2 = ['.xml', '.csv', '.yaml', '.yml', '.html', '.htm', '.md', '.markdown', '.css', '.js', '.ts', '.png', '.jpg', '.jpeg']
+const fileType2 = [
+  '.xml',
+  '.csv',
+  '.yaml',
+  '.yml',
+  '.html',
+  '.htm',
+  '.md',
+  '.markdown',
+  '.css',
+  '.js',
+  '.ts',
+  '.py',
+  '.pyi',
+  '.ipynb',
+  '.png',
+  '.jpg',
+  '.jpeg'
+]
 const fileType3 = ['.zip', '.rar', '.7z', '.tar', '.gz', '.bz2', '.xz', '.exe', '.dmg', '.pkg', '.apk', '.ipa', '.log', '.dat', '.bin']
 const fileType4 = ['.svg', '.ico', '.mp3', '.wav', '.ogg', '.aac', '.m4a', '.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv', '.webm']
-const SAFE_EXTENSIONS = new Set([...fileType1, ...fileType2, ...fileType3, ...fileType4])
+const DEFAULT_SAFE_EXTENSIONS = new Set([...fileType1, ...fileType2, ...fileType3, ...fileType4])
+
+function normalizeAttachmentExt(raw: string): string | null {
+  const t = raw.trim().toLowerCase()
+  if (!t) return null
+  return t.startsWith('.') ? t : `.${t}`
+}
+
+function buildSafeExtensions(extra?: string[]): Set<string> {
+  const set = new Set(DEFAULT_SAFE_EXTENSIONS)
+  for (const e of extra ?? []) {
+    const n = normalizeAttachmentExt(e)
+    if (n && n !== '.') set.add(n)
+  }
+  return set
+}
 
 const messageToolParameters = {
   type: 'object',
@@ -82,6 +128,7 @@ const messageToolParameters = {
       }
     }
   },
+  // 须至少提供正文或附件之一；用 anyOf（非 oneOf），否则同时带 content+media 时两个分支都满足会违反「恰好其一」而校验失败
   anyOf: [{ required: ['content'] }, { required: ['media'] }]
 }
 
@@ -113,13 +160,13 @@ function extractPaths(text: string | undefined, workspaceDir?: string): string[]
   return [...new Set([...unix, ...win, ...underWs])]
 }
 
-function isSafeFile(filepath: string) {
+function isSafeFile(filepath: string, extensions: Set<string>) {
   if (!fs.existsSync(filepath)) return false
   const stat = fs.statSync(filepath)
   if (!stat.isFile()) return false
   if (stat.size === 0) return false
   const ext = path.extname(filepath).toLowerCase()
-  return SAFE_EXTENSIONS.has(ext)
+  return extensions.has(ext)
 }
 
 /**
@@ -128,6 +175,7 @@ function isSafeFile(filepath: string) {
  * 通过注册时的 `OpenClawPluginToolContext.sessionKey` 出站，不再使用非标准的 `execute(args, ctx)`。
  */
 export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext): AnyAgentTool {
+  const safeExtensions = buildSafeExtensions(pluginCtx.allowedAttachmentExtensions)
   return {
     name: 'dcgchat_message',
     label: 'dcgchat_message',
@@ -155,13 +203,14 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
         const sentFiles = new Set<string>()
         const sentKeys = new Set<string>()
         const workspaceDir = pluginCtx.workspaceDir
+        const allowedPaths = pluginCtx.allowedPaths
 
         if (args.media?.length) {
           for (const media of args.media) {
             const filepath = media.file
             if (!filepath) continue
-            if (!isSafePath(filepath, workspaceDir)) continue
-            if (!isSafeFile(filepath)) continue
+            if (!isSafePath(filepath, workspaceDir, allowedPaths)) continue
+            if (!isSafeFile(filepath, safeExtensions)) continue
             const key = pathKey(filepath)
             if (sentKeys.has(key)) continue
 
@@ -173,8 +222,8 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
 
         const fallbackPaths = extractPaths(args.content, workspaceDir)
         for (const filepath of fallbackPaths) {
-          if (!isSafePath(filepath, workspaceDir)) continue
-          if (!isSafeFile(filepath)) continue
+          if (!isSafePath(filepath, workspaceDir, allowedPaths)) continue
+          if (!isSafeFile(filepath, safeExtensions)) continue
           const key = pathKey(filepath)
           if (sentKeys.has(key)) continue
 

package/src/utils/agentErrors.ts

@@ -0,0 +1,23 @@
+/**
+ * 识别 OpenClaw embedded agent 抛出的上下文/压缩相关错误（日志与异常文案可能略有差异）。
+ */
+function errorText(err: unknown): string {
+  if (err instanceof Error) return err.message
+  if (typeof err === 'string') return err
+  return String(err)
+}
+
+export function isContextOverflowError(err: unknown): boolean {
+  const t = errorText(err)
+  return (
+    /context overflow/i.test(t) ||
+    /prompt too large/i.test(t) ||
+    /auto-compaction failed/i.test(t) ||
+    /\(precheck\)/i.test(t)
+  )
+}
+
+/** 用户可见说明（不含 transport 层前缀） */
+export function contextOverflowUserHint(): string {
+  return '当前对话过长，已超过模型上下文限制；自动压缩未完全生效时会出现此情况。请尝试新开对话、缩短任务，或换用更大上下文的模型。'
+}

package/src/utils/gatewayMsgHanlder.ts

@@ -1,15 +1,21 @@
 import type { GatewayEvent } from '../gateway/index.js'
-import { finishedDcgchatCron, sendDcgchatCron } from '../cron.js'
+import { finishedDcgchatCron, getCronJobsPath, readCronJob, sendDcgchatCron } from '../cron.js'
+import { sendDcgchatMedia } from '../channel.js'
+import { resolveCronFinishedLocalPaths } from '../gateway/cronFinishedPayload.js'
+import { channelInfo, ENV } from './constant.js'
 import { dcgLogger } from './log.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'
+import { getEffectiveMsgParams, getSessionKeyBySubAgentRunId } from './params.js'
+import { sendChunk } from '../transport.js'
+import { getCronMessageId, getOpenClawConfig, getWorkspaceDir, setCronMessageId } from './global.js'
 
 /**
  * 处理网关 event 帧的副作用（agent 流式输出、cron 同步），并构造供上层分发的 GatewayEvent。
  */
-export function handleGatewayEventMessage(msg: { event?: string; payload?: Record<string, unknown>; seq?: number }): GatewayEvent {
+export async function handleGatewayEventMessage(msg: {
+  event?: string
+  payload?: Record<string, unknown>
+  seq?: number
+}): Promise<GatewayEvent> {
   try {
     // 子agent消息输出
     if (msg.event === 'agent') {
@@ -36,12 +42,35 @@ export function handleGatewayEventMessage(msg: { event?: string; payload?: Recor
         sendDcgchatCron(p?.jobId as string)
       }
       if (p?.action === 'finished' && p?.status === 'ok') {
-        const hasFileOutput = p.delivered === true && p.deliveryStatus === 'delivered'
-        let summary = p?.summary as string
+        let summary = typeof p?.summary === 'string' ? p.summary : ''
         if (summary.indexOf('HEARTBEAT_OK') >= 0 && summary !== 'HEARTBEAT_OK') {
           summary = summary.replace('HEARTBEAT_OK', '')
         }
-        finishedDcgchatCron(p?.jobId as string, summary, hasFileOutput)
+
+        const jobIdStr = typeof p?.jobId === 'string' ? p.jobId.trim() : ''
+        const cfg = getOpenClawConfig()
+        const chCfg = cfg?.channels?.["dcgchat-test" as keyof NonNullable<typeof cfg.channels>] as { allowedPaths?: string[] } | undefined
+        const attachmentPaths = resolveCronFinishedLocalPaths(p, summary, getWorkspaceDir(), chCfg?.allowedPaths)
+        const jobPath = getCronJobsPath()
+        const job = jobIdStr ? readCronJob(jobPath, jobIdStr) : null
+        const sessionKey = job && typeof job.sessionKey === 'string' ? job.sessionKey.trim() : ''
+
+        if (sessionKey && attachmentPaths.length > 0) {
+          const messageId = getCronMessageId(sessionKey) || `${Date.now()}`
+          setCronMessageId(sessionKey, messageId)
+          for (const mediaPath of attachmentPaths) {
+            try {
+              await sendDcgchatMedia({ sessionKey, mediaUrl: mediaPath, messageId })
+            } catch (err) {
+              dcgLogger(`[Gateway] cron 附件经通道发送失败: ${mediaPath} ${String(err)}`, 'error')
+            }
+          }
+        } else if (attachmentPaths.length > 0 && !sessionKey) {
+          dcgLogger(`[Gateway] cron finished 有可发送附件路径但 jobs.json 无 sessionKey: jobId=${jobIdStr}`, 'error')
+        }
+
+        const hasAttachments = attachmentPaths.length > 0
+        finishedDcgchatCron(jobIdStr, summary, hasAttachments)
       }
     }
   } catch (error) {

package/src/utils/global.ts

@@ -2,7 +2,8 @@ import type WebSocket from 'ws'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
-import { createPluginRuntimeStore, type OpenClawConfig, type PluginRuntime } from 'openclaw/plugin-sdk'
+import type { OpenClawConfig, PluginRuntime } from 'openclaw/plugin-sdk'
+import { createPluginRuntimeStore } from 'openclaw/plugin-sdk/runtime-store'
 import { channelInfo, ENV } from './constant.js'
 import { dcgLogger } from './log.js'
 

package/src/utils/workspaceFilePaths.ts

@@ -0,0 +1,89 @@
+import os from 'node:os'
+import path from 'node:path'
+
+/** 统一为 POSIX 风格斜杠，便于跨平台判断。 */
+export function toPosixPath(p: string): string {
+  return path.normalize(p.trim()).replace(/\\/g, '/')
+}
+
+/** `filepath` 解析后在 `rootDir` 内或等于 `rootDir`（防 `..` 逃逸）。 */
+export function isPathInsideDir(filepath: string, rootDir: string): boolean {
+  const root = path.resolve(rootDir)
+  const resolved = path.resolve(filepath)
+  const rel = path.relative(root, resolved)
+  if (rel.startsWith('..') || path.isAbsolute(rel)) return false
+  return true
+}
+
+/**
+ * 与 dcgchat_message 一致：允许的路径为当前工作区根、`allowedPaths`、或兼容挂载 /workspace、/mobook。
+ */
+export function isAllowedSendPath(filepath: string, workspaceDir?: string, allowedPaths?: string[]): boolean {
+  const ws = workspaceDir?.trim()
+  if (ws && isPathInsideDir(filepath, ws)) return true
+  if (allowedPaths?.length) {
+    for (const allowed of allowedPaths) {
+      if (isPathInsideDir(filepath, allowed)) return true
+    }
+  }
+  const p = toPosixPath(filepath)
+  if (p.startsWith('/workspace/') || p === '/workspace') return true
+  if (p.startsWith('/mobook/') || p === '/mobook') return true
+  return /^[A-Za-z]:\/(workspace|mobook)(\/|$)/.test(p)
+}
+
+/** 去掉 Markdown/标点误粘在路径末尾的字符（如 `**`、反引号、右括号）。 */
+export function trimArtifactPathCandidate(raw: string): string {
+  return raw.replace(/[`'"，,*_)\]]+$/u, '').trimEnd()
+}
+
+/**
+ * 将正文里的 `~/...` / `~\...` 展开为绝对路径（`path.resolve` 不会处理 `~`）。
+ */
+export function expandTildePath(input: string): string {
+  const s = input.trim()
+  if (!s) return s
+  if (s === '~') return os.homedir()
+  if (s.startsWith('~/')) {
+    return path.resolve(os.homedir(), s.slice(2))
+  }
+  if (s.startsWith('~\\')) {
+    return path.resolve(os.homedir(), s.slice(2))
+  }
+  return s
+}
+
+/**
+ * 从正文中提取可作为附件发送的本地路径（与 messageTool 规则一致：工作区前缀、`/workspace`、`~` 等）。
+ */
+export function extractWorkspaceFilePathsFromText(text: string | undefined, workspaceDir?: string): string[] {
+  if (!text) return []
+  const unix = text.match(/\/workspace\/[^\s]+|\/mobook\/[^\s]+/g) ?? []
+  const win = text.match(/[A-Za-z]:[/\\](?:workspace|mobook)[/\\][^\s]+/g) ?? []
+  const tildePaths = text.match(/~[/\\][^\s`'")\]]+/g) ?? []
+  const underWs: string[] = []
+  const ws = workspaceDir?.trim()
+  if (ws) {
+    const variants = new Set<string>()
+    variants.add(ws)
+    variants.add(toPosixPath(ws))
+    if (path.sep === '\\') variants.add(ws.replace(/\//g, '\\'))
+    for (const prefix of variants) {
+      if (!prefix) continue
+      let from = 0
+      while (from < text.length) {
+        const i = text.indexOf(prefix, from)
+        if (i === -1) break
+        let end = i + prefix.length
+        while (end < text.length && !/\s/.test(text[end])) end++
+        underWs.push(text.slice(i, end))
+        from = i + 1
+      }
+    }
+  }
+  const cleaned = [...unix, ...win, ...tildePaths, ...underWs]
+    .map((s) => trimArtifactPathCandidate(s))
+    .filter(Boolean)
+  const resolved = cleaned.map((s) => (s.startsWith('~') ? expandTildePath(s) : s))
+  return [...new Set(resolved)]
+}