@spzhongwin/skill-logger-plugin 1.0.13 → 1.0.14

package/dist/index.js

@@ -1638,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;
@@ -1660,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;
@@ -1965,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;
@@ -2088,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.13",
+  "version": "1.0.14",
   "type": "module",
   "exports": "./dist/index.js",
   "scripts": {

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,