@dcrays/dcgchat-test 0.3.41 → 0.4.1

package/package.json

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

package/src/agent.ts

@@ -32,20 +32,12 @@ function sendEvent(msgContent: Record<string, any>) {
   }
 }
 
-interface ICreateAgentParams {
-  code: string
-  workspace: string
-  name?: string
-  description?: string
-  msgContent?: Record<string, any>
-}
-
-/** 若 workspace-${code}/agent 存在，则复制到 agents/${code}/agent */
-function copyAgentsFiles(code: string) {
+/** 若 workspace-${clone_code}/agent 存在，则复制到 agents/${clone_code}/agent */
+function copyAgentsFiles(clone_code: string) {
   const workspacePath = getWorkspaceDir()
   if (!workspacePath) return
-  const workspaceDir = path.join(workspacePath, '../', `workspace-${code}`)
-  const agentDir = path.join(workspacePath, '../', `agents/${code}`)
+  const workspaceDir = path.join(workspacePath, '../', `workspace-${clone_code}`)
+  const agentDir = path.join(workspacePath, '../', `agents/${clone_code}`)
   const sourceAgent = path.join(workspaceDir, 'agent')
   try {
     if (!fs.existsSync(sourceAgent)) return
@@ -62,15 +54,15 @@ function copyAgentsFiles(code: string) {
 }
 
 export async function onCreateAgent(params: Record<string, any>) {
-  const { code, name, description } = params
+  const { clone_code, name, description } = params
   try {
-    await sendMessageToGateway(JSON.stringify({ method: 'agents.create', params: { name: code, workspace: code } }))
+    await sendMessageToGateway(JSON.stringify({ method: 'agents.create', params: { name: clone_code, workspace: clone_code } }))
   } catch (err: unknown) {
     dcgLogger(`agents.create failed: ${String(err)}`, 'error')
   }
   // Update config.name to the user-supplied display name (may contain CJK, spaces, etc.)
   try {
-    await sendMessageToGateway(JSON.stringify({ method: 'agents.update', params: { name: name, agentId: code } }))
+    await sendMessageToGateway(JSON.stringify({ method: 'agents.update', params: { name: name, agentId: clone_code } }))
   } catch (err: unknown) {
     dcgLogger(`agents.update failed: ${String(err)}`, 'error')
   }
@@ -79,7 +71,7 @@ export async function onCreateAgent(params: Record<string, any>) {
       await sendMessageToGateway(
         JSON.stringify({
           method: 'agents.files.set',
-          params: { agentId: code, name: 'IDENTITY.md', content: description.trim() }
+          params: { agentId: clone_code, name: 'IDENTITY.md', content: description.trim() }
         })
       )
     } catch {
@@ -91,26 +83,26 @@ export async function onCreateAgent(params: Record<string, any>) {
       await sendMessageToGateway(
         JSON.stringify({
           method: 'agents.files.set',
-          params: { agentId: code, name: 'USER.md', content: name.trim() }
+          params: { agentId: clone_code, name: 'USER.md', content: name.trim() }
         })
       )
     } catch {
       // Non-fatal
     }
   }
-  copyAgentsFiles(code)
+  copyAgentsFiles(clone_code)
   sendEvent({ ...params, status: 'ok' })
 }
 
 export async function createAgent(msgContent: Record<string, any>) {
-  const { url, code } = msgContent
-  if (!url || !code) {
-    dcgLogger(`createAgent failed empty url&code: ${JSON.stringify(msgContent)}`, 'error')
+  const { url, clone_code } = msgContent
+  if (!url || !clone_code) {
+    dcgLogger(`createAgent failed empty url&clone_code: ${JSON.stringify(msgContent)}`, 'error')
     sendEvent({ ...msgContent, status: 'fail' })
     return
   }
   const workspacePath = getWorkspaceDir()
-  const workspaceDir = path.join(workspacePath, '../', `workspace-${code}`)
+  const workspaceDir = path.join(workspacePath, '../', `workspace-${clone_code}`)
 
   // 如果目标目录已存在，先删除
   if (fs.existsSync(workspaceDir)) {
@@ -159,7 +151,7 @@ export async function createAgent(msgContent: Record<string, any>) {
               return
             }
 
-            const targetPath = path.join(workspacePath, newPath)
+            const targetPath = path.join(workspaceDir, newPath)
 
             if (entry.type === 'Directory') {
               fs.mkdirSync(targetPath, { recursive: true })

package/src/bot.ts

@@ -238,7 +238,7 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     if (msg.content.skills_scope.length > 0) {
       const workspaceDir = getWorkspaceDir()
       const skillCode = msg.content.skills_scope.map((skill) => `${workspaceDir}/skills/${skill.skill_code}`).join('\n')
-      const skillText = `在这个目录${skillCode}下有你需要的技能，`
+      const skillText = `技能${skillCode} 在目录${skillCode}下，在目录${skillCode}下读取技能 \n`
       text = skillText ? `${skillText} \n ${text}` : text
     }
     const prefixContext = createReplyPrefixContext({

package/src/session.ts

@@ -6,11 +6,11 @@ interface TSession {
   agent_id: string
   session_id: string
   agent_clone_code?: string
-  account_id?: string
+  account_id: string
 }
 
 export const onRemoveSession = async ({ agent_id, session_id, agent_clone_code, account_id }: TSession) => {
-  const sessionKey = getSessionKey({ agent_id, session_id }, account_id)
+  const sessionKey = getSessionKey({ agent_id, session_id, agent_clone_code }, account_id)
   if (!session_id) {
     dcgLogger('onRemoveSession: empty session_id', 'error')
     return

package/src/tools/messageTool.ts

@@ -1,4 +1,5 @@
 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'
@@ -12,7 +13,39 @@ export type DcgchatMessageToolContext = {
   workspaceDir?: string
 }
 
-const SAFE_PREFIXES = ['/workspace/', '/mobook/']
+/** 统一为 POSIX 风格斜杠，便于跨平台判断（不改变语义，仅用于匹配）。 */
+function toPosixPath(p: string): string {
+  return path.normalize(p.trim()).replace(/\\/g, '/')
+}
+
+/** `filepath` 解析后在 `rootDir` 内或等于 `rootDir`（防 `..` 逃逸）。 */
+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
+}
+
+/**
+ * 允许发送的路径：
+ * - 当前 Agent 工作区根及其子路径（`workspaceDir`，如 ~/.openclaw/workspace-xxx/output/...）；
+ * - 兼容旧挂载：Unix `/workspace`、`/mobook`；Windows 盘符下 `workspace`、`mobook`。
+ */
+function isSafePath(filepath: string, workspaceDir?: string): boolean {
+  const ws = workspaceDir?.trim()
+  if (ws && isPathInsideDir(filepath, ws)) return true
+  const p = toPosixPath(filepath)
+  if (p.startsWith('/workspace/') || p === '/workspace') return true
+  if (p === '/mobook') return true
+  return /^[A-Za-z]:\/(workspace|mobook)(\/|$)/.test(p)
+}
+
+/** 同一路径在 Windows 上可能大小写不同，用于 Set 去重。 */
+function pathKey(filepath: string): string {
+  const n = path.normalize(filepath.trim())
+  return os.platform() === 'win32' ? n.toLowerCase() : n
+}
 
 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']
@@ -26,8 +59,7 @@ const messageToolParameters = {
   properties: {
     target: {
       type: 'string',
-      description:
-        '目标会话键（sessionKey），必须与当前会话 SessionKey 一致，禁止填写 userId。'
+      description: '目标会话键（sessionKey），必须与当前会话 SessionKey 一致，禁止填写 userId。'
     },
     content: {
       type: 'string',
@@ -42,7 +74,8 @@ const messageToolParameters = {
         properties: {
           file: {
             type: 'string',
-            description: '文件路径，例如 /workspace/output/report.pdf'
+            description:
+              '文件绝对路径：须在「当前 Agent 工作区」目录下（如 /root/.openclaw/workspace-xxx/output/28337/slices_result.json），或为兼容环境的 /workspace/、/mobook/（Windows 盘符下 workspace、mobook）'
           }
         },
         required: ['file']
@@ -52,14 +85,32 @@ const messageToolParameters = {
   oneOf: [{ required: ['content'] }, { required: ['media'] }]
 }
 
-function extractPaths(text?: string) {
+/** 从正文提取可发送的文件路径（固定挂载 + 当前工作区前缀）。 */
+function extractPaths(text: string | undefined, workspaceDir?: string): string[] {
   if (!text) return []
-  const regex = /(\/workspace\/[^\s]+|\/mobook\/[^\s]+)/g
-  return text.match(regex) ?? []
-}
-
-function isSafePath(filepath: string) {
-  return SAFE_PREFIXES.some((prefix) => filepath.startsWith(prefix))
+  const unix = text.match(/\/workspace\/[^\s]+|\/mobook\/[^\s]+/g) ?? []
+  const win = text.match(/[A-Za-z]:[/\\](?:workspace|mobook)[/\\][^\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
+      }
+    }
+  }
+  return [...new Set([...unix, ...win, ...underWs])]
 }
 
 function isSafeFile(filepath: string) {
@@ -67,7 +118,7 @@ function isSafeFile(filepath: string) {
   const stat = fs.statSync(filepath)
   if (!stat.isFile()) return false
   if (stat.size === 0) return false
-  const ext = path.extname(filepath)
+  const ext = path.extname(filepath).toLowerCase()
   return SAFE_EXTENSIONS.has(ext)
 }
 
@@ -84,10 +135,8 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
       向用户发送消息。
       若传 target，target 必须是 sessionKey，不能是 userId。
       如果发送附件：必须使用 media 字段
-      支持路径目录：
-      /workspace/
-      /mobook/
-      禁止直接输出路径文本
+      文件路径须在当前 Agent 工作区目录下（随部署变化，如 ~/.openclaw/workspace-xxx/...），或为兼容环境的 /workspace/、/mobook/（Windows 盘符下 workspace、mobook）。
+      禁止在正文中直接输出可访问路径（应通过 media 发送）
     `,
     parameters: messageToolParameters,
     execute: async (_toolCallId, args, signal) => {
@@ -104,33 +153,46 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
 
       try {
         const sentFiles = new Set<string>()
+        const sentKeys = new Set<string>()
+        const workspaceDir = pluginCtx.workspaceDir
 
         if (args.media?.length) {
           for (const media of args.media) {
             const filepath = media.file
             if (!filepath) continue
-            if (!isSafePath(filepath)) continue
+            if (!isSafePath(filepath, workspaceDir)) continue
             if (!isSafeFile(filepath)) continue
-            if (sentFiles.has(filepath)) continue
+            const key = pathKey(filepath)
+            if (sentKeys.has(key)) continue
 
             await sendDcgchatMedia({ sessionKey, mediaUrl: filepath })
             sentFiles.add(filepath)
+            sentKeys.add(key)
           }
         }
 
-        const fallbackPaths = extractPaths(args.content)
+        const fallbackPaths = extractPaths(args.content, workspaceDir)
         for (const filepath of fallbackPaths) {
-          if (!isSafePath(filepath)) continue
+          if (!isSafePath(filepath, workspaceDir)) continue
           if (!isSafeFile(filepath)) continue
-          if (sentFiles.has(filepath)) continue
+          const key = pathKey(filepath)
+          if (sentKeys.has(key)) continue
 
           await sendDcgchatMedia({ sessionKey, mediaUrl: filepath })
           sentFiles.add(filepath)
+          sentKeys.add(key)
         }
 
         let content = args.content ?? ''
         for (const filepath of sentFiles) {
-          content = content.replace(filepath, '')
+          const posix = toPosixPath(filepath)
+          const variants = posix === filepath ? [filepath] : [filepath, posix]
+          const seen = new Set<string>()
+          for (const v of variants) {
+            if (!v || seen.has(v)) continue
+            seen.add(v)
+            content = content.split(v).join('')
+          }
         }
         content = content.trim()
 

package/src/utils/wsMessageHandler.ts

@@ -39,8 +39,8 @@ export async function handleParsedWsMessage(parsed: ParsedWsPayload, rawPayload:
         dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${rawPayload}`)
       }
     } else if (event_type === 'agent') {
-      if (operation_type === 'install') {
-        createAgent(parsed.content)
+      if (operation_type === 'create') {
+        await createAgent(parsed.content)
       } else {
         dcgLogger(`openclaw_bot_event unknown event_type: ${event_type}, ${rawPayload}`)
       }