@workclaw/openclaw-workclaw 1.0.19 → 1.0.23

package/dist/src/gateway/reconnect.js

@@ -136,6 +136,10 @@ export function createReconnectScheduler(options) {
                     // 永久失败，清除 pending promise
                     pendingDoConnectPromise = null;
                 }
+                else {
+                    // 错误不代表永久失败，调度下一次重连
+                    scheduleReconnect();
+                }
             }
         }, delayMs);
     };

package/dist/src/gateway/skills-handler.js

@@ -3,22 +3,22 @@
  * 处理云端下发的 skills 相关 EVENT 消息
  * 通过 HTTP 回调返回结果
  */
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
-import fs from "node:fs/promises";
-import path from "node:path";
-import os from "node:os";
-import https from "node:https";
-import http from "node:http";
+import { exec } from 'node:child_process';
+import fs from 'node:fs/promises';
+import http from 'node:http';
+import https from 'node:https';
+import os from 'node:os';
+import path from 'node:path';
+import { promisify } from 'node:util';
 const execAsync = promisify(exec);
 // 回调 URL 映射
 const TOPIC_TO_CALLBACK_URL = {
-    "skills/add": "/open-apis/v1/claw/do/skills/result",
-    "skills/update": "/open-apis/v1/claw/do/skills/result",
-    "skills/remove": "/open-apis/v1/claw/do/skills/result",
-    "skills/list": "/open-apis/v1/claw/do/skills/result",
-    "skills/get": "/open-apis/v1/claw/do/skills/result",
-    "skills/invoke": "/open-apis/v1/claw/do/skills/result",
+    'skills/add': '/open-apis/v1/claw/do/skills/result',
+    'skills/update': '/open-apis/v1/claw/do/skills/result',
+    'skills/remove': '/open-apis/v1/claw/do/skills/result',
+    'skills/list': '/open-apis/v1/claw/do/skills/result',
+    'skills/get': '/open-apis/v1/claw/do/skills/result',
+    'skills/invoke': '/open-apis/v1/claw/do/skills/result',
 };
 /**
  * 处理 skills 事件
@@ -30,22 +30,22 @@ export async function handleSkillsEvent(eventData, token, baseUrl, appKey, log)
         let result;
         // 根据 topic 路由到不同的处理函数
         switch (topic) {
-            case "skills/add":
+            case 'skills/add':
                 result = await handleCreateSkill(data, log);
                 break;
-            case "skills/update":
+            case 'skills/update':
                 result = await handleUpdateSkill(data, log);
                 break;
-            case "skills/remove":
+            case 'skills/remove':
                 result = await handleDeleteSkill(data, log);
                 break;
-            case "skills/list":
+            case 'skills/list':
                 result = await handleListSkills(data, log);
                 break;
-            case "skills/get":
+            case 'skills/get':
                 result = await handleGetSkill(data, log);
                 break;
-            case "skills/invoke":
+            case 'skills/invoke':
                 result = await handleInvokeSkill(data, log);
                 break;
             default:
@@ -53,19 +53,19 @@ export async function handleSkillsEvent(eventData, token, baseUrl, appKey, log)
         }
         // 发送成功回调
         await sendCallback(baseUrl, topic, {
-            userId: result.userId || "",
-            agentId: "",
+            userId: result.userId || '',
+            agentId: '',
             appKey,
             agentIds: Array.isArray(result.agentIds) ? result.agentIds : (result.agentIds || 0),
             dotype: result.status || topic.split('/')[1],
             doStatus: true,
-            doErrorMsg: "",
+            doErrorMsg: '',
             dataList: [
                 {
-                    typeStr: "",
-                    name: result.skillName || "",
-                    description: "",
-                }
+                    typeStr: '',
+                    name: result.skillName || '',
+                    description: '',
+                },
             ],
         }, token, log);
         log?.info?.(`[SkillsHandler] ${topic} completed, callback sent`);
@@ -89,19 +89,19 @@ export async function handleSkillsEvent(eventData, token, baseUrl, appKey, log)
         log?.error?.(`[SkillsHandler] ${topic} failed: ${err.message}`);
         // 发送失败回调
         await sendCallback(baseUrl, topic, {
-            userId: "",
-            agentId: "",
+            userId: '',
+            agentId: '',
             agentIds: [],
             appKey,
-            dotype: topic.split("/")[1],
+            dotype: topic.split('/')[1],
             doStatus: false,
             doErrorMsg: err.message,
             dataList: [
                 {
-                    typeStr: "",
-                    name: "",
-                    description: "",
-                }
+                    typeStr: '',
+                    name: '',
+                    description: '',
+                },
             ],
         }, token, log);
     }
@@ -115,15 +115,15 @@ async function sendCallback(baseUrl, topic, response, authToken, log) {
     if (!callbackPath) {
         throw new Error(`No callback URL defined for topic: ${topic}`);
     }
-    const callbackUrl = `${baseUrl.replace(/\/$/, "")}${callbackPath}`;
+    const callbackUrl = `${baseUrl.replace(/\/$/, '')}${callbackPath}`;
     const responseData = JSON.stringify(response);
     log?.info?.(`[SkillsHandler] Sending callback to ${callbackUrl}, data: ${responseData}`);
     // 准备请求头
     const headers = {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
     };
     if (authToken) {
-        headers["Authorization"] = authToken.startsWith("Bearer ")
+        headers.Authorization = authToken.startsWith('Bearer ')
             ? authToken
             : `Bearer ${authToken}`;
     }
@@ -132,7 +132,7 @@ async function sendCallback(baseUrl, topic, response, authToken, log) {
     const timeoutId = setTimeout(() => controller.abort(), 30000);
     try {
         const res = await fetch(callbackUrl, {
-            method: "POST",
+            method: 'POST',
             headers,
             body: responseData,
             signal: controller.signal,
@@ -146,9 +146,9 @@ async function sendCallback(baseUrl, topic, response, authToken, log) {
     }
     catch (err) {
         clearTimeout(timeoutId);
-        if (err.name === "AbortError") {
+        if (err.name === 'AbortError') {
             log?.error?.(`[SkillsHandler] Callback timeout after 30s: ${callbackUrl}`);
-            throw new Error("Callback timeout");
+            throw new Error('Callback timeout');
         }
         log?.error?.(`[SkillsHandler] Failed to send callback: ${err.message}`);
         throw err;
@@ -159,27 +159,27 @@ async function sendCallback(baseUrl, topic, response, authToken, log) {
  */
 async function downloadFromUrl(url, log) {
     return new Promise((resolve, reject) => {
-        const client = url.startsWith("https:") ? https : http;
+        const client = url.startsWith('https:') ? https : http;
         const req = client.get(url, (res) => {
             if (res.statusCode !== 200) {
                 reject(new Error(`Failed to download: HTTP ${res.statusCode}`));
                 return;
             }
             const chunks = [];
-            res.on("data", (chunk) => {
+            res.on('data', (chunk) => {
                 chunks.push(chunk);
             });
-            res.on("end", () => {
+            res.on('end', () => {
                 const buffer = Buffer.concat(chunks);
                 resolve(buffer);
             });
         });
-        req.on("error", (err) => {
+        req.on('error', (err) => {
             reject(new Error(`Download failed: ${err.message}`));
         });
         req.setTimeout(30000, () => {
             req.destroy();
-            reject(new Error("Download timeout"));
+            reject(new Error('Download timeout'));
         });
     });
 }
@@ -188,17 +188,17 @@ async function downloadFromUrl(url, log) {
  */
 function getOpenClawConfigDir() {
     const homeDir = os.homedir();
-    return path.join(homeDir, ".openclaw");
+    return path.join(homeDir, '.openclaw');
 }
 /**
  * 获取 skills 目录
  */
 async function getSkillsDir(agentId, log) {
     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 {
         await fs.mkdir(skillsDir, { recursive: true });
@@ -282,14 +282,14 @@ async function installSkillToClaw(skillName, skillContent, agentId, log) {
         if (!skillData.id || !skillData.name) {
             return {
                 success: false,
-                message: "Missing required fields in skill: id, name",
+                message: 'Missing required fields in skill: id, name',
             };
         }
         // 获取 skills 目录
         const skillsDir = await getSkillsDir(agentId, log);
         const skillFilePath = path.join(skillsDir, `${skillName}.json`);
         // 写入 skill 文件
-        await fs.writeFile(skillFilePath, skillContent, "utf-8");
+        await fs.writeFile(skillFilePath, skillContent, 'utf-8');
         log?.info?.(`[SkillsHandler] Skill saved to: ${skillFilePath}`);
         return {
             success: true,
@@ -307,17 +307,31 @@ async function installSkillToClaw(skillName, skillContent, agentId, log) {
 /**
  * 创建 Skill
  */
+async function installSkillToLocations(skillName, skillContent, locations, log) {
+    const installResults = [];
+    for (const agentId of locations) {
+        const installResult = await installSkillToClaw(skillName, skillContent, agentId, log);
+        if (!installResult.success) {
+            const error = 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, log) {
-    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) {
-        const error = new Error("Missing required fields: userId, skillName");
-        error.code = "MISSING_FIELDS";
+        const error = new Error('Missing required fields: userId, skillName');
+        error.code = 'MISSING_FIELDS';
         throw error;
     }
     log?.info?.(`[SkillsHandler] Creating skill: ${skillName}`);
+    log?.info?.(`[SkillsHandler] mainId: ${mainId}`);
     if (agentIds.length > 0) {
-        log?.info?.(`[SkillsHandler] Target agents: ${agentIds.join(", ")}`);
+        log?.info?.(`[SkillsHandler] Target agents: ${agentIds.join(', ')}`);
     }
     // 如果提供了 URL，从 URL 下载 skill 定义
     if (unloadUrl) {
@@ -326,34 +340,43 @@ async function handleCreateSkill(data, log) {
             // 下载 skill 定义
             const skillContent = await downloadFromUrl(unloadUrl, log);
             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 = new Error(`Failed to install skill to agent ${agentId}: ${installResult.message}`);
-                    error.code = "INSTALL_FAILED";
-                    throw error;
-                }
-                installResults.push(installResult);
+            // 确定安装位置
+            const installLocations = [];
+            // 检查 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);
             }
-            // 如果没有指定智能体，安装到默认位置
-            if (agentIds.length === 0) {
-                const installResult = await installSkillToClaw(skillName, skillContent, undefined, log);
-                if (!installResult.success) {
-                    const error = new Error(installResult.message);
-                    error.code = "INSTALL_FAILED";
-                    throw error;
-                }
-                installResults.push(installResult);
+            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 => 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`);
             return {
                 userId,
                 skillName,
-                agentId: "",
+                agentId: '',
                 agentIds: agentIds.length > 0 ? agentIds : undefined,
-                status: "add",
+                status: 'add',
                 installedAt: new Date().toISOString(),
             };
         }
@@ -365,9 +388,9 @@ async function handleCreateSkill(data, log) {
     return {
         userId,
         skillName,
-        agentId: "",
+        agentId: '',
         agentIds: agentIds.length > 0 ? agentIds : undefined,
-        status: "add",
+        status: 'add',
         createdAt: new Date().toISOString(),
     };
 }
@@ -377,98 +400,114 @@ async function handleCreateSkill(data, log) {
 async function handleUpdateSkill(data, log) {
     const { id, ...updates } = data;
     if (!id) {
-        const error = new Error("Missing required field: id");
-        error.code = "MISSING_FIELDS";
+        const error = new Error('Missing required field: id');
+        error.code = 'MISSING_FIELDS';
         throw error;
     }
     log?.info?.(`[SkillsHandler] Updating skill: ${id}`);
     return {
         id,
         ...updates,
-        status: "updated",
+        status: 'updated',
         updatedAt: new Date().toISOString(),
     };
 }
 /**
  * 删除 Skill
  */
+async function deleteSkillAtLocation(skillName, agentId, log) {
+    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 (err) {
+            // 文件不存在，继续尝试删除目录
+        }
+        // 尝试删除技能目录（ZIP 安装的技能）
+        try {
+            await fs.rm(skillDirPath, { recursive: true, force: true });
+            log?.info?.(`[SkillsHandler] Skill directory deleted: ${skillDirPath}`);
+            deleted = true;
+        }
+        catch (err) {
+            // 目录不存在，继续
+        }
+        return deleted;
+    }
+    catch (err) {
+        log?.error?.(`[SkillsHandler] Failed to delete skill at location: ${err.message}`);
+        return false;
+    }
+}
 async function handleDeleteSkill(data, log) {
-    const { userId, skillName, agentIds } = data;
+    const { userId, skillName, agentIds, mainId } = data;
     const agentIdsList = Array.isArray(agentIds) ? agentIds : (agentIds ? [agentIds] : []);
     if (!skillName) {
-        const error = new Error("Missing required field: skillName");
-        error.code = "MISSING_FIELDS";
+        const error = new Error('Missing required field: skillName');
+        error.code = 'MISSING_FIELDS';
         throw error;
     }
     log?.info?.(`[SkillsHandler] Deleting skill: ${skillName}`);
+    log?.info?.(`[SkillsHandler] mainId: ${mainId}`);
     if (agentIdsList.length > 0) {
-        log?.info?.(`[SkillsHandler] Target agents: ${agentIdsList.join(", ")}`);
+        log?.info?.(`[SkillsHandler] Target agents: ${agentIdsList.join(', ')}`);
     }
     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 (err) {
-                // 文件不存在，继续尝试删除目录
-            }
-            // 尝试删除技能目录（ZIP 安装的技能）
-            try {
-                await fs.rm(skillDirPath, { recursive: true, force: true });
-                log?.info?.(`[SkillsHandler] Skill directory deleted: ${skillDirPath}`);
-                deleted = true;
-            }
-            catch (err) {
-                // 目录不存在，继续
-            }
+        // 检查 agentIds 是否只包含 mainId
+        const hasOnlyMainId = agentIdsList.length === 1 && agentIdsList[0] === mainId;
+        // 检查 agentIds 是否包含 mainId 和其他 id
+        const hasMainIdAndOthers = agentIdsList.includes(mainId) && agentIdsList.length > 1;
+        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 (err) {
-                // 文件不存在，继续尝试删除目录
-            }
-            // 尝试删除技能目录（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 (err) {
-                // 目录不存在，继续
+        }
+        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 = new Error(`Skill not found: ${skillName}`);
-            error.code = "SKILL_NOT_FOUND";
+            error.code = 'SKILL_NOT_FOUND';
             throw error;
         }
         return {
             userId,
             skillName,
-            agentId: "",
+            agentId: '',
             agentIds: agentIdsList.length > 0 ? agentIdsList : undefined,
-            status: "remove",
+            status: 'remove',
             deletedAt: new Date().toISOString(),
         };
     }
@@ -485,7 +524,7 @@ async function handleListSkills(data, log) {
     log?.info?.(`[SkillsHandler] Listing skills, filter: ${filter}, limit: ${limit}`);
     try {
         // 调用 openclaw skills list 命令
-        const { stdout } = await execAsync("openclaw skills list --json", {
+        const { stdout } = await execAsync('openclaw skills list --json', {
             timeout: 10000,
         });
         let skills = [];
@@ -495,17 +534,17 @@ async function handleListSkills(data, log) {
         }
         catch {
             // 解析文本输出
-            const lines = stdout.split("\n");
+            const lines = stdout.split('\n');
             skills = lines
-                .filter((line) => line.trim() && !line.includes("Skills"))
+                .filter(line => line.trim() && !line.includes('Skills'))
                 .map((line) => {
-                const parts = line.split(/\s{2,}/).map((p) => p.trim());
+                const parts = line.split(/\s{2,}/).map(p => p.trim());
                 if (parts.length >= 3) {
                     return {
-                        status: parts[0]?.includes("✓") ? "ready" : "missing",
+                        status: parts[0]?.includes('✓') ? 'ready' : 'missing',
                         name: parts[1],
                         description: parts[2],
-                        source: parts[3] || "openclaw-bundled",
+                        source: parts[3] || 'openclaw-bundled',
                     };
                 }
                 return null;
@@ -514,7 +553,7 @@ async function handleListSkills(data, log) {
         }
         // 应用过滤
         if (filter) {
-            skills = skills.filter((s) => s.status === filter);
+            skills = skills.filter(s => s.status === filter);
         }
         // 应用 limit
         skills = skills.slice(0, limit);
@@ -538,8 +577,8 @@ async function handleListSkills(data, log) {
 async function handleGetSkill(data, log) {
     const { id } = data;
     if (!id) {
-        const error = new Error("Missing required field: id");
-        error.code = "MISSING_FIELDS";
+        const error = new Error('Missing required field: id');
+        error.code = 'MISSING_FIELDS';
         throw error;
     }
     log?.info?.(`[SkillsHandler] Getting skill: ${id}`);
@@ -547,8 +586,8 @@ async function handleGetSkill(data, log) {
     return {
         id,
         name: `Skill ${id}`,
-        description: "Skill description",
-        status: "ready",
+        description: 'Skill description',
+        status: 'ready',
     };
 }
 /**
@@ -557,15 +596,15 @@ async function handleGetSkill(data, log) {
 async function handleInvokeSkill(data, log) {
     const { id, input, context } = data;
     if (!id) {
-        const error = new Error("Missing required field: id");
-        error.code = "MISSING_FIELDS";
+        const error = new Error('Missing required field: id');
+        error.code = 'MISSING_FIELDS';
         throw error;
     }
     log?.info?.(`[SkillsHandler] Invoking skill: ${id}`);
     // TODO: 实现实际的 skill 执行逻辑
     return {
         id,
-        status: "completed",
+        status: 'completed',
         output: {
             result: `Skill ${id} executed successfully`,
             input,

package/dist/src/gateway/workclaw-gateway.d.ts

@@ -1,4 +1,4 @@
-import type { ResolvedWorkclawAccount } from "../types.js";
+import type { ResolvedWorkclawAccount } from '../types.js';
 export interface WorkclawGatewayOptions {
     accountId: string;
     account: ResolvedWorkclawAccount;