@dcrays/dcgchat-test 0.4.4 → 0.4.9

package/index.ts

@@ -3,12 +3,11 @@ import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk'
 import { dcgchatPlugin } from './src/channel.js'
 import { setDcgchatRuntime, setWorkspaceDir } from './src/utils/global.js'
 import { monitoringToolMessage } from './src/tool.js'
-import { channelInfo, ENV } from './src/utils/constant.js'
 import { setOpenClawConfig } from './src/utils/global.js'
 import { createDcgchatMessageTool } from './src/tools/messageTool.js'
 
 const plugin = {
-  id: channelInfo[ENV],
+  id: "dcgchat-test",
   name: '书灵墨宝',
   description: '连接 OpenClaw 与 书灵墨宝 产品（WebSocket）',
   configSchema: emptyPluginConfigSchema(),

package/openclaw.plugin.json

@@ -1,9 +1,11 @@
 {
   "id": "dcgchat-test",
-  "channels": ["dcgchat-test"],
+  "channels": [
+    "dcgchat-test"
+  ],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
     "properties": {}
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat-test",
-  "version": "0.4.4",
+  "version": "0.4.9",
   "type": "module",
   "description": "OpenClaw channel plugin for 书灵墨宝 (WebSocket)",
   "main": "index.ts",
@@ -16,12 +16,6 @@
     "websocket",
     "ai"
   ],
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build:production": "npx tsx scripts/build.ts production",
-    "build:prod": "npx tsx scripts/build.ts production",
-    "build:test": "npx tsx scripts/build.ts test"
-  },
   "dependencies": {
     "ali-oss": "file:src/libs/ali-oss-6.23.0.tgz",
     "axios": "file:src/libs/axios-1.13.6.tgz",
@@ -37,19 +31,15 @@
       "id": "dcgchat-test",
       "label": "书灵墨宝",
       "selectionLabel": "书灵墨宝",
-      "docsPath": "/channels/dcgchat",
+      "docsPath": "/channels/dcgchat-test",
       "docsLabel": "dcgchat-test",
       "blurb": "连接 OpenClaw 与 书灵墨宝 产品",
       "order": 80
     },
     "install": {
       "npmSpec": "@dcrays/dcgchat-test",
-      "localPath": "extensions/dcgchat",
+      "localPath": "extensions/dcgchat-test",
       "defaultChoice": "npm"
     }
-  },
-  "devDependencies": {
-    "openclaw": "^2026.3.13",
-    "typescript": "~5.8.0"
   }
 }

package/src/bot.ts

@@ -151,7 +151,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
 
   const route = core.channel.routing.resolveAgentRoute({
     cfg: config,
-    channel: channelInfo[ENV],
+    channel: "dcgchat-test",
     accountId: account.accountId,
     peer: { kind: 'direct', id: conversationId }
   })
@@ -191,6 +191,14 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
   }
 
   try {
+    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]
+      const skillDir = `${workspaceDir}/skills/${skill.skill_code}`
+      const skillText = `用户选择使用此技能："${skill.skill_code}"，技能路径是："${skillDir}"，在目录下查找并`
+      text = skill.skill_code ? `${skillText} ${text}` : text
+      dcgLogger(`skill: text: ${text}`)
+    }
     // 处理用户上传的文件
     const files = msg.content.files ?? []
     let mediaPayload: Record<string, unknown> = {}
@@ -220,13 +228,13 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
       ChatType: 'direct',
       SenderName: agentDisplayName,
       SenderId: userId,
-      Provider: channelInfo[ENV],
-      Surface: channelInfo[ENV],
+      Provider: "dcgchat-test",
+      Surface: "dcgchat-test",
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: channelInfo[ENV],
+      OriginatingChannel: "dcgchat-test",
       OriginatingTo: dcgSessionKey,
       Target: dcgSessionKey,
       SourceTarget: dcgSessionKey,
@@ -237,21 +245,18 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
     let streamedTextLen = 0
 
