@workclaw/openclaw-workclaw 1.0.13 → 1.0.16

package/src/gateway/message-dispatcher.ts

@@ -134,7 +134,7 @@ async function handleAgentEvent(
 
 async function handleSkillsProcessingEvent(ctx: MessageDispatcherContext, result: ParseWorkClawResult): Promise<void> {
   const { accountId, baseConfig, log } = ctx
-  if (!result.skillsEvent)
+  if (!result.eventData)
     return
   try {
     const { handleSkillsEvent } = await import('./skills-handler.js')
@@ -149,7 +149,7 @@ async function handleSkillsProcessingEvent(ctx: MessageDispatcherContext, result
     }
     const tokenCacheKey = baseConfig.appKey || accountId
     const token = await getOpenclawWorkclawAccessToken(tokenCacheKey, connConfig)
-    await handleSkillsEvent(result.skillsEvent, token, connConfig.baseUrl, connConfig.appKey || accountId, log)
+    await handleSkillsEvent(result.eventData, token, connConfig.baseUrl, connConfig.appKey || accountId, log)
   }
   catch (err) {
     logError(log, 'handleSkillsEvent failed', err)

package/src/gateway/skills-handler.ts

@@ -231,7 +231,7 @@ async function sendCallback(
 /**
  * 从 URL 下载文件内容
  */
-async function downloadFromUrl(url: string, _log?: any): Promise<Buffer> {
+async function downloadFromUrl(url: string): Promise<Buffer> {
   return new Promise((resolve, reject) => {
     const client = url.startsWith('https:') ? https : http
 
@@ -275,11 +275,11 @@ function getOpenClawConfigDir(): string {
  */
 async function getSkillsDir(agentId?: string, log?: any): Promise<string> {
   const openclawDir = getOpenClawConfigDir()
-  let skillsDir = path.join(openclawDir, 'skills')
+  let skillsDir = path.join(openclawDir, 'workspace', 'skills')
 
   // 如果有 agentId，添加到对应目录
   if (agentId && agentId.trim()) {
-    skillsDir = path.join(openclawDir, 'agents', `openclaw-workclaw-${agentId}`, 'skills')
+    skillsDir = path.join(openclawDir, `workspace-${agentId}`, 'skills')
   }
 
   try {
@@ -410,6 +410,22 @@ async function installSkillToClaw(
 /**
  * 创建 Skill
  */
+async function installSkillToLocations(skillName: string, skillContent: Buffer, locations: (string | undefined)[], log?: any): Promise<any[]> {
+  const installResults = []
+
+  for (const agentId of locations) {
+    const installResult = await installSkillToClaw(skillName, skillContent, agentId, log)
+    if (!installResult.success) {
+      const error: any = new Error(`Failed to install skill to ${agentId ? `agent ${agentId}` : 'default location'}: ${installResult.message}`)
+      error.code = 'INSTALL_FAILED'
+      throw error
+    }
+    installResults.push(installResult)
+  }
+
+  return installResults
+}
+
 async function handleCreateSkill(
   data: any,
   log?: {
@@ -417,7 +433,7 @@ async function handleCreateSkill(
     error?: (msg: string) => void
   },
 ): Promise<any> {
-  const { userId, skillName, unloadUrl } = data
+  const { userId, skillName, unloadUrl, mainId } = data
   const agentIds = Array.isArray(data?.agentIds) ? data.agentIds : (data?.agentIds ? [data.agentIds] : [])
 
   if (!userId || !skillName) {
@@ -427,6 +443,7 @@ async function handleCreateSkill(
   }
 
   log?.info?.(`[SkillsHandler] Creating skill: ${skillName}`)
+  log?.info?.(`[SkillsHandler] mainId: ${mainId}`)
   if (agentIds.length > 0) {
     log?.info?.(`[SkillsHandler] Target agents: ${agentIds.join(', ')}`)
   }
@@ -437,31 +454,42 @@ async function handleCreateSkill(
 
     try {
       // 下载 skill 定义
-      const skillContent = await downloadFromUrl(unloadUrl, log)
+      const skillContent = await downloadFromUrl(unloadUrl)
       log?.info?.(`[SkillsHandler] Downloaded skill content, length: ${skillContent.length} bytes`)
 
-      // 安装 skill 到多个智能体
-      const installResults = []
-      for (const agentId of agentIds) {
-        const installResult = await installSkillToClaw(skillName, skillContent, agentId, log)
-        if (!installResult.success) {
-          const error: any = new Error(`Failed to install skill to agent ${agentId}: ${installResult.message}`)
-          error.code = 'INSTALL_FAILED'
-          throw error
-        }
-        installResults.push(installResult)
-      }
+      // 确定安装位置
+      const installLocations: (string | undefined)[] = []
 
-      // 如果没有指定智能体，安装到默认位置
-      if (agentIds.length === 0) {
-        const installResult = await installSkillToClaw(skillName, skillContent, undefined, log)
-        if (!installResult.success) {
-          const error: any = new Error(installResult.message)
-          error.code = 'INSTALL_FAILED'
-          throw error
-        }
-        installResults.push(installResult)
+      // 检查 agentIds 是否只包含 mainId
+      const hasOnlyMainId = agentIds.length === 1 && agentIds[0] === mainId
+      // 检查 agentIds 是否包含 mainId 和其他 id
+      const hasMainIdAndOthers = agentIds.includes(mainId) && agentIds.length > 1
+
+      if (hasOnlyMainId) {
+        // 如果只有 mainId，安装到默认位置
+        log?.info?.(`[SkillsHandler] Only mainId found, installing to default location`)
+        installLocations.push(undefined)
+      }
+      else if (hasMainIdAndOthers) {
+        // 如果有 mainId 和其他 id，安装到默认位置和其他 id 位置
+        log?.info?.(`[SkillsHandler] mainId and other agents found, installing to default location and other agents`)
+        installLocations.push(undefined)
+        // 添加其他 id 位置（排除 mainId）
+        installLocations.push(...agentIds.filter((id: any) => id !== mainId))
       }
+      else if (agentIds.length > 0) {
+        // 如果没有 mainId，安装到所有指定的 agentId 位置
+        log?.info?.(`[SkillsHandler] No mainId found, installing to all specified agents`)
+        installLocations.push(...agentIds)
+      }
+      else {
+        // 如果没有指定智能体，安装到默认位置
+        log?.info?.(`[SkillsHandler] No agents specified, installing to default location`)
+        installLocations.push(undefined)
+      }
+
+      // 安装技能到所有位置
+      const installResults = await installSkillToLocations(skillName, skillContent, installLocations, log)
 
       log?.info?.(`[SkillsHandler] Skill installed to ${installResults.length} locations`)
 
@@ -521,6 +549,43 @@ async function handleUpdateSkill(
 /**
  * 删除 Skill
  */
+async function deleteSkillAtLocation(skillName: string, agentId: string | undefined, log?: any): Promise<boolean> {
+  try {
+    const skillsDir = await getSkillsDir(agentId, log)
+
+    const skillFilePath = path.join(skillsDir, `${skillName}.json`)
+    const skillDirPath = path.join(skillsDir, skillName)
+
+    let deleted = false
+
+    // 尝试删除技能文件
+    try {
+      await fs.unlink(skillFilePath)
+      log?.info?.(`[SkillsHandler] Skill file deleted: ${skillFilePath}`)
+      deleted = true
+    }
+    catch {
+      // 文件不存在，继续尝试删除目录
+    }
+
+    // 尝试删除技能目录（ZIP 安装的技能）
+    try {
+      await fs.rm(skillDirPath, { recursive: true, force: true })
+      log?.info?.(`[SkillsHandler] Skill directory deleted: ${skillDirPath}`)
+      deleted = true
+    }
+    catch {
+      // 目录不存在，继续
+    }
+
+    return deleted
+  }
+  catch (err: any) {
+    log?.error?.(`[SkillsHandler] Failed to delete skill at location: ${err.message}`)
+    return false
+  }
+}
+
 async function handleDeleteSkill(
   data: any,
   log?: {
@@ -528,7 +593,7 @@ async function handleDeleteSkill(
     error?: (msg: string) => void
   },
 ): Promise<any> {
-  const { userId, skillName, agentIds } = data
+  const { userId, skillName, agentIds, mainId } = data
   const agentIdsList = Array.isArray(agentIds) ? agentIds : (agentIds ? [agentIds] : [])
 
   if (!skillName) {
@@ -538,6 +603,7 @@ async function handleDeleteSkill(
   }
 
   log?.info?.(`[SkillsHandler] Deleting skill: ${skillName}`)
+  log?.info?.(`[SkillsHandler] mainId: ${mainId}`)
   if (agentIdsList.length > 0) {
     log?.info?.(`[SkillsHandler] Target agents: ${agentIdsList.join(', ')}`)
   }
@@ -545,65 +611,45 @@ async function handleDeleteSkill(
   try {
     let deleted = false
 
-    // 从多个智能体中删除技能
-    for (const agentId of agentIdsList) {
-      // 获取技能目录
-      const skillsDir = await getSkillsDir(agentId, log)
-
-      // 检查技能文件和目录
-      const skillFilePath = path.join(skillsDir, `${skillName}.json`)
-      const skillDirPath = path.join(skillsDir, skillName)
-
-      // 尝试删除技能文件
-      try {
-        await fs.unlink(skillFilePath)
-        log?.info?.(`[SkillsHandler] Skill file deleted: ${skillFilePath}`)
-        deleted = true
-      }
-      catch {
-        // 文件不存在，继续尝试删除目录
-      }
+    // 检查 agentIds 是否只包含 mainId
+    const hasOnlyMainId = agentIdsList.length === 1 && agentIdsList[0] === mainId
+    // 检查 agentIds 是否包含 mainId 和其他 id
+    const hasMainIdAndOthers = agentIdsList.includes(mainId) && agentIdsList.length > 1
 
-      // 尝试删除技能目录（ZIP 安装的技能）
-      try {
-        await fs.rm(skillDirPath, { recursive: true, force: true })
-        log?.info?.(`[SkillsHandler] Skill directory deleted: ${skillDirPath}`)
-        deleted = true
-      }
-      catch {
-        // 目录不存在，继续
-      }
+    if (hasOnlyMainId) {
+      // 如果只有 mainId，从默认位置删除
+      log?.info?.(`[SkillsHandler] Only mainId found, deleting from default location`)
+      deleted = await deleteSkillAtLocation(skillName, undefined, log)
     }
-
-    // 如果没有指定智能体，从默认位置删除
-    if (agentIdsList.length === 0) {
-      // 获取默认技能目录
-      const skillsDir = await getSkillsDir(undefined, log)
-
-      // 检查技能文件和目录
-      const skillFilePath = path.join(skillsDir, `${skillName}.json`)
-      const skillDirPath = path.join(skillsDir, skillName)
-
-      // 尝试删除技能文件
-      try {
-        await fs.unlink(skillFilePath)
-        log?.info?.(`[SkillsHandler] Skill file deleted: ${skillFilePath}`)
-        deleted = true
-      }
-      catch {
-        // 文件不存在，继续尝试删除目录
-      }
-
-      // 尝试删除技能目录（ZIP 安装的技能）
-      try {
-        await fs.rm(skillDirPath, { recursive: true, force: true })
-        log?.info?.(`[SkillsHandler] Skill directory deleted: ${skillDirPath}`)
-        deleted = true
+    else if (hasMainIdAndOthers) {
+      // 如果有 mainId 和其他 id，从默认位置和其他 id 位置删除
+      log?.info?.(`[SkillsHandler] mainId and other agents found, deleting from default location and other agents`)
+
+      // 从默认位置删除
+      const defaultDeleted = await deleteSkillAtLocation(skillName, undefined, log)
+      deleted = deleted || defaultDeleted
+
+      // 从其他 id 位置删除（排除 mainId）
+      for (const agentId of agentIdsList) {
+        if (agentId !== mainId) {
+          const agentDeleted = await deleteSkillAtLocation(skillName, agentId, log)
+          deleted = deleted || agentDeleted
+        }
       }
-      catch {
-        // 目录不存在，继续
+    }
+    else if (agentIdsList.length > 0) {
+      // 如果没有 mainId，从所有指定的 agentId 位置删除
+      log?.info?.(`[SkillsHandler] No mainId found, deleting from all specified agents`)
+      for (const agentId of agentIdsList) {
+        const agentDeleted = await deleteSkillAtLocation(skillName, agentId, log)
+        deleted = deleted || agentDeleted
       }
     }
+    else {
+      // 如果没有指定智能体，从默认位置删除
+      log?.info?.(`[SkillsHandler] No agents specified, deleting from default location`)
+      deleted = await deleteSkillAtLocation(skillName, undefined, log)
+    }
 
     if (!deleted) {
       const error: any = new Error(`Skill not found: ${skillName}`)