@dcrays/dcgchat-test 0.4.0 → 0.4.2

package/package.json

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

package/src/agent.ts

@@ -1,7 +1,4 @@
 import axios from 'axios'
-/** @ts-ignore */
-import unzipper from 'unzipper'
-import { pipeline } from 'stream/promises'
 import fs from 'fs'
 import path from 'path'
 import { getWorkspaceDir } from './utils/global.js'
@@ -9,7 +6,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'
+import { extractZipBufferToDirectory } from './utils/zipExtract.js'
 
 type IAgentParams = {
   url: string
@@ -110,81 +107,13 @@ export async function createAgent(msgContent: Record<string, any>) {
   }
 
   try {
-    // 下载 zip 文件
     const response = await axios({
       method: 'get',
       url,
-      responseType: 'stream'
+      responseType: 'arraybuffer'
     })
-    // 创建目标目录
     fs.mkdirSync(workspaceDir, { recursive: true })
-    // 解压文件到目标目录，跳过顶层文件夹
-    await new Promise((resolve, reject) => {
-      const tasks: Promise<void>[] = []
-      let rootDir: string | null = null
-      let hasError = false
-
-      response.data
-        .pipe(unzipper.Parse())
-        .on('entry', (entry: any) => {
-          if (hasError) {
-            entry.autodrain()
-            return
-          }
-          try {
-            const flags = entry.props?.flags ?? 0
-            const entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
-            const pathParts = entryPath.split('/')
-
-            // 检测根目录
-            if (!rootDir && pathParts.length > 1) {
-              rootDir = pathParts[0]
-            }
-            let newPath = entryPath
-            // 移除顶层文件夹
-            if (rootDir && entryPath.startsWith(rootDir + '/')) {
-              newPath = entryPath.slice(rootDir.length + 1)
-            }
-
-            if (!newPath) {
-              entry.autodrain()
-              return
-            }
-
-            const targetPath = path.join(workspaceDir, newPath)
-
-            if (entry.type === 'Directory') {
-              fs.mkdirSync(targetPath, { recursive: true })
-              entry.autodrain()
-            } else {
-              const parentDir = path.dirname(targetPath)
-              fs.mkdirSync(parentDir, { recursive: true })
-              const writeStream = fs.createWriteStream(targetPath)
-              const task = pipeline(entry, writeStream).catch((err) => {
-                hasError = true
-                throw new Error(`解压文件失败 ${entryPath}: ${err.message}`)
-              })
-              tasks.push(task)
-            }
-          } catch (err) {
-            hasError = true
-            entry.autodrain()
-            reject(new Error(`处理entry失败: ${err}`))
-          }
-        })
-        .on('close', async () => {
-          try {
-            await Promise.all(tasks)
-            resolve(null)
-          } catch (err) {
-            reject(err)
-          }
-        })
-        .on('error', (err: { message: any }) => {
-          hasError = true
-          reject(new Error(`解压流错误: ${err.message}`))
-        })
-    })
+    await extractZipBufferToDirectory(Buffer.from(response.data), workspaceDir)
     await onCreateAgent(msgContent)
   } catch (error) {
     // 如果安装失败，清理目录

package/src/bot.ts

@@ -235,10 +235,10 @@ 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) {
+    if (msg.content.skills_scope.length > 0 && !msg.content?.agent_clone_code) {
       const workspaceDir = getWorkspaceDir()
       const skillCode = msg.content.skills_scope.map((skill) => `${workspaceDir}/skills/${skill.skill_code}`).join('\n')
-      const skillText = `技能${skillCode} 在目录${skillCode}下，在目录${skillCode}下查找技能 \n`
+      const skillText = `技能${skillCode} 在目录${skillCode}下，在目录${skillCode}下读取技能 \n`
       text = skillText ? `${skillText} \n ${text}` : text
     }
     const prefixContext = createReplyPrefixContext({
@@ -385,7 +385,9 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
                       const prev = streamChunkIdxBySessionKey.get(dcgSessionKey) ?? 0
                       streamChunkIdxBySessionKey.set(dcgSessionKey, prev + 1)
                       sendChunk(delta, outboundCtx, prev)
-                      dcgLogger(`[stream]: chunkIdx=${prev} len=${delta.length} user=${outboundCtx.sessionId} ${delta.slice(0, 100)}`)
+                      dcgLogger(
+                        `[stream]: chunkIdx=${prev} len=${delta.length} sessionId=${outboundCtx.sessionId} ${delta.slice(0, 100)}`
+                      )
                     }
                     streamedTextLen = payload.text.length
                   } else {

package/src/skill.ts

@@ -1,7 +1,4 @@
 import axios from 'axios'
-/** @ts-ignore */
-import unzipper from 'unzipper'
-import { pipeline } from 'stream/promises'
 import fs from 'fs'
 import path from 'path'
 import { getWorkspaceDir } from './utils/global.js'
@@ -9,7 +6,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'
+import { extractZipBufferToDirectory } from './utils/zipExtract.js'
 
 type ISkillParams = {
   path: string
@@ -47,81 +44,13 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
   }
 
   try {
-    // 下载 zip 文件
     const response = await axios({
       method: 'get',
       url: cdnUrl,
-      responseType: 'stream'
+      responseType: 'arraybuffer'
     })
-    // 创建目标目录
     fs.mkdirSync(skillDir, { recursive: true })
-    // 解压文件到目标目录，跳过顶层文件夹
-    await new Promise((resolve, reject) => {
-      const tasks: Promise<void>[] = []
-      let rootDir: string | null = null
-      let hasError = false
-
-      response.data
-        .pipe(unzipper.Parse())
-        .on('entry', (entry: any) => {
-          if (hasError) {
-            entry.autodrain()
-            return
-          }
-          try {
-            const flags = entry.props?.flags ?? 0
-            const entryPath = decodeZipEntryPath(entry.props?.pathBuffer, flags, entry.path)
-            const pathParts = entryPath.split('/')
-
-            // 检测根目录
-            if (!rootDir && pathParts.length > 1) {
-              rootDir = pathParts[0]
-            }
-            let newPath = entryPath
-            // 移除顶层文件夹
-            if (rootDir && entryPath.startsWith(rootDir + '/')) {
-              newPath = entryPath.slice(rootDir.length + 1)
-            }
-
-            if (!newPath) {
-              entry.autodrain()
-              return
-            }
-
-            const targetPath = path.join(skillDir, newPath)
-
-            if (entry.type === 'Directory') {
-              fs.mkdirSync(targetPath, { recursive: true })
-              entry.autodrain()
-            } else {
-              const parentDir = path.dirname(targetPath)
-              fs.mkdirSync(parentDir, { recursive: true })
-              const writeStream = fs.createWriteStream(targetPath)
-              const task = pipeline(entry, writeStream).catch((err) => {
-                hasError = true
-                throw new Error(`解压文件失败 ${entryPath}: ${err.message}`)
-              })
-              tasks.push(task)
-            }
-          } catch (err) {
-            hasError = true
-            entry.autodrain()
-            reject(new Error(`处理entry失败: ${err}`))
-          }
-        })
-        .on('close', async () => {
-          try {
-            await Promise.all(tasks)
-            resolve(null)
-          } catch (err) {
-            reject(err)
-          }
-        })
-        .on('error', (err: { message: any }) => {
-          hasError = true
-          reject(new Error(`解压流错误: ${err.message}`))
-        })
-    })
+    await extractZipBufferToDirectory(Buffer.from(response.data), skillDir)
     sendEvent({ ...msgContent, status: 'ok' })
     sendMessageToGateway(JSON.stringify({ method: 'skills.status', params: {} }))
   } catch (error) {

package/src/tools/messageTool.ts

@@ -18,15 +18,26 @@ 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
+}
+
 /**
- * 允许发送的挂载根：Unix/macOS/Linux 为 /workspace、/mobook；
- * Windows 为盘符路径如 C:/workspace、D:\\mobook\\...（规范化后比较）。
+ * 允许发送的路径：
+ * - 当前 Agent 工作区根及其子路径（`workspaceDir`，如 ~/.openclaw/workspace-xxx/output/...）；
+ * - 兼容旧挂载：Unix `/workspace`、`/mobook`；Windows 盘符下 `workspace`、`mobook`。
  */
-function isSafePath(filepath: string): boolean {
+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.startsWith('/mobook/') || p === '/mobook') return true
-  // Windows: C:/workspace/...、c:/mobook/...
+  if (p === '/mobook') return true
   return /^[A-Za-z]:\/(workspace|mobook)(\/|$)/.test(p)
 }
 
@@ -64,7 +75,7 @@ const messageToolParameters = {
           file: {
             type: 'string',
             description:
-              '文件路径。Unix/macOS/Linux 如 /workspace/output/report.pdf；Windows 如 C:/workspace/output/report.pdf 或 C:\\workspace\\output\\report.pdf'
+              '文件绝对路径：须在「当前 Agent 工作区」目录下（如 /root/.openclaw/workspace-xxx/output/28337/slices_result.json），或为兼容环境的 /workspace/、/mobook/（Windows 盘符下 workspace、mobook）'
           }
         },
         required: ['file']
@@ -74,12 +85,32 @@ const messageToolParameters = {
   oneOf: [{ required: ['content'] }, { required: ['media'] }]
 }
 
-function extractPaths(text?: string): string[] {
+/** 从正文提取可发送的文件路径（固定挂载 + 当前工作区前缀）。 */
+function extractPaths(text: string | undefined, workspaceDir?: string): string[] {
   if (!text) return []
   const unix = text.match(/\/workspace\/[^\s]+|\/mobook\/[^\s]+/g) ?? []
-  // Windows: C:\workspace\...、C:/mobook/...（不含空白）
   const win = text.match(/[A-Za-z]:[/\\](?:workspace|mobook)[/\\][^\s]+/g) ?? []
-  return [...new Set([...unix, ...win])]
+  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) {
@@ -104,8 +135,8 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
       向用户发送消息。
       若传 target，target 必须是 sessionKey，不能是 userId。
       如果发送附件：必须使用 media 字段
-      支持路径目录（Unix/macOS/Linux：/workspace/、/mobook/；Windows：盘符下 workspace、mobook，如 C:/workspace/）：
-      禁止直接输出路径文本
+      文件路径须在当前 Agent 工作区目录下（随部署变化，如 ~/.openclaw/workspace-xxx/...），或为兼容环境的 /workspace/、/mobook/（Windows 盘符下 workspace、mobook）。
+      禁止在正文中直接输出可访问路径（应通过 media 发送）
     `,
     parameters: messageToolParameters,
     execute: async (_toolCallId, args, signal) => {
@@ -123,12 +154,13 @@ 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
             const key = pathKey(filepath)
             if (sentKeys.has(key)) continue
@@ -139,9 +171,9 @@ export function createDcgchatMessageTool(pluginCtx: DcgchatMessageToolContext):
           }
         }
 
-        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
           const key = pathKey(filepath)
           if (sentKeys.has(key)) continue

package/src/transport.ts

@@ -169,7 +169,7 @@ export function sendChunk(text: string, ctx: IMsgParams, chunkIdx: number): bool
 }
 
 export function sendFinal(ctx: IMsgParams, tag: string): boolean {
-  dcgLogger(` message handling complete state: final tag:${tag}`)
+  dcgLogger(` message handling complete state: to=${ctx.sessionId} final tag:${tag}`)
   return wsSend(ctx, { response: '', state: 'final' })
 }
 

package/src/utils/zipExtract.ts

@@ -0,0 +1,97 @@
+import path from 'path'
+import fs from 'fs'
+/** @ts-ignore */
+import unzipper from 'unzipper'
+import { pipeline } from 'stream/promises'
+import { decodeZipEntryPath } from './zipPath.js'
+
+/**
+ * 若且唯若所有条目都在同一顶层目录下（如 GitHub 下载的 repo-name/...），返回该目录名；否则返回 null。
+ * 不能再用「第一个多段路径的第一段」推断，否则 ZIP 条目顺序变化时会误判（例如先出现 .github/ 或 src/）。
+ */
+export function computeSharedZipRootPrefix(decodedPaths: string[]): string | null {
+  const normalized = decodedPaths
+    .map((p) => p.replace(/\\/g, '/').replace(/\/+$/, ''))
+    .filter((p) => p.length > 0)
+
+  if (normalized.length === 0) return null
+
+  const firstSegs = new Set<string>()
+  for (const p of normalized) {
+    const seg = p.split('/').filter(Boolean)[0]
+    if (seg) firstSegs.add(seg)
+  }
+  if (firstSegs.size !== 1) return null
+
+  const root = [...firstSegs][0]!
+  const prefix = `${root}/`
+  for (const p of normalized) {
+    if (p !== root && !p.startsWith(prefix)) return null
+  }
+  return root
+}
+
+function assertSafeZipTarget(destDir: string, relativePath: string): string {
+  const resolvedPath = path.resolve(destDir, relativePath)
+  const resolvedDest = path.resolve(destDir)
+  const rel = path.relative(resolvedDest, resolvedPath)
+  if (rel.startsWith('..') || path.isAbsolute(rel)) {
+    throw new Error(`zip 路径越界: ${relativePath}`)
+  }
+  return resolvedPath
+}
+
+type ZipEntry = {
+  path: string
+  pathBuffer: Buffer
+  flags: number
+  type: string
+  stream: (password?: string) => NodeJS.ReadableStream
+}
+
+/**
+ * 将已下载的 zip 解压到 destDir；顶层单根目录（若存在）会被剥掉，与原先流式 Parse 行为一致，但根目录由全量路径计算，与条目顺序无关。
+ */
+export async function extractZipBufferToDirectory(buf: Buffer, destDir: string): Promise<void> {
+  const directory = await unzipper.Open.buffer(buf)
+  const files = (await directory.files) as ZipEntry[]
+
+  const decodedPaths = files.map((entry) =>
+    decodeZipEntryPath(entry.pathBuffer, entry.flags ?? 0, entry.path)
+  )
+  const rootDir = computeSharedZipRootPrefix(decodedPaths)
+
+  // 与 unzipper 默认 extract 一致：串行读各 entry，避免同一 buffer 上多路解压竞争
+  for (let i = 0; i < files.length; i++) {
+    const entry = files[i]!
+    const entryPath = decodedPaths[i]!
+    let newPath = entryPath.replace(/\\/g, '/')
+    if (rootDir) {
+      if (newPath === rootDir || newPath === `${rootDir}/`) {
+        continue
+      }
+      if (newPath.startsWith(`${rootDir}/`)) {
+        newPath = newPath.slice(rootDir.length + 1)
+      }
+    }
+    newPath = newPath.replace(/\/+$/, '')
+    if (!newPath) continue
+
+    const targetPath = assertSafeZipTarget(destDir, newPath)
+
+    if (entry.type === 'Directory') {
+      fs.mkdirSync(targetPath, { recursive: true })
+      continue
+    }
+
+    const parentDir = path.dirname(targetPath)
+    fs.mkdirSync(parentDir, { recursive: true })
+    const writeStream = fs.createWriteStream(targetPath)
+    try {
+      await pipeline(entry.stream(), writeStream)
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err)
+      throw new Error(`解压文件失败 ${entryPath}: ${message}`)
+    }
+  }
+}