@spzhongwin/skill-logger-plugin 1.0.12 → 1.0.14

package/dist/index.js

@@ -106,7 +106,6 @@ import fsSync from "node:fs";
 import path3 from "node:path";
 import os2 from "node:os";
 import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { randomUUID, createHash } from "node:crypto";
 
 // src/skill-version.ts
@@ -139,14 +138,37 @@ function parseSkillVersion(content) {
 }
 
 // src/updater.ts
-var execFileAsync = promisify(execFile);
+var EXTRACT_TIMEOUT_MS = 3e4;
 var ATTEMPT_COOLDOWN_MS = 30 * 60 * 1e3;
 function skillIdentityHash(code, version) {
   return createHash("sha256").update(`${code} ${code} ${version}`).digest("hex");
 }
+function extractorCommandForPlatform(platform, zipPath, destDir) {
+  return platform === "darwin" ? { command: "ditto", args: ["-x", "-k", zipPath, destDir] } : { command: "unzip", args: ["-o", "-q", zipPath, "-d", destDir] };
+}
+function runExtractor(command, args) {
+  return new Promise((resolve, reject) => {
+    const child = execFile(command, args, {
+      encoding: "utf8",
+      timeout: EXTRACT_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      maxBuffer: 1024 * 1024
+    }, (error, _stdout, stderr) => {
+      if (!error) {
+        resolve();
+        return;
+      }
+      const detail = String(stderr || "").trim();
+      const timeout = error.killed ? `\uFF0C\u8D85\u8FC7 ${EXTRACT_TIMEOUT_MS}ms \u5DF2\u7EC8\u6B62` : "";
+      reject(new Error(`${command} \u89E3\u538B\u5931\u8D25${timeout}: ${detail || error.message}`));
+    });
+    child.stdin?.end();
+  });
+}
 async function systemUnzip(zipPath, destDir) {
   await fs3.mkdir(destDir, { recursive: true });
-  await execFileAsync("unzip", ["-o", "-q", zipPath, "-d", destDir]);
+  const { command, args } = extractorCommandForPlatform(process.platform, zipPath, destDir);
+  await runExtractor(command, args);
 }
 var SkillUpdater = class {
   getConfig;
@@ -464,7 +486,7 @@ var SkillUpdater = class {
       emit("download.file.written", { bytes: buf.byteLength });
       const staging = path3.join(work, "staging");
       const unzipStartedAt = Date.now();
-      emit("unzip.start");
+      emit("unzip.start", { extractor: process.platform === "darwin" ? "ditto" : "unzip" });
       await this.unzip(zipPath, staging);
       emit("unzip.completed", { elapsedMs: Date.now() - unzipStartedAt });
       const srcRoot = await this.locateSkillRoot(staging, 0);
@@ -1354,11 +1376,11 @@ import path6 from "node:path";
 // src/identity.ts
 import os3 from "node:os";
 import { execFile as execFile2 } from "node:child_process";
-import { promisify as promisify2 } from "node:util";
-var execFileAsync2 = promisify2(execFile2);
+import { promisify } from "node:util";
+var execFileAsync = promisify(execFile2);
 async function getGitConfigValue(key) {
   try {
-    const { stdout } = await execFileAsync2("git", ["config", "--global", key]);
+    const { stdout } = await execFileAsync("git", ["config", "--global", key]);
     return stdout.trim();
   } catch {
     console.warn(
@@ -1616,6 +1638,7 @@ var Reporter = class {
 import WebSocket from "ws";
 import path7 from "path";
 import fs6 from "fs/promises";
+import { DatabaseSync } from "node:sqlite";
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var HEARTBEAT_ACK_TIMEOUT_MS = 75e3;
 var AGENT_SCAN_INTERVAL_MS = 3 * 60 * 1e3;
@@ -1638,6 +1661,21 @@ function normalizeAssistantUserId(userId) {
 function shouldSyncBuiltInTemplate(action, isBuiltIn) {
   return action === "UPDATE_SKILL" && isBuiltIn === true;
 }
+function defaultOpenclawSqlitePath() {
+  return path7.join(openclawHome(), "state", "openclaw.sqlite");
+}
+function readCronJobsByAgentId(agentId, sqlitePath = defaultOpenclawSqlitePath(), onError) {
+  let db;
+  try {
+    db = new DatabaseSync(sqlitePath, { readOnly: true });
+    return db.prepare("SELECT * FROM cron_jobs WHERE agent_id = ?").all(agentId);
+  } catch (err) {
+    onError?.(err);
+    return [];
+  } finally {
+    db?.close();
+  }
+}
 var GatewayWsClient = class {
   ws = null;
   options;
@@ -1943,8 +1981,29 @@ var GatewayWsClient = class {
       isBuiltIn,
       hasDirectUrl: Boolean(url)
     });
-    if (!action || !userId) {
-      this.appendLogToFile("WARN", "Command", `Message dropped: missing action or userId`, msg);
+    if (!action) {
+      this.appendLogToFile("WARN", "Command", `Message dropped: missing action`, msg);
+      return;
+    }
+    if (action === "GET_CRON_JOBS_BY_AGENT_ID") {
+      const agentId = typeof msg.agent_id === "string" ? msg.agent_id : msg.agentId;
+      if (!agentId) {
+        this.reply(replyId, { success: false, message: "Missing agent_id parameter", action });
+        return;
+      }
+      try {
+        const data = readCronJobsByAgentId(agentId, defaultOpenclawSqlitePath(), (err) => {
+          this.appendLogToFile("WARN", "Command", `GET_CRON_JOBS_BY_AGENT_ID sqlite lookup skipped`, err);
+        });
+        this.reply(replyId, { success: true, data, action });
+      } catch (err) {
+        this.appendLogToFile("ERROR", "Command", `GET_CRON_JOBS_BY_AGENT_ID threw`, err);
+        this.reply(replyId, { success: false, message: err.message, action });
+      }
+      return;
+    }
+    if (!userId) {
+      this.appendLogToFile("WARN", "Command", `Message dropped: missing userId`, msg);
       return;
     }
     const safeCode = code ? path7.basename(code) : void 0;
@@ -2066,6 +2125,12 @@ var GatewayWsClient = class {
         setTimeout(async () => {
           try {
             const additionalTargetDirs = syncBuiltInTemplate ? [path7.join(openclawHome(), "workspace-xgjk-assistant-template", "skills")] : [];
+            const userSkillDir = path7.join(openclawHome(), `workspace-assistant-${pureId}`, ".user", "skills", safeCode);
+            try {
+              await fs6.stat(userSkillDir);
+              additionalTargetDirs.push(userSkillDir);
+            } catch {
+            }
             const result = await this.options.updater.manualInstall({
               code: safeCode,
               url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spzhongwin/skill-logger-plugin",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "type": "module",
   "exports": "./dist/index.js",
   "scripts": {

package/src/updater.test.ts

@@ -4,7 +4,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
 import { createHash } from "node:crypto";
-import { SkillUpdater, type OutdatedCopy } from "./updater.ts";
+import { extractorCommandForPlatform, SkillUpdater, type OutdatedCopy } from "./updater.ts";
 import type { PluginConfig } from "./types.ts";
 
 /** 与 updater/服务端一致的身份哈希：code code version（空格分隔）。 */
@@ -72,6 +72,17 @@ const outdatedFor = (target: string): OutdatedCopy[] => [
 ];
 
 describe("SkillUpdater", () => {
+  it("macOS 使用 ditto 解压，其他平台保持 unzip", () => {
+    assert.deepEqual(extractorCommandForPlatform("darwin", "/tmp/a.zip", "/tmp/out"), {
+      command: "ditto",
+      args: ["-x", "-k", "/tmp/a.zip", "/tmp/out"],
+    });
+    assert.deepEqual(extractorCommandForPlatform("linux", "/tmp/a.zip", "/tmp/out"), {
+      command: "unzip",
+      args: ["-o", "-q", "/tmp/a.zip", "-d", "/tmp/out"],
+    });
+  });
+
   it("手动更新可复用同一次下载，同时覆盖用户与内置模板目录并记录关键阶段", async () => {
     const calls: string[] = [];
     const traces: Array<{ stage: string; data?: Record<string, unknown> }> = [];

package/src/updater.ts

@@ -5,7 +5,7 @@
  * 流程（每个 skill@version 仅下载一次，覆盖其全部 workspace 副本）：
  *   1. POST {platformBaseUrl}/skill_package/pull {skillName, version} → { url }
  *   2. GET url → zip 字节 → 写入临时文件
- *   3. 解压到临时 staging 目录（默认调用系统 unzip）
+ *   3. 解压到临时 staging 目录（macOS 使用 ditto，其他系统使用 unzip）
  *   4. 在 staging 内定位含 SKILL.md 的目录作为源根（兼容包内带或不带顶层目录）
  *   5. 逐个目标目录「直接覆盖、不备份」：先复制到同级临时目录，再删旧、原子 rename 换入，
  *      避免中途失败留下损坏的半成品；不保留 .bak。
@@ -20,12 +20,11 @@ import fsSync from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { randomUUID, createHash } from "node:crypto";
 import type { PluginConfig } from "./types.ts";
 import { parseSkillVersion, readSkillVersion } from "./skill-version.ts";
 
-const execFileAsync = promisify(execFile);
+const EXTRACT_TIMEOUT_MS = 30_000;
 
 /**
  * 同一 skill@version 的更新尝试冷却期。
@@ -77,10 +76,42 @@ export type UpdaterOptions = {
   cooldownStatePath?: string;
 };
 
-/** 默认解压：系统 unzip -o -q（覆盖、静默）。 */
+export function extractorCommandForPlatform(
+  platform: NodeJS.Platform,
+  zipPath: string,
+  destDir: string,
+): { command: string; args: string[] } {
+  return platform === "darwin"
+    ? { command: "ditto", args: ["-x", "-k", zipPath, destDir] }
+    : { command: "unzip", args: ["-o", "-q", zipPath, "-d", destDir] };
+}
+
+function runExtractor(command: string, args: string[]): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = execFile(command, args, {
+      encoding: "utf8",
+      timeout: EXTRACT_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      maxBuffer: 1024 * 1024,
+    }, (error, _stdout, stderr) => {
+      if (!error) {
+        resolve();
+        return;
+      }
+      const detail = String(stderr || "").trim();
+      const timeout = error.killed ? `，超过 ${EXTRACT_TIMEOUT_MS}ms 已终止` : "";
+      reject(new Error(`${command} 解压失败${timeout}: ${detail || error.message}`));
+    });
+    // 防止 unzip 遇到异常包时弹出 Continue? 并永久等待输入。
+    child.stdin?.end();
+  });
+}
+
+/** 默认解压：macOS 的 ditto 正确支持 ZIP 中文文件名；其余平台保持原 unzip 行为。 */
 async function systemUnzip(zipPath: string, destDir: string): Promise<void> {
   await fs.mkdir(destDir, { recursive: true });
-  await execFileAsync("unzip", ["-o", "-q", zipPath, "-d", destDir]);
+  const { command, args } = extractorCommandForPlatform(process.platform, zipPath, destDir);
+  await runExtractor(command, args);
 }
 
 export class SkillUpdater {
@@ -448,7 +479,7 @@ export class SkillUpdater {
       // 2. 调用系统解压工具 unzip
       const staging = path.join(work, "staging");
       const unzipStartedAt = Date.now();
-      emit("unzip.start");
+      emit("unzip.start", { extractor: process.platform === "darwin" ? "ditto" : "unzip" });
       await this.unzip(zipPath, staging);
       emit("unzip.completed", { elapsedMs: Date.now() - unzipStartedAt });
 

package/src/ws-client.test.ts

@@ -1,8 +1,13 @@
 import { describe, it } from "node:test";
 import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { DatabaseSync } from "node:sqlite";
 import {
   normalizeAssistantUserId,
   parseAssistantWorkspaceAgentId,
+  readCronJobsByAgentId,
   shouldSyncBuiltInTemplate,
 } from "./ws-client.ts";
 
@@ -46,3 +51,78 @@ describe("built-in template update boundary", () => {
     assert.equal(shouldSyncBuiltInTemplate("UNINSTALL_SKILL", true), false);
   });
 });
+
+describe("cron job sqlite lookup", () => {
+  it("returns all cron_jobs rows for the requested agent_id", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec(`
+        CREATE TABLE cron_jobs (
+          id INTEGER PRIMARY KEY,
+          agent_id TEXT NOT NULL,
+          name TEXT NOT NULL,
+          cron TEXT NOT NULL
+        );
+      `);
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-1579723293989240833",
+        "morning",
+        "0 9 * * *"
+      );
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-1579723293989240833",
+        "evening",
+        "0 18 * * *"
+      );
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-000001",
+        "other",
+        "0 12 * * *"
+      );
+    } finally {
+      db.close();
+    }
+
+    const rows = readCronJobsByAgentId("assistant-1579723293989240833", dbPath);
+
+    assert.equal(rows.length, 2);
+    assert.deepEqual(
+      rows.map((row) => row.name),
+      ["morning", "evening"]
+    );
+  });
+
+  it("returns an empty list when no cron_jobs row matches", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec("CREATE TABLE cron_jobs (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
+    } finally {
+      db.close();
+    }
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
+  });
+
+  it("returns an empty list when the sqlite file is not readable", () => {
+    const missingPath = path.join(os.tmpdir(), `missing-openclaw-${Date.now()}.sqlite`);
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", missingPath), []);
+  });
+
+  it("returns an empty list when cron_jobs table does not exist", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec("CREATE TABLE other_table (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
+    } finally {
+      db.close();
+    }
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
+  });
+});

package/src/ws-client.ts

@@ -1,6 +1,7 @@
 import WebSocket from "ws";
 import path from "path";
 import fs from "fs/promises";
+import { DatabaseSync } from "node:sqlite";
 import { SkillUpdater } from "./updater.ts";
 import { openclawHome } from "./paths.ts";
 import { readSkillVersion } from "./skill-version.ts";
@@ -33,6 +34,27 @@ export function shouldSyncBuiltInTemplate(action: string, isBuiltIn: unknown): b
   return action === "UPDATE_SKILL" && isBuiltIn === true;
 }
 
+export function defaultOpenclawSqlitePath(): string {
+  return path.join(openclawHome(), "state", "openclaw.sqlite");
+}
+
+export function readCronJobsByAgentId(
+  agentId: string,
+  sqlitePath = defaultOpenclawSqlitePath(),
+  onError?: (err: unknown) => void
+): any[] {
+  let db: DatabaseSync | undefined;
+  try {
+    db = new DatabaseSync(sqlitePath, { readOnly: true });
+    return db.prepare("SELECT * FROM cron_jobs WHERE agent_id = ?").all(agentId);
+  } catch (err) {
+    onError?.(err);
+    return [];
+  } finally {
+    db?.close();
+  }
+}
+
 export interface WsClientOptions {
   serverUrl: string;       // 例如: wss://api.aishuo.co/gateway/ws
   authToken?: string;      // 用于网关鉴权
@@ -396,8 +418,31 @@ export class GatewayWsClient {
       hasDirectUrl: Boolean(url),
     });
 
-    if (!action || !userId) {
-      this.appendLogToFile("WARN", "Command", `Message dropped: missing action or userId`, msg);
+    if (!action) {
+      this.appendLogToFile("WARN", "Command", `Message dropped: missing action`, msg);
+      return;
+    }
+
+    if (action === "GET_CRON_JOBS_BY_AGENT_ID") {
+      const agentId = typeof msg.agent_id === "string" ? msg.agent_id : msg.agentId;
+      if (!agentId) {
+        this.reply(replyId, { success: false, message: "Missing agent_id parameter", action });
+        return;
+      }
+      try {
+        const data = readCronJobsByAgentId(agentId, defaultOpenclawSqlitePath(), (err) => {
+          this.appendLogToFile("WARN", "Command", `GET_CRON_JOBS_BY_AGENT_ID sqlite lookup skipped`, err);
+        });
+        this.reply(replyId, { success: true, data, action });
+      } catch (err: any) {
+        this.appendLogToFile("ERROR", "Command", `GET_CRON_JOBS_BY_AGENT_ID threw`, err);
+        this.reply(replyId, { success: false, message: err.message, action });
+      }
+      return;
+    }
+
+    if (!userId) {
+      this.appendLogToFile("WARN", "Command", `Message dropped: missing userId`, msg);
       return;
     }
 
@@ -536,9 +581,16 @@ export class GatewayWsClient {
         
         setTimeout(async () => {
           try {
-            const additionalTargetDirs = syncBuiltInTemplate
+            const additionalTargetDirs: string[] = syncBuiltInTemplate
               ? [path.join(openclawHome(), "workspace-xgjk-assistant-template", "skills")]
               : [];
+
+            // 同步更新用户的 expert skill 目录
+            const userSkillDir = path.join(openclawHome(), `workspace-assistant-${pureId}`, ".user", "skills", safeCode);
+            try {
+              await fs.stat(userSkillDir);
+              additionalTargetDirs.push(userSkillDir);
+            } catch {} // 目录不存在则跳过
             const result = await this.options.updater.manualInstall({
               code: safeCode,
               url,