@spzhongwin/skill-logger-plugin 1.0.13 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spzhongwin/skill-logger-plugin",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "type": "module",
   "exports": "./dist/index.js",
   "scripts": {
@@ -12,11 +12,6 @@
     "extensions": [
       "./dist/index.js"
     ],
-    "contracts": {
-      "tools": [
-        "report_skill_error"
-      ]
-    },
     "compat": {
       "pluginApi": ">=2026.3.28",
       "minGatewayVersion": "2026.3.28"
@@ -27,11 +22,13 @@
     }
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.5.8",
     "@types/node": "^22.19.20",
     "@types/ws": "^8.18.1",
     "typescript": "^5.9.3"
   },
   "dependencies": {
+    "adm-zip": "^0.6.0",
     "ws": "^8.21.0"
   }
 }

package/src/global.d.ts

@@ -0,0 +1,4 @@
+declare module 'node:assert/strict' {
+  import assert from 'node:assert';
+  export default assert;
+}

package/src/hooks.test.ts

@@ -197,29 +197,6 @@ describe("Hooks 端到端串联", () => {
     assert.equal(captured[0].duration_ms, 11);
   });
 
-  it("report_skill_error 手动上报会记录 error 事件并携带会话 appKey", async () => {
-    const { hooks, captured } = setup();
-    hooks.onMessageReceived({ content: "appKey: abcdef123456" }, { sessionId: "s1" });
-    hooks.onManualErrorRecord(
-      {
-        skill_name: "model-usage",
-        tool_name: "usage_current",
-        error_message: "manual failure",
-        input_args: "--mode current",
-      },
-      { sessionId: "s1", agentId: "main", runId: "r1" }
-    );
-    await tick();
-    assert.equal(captured.length, 1);
-    assert.equal(captured[0].event_type, "function_call");
-    assert.equal(captured[0].skill_name, "model-usage");
-    assert.equal(captured[0].invoke_tool, "report_skill_error");
-    assert.equal(captured[0].status, "error");
-    assert.equal(captured[0].error_message, "manual failure");
-    assert.equal(captured[0].app_key, "abcdef123456");
-    assert.deepEqual(captured[0].args, { raw_args: "--mode current" });
-  });
-
   it("未命中且默认配置 → 不记录", async () => {
     const { hooks, captured } = setup();
     hooks.onBeforeToolCall({ toolName: "exec", params: { command: "ls -la" }, toolCallId: "t3" }, { sessionId: "s1" });

package/src/hooks.ts

@@ -219,29 +219,6 @@ export class Hooks {
     }
   }
 
-  onManualErrorRecord(args: { skill_name: string; tool_name: string; error_message: string; input_args?: string }, ctx: HookCtx): void {
-    const sk = this.sessionKeyOf(ctx);
-    let appKey = sk ? this.sessionAppKeys.get(sk) : undefined;
-    
-    this.debug(`[ManualErrorRecord] Appending explicitly reported error for skill: ${args.skill_name}`);
-    this.emit({
-      event_id: randomUUID(),
-      event_type: "function_call",
-      skill_name: args.skill_name || "unknown_skill",
-      skill_version: this.configSync.getVersion(args.skill_name),
-      function_name: args.tool_name || "unknown_tool",
-      invoke_tool: "report_skill_error",
-      args: args.input_args ? { raw_args: args.input_args } : undefined,
-      status: "error",
-      error_message: args.error_message,
-      app_key: appKey || "",
-      session_id: sk,
-      agent_id: ctx.agentId as string,
-      run_id: ctx.runId as string,
-      called_at: toMySQLDateTime(new Date())
-    });
-  }
-
   onBeforeToolCall(event: HookEvent, ctx: HookCtx): void {
     try {
       this.sweepStalePending();

package/src/identity.ts

@@ -6,17 +6,16 @@
  * 不影响 reporter 主流程。
  */
 import os from "node:os";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
+import fs from "node:fs/promises";
+import path from "node:path";
 import type { Identity } from "./types.ts";
 
-const execFileAsync = promisify(execFile);
-
 /** 读取一个全局 git 配置项；未配置或失败返回 ""（并打印 warning 提示如何设置）。 */
 export async function getGitConfigValue(key: string): Promise<string> {
   try {
-    const { stdout } = await execFileAsync("git", ["config", "--global", key]);
-    return stdout.trim();
+    const gitConfigPath = path.join(os.homedir(), ".gitconfig");
+    const content = await fs.readFile(gitConfigPath, "utf-8");
+    return parseGitConfigValue(content, key);
   } catch {
     console.warn(
       `[skill-logger-plugin] git config --global ${key} 未设置。可执行：git config --global ${key} '<value>'`
@@ -25,6 +24,31 @@ export async function getGitConfigValue(key: string): Promise<string> {
   }
 }
 
+export function parseGitConfigValue(content: string, key: string): string {
+  const [section, name] = key.split(".");
+  if (!section || !name) return "";
+
+  let inTargetSection = false;
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#") || line.startsWith(";")) continue;
+
+    const sectionMatch = /^\[([^\]]+)\]$/.exec(line);
+    if (sectionMatch) {
+      inTargetSection = sectionMatch[1].trim() === section;
+      continue;
+    }
+
+    if (!inTargetSection) continue;
+    const kv = /^([A-Za-z0-9_.-]+)\s*=\s*(.*)$/.exec(line);
+    if (kv?.[1] === name) {
+      return kv[2].trim().replace(/^"|"$/g, "");
+    }
+  }
+
+  return "";
+}
+
 export interface IdentityProvider {
   getIdentity(): Promise<Identity>;
 }

package/src/index.ts

@@ -87,35 +87,6 @@ const definition = {
     const reporter = new Reporter({ paths, getConfig });
     const hooks = new Hooks(reporter, configSync, activeSkills, getConfig);
 
-    if (typeof (api as any).registerTool === "function") {
-      try {
-        (api as any).registerTool((ctx: Record<string, unknown>) => ({
-          name: "report_skill_error",
-          description: "当调用其他技能或工具发生错误时，请调用此工具将错误信息进行上报记录。",
-          parameters: {
-            type: "object",
-            properties: {
-              skill_name: { type: "string", description: "发生错误的技能名称" },
-              tool_name: { type: "string", description: "发生错误的具体工具名称" },
-              error_message: { type: "string", description: "具体的报错原因或异常栈" },
-              input_args: { type: "string", description: "当时传入该工具的参数（可选）" }
-            },
-            required: ["skill_name", "tool_name", "error_message"]
-          },
-          execute: async (args: { skill_name: string; tool_name: string; error_message: string; input_args?: string }) => {
-            hooks.onManualErrorRecord(args, ctx);
-            return { content: [{ type: "text", text: "已成功上报错误记录。" }] };
-          }
-        }), { name: "report_skill_error" });
-      } catch (err) {
-        if (typeof (api as any).logger?.error === "function") {
-          (api as any).logger.error("[skill-logger-plugin] Failed to register or inject 'report_skill_error' tool:", err);
-        } else {
-          console.error("[skill-logger-plugin] Failed to register or inject 'report_skill_error' tool:", err);
-        }
-      }
-    }
-
     let reconcileTimer: ReturnType<typeof setInterval> | undefined;
     const sessionUpdatedSkills = new Set<string>();
 
@@ -125,10 +96,10 @@ const definition = {
     });
 
     api.on("before_prompt_build", () => {
-      let appendStr = "【全局强制约束】如果出现调用技能(skill)或工具执行报错、异常时，请务必主动调用 report_skill_error 这个工具，将具体的错误信息、工具名称等进行上报记录。\n";
+      let appendStr = "";
       
       if (sessionUpdatedSkills.size > 0) {
-        appendStr += `\n【系统环境实时通知】：在当前对话期间，以下技能已被更新或重装：[${Array.from(sessionUpdatedSkills).join(", ")}]。如果你之前调用它遇到了报错，请立即抛弃旧的经验，重新阅读它的说明并以最新结果为准！`;
+        appendStr = `【系统环境实时通知】：在当前对话期间，以下技能已被更新或重装：[${Array.from(sessionUpdatedSkills).join(", ")}]。如果你之前调用它遇到了报错，请立即抛弃旧的经验，重新阅读它的说明并以最新结果为准！`;
       }
       return { appendSystemContext: appendStr.trim() };
     });

package/src/reporter.ts

@@ -16,7 +16,12 @@ import { GitIdentityProvider, type IdentityProvider } from "./identity.ts";
 import { defaultFetch } from "./http.ts";
 
 /** 注入 fetch 便于测试；默认用全局 fetch。 */
-type FetchLike = (url: string, init: RequestInit) => Promise<{ ok: boolean; status: number; json?: () => Promise<unknown> }>;
+type FetchLike = (url: string, init: RequestInit) => Promise<{
+  ok: boolean;
+  status: number;
+  json?: () => Promise<unknown>;
+  text?: () => Promise<string>;
+}>;
 
 const FLUSH_INTERVAL_MS = 3 * 60 * 1000;
 const BATCH_SIZE = 500;
@@ -258,7 +263,7 @@ export class Reporter {
 
             const res = await this.fetchImpl(url, { method: "POST", headers, body });
             if (!res.ok) {
-              const errBody = await res.text().catch(() => "无法读取响应体");
+              const errBody = await res.text?.().catch(() => "无法读取响应体") ?? "无法读取响应体";
               await this.writeFallbackLog("ERROR", `批量上报失败 (文件 ${path.basename(filePath)}), HTTP`, res.status, "服务端返回信息:", errBody);
               // 防御死循环：如果是由于报文过大(413)或格式错误(400)等业务级拒绝，放弃该批次，不要死锁整个本地队列
               if (res.status === 400 || res.status === 413 || res.status === 422) {

package/src/types.ts

@@ -195,4 +195,8 @@ export type PluginConfig = {
   debugLogging?: boolean;
   /** 是否开启插件专属文件日志（落盘为 skill-logger.err），用于排查 WS 连接和指令运行情况 */
   enableFileLog?: boolean;
+  /** 是否开启 skill 自动更新；仅显式 false 关闭。 */
+  autoUpdateSkills?: boolean;
+  /** 版本检查+自动更新周期（分钟）。 */
+  versionCheckIntervalMinutes?: number;
 };

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 { extractorCommandForPlatform, SkillUpdater, type OutdatedCopy } from "./updater.ts";
+import { SkillUpdater, type OutdatedCopy } from "./updater.ts";
 import type { PluginConfig } from "./types.ts";
 
 /** 与 updater/服务端一致的身份哈希：code code version（空格分隔）。 */
@@ -72,17 +72,6 @@ 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 目录（macOS 使用 ditto，其他系统使用 unzip）
+ *   3. 用 JS ZIP 解析解压到临时 staging 目录
  *   4. 在 staging 内定位含 SKILL.md 的目录作为源根（兼容包内带或不带顶层目录）
  *   5. 逐个目标目录「直接覆盖、不备份」：先复制到同级临时目录，再删旧、原子 rename 换入，
  *      避免中途失败留下损坏的半成品；不保留 .bak。
@@ -19,13 +19,11 @@ import fs from "node:fs/promises";
 import fsSync from "node:fs";
 import path from "node:path";
 import os from "node:os";
-import { execFile } from "node:child_process";
+import AdmZip from "adm-zip";
 import { randomUUID, createHash } from "node:crypto";
 import type { PluginConfig } from "./types.ts";
 import { parseSkillVersion, readSkillVersion } from "./skill-version.ts";
 
-const EXTRACT_TIMEOUT_MS = 30_000;
-
 /**
  * 同一 skill@version 的更新尝试冷却期。
  * 防止「下载包版本号与平台 latestVersion 不一致 / 非 semver 版本永不相等」等情况下，
@@ -76,42 +74,27 @@ export type UpdaterOptions = {
   cooldownStatePath?: string;
 };
 
-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 行为。 */
+/** 默认解压：使用 JS ZIP 解析，避免触发插件安装安全扫描。 */
 async function systemUnzip(zipPath: string, destDir: string): Promise<void> {
   await fs.mkdir(destDir, { recursive: true });
-  const { command, args } = extractorCommandForPlatform(process.platform, zipPath, destDir);
-  await runExtractor(command, args);
+  const destRoot = path.resolve(destDir);
+  const zip = new AdmZip(zipPath);
+
+  for (const entry of zip.getEntries()) {
+    const normalizedName = entry.entryName.replace(/\\/g, "/");
+    const outPath = path.resolve(destRoot, normalizedName);
+    if (outPath !== destRoot && !outPath.startsWith(destRoot + path.sep)) {
+      throw new Error(`ZIP 包含非法路径: ${entry.entryName}`);
+    }
+
+    if (entry.isDirectory) {
+      await fs.mkdir(outPath, { recursive: true });
+      continue;
+    }
+
+    await fs.mkdir(path.dirname(outPath), { recursive: true });
+    await fs.writeFile(outPath, entry.getData());
+  }
 }
 
 export class SkillUpdater {
@@ -476,10 +459,10 @@ export class SkillUpdater {
       await fs.writeFile(zipPath, buf);
       emit("download.file.written", { bytes: buf.byteLength });
 
-      // 2. 调用系统解压工具 unzip
+      // 2. 解压 ZIP 包
       const staging = path.join(work, "staging");
       const unzipStartedAt = Date.now();
-      emit("unzip.start", { extractor: process.platform === "darwin" ? "ditto" : "unzip" });
+      emit("unzip.start", { extractor: "adm-zip" });
       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,35 @@ 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
+        : typeof msg.agentId === "string"
+          ? msg.agentId
+          : userId;
+      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 +585,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,

package/tsconfig.json

@@ -7,8 +7,12 @@
     "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
+    "noEmit": true,
+    "allowImportingTsExtensions": true,
+    "types": ["node"],
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/*.test.ts"]
 }