@dcrays/dcgchat-test 0.4.3 → 0.4.9

package/package.json

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

package/src/bot.ts

@@ -173,6 +173,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
     sessionKey: dcgSessionKey,
     real_mobook
   }
+  /** 写入本条消息参数前快照：流式/abort 的 final 须对齐「上一轮」触发的对话 messageId，而非打断指令本身 */
+  const priorOutboundCtx = getEffectiveMsgParams(dcgSessionKey)
   setParamsMessage(dcgSessionKey, mergedParams)
   dcgLogger(`target alias bound: aliasTarget=${userId} -> sessionKey=${dcgSessionKey}`)
   const outboundCtx = getEffectiveMsgParams(dcgSessionKey)
@@ -189,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> = {}
@@ -235,12 +245,13 @@ 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 skillCode = msg.content.skills_scope.map((skill) => `${workspaceDir}/skills/${skill.skill_code}`).join('\n')
-      const skillText = `技能${skillCode} 在目录${skillCode}下，在目录${skillCode}下读取技能 \n`
-      text = skillText ? `${skillText} \n ${text}` : text
-      dcgLogger('skill: skillText: ${skillText}')
+      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,
@@ -304,7 +315,8 @@ export async function handleDcgchatMessage(msg: InboundMessage, accountId: strin
         })
       } else if (interruptCommand.includes(text?.trim())) {
         dcgLogger(`interrupt command: ${text}`)
-        sendFinal({ ...outboundCtx, 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) => {

package/src/channel.ts

@@ -224,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: {

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)