-    if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code) {
+    if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code && !ignoreToolCommand.includes(text?.trim())) {
       const workspaceDir = getWorkspaceDir()
-      const skillText = msg.content.skills_scope
-        .map((skill) => {
-          const skillDir = `${workspaceDir}/skills/${skill.skill_code}`
-          return `技能${skill.skill_code} 在目录${skillDir}下，在目录${skillDir}下读取技能 \n`
-        })
-        .join('\n')
-      text = skillText ? `${skillText} ${text}` : text
+      const skill = msg.content.skills_scope[0]
+      const skillDir = `${workspaceDir}/skills/${skill.skill_code}`
+      const skillText = `用户选择使用此技能："${skill.skill_code}"，技能路径是："${skillDir}"，在目录下查找并`
+      text = skill.skill_code ? `${skillText} ${text}` : text
       dcgLogger(`skill: text: ${text}`)
     }
     const prefixContext = createReplyPrefixContext({
       cfg: config,
       agentId: effectiveAgentId ?? '',
-      channel: channelInfo[ENV],
+      channel: "dcgchat-test",
       accountId: account.accountId
     })
 
@@ -310,14 +315,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        const ctxForAbort =
-          priorOutboundCtx.messageId?.trim() || priorOutboundCtx.sessionId?.trim()
-            ? priorOutboundCtx
-            : outboundCtx
-        sendFinal(
-          ctxForAbort.messageId?.trim() ? ctxForAbort : { ...ctxForAbort, messageId: `${Date.now()}` },
-          'abort'
-        )
+        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) => {
@@ -440,7 +439,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         ctx: ctxPayload,
         updateLastRoute: {
           sessionKey: dcgSessionKey,
-          channel: channelInfo[ENV],
+          channel: "dcgchat-test",
           to: dcgSessionKey,
           accountId: route.accountId
         },

package/src/channel.ts

@@ -11,13 +11,12 @@ import {
   hasSentMediaKey
 } from './utils/global.js'
 import { isWsOpen, mergeDefaultParams, mergeSessionParams, sendFinal, wsSendRaw } from './transport.js'
-import { channelInfo, ENV } from './utils/constant.js'
 import { dcgLogger, setLogger } from './utils/log.js'
 import { getOutboundMsgParams, getParamsMessage } from './utils/params.js'
 import { startDcgchatGatewaySocket } from './gateway/socket.js'
 
 function dcgchatChannelCfg(): DcgchatConfig {
-  return (getOpenClawConfig()?.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  return (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
 }
 
 /** `agent:<code>:mobook:direct:<agentId>:<sessionId>`（与 getSessionKey 非 real_mobook 分支一致） */
@@ -91,7 +90,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
   const fileName = mediaUrl?.split(/[\\/]/).pop() || ''
 
   try {
-    const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.[channelInfo[ENV]]?.botToken ?? ''
+    const botToken = msgCtx.botToken ?? getOpenClawConfig()?.channels?.["dcgchat-test"]?.botToken ?? ''
     const url = opts.mediaUrl ? await ossUpload(opts.mediaUrl, botToken, 1) : ''
     wsSendRaw(msgCtx, {
       response: opts.text ?? '',
@@ -111,7 +110,7 @@ export async function sendDcgchatMedia(opts: DcgchatMediaSendOptions): Promise<v
 
 export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null): ResolvedDcgchatAccount {
   const id = accountId ?? DEFAULT_ACCOUNT_ID
-  const raw = (cfg.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  const raw = (cfg.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     accountId: id,
     enabled: raw.enabled !== false,
@@ -125,13 +124,13 @@ export function resolveAccount(cfg: OpenClawConfig, accountId?: string | null):
 }
 
 export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
-  id: channelInfo[ENV],
+  id: "dcgchat-test",
   meta: {
-    id: channelInfo[ENV],
+    id: "dcgchat-test",
     label: '书灵墨宝',
     selectionLabel: '书灵墨宝',
     docsPath: '/channels/dcgchat',
-    docsLabel: channelInfo[ENV],
+    docsLabel: "dcgchat-test",
     blurb: '连接 OpenClaw 与 书灵墨宝 产品',
     order: 80
   },
@@ -148,7 +147,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     // blockStreaming: true,
   },
   /** 当前构建的 channel id + 兼容旧配置键 `channels.dcgchat` */
-  reload: { configPrefixes: [`channels.${channelInfo[ENV]}`, 'channels.dcgchat'] },
+  reload: { configPrefixes: [`channels.${"dcgchat-test"}`, 'channels.dcgchat'] },
   configSchema: {
     schema: {
       type: 'object',
@@ -184,7 +183,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
     resolveAccount: (cfg, accountId) => resolveAccount(cfg, accountId),
     defaultAccountId: () => DEFAULT_ACCOUNT_ID,
     setAccountEnabled: ({ cfg, enabled }) => {
-      const channelKey = channelInfo[ENV]
+      const channelKey = "dcgchat-test"
       const prev = (cfg.channels?.[channelKey as keyof NonNullable<typeof cfg.channels>] as Record<string, unknown> | undefined) ?? {}
       return {
         ...cfg,
@@ -225,10 +224,10 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
   },
   agentPrompt: {
     messageToolHints: () => [
-      '生成文件后，**尽可能不要**把文件路径、地址直接告诉用户。',
-      '生成文件后，把文件名告诉用户。',
-      '使用内置 `message` 或 `dcgchat_message` 发消息时，target 必须是完整 dcgSessionKey（与上下文 SessionKey 相同），禁止填 From、SenderId、WS userId 等纯数字。',
-      '生成文件后，须通过工具发送文件，勿在文本里直接输出路径或地址。'
+      '书灵墨宝 / 内置 `message`：**优先不要传 `target`**，即回复当前会话；OpenClaw 会用工具上下文里的 `currentChannelId`（与入站 `To` / `SessionKey` / `OriginatingTo` 相同）。',
+      '仅在需要显式指定时：`target` 必须与上下文中的 **完整 SessionKey 字符串逐字一致**（形如 `agent:…:mobook:direct:…` 或以 `agent:` 开头的路由键）。**禁止**填 `From`、`SenderId`、通道配置里的 WS `userId`、会话 id 纯数字等。',
+      '生成文件后，**尽可能不要**把文件路径、地址直接告诉用户；把文件名告诉用户；须通过工具发文件，勿在正文里直接输出可访问路径。',
+      '使用 `dcgchat_message` 时同样遵守上述 SessionKey 规则（该工具通常由插件注入当前会话，一般无需自造 target）。'
     ]
   },
   outbound: {
@@ -272,7 +271,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
         }
       }
       return {
-        channel: channelInfo[ENV],
+        channel: "dcgchat-test",
         messageId: `${messageId}`,
         chatId: to
       }
@@ -289,7 +288,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       if (!outboundCtx?.sessionId) {
         dcgLogger(`channel sendMedia to ${ctx.to} -> sessionId not found`, 'error')
         return {
-          channel: channelInfo[ENV],
+          channel: "dcgchat-test",
           messageId,
           chatId: to || ''
         }
@@ -298,7 +297,7 @@ export const dcgchatPlugin: ChannelPlugin<ResolvedDcgchatAccount> = {
       dcgLogger(`channel sendMedia to ${ctx.to}`)
       await sendDcgchatMedia({ sessionKey: to || '', mediaUrl: ctx.mediaUrl || '' })
       return {
-        channel: channelInfo[ENV],
+        channel: "dcgchat-test",
         messageId,
         chatId: to || ''
       }

package/src/cronToolCall.ts

@@ -127,7 +127,7 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
     ;(newParams.delivery as CronDelivery).bestEffort = true
     ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
     ;(newParams.delivery as CronDelivery).accountId = agentId
-    ;(newParams.delivery as CronDelivery).channel = channelInfo[ENV]
+    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
     newParams.sessionKey = sk
     return newParams
   }
@@ -138,7 +138,7 @@ function injectBestEffort(params: Record<string, unknown>, sk: string): Record<s
     ;(job.delivery as CronDelivery).bestEffort = true
     ;(newParams.delivery as CronDelivery).to = `dcg-cron:${sk}`
     ;(newParams.delivery as CronDelivery).accountId = agentId
-    ;(newParams.delivery as CronDelivery).channel = channelInfo[ENV]
+    ;(newParams.delivery as CronDelivery).channel = "dcgchat-test"
     newParams.sessionKey = sk
     return newParams
   }
@@ -176,7 +176,7 @@ export function cronToolCall(event: { toolName: any; params: any; toolCallId: an
     if (params.command.indexOf('cron create') > -1 || params.command.indexOf('cron add') > -1) {
       const newParams = JSON.parse(JSON.stringify(params)) as Record<string, unknown>
       newParams.command =
-        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${channelInfo[ENV]}  --to dcg-cron:${sk} --json`
+        params.command.replace('--json', '') + `  --session-key ${sk}  --channel ${"dcgchat-test"}  --to dcg-cron:${sk} --json`
       return { params: newParams }
     } else {
       return params

package/src/skill.ts

@@ -9,6 +9,7 @@ import { getWsConnection } from './utils/global.js'
 import { dcgLogger } from './utils/log.js'
 import { isWsOpen } from './transport.js'
 import { sendMessageToGateway } from './gateway/socket.js'
+import { decodeZipEntryPath } from './utils/zipPath.js'
 
 type ISkillParams = {
   path: string
@@ -69,13 +70,7 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
           }
           try {
             const flags = entry.props?.flags ?? 0
-            const isUtf8 = (flags & 0x800) !== 0
-            let entryPath: string
-            if (!isUtf8 && entry.props?.pathBuffer) {
-              entryPath = new TextDecoder('gbk').decode(entry.props.pathBuffer)
-            } else {
-              entryPath = entry.path
-            }
+            const entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
             const pathParts = entryPath.split('/')
 
             // 检测根目录

package/src/tools/messageTool.ts

@@ -37,7 +37,7 @@ function isSafePath(filepath: string, workspaceDir?: string): boolean {
   if (ws && isPathInsideDir(filepath, ws)) return true
   const p = toPosixPath(filepath)
   if (p.startsWith('/workspace/') || p === '/workspace') return true
-  if (p === '/mobook') return true
+  if (p.startsWith('/mobook/') || p === '/mobook') return true
   return /^[A-Za-z]:\/(workspace|mobook)(\/|$)/.test(p)
 }
 
@@ -183,6 +183,15 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
           sentKeys.add(key)
         }
 
+        if (args.media?.length && sentFiles.size === 0) {
+          return jsonResult({
+            success: false,
+            error:
+              '未能发送任何附件：路径须位于当前 Agent 工作区，或为 /workspace/、/mobook/ 下的真实文件（非空、扩展名在白名单内）。',
+            sentMediaCount: 0
+          })
+        }
+
         let content = args.content ?? ''
         for (const filepath of sentFiles) {
           const posix = toPosixPath(filepath)

package/src/utils/constant.ts

@@ -1,9 +1,5 @@
 export const ENV: 'production' | 'test' | 'develop' = 'test'
 
-export const channelInfo: Record<string, string> = {
-  production: 'dcgchat',
-  test: 'dcgchat-test'
-}
 
 export const systemCommand = ['/new', '/status']
 export const interruptCommand = ['/stop']

package/src/utils/global.ts

@@ -30,7 +30,7 @@ export function getOpenClawConfig(): OpenClawConfig | null {
 function getWorkspacePath(): string | null {
   const workspacePath = path.join(
     os.homedir(),
-    config?.channels?.[channelInfo[ENV]]?.appId == 110 ? '.mobook' : '.openclaw',
+    config?.channels?.["dcgchat-test"]?.appId == 110 ? '.mobook' : '.openclaw',
     'workspace'
   )
   if (fs.existsSync(workspacePath)) {
@@ -55,7 +55,7 @@ export function getWorkspaceDir(): string {
 }
 
 const { setRuntime: setDcgchatRuntime, getRuntime: getDcgchatRuntime } = createPluginRuntimeStore<PluginRuntime>(
-  `${channelInfo[ENV]} runtime not initialized`
+  `${"dcgchat-test"} runtime not initialized`
 )
 export { setDcgchatRuntime, getDcgchatRuntime }
 
@@ -130,7 +130,7 @@ export const getSessionKey = (content: any, accountId: string) => {
 
   const route = core.channel.routing.resolveAgentRoute({
     cfg: getOpenClawConfig() as OpenClawConfig,
-    channel: channelInfo[ENV],
+    channel: "dcgchat-test",
     accountId: accountId || 'default',
     peer: { kind: 'direct', id: session_id }
   })

package/src/utils/log.ts

@@ -1,5 +1,4 @@
 import { RuntimeEnv } from 'openclaw/plugin-sdk'
-import { channelInfo, ENV } from './constant.js'
 
 let logger: RuntimeEnv | null = null
 
@@ -11,6 +10,6 @@ export function dcgLogger(message: string, type: 'log' | 'error' = 'log'): void
   if (logger) {
     logger[type](`书灵墨宝🚀 ~ [${new Date().toISOString()}] ${message}`)
   } else {
-    console[type](`书灵墨宝🚀 ~ ${new Date().toISOString()} [${channelInfo[ENV]}]: ${message}`)
+    console[type](`书灵墨宝🚀 ~ ${new Date().toISOString()} [${"dcgchat-test"}]: ${message}`)
   }
 }

package/src/utils/params.ts

@@ -9,7 +9,7 @@ const paramsMessageMap = new Map<string, IMsgParams>()
 
 /** 从 OpenClaw 配置读取当前 channel 的基础参数（唯一来源，供 transport / resolve 等复用） */
 export function getParamsDefaults(): IMsgParams {
-  const ch = (getOpenClawConfig()?.channels?.[channelInfo[ENV]] as DcgchatConfig | undefined) ?? {}
+  const ch = (getOpenClawConfig()?.channels?.["dcgchat-test"] as DcgchatConfig | undefined) ?? {}
   return {
     userId: Number(ch.userId ?? 0),
     botToken: ch.botToken ?? '',

package/README.md

@@ -1,83 +0,0 @@
-# OpenClaw 书灵墨宝 插件
-
-连接 OpenClaw 与 书灵墨宝 产品的通道插件。
-
-## 架构
-
-```
-┌──────────┐      WebSocket       ┌──────────────┐      WebSocket      ┌─────────────────────┐
-│ Web 前端 │  ←───────────────→   │  公司后端服务  │  ←───────────────→  │ OpenClaw（工作电脑） │
-└──────────┘                      └──────────────┘   (OpenClaw 主动连)   └─────────────────────┘
-```
-
-- OpenClaw 插件**主动连接**后端的 WebSocket 服务（不需要公网 IP）
-- 后端收到用户消息后转发给 OpenClaw，OpenClaw 回复后发回后端
-
-## 快速开始
-
-### 1. 安装插件
-
-```bash
-pnpm openclaw plugins install -l /path/to/openclaw-dcgchat
-```
-
-### 2. 配置
-
-```bash
-openclaw config set channels.dcgchat.enabled true
-openclaw config set channels.dcgchat.wsUrl "ws://your-backend:8080/openclaw/ws"
-```
-
-### 3. 启动
-
-```bash
-pnpm openclaw gateway
-```
-
-## 消息协议（MVP）
-
-### 下行：后端 → OpenClaw（用户消息）
-
-```json
-{ "type": "message", "userId": "user_001", "text": "你好" }
-```
-
-### 上行：OpenClaw → 后端（Agent 回复）
-
-```json
-{ "type": "reply", "userId": "user_001", "text": "你好！有什么可以帮你的？" }
-```
-
-## 配置项
-
-| 配置键 | 类型 | 说明 |
-|--------|------|------|
-| `channels.dcgchat.enabled` | boolean | 是否启用 |
-| `channels.dcgchat.wsUrl` | string | 后端 WebSocket 地址 |
-
-## 开发
-
-```bash
-# 安装依赖
-pnpm install
-
-# 类型检查
-pnpm typecheck
-```
-
-## 文件结构
-
-- `index.ts` - 插件入口
-- `src/channel.ts` - ChannelPlugin 定义
-- `src/runtime.ts` - 插件 runtime
-- `src/types.ts` - 类型定义
-- `src/monitor.ts` - WebSocket 连接与断线重连
-- `src/bot.ts` - 消息处理与 Agent 调用
-
-## 后续迭代
-
-- [ ] Token 认证
-- [ ] 流式输出
-- [ ] Typing 指示
-- [ ] messageId 去重
-- [ ] 错误消息类型