@spzhongwin/skill-logger-plugin 1.0.9 → 1.0.11

package/dist/index.js

@@ -369,6 +369,31 @@ var SkillUpdater = class {
   /**
    * 手动下发安装/更新指令 (供沙盒 HTTP Proxy 与星型架构中控使用)
    */
+  /**
+   * 从 URL 下载 ZIP 并直接解压替换到目标目录（不检查 SKILL.md）
+   */
+  async installZipFromUrl(url, targetDir) {
+    const work = path3.join(this.tmpDir, `slp-zip-${randomUUID()}`);
+    await fs3.mkdir(work, { recursive: true });
+    try {
+      const zipPath = path3.join(work, "pkg.zip");
+      const res = await this.fetchImpl(url);
+      if (!res.ok) {
+        return { success: false, message: `\u4E0B\u8F7D\u5931\u8D25: HTTP ${res.status}` };
+      }
+      const buf = Buffer.from(await res.arrayBuffer());
+      await fs3.writeFile(zipPath, buf);
+      const staging = path3.join(work, "staging");
+      await this.unzip(zipPath, staging);
+      await this.replaceDir(staging, targetDir);
+      return { success: true, message: `\u5B89\u88C5\u6210\u529F` };
+    } catch (err) {
+      return { success: false, message: `\u6267\u884C\u51FA\u9519: ${err.message}` };
+    } finally {
+      await fs3.rm(work, { recursive: true, force: true }).catch(() => {
+      });
+    }
+  }
   async manualInstall(options) {
     const { code, force, targetDir } = options;
     let { url, version } = options;
@@ -1637,6 +1662,13 @@ var GatewayWsClient = class {
           this.appendLogToFile("INFO", "Heartbeat", "Server heartbeat acknowledged", { type: msg.type, connectionId: msg.connectionId });
           return;
         }
+        if (msg?.type === "BATCH_COMMAND" && Array.isArray(msg.commands)) {
+          const { commands, type, ...shared } = msg;
+          for (const cmd of commands) {
+            await this.handleMessage({ ...shared, userId: cmd.userId, replyId: cmd.replyId });
+          }
+          return;
+        }
         await this.handleMessage(msg);
       } catch (err) {
         console.error(`[skill-logger-plugin][WS] Failed to parse/handle message:`, err);
@@ -1673,9 +1705,7 @@ var GatewayWsClient = class {
       try {
         entries = await fs6.readdir(rootPath);
       } catch (e) {
-        this.currentAgentIds = /* @__PURE__ */ new Set();
-        this.appendLogToFile("WARN", "AgentScan", "OpenClaw home is not readable; reporting empty agent list", e);
-        this.sendAgentListReport("AGENT_LIST_REPORT");
+        this.appendLogToFile("WARN", "AgentScan", "OpenClaw home is not readable; skipping this scan cycle", e);
         return;
       }
       const newAgentIds = /* @__PURE__ */ new Set();
@@ -1789,7 +1819,8 @@ var GatewayWsClient = class {
       type: "GATEWAY_HELLO",
       gatewayId: this.options.gatewayId,
       agentIds: Array.from(this.currentAgentIds),
-      clientTime: Date.now()
+      clientTime: Date.now(),
+      supportsBatch: true
     }, "Heartbeat");
   }
   sendClientHeartbeat() {
@@ -1947,10 +1978,46 @@ var GatewayWsClient = class {
             if (replyId) this.reply(replyId, { success: false, message: e.message, action });
           }
         }, delayMs);
+      } else if (action === "INSTALL_EXPERT") {
+        if (!safeCode) throw new Error("Missing code parameter");
+        const { name, version: version2, downloadUrl, skills } = msg;
+        console.log(`[skill-logger-plugin][WS] Executing INSTALL_EXPERT for user ${userId}, code: ${safeCode}`);
+        this.appendLogToFile("INFO", "Command", `INSTALL_EXPERT received`, { userId, code: safeCode, version: version2, downloadUrl });
+        const userSkillRoot = path7.join(openclawHome(), `workspace-assistant-${pureId}`, ".user");
+        const expertTarget = path7.join(userSkillRoot, "experts", safeCode);
+        await fs6.mkdir(path7.dirname(expertTarget), { recursive: true });
+        const expertResult = await this.options.updater.installZipFromUrl(downloadUrl, expertTarget);
+        if (!expertResult.success) {
+          throw new Error(`\u4E13\u5BB6\u5B89\u88C5\u5931\u8D25: ${expertResult.message}`);
+        }
+        const skillTargetRoot = path7.join(userSkillRoot, "skills");
+        await fs6.mkdir(skillTargetRoot, { recursive: true });
+        const skillResults = [];
+        if (Array.isArray(skills)) {
+          for (const sk of skills) {
+            if (!sk.code || !sk.downloadUrl) {
+              skillResults.push(`${sk.code || "unknown"}: \u7F3A\u5C11\u4E0B\u8F7D\u5730\u5740`);
+              continue;
+            }
+            try {
+              const skTarget = path7.join(skillTargetRoot, sk.code);
+              const result = await this.options.updater.installZipFromUrl(sk.downloadUrl, skTarget);
+              skillResults.push(`${sk.code}: ${result.success ? "\u6210\u529F" : "\u5931\u8D25 - " + result.message}`);
+            } catch (e) {
+              skillResults.push(`${sk.code}: \u5931\u8D25 - ${e.message}`);
+            }
+          }
+        }
+        this.reply(replyId, {
+          success: true,
+          message: `\u4E13\u5BB6 ${safeCode} \u5B89\u88C5\u5B8C\u6210`,
+          action,
+          data: { expertCode: safeCode, skills: skillResults }
+        });
       } else if (action === "GET_EXPERT_REGISTRY") {
         console.log(`[skill-logger-plugin][WS] Executing GET_EXPERT_REGISTRY for user ${userId}`);
         this.appendLogToFile("INFO", "Command", `GET_EXPERT_REGISTRY received`, { userId });
-        const registryFilePath = path7.join(openclawHome(), `workspace-assistant-${pureId}`, ".openclaw", "userskill", "expert-registry.yaml");
+        const registryFilePath = path7.join(openclawHome(), `workspace-assistant-${pureId}`, ".user", "expert-registry.yaml");
         let content = "";
         let fileExists = false;
         try {
@@ -1992,6 +2059,7 @@ var GatewayWsClient = class {
       } else {
         console.warn(`[skill-logger-plugin][WS] Unknown action: ${action}`);
         this.appendLogToFile("WARN", "Command", `Unknown action: ${action}`);
+        this.reply(replyId, { success: false, message: `Unknown action: ${action}`, action });
       }
     } catch (err) {
       this.appendLogToFile("ERROR", "Command", `Error executing action ${action}`, err);

package/openclaw.plugin.json

@@ -1,50 +1,50 @@
-{
-  "id": "skill-logger-plugin",
-  "name": "Skill Logger",
-  "description": "追踪 openclaw skill 内功能点（脚本/命令/工具/HTTP）使用与报错，落本地并批量上报",
-  "activation": {
-    "onStartup": true
-  },
-  "configSchema": {
-    "type": "object",
-    "additionalProperties": true,
-    "properties": {
-      "pluginId": {
-        "type": "string",
-        "description": "自定义插件 ID"
-      },
-      "pluginName": {
-        "type": "string",
-        "description": "自定义插件名称"
-      },
-      "platformBaseUrl": {
-        "type": "string",
-        "description": "拉取 skill 标准配置的服务地址；缺省时使用内置静态桩"
-      },
-      "reportBaseUrl": {
-        "type": "string",
-        "description": "批量上报的服务地址；缺省时只落本地、不上报"
-      },
-      "authToken": {
-        "type": "string",
-        "description": "拉取/上报接口的 Authorization 头值（如 'Bearer xxx'）"
-      },
-      "recordUnattributed": {
-        "type": "boolean",
-        "description": "是否记录无法归属到具体功能点的 exec 调用（默认 true）"
-      },
-      "enableFileLog": {
-        "type": "boolean",
-        "description": "是否开启插件专属文件日志（落盘为 skill-logger.err），用于排查 WS 连接和指令运行情况"
-      },
-      "autoUpdateSkills": {
-        "type": "boolean",
-        "description": "是否开启 skill 版本自动更新（检测到本地落后于平台最新版本时下载并覆盖各 workspace 下的副本）；默认开启，仅显式设为 false 才关闭"
-      },
-      "versionCheckIntervalMinutes": {
-        "type": "number",
-        "description": "版本检查+自动更新的周期（分钟）。每隔该周期按本地所有已装 skill 向服务端拉最新版本并按需更新；默认 30。本地扫描发现固定 3 分钟，与此独立"
-      }
-    }
-  }
-}
+{
+  "id": "skill-logger-plugin",
+  "name": "Skill Logger",
+  "description": "追踪 openclaw skill 内功能点（脚本/命令/工具/HTTP）使用与报错，落本地并批量上报",
+  "activation": {
+    "onStartup": true
+  },
+  "configSchema": {
+    "type": "object",
+    "additionalProperties": true,
+    "properties": {
+      "pluginId": {
+        "type": "string",
+        "description": "自定义插件 ID"
+      },
+      "pluginName": {
+        "type": "string",
+        "description": "自定义插件名称"
+      },
+      "platformBaseUrl": {
+        "type": "string",
+        "description": "拉取 skill 标准配置的服务地址；缺省时使用内置静态桩"
+      },
+      "reportBaseUrl": {
+        "type": "string",
+        "description": "批量上报的服务地址；缺省时只落本地、不上报"
+      },
+      "authToken": {
+        "type": "string",
+        "description": "拉取/上报接口的 Authorization 头值（如 'Bearer xxx'）"
+      },
+      "recordUnattributed": {
+        "type": "boolean",
+        "description": "是否记录无法归属到具体功能点的 exec 调用（默认 true）"
+      },
+      "enableFileLog": {
+        "type": "boolean",
+        "description": "是否开启插件专属文件日志（落盘为 skill-logger.err），用于排查 WS 连接和指令运行情况"
+      },
+      "autoUpdateSkills": {
+        "type": "boolean",
+        "description": "是否开启 skill 版本自动更新（检测到本地落后于平台最新版本时下载并覆盖各 workspace 下的副本）；默认开启，仅显式设为 false 才关闭"
+      },
+      "versionCheckIntervalMinutes": {
+        "type": "number",
+        "description": "版本检查+自动更新的周期（分钟）。每隔该周期按本地所有已装 skill 向服务端拉最新版本并按需更新；默认 30。本地扫描发现固定 3 分钟，与此独立"
+      }
+    }
+  }
+}

package/package.json

@@ -1,37 +1,37 @@
-{
-  "name": "@spzhongwin/skill-logger-plugin",
-  "version": "1.0.9",
-  "type": "module",
-  "exports": "./dist/index.js",
-  "scripts": {
-    "test": "node --experimental-strip-types --test src/*.test.ts",
-    "typecheck": "tsc --noEmit",
-    "build": "npx esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:ws"
-  },
-  "openclaw": {
-    "extensions": [
-      "./dist/index.js"
-    ],
-    "contracts": {
-      "tools": [
-        "report_skill_error"
-      ]
-    },
-    "compat": {
-      "pluginApi": ">=2026.3.28",
-      "minGatewayVersion": "2026.3.28"
-    },
-    "build": {
-      "openclawVersion": "2026.3.28",
-      "pluginSdkVersion": "2026.3.28"
-    }
-  },
-  "devDependencies": {
-    "@types/node": "^22.19.20",
-    "@types/ws": "^8.18.1",
-    "typescript": "^5.9.3"
-  },
-  "dependencies": {
-    "ws": "^8.21.0"
-  }
-}
+{
+  "name": "@spzhongwin/skill-logger-plugin",
+  "version": "1.0.11",
+  "type": "module",
+  "exports": "./dist/index.js",
+  "scripts": {
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsc --noEmit",
+    "build": "npx esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:ws"
+  },
+  "openclaw": {
+    "extensions": [
+      "./dist/index.js"
+    ],
+    "contracts": {
+      "tools": [
+        "report_skill_error"
+      ]
+    },
+    "compat": {
+      "pluginApi": ">=2026.3.28",
+      "minGatewayVersion": "2026.3.28"
+    },
+    "build": {
+      "openclawVersion": "2026.3.28",
+      "pluginSdkVersion": "2026.3.28"
+    }
+  },
+  "devDependencies": {
+    "@types/node": "^22.19.20",
+    "@types/ws": "^8.18.1",
+    "typescript": "^5.9.3"
+  },
+  "dependencies": {
+    "ws": "^8.21.0"
+  }
+}

package/src/active-skills.test.ts

@@ -1,32 +1,32 @@
-import { describe, it } from "node:test";
-import assert from "node:assert/strict";
-import { ActiveSkills } from "./active-skills.ts";
-
-describe("ActiveSkills", () => {
-  it("标记并取回激活 skill", () => {
-    const a = new ActiveSkills();
-    a.markActive("s1", "skA");
-    a.markActive("s1", "skB");
-    assert.deepEqual([...a.getActive("s1")].sort(), ["skA", "skB"]);
-    assert.deepEqual([...a.getActive("s2")], []);
-  });
-
-  it("TTL 过期后不再返回", () => {
-    let t = 1000;
-    const a = new ActiveSkills({ ttlMs: 100, now: () => t });
-    a.markActive("s", "skA");
-    t = 1050;
-    assert.deepEqual([...a.getActive("s")], ["skA"]);
-    t = 2000;
-    assert.deepEqual([...a.getActive("s")], []);
-  });
-
-  it("超出 session 上限按 LRU 淘汰最旧", () => {
-    const a = new ActiveSkills({ maxSessions: 2 });
-    a.markActive("s1", "x");
-    a.markActive("s2", "x");
-    a.markActive("s3", "x"); // 淘汰 s1
-    assert.deepEqual([...a.getActive("s1")], []);
-    assert.deepEqual([...a.getActive("s3")], ["x"]);
-  });
-});
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import { ActiveSkills } from "./active-skills.ts";
+
+describe("ActiveSkills", () => {
+  it("标记并取回激活 skill", () => {
+    const a = new ActiveSkills();
+    a.markActive("s1", "skA");
+    a.markActive("s1", "skB");
+    assert.deepEqual([...a.getActive("s1")].sort(), ["skA", "skB"]);
+    assert.deepEqual([...a.getActive("s2")], []);
+  });
+
+  it("TTL 过期后不再返回", () => {
+    let t = 1000;
+    const a = new ActiveSkills({ ttlMs: 100, now: () => t });
+    a.markActive("s", "skA");
+    t = 1050;
+    assert.deepEqual([...a.getActive("s")], ["skA"]);
+    t = 2000;
+    assert.deepEqual([...a.getActive("s")], []);
+  });
+
+  it("超出 session 上限按 LRU 淘汰最旧", () => {
+    const a = new ActiveSkills({ maxSessions: 2 });
+    a.markActive("s1", "x");
+    a.markActive("s2", "x");
+    a.markActive("s3", "x"); // 淘汰 s1
+    assert.deepEqual([...a.getActive("s1")], []);
+    assert.deepEqual([...a.getActive("s3")], ["x"]);
+  });
+});

package/src/active-skills.ts

@@ -1,77 +1,77 @@
-/**
- * 按 session 记录「已触发（激活）的 skill」，供 matcher 在通用命令（curl、共享 CLI）
- * 出现多候选时消歧——优先归属到本 session 已激活的 skill。
- *
- * 内存态，带 TTL + 容量上限，防止长跑 gateway 进程里无限增长。
- */
-
-type SkillEntry = { name: string; ts: number };
-
-const DEFAULT_TTL_MS = 30 * 60 * 1000; // 30 分钟
-const DEFAULT_MAX_SESSIONS = 500;
-
-export type ActiveSkillsOptions = {
-  ttlMs?: number;
-  maxSessions?: number;
-  /** 注入时钟，便于测试。 */
-  now?: () => number;
-};
-
-export class ActiveSkills {
-  private readonly ttlMs: number;
-  private readonly maxSessions: number;
-  private readonly now: () => number;
-  /** sessionKey -> (skillName -> entry)。用 Map 保留插入顺序以便 LRU 淘汰。 */
-  private readonly bySession = new Map<string, Map<string, SkillEntry>>();
-
-  constructor(opts: ActiveSkillsOptions = {}) {
-    this.ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS;
-    this.maxSessions = opts.maxSessions ?? DEFAULT_MAX_SESSIONS;
-    this.now = opts.now ?? Date.now;
-  }
-
-  /** 标记某 session 触发了某 skill。 */
-  markActive(sessionKey: string | undefined, skillName: string): void {
-    const key = sessionKey || "__nosession__";
-    let skills = this.bySession.get(key);
-    if (!skills) {
-      skills = new Map();
-      this.bySession.set(key, skills);
-    } else {
-      // 触碰即刷新 LRU 顺序
-      this.bySession.delete(key);
-      this.bySession.set(key, skills);
-    }
-    skills.set(skillName, { name: skillName, ts: this.now() });
-    this.evictIfNeeded();
-  }
-
-  /** 取某 session 当前仍在 TTL 内的已激活 skill 集合。 */
-  getActive(sessionKey: string | undefined): Set<string> {
-    const key = sessionKey || "__nosession__";
-    const skills = this.bySession.get(key);
-    const out = new Set<string>();
-    if (!skills) return out;
-    const cutoff = this.now() - this.ttlMs;
-    for (const [name, entry] of skills) {
-      if (entry.ts >= cutoff) out.add(name);
-      else skills.delete(name);
-    }
-    if (skills.size === 0) this.bySession.delete(key);
-    return out;
-  }
-
-  /** session 结束时清掉其激活记录（释放内存 + 避免跨会话误判）。 */
-  clearSession(sessionKey: string | undefined): void {
-    this.bySession.delete(sessionKey || "__nosession__");
-  }
-
-  /** 超出 session 上限时，按 LRU 淘汰最旧的 session。 */
-  private evictIfNeeded(): void {
-    while (this.bySession.size > this.maxSessions) {
-      const oldest = this.bySession.keys().next().value;
-      if (oldest === undefined) break;
-      this.bySession.delete(oldest);
-    }
-  }
-}
+/**
+ * 按 session 记录「已触发（激活）的 skill」，供 matcher 在通用命令（curl、共享 CLI）
+ * 出现多候选时消歧——优先归属到本 session 已激活的 skill。
+ *
+ * 内存态，带 TTL + 容量上限，防止长跑 gateway 进程里无限增长。
+ */
+
+type SkillEntry = { name: string; ts: number };
+
+const DEFAULT_TTL_MS = 30 * 60 * 1000; // 30 分钟
+const DEFAULT_MAX_SESSIONS = 500;
+
+export type ActiveSkillsOptions = {
+  ttlMs?: number;
+  maxSessions?: number;
+  /** 注入时钟，便于测试。 */
+  now?: () => number;
+};
+
+export class ActiveSkills {
+  private readonly ttlMs: number;
+  private readonly maxSessions: number;
+  private readonly now: () => number;
+  /** sessionKey -> (skillName -> entry)。用 Map 保留插入顺序以便 LRU 淘汰。 */
+  private readonly bySession = new Map<string, Map<string, SkillEntry>>();
+
+  constructor(opts: ActiveSkillsOptions = {}) {
+    this.ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS;
+    this.maxSessions = opts.maxSessions ?? DEFAULT_MAX_SESSIONS;
+    this.now = opts.now ?? Date.now;
+  }
+
+  /** 标记某 session 触发了某 skill。 */
+  markActive(sessionKey: string | undefined, skillName: string): void {
+    const key = sessionKey || "__nosession__";
+    let skills = this.bySession.get(key);
+    if (!skills) {
+      skills = new Map();
+      this.bySession.set(key, skills);
+    } else {
+      // 触碰即刷新 LRU 顺序
+      this.bySession.delete(key);
+      this.bySession.set(key, skills);
+    }
+    skills.set(skillName, { name: skillName, ts: this.now() });
+    this.evictIfNeeded();
+  }
+
+  /** 取某 session 当前仍在 TTL 内的已激活 skill 集合。 */
+  getActive(sessionKey: string | undefined): Set<string> {
+    const key = sessionKey || "__nosession__";
+    const skills = this.bySession.get(key);
+    const out = new Set<string>();
+    if (!skills) return out;
+    const cutoff = this.now() - this.ttlMs;
+    for (const [name, entry] of skills) {
+      if (entry.ts >= cutoff) out.add(name);
+      else skills.delete(name);
+    }
+    if (skills.size === 0) this.bySession.delete(key);
+    return out;
+  }
+
+  /** session 结束时清掉其激活记录（释放内存 + 避免跨会话误判）。 */
+  clearSession(sessionKey: string | undefined): void {
+    this.bySession.delete(sessionKey || "__nosession__");
+  }
+
+  /** 超出 session 上限时，按 LRU 淘汰最旧的 session。 */
+  private evictIfNeeded(): void {
+    while (this.bySession.size > this.maxSessions) {
+      const oldest = this.bySession.keys().next().value;
+      if (oldest === undefined) break;
+      this.bySession.delete(oldest);
+    }
+  }
+}