@cfio/cohort-sync 0.4.3 → 0.4.5

package/dist/index.js

@@ -15,10 +15,10 @@ __export(keychain_exports, {
   getCredential: () => getCredential,
   setCredential: () => setCredential
 });
-import { execFile as execFile2 } from "node:child_process";
+import { execFile } from "node:child_process";
 function securityCmd(args) {
   return new Promise((resolve, reject) => {
-    execFile2("security", args, { timeout: 5e3 }, (err, stdout, stderr) => {
+    execFile("security", args, { timeout: 5e3 }, (err, stdout, stderr) => {
       if (err) {
         reject(Object.assign(err, { stderr }));
       } else {
@@ -88,8 +88,8 @@ var init_keychain = __esm({
 });
 
 // src/hooks.ts
-import fs from "node:fs";
-import path from "node:path";
+import fs2 from "node:fs";
+import path2 from "node:path";
 
 // ../../node_modules/.pnpm/@sinclair+typebox@0.34.48/node_modules/@sinclair/typebox/build/esm/type/guard/value.mjs
 var value_exports = {};
@@ -2698,8 +2698,10 @@ __export(type_exports2, {
 var Type = type_exports2;
 
 // src/sync.ts
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
+import { execSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 
 // ../../node_modules/.pnpm/convex@1.33.0_patch_hash=l43bztwr6e2lbmpd6ao6hmcg24_react@19.2.1/node_modules/convex/dist/esm/index.js
 var version = "1.33.0";
@@ -4555,12 +4557,12 @@ function createApi(pathParts = []) {
             `API path is expected to be of the form \`api.moduleName.functionName\`. Found: \`${found}\``
           );
         }
-        const path2 = pathParts.slice(0, -1).join("/");
+        const path3 = pathParts.slice(0, -1).join("/");
         const exportName = pathParts[pathParts.length - 1];
         if (exportName === "default") {
-          return path2;
+          return path3;
         } else {
-          return path2 + ":" + exportName;
+          return path3 + ":" + exportName;
         }
       } else if (prop === Symbol.toStringTag) {
         return "FunctionReference";
@@ -7629,16 +7631,16 @@ var require_constants = __commonJS({
 });
 var require_node_gyp_build = __commonJS({
   "../common/temp/node_modules/.pnpm/node-gyp-build@4.8.4/node_modules/node-gyp-build/node-gyp-build.js"(exports, module) {
-    var fs2 = __require("fs");
-    var path2 = __require("path");
-    var os = __require("os");
+    var fs3 = __require("fs");
+    var path3 = __require("path");
+    var os2 = __require("os");
     var runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
     var vars = process.config && process.config.variables || {};
     var prebuildsOnly = !!process.env.PREBUILDS_ONLY;
     var abi = process.versions.modules;
     var runtime = isElectron() ? "electron" : isNwjs() ? "node-webkit" : "node";
-    var arch = process.env.npm_config_arch || os.arch();
-    var platform = process.env.npm_config_platform || os.platform();
+    var arch = process.env.npm_config_arch || os2.arch();
+    var platform = process.env.npm_config_platform || os2.platform();
     var libc = process.env.LIBC || (isAlpine(platform) ? "musl" : "glibc");
     var armv = process.env.ARM_VERSION || (arch === "arm64" ? "8" : vars.arm_version) || "";
     var uv = (process.versions.uv || "").split(".")[0];
@@ -7647,21 +7649,21 @@ var require_node_gyp_build = __commonJS({
       return runtimeRequire(load.resolve(dir));
     }
     load.resolve = load.path = function(dir) {
-      dir = path2.resolve(dir || ".");
+      dir = path3.resolve(dir || ".");
       try {
-        var name = runtimeRequire(path2.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
+        var name = runtimeRequire(path3.join(dir, "package.json")).name.toUpperCase().replace(/-/g, "_");
         if (process.env[name + "_PREBUILD"]) dir = process.env[name + "_PREBUILD"];
       } catch (err) {
       }
       if (!prebuildsOnly) {
-        var release = getFirst(path2.join(dir, "build/Release"), matchBuild);
+        var release = getFirst(path3.join(dir, "build/Release"), matchBuild);
         if (release) return release;
-        var debug = getFirst(path2.join(dir, "build/Debug"), matchBuild);
+        var debug = getFirst(path3.join(dir, "build/Debug"), matchBuild);
         if (debug) return debug;
       }
       var prebuild = resolve(dir);
       if (prebuild) return prebuild;
-      var nearby = resolve(path2.dirname(process.execPath));
+      var nearby = resolve(path3.dirname(process.execPath));
       if (nearby) return nearby;
       var target = [
         "platform=" + platform,
@@ -7678,26 +7680,26 @@ var require_node_gyp_build = __commonJS({
       ].filter(Boolean).join(" ");
       throw new Error("No native build was found for " + target + "\n    loaded from: " + dir + "\n");
       function resolve(dir2) {
-        var tuples = readdirSync(path2.join(dir2, "prebuilds")).map(parseTuple);
+        var tuples = readdirSync(path3.join(dir2, "prebuilds")).map(parseTuple);
         var tuple = tuples.filter(matchTuple(platform, arch)).sort(compareTuples)[0];
         if (!tuple) return;
-        var prebuilds = path2.join(dir2, "prebuilds", tuple.name);
+        var prebuilds = path3.join(dir2, "prebuilds", tuple.name);
         var parsed = readdirSync(prebuilds).map(parseTags);
         var candidates = parsed.filter(matchTags(runtime, abi));
         var winner = candidates.sort(compareTags(runtime))[0];
-        if (winner) return path2.join(prebuilds, winner.file);
+        if (winner) return path3.join(prebuilds, winner.file);
       }
     };
     function readdirSync(dir) {
       try {
-        return fs2.readdirSync(dir);
+        return fs3.readdirSync(dir);
       } catch (err) {
         return [];
       }
     }
     function getFirst(dir, filter) {
       var files = readdirSync(dir).filter(filter);
-      return files[0] && path2.join(dir, files[0]);
+      return files[0] && path3.join(dir, files[0]);
     }
     function matchBuild(name) {
       return /\.node$/.test(name);
@@ -7784,7 +7786,7 @@ var require_node_gyp_build = __commonJS({
       return typeof window !== "undefined" && window.process && window.process.type === "renderer";
     }
     function isAlpine(platform2) {
-      return platform2 === "linux" && fs2.existsSync("/etc/alpine-release");
+      return platform2 === "linux" && fs3.existsSync("/etc/alpine-release");
     }
     load.parseTags = parseTags;
     load.matchTags = matchTags;
@@ -11760,7 +11762,7 @@ function initCommandSubscription(cfg, logger, resolveAgentName) {
             if (cmd.type.startsWith("cron") && cmd.payload?.jobId) {
               handleCronCommand(cmd.type, cmd.payload.jobId, logger);
               try {
-                const freshJobs = await fetchCronJobs(logger);
+                const freshJobs = fetchCronJobs(logger);
                 if (freshJobs !== null) {
                   const resolvedJobs = resolveAgentName ? freshJobs.map((j) => ({ ...j, agentId: j.agentId ? resolveAgentName(j.agentId) : j.agentId })) : freshJobs;
                   await pushCronSnapshot(cfg.apiKey, resolvedJobs);
@@ -11915,7 +11917,6 @@ function getChannelAgent(channelId) {
 }
 
 // src/sync.ts
-var execFileAsync = promisify(execFile);
 function extractJson(raw) {
   const jsonStart = raw.search(/[\[{]/);
   const jsonEndBracket = raw.lastIndexOf("]");
@@ -11926,14 +11927,15 @@ function extractJson(raw) {
   }
   return raw.slice(jsonStart, jsonEnd + 1);
 }
-async function fetchSkills(logger) {
+function fetchSkills(logger) {
   try {
-    const { stdout } = await execFileAsync("openclaw", ["skills", "list", "--json"], {
+    const raw = execSync("openclaw skills list --json", {
       encoding: "utf8",
-      timeout: 1e4,
+      timeout: 3e4,
+      stdio: ["ignore", "pipe", "ignore"],
       env: { ...process.env, NO_COLOR: "1" }
     });
-    const parsed = JSON.parse(extractJson(stdout));
+    const parsed = JSON.parse(extractJson(raw));
     const list = Array.isArray(parsed) ? parsed : parsed?.skills ?? [];
     return list.map((s) => ({
       name: String(s.name ?? s.id ?? "unknown"),
@@ -11946,27 +11948,29 @@ async function fetchSkills(logger) {
     return [];
   }
 }
-async function fetchCronJobs(logger) {
+function fetchCronJobs(logger) {
   try {
-    const { stdout } = await execFileAsync("openclaw", ["cron", "list", "--all", "--json"], {
-      encoding: "utf8",
-      timeout: 1e4,
-      env: { ...process.env, NO_COLOR: "1" }
-    });
-    const parsed = JSON.parse(extractJson(stdout));
-    const list = Array.isArray(parsed) ? parsed : parsed?.jobs ?? [];
-    return list.map((j) => ({
-      id: String(j.jobId ?? j.id ?? "unknown"),
-      text: String(j.name ?? j.text ?? ""),
+    const storePath = path.join(os.homedir(), ".openclaw", "cron", "jobs.json");
+    logger.info(`cohort-sync: reading cron store from ${storePath} (homedir=${os.homedir()})`);
+    if (!fs.existsSync(storePath)) {
+      logger.warn(`cohort-sync: cron store not found at ${storePath}`);
+      return null;
+    }
+    const raw = fs.readFileSync(storePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const jobs = Array.isArray(parsed?.jobs) ? parsed.jobs : [];
+    return jobs.map((j) => ({
+      id: String(j.id ?? "unknown"),
+      text: String(j.name ?? ""),
       schedule: formatSchedule(j.schedule),
-      ...j.nextRunAt != null ? { nextRun: Number(j.nextRunAt) } : {},
-      ...j.lastRunAt != null ? { lastRun: Number(j.lastRunAt) } : {},
-      ...j.lastStatus ? { lastStatus: String(j.lastStatus) } : {},
+      ...j.state?.nextRunAtMs != null ? { nextRun: Number(j.state.nextRunAtMs) } : {},
+      ...j.state?.lastRunAtMs != null ? { lastRun: Number(j.state.lastRunAtMs) } : {},
+      ...j.state?.lastStatus ? { lastStatus: String(j.state.lastStatus) } : {},
       enabled: j.enabled !== false,
       ...j.agentId != null ? { agentId: String(j.agentId) } : {}
     }));
   } catch (err) {
-    logger.warn(`cohort-sync: failed to fetch cron jobs: ${String(err)}`);
+    logger.warn(`cohort-sync: failed to read cron store: ${String(err)}`);
     return null;
   }
 }
@@ -11987,31 +11991,31 @@ var VALID_STATUSES = /* @__PURE__ */ new Set(["idle", "working", "waiting"]);
 function normalizeStatus(status) {
   return VALID_STATUSES.has(status) ? status : "idle";
 }
-async function v1Get(apiUrl, apiKey, path2) {
-  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path2}`, {
+async function v1Get(apiUrl, apiKey, path3) {
+  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path3}`, {
     headers: { Authorization: `Bearer ${apiKey}` },
     signal: AbortSignal.timeout(1e4)
   });
-  if (!res.ok) throw new Error(`GET ${path2} \u2192 ${res.status}`);
+  if (!res.ok) throw new Error(`GET ${path3} \u2192 ${res.status}`);
   return res.json();
 }
-async function v1Patch(apiUrl, apiKey, path2, body) {
-  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path2}`, {
+async function v1Patch(apiUrl, apiKey, path3, body) {
+  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path3}`, {
     method: "PATCH",
     headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
     body: JSON.stringify(body),
     signal: AbortSignal.timeout(1e4)
   });
-  if (!res.ok) throw new Error(`PATCH ${path2} \u2192 ${res.status}`);
+  if (!res.ok) throw new Error(`PATCH ${path3} \u2192 ${res.status}`);
 }
-async function v1Post(apiUrl, apiKey, path2, body) {
-  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path2}`, {
+async function v1Post(apiUrl, apiKey, path3, body) {
+  const res = await fetch(`${apiUrl.replace(/\/+$/, "")}${path3}`, {
     method: "POST",
     headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
     body: JSON.stringify(body),
     signal: AbortSignal.timeout(1e4)
   });
-  if (!res.ok) throw new Error(`POST ${path2} \u2192 ${res.status}`);
+  if (!res.ok) throw new Error(`POST ${path3} \u2192 ${res.status}`);
 }
 async function checkForUpdate(currentVersion, logger) {
   try {
@@ -12172,7 +12176,7 @@ async function fullSync(agentName, model, cfg, logger, openClawAgents) {
   } else {
     await syncAgentStatus(agentName, "working", model, cfg, logger);
   }
-  const skills = await fetchSkills(logger);
+  const skills = fetchSkills(logger);
   if (skills.length > 0) {
     await syncSkillsToV1(skills, cfg, logger);
   }
@@ -12688,7 +12692,7 @@ function diag(label, data) {
   const line = `[${ts}] ${label}${payload}
 `;
   try {
-    fs.appendFileSync(DIAG_LOG_PATH, line);
+    fs2.appendFileSync(DIAG_LOG_PATH, line);
   } catch {
   }
 }
@@ -12716,16 +12720,16 @@ function dumpEvent(event) {
 }
 var PLUGIN_VERSION = "unknown";
 try {
-  const pkgPath = path.join(path.dirname(new URL(import.meta.url).pathname), "package.json");
-  const pkgJson = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  const pkgPath = path2.join(path2.dirname(new URL(import.meta.url).pathname), "package.json");
+  const pkgJson = JSON.parse(fs2.readFileSync(pkgPath, "utf8"));
   PLUGIN_VERSION = pkgJson.version ?? "unknown";
 } catch {
 }
 diag("MODULE_LOADED", { BUILD_ID, PLUGIN_VERSION });
 function parseIdentityFile(workspaceDir) {
   try {
-    const filePath = path.join(workspaceDir, "IDENTITY.md");
-    const content = fs.readFileSync(filePath, "utf-8");
+    const filePath = path2.join(workspaceDir, "IDENTITY.md");
+    const content = fs2.readFileSync(filePath, "utf-8");
     const identity = {};
     for (const line of content.split(/\r?\n/)) {
       const cleaned = line.trim().replace(/^\s*-\s*/, "");
@@ -12763,8 +12767,8 @@ function getOrCreateTracker() {
   state.tracker = fresh;
   return fresh;
 }
-var STATE_FILE_PATH = path.join(
-  path.dirname(new URL(import.meta.url).pathname),
+var STATE_FILE_PATH = path2.join(
+  path2.dirname(new URL(import.meta.url).pathname),
   ".session-state.json"
 );
 function saveSessionsToDisk(tracker) {
@@ -12781,14 +12785,14 @@ function saveSessionsToDisk(tracker) {
         data.sessions.push({ agentName: name, key });
       }
     }
-    fs.writeFileSync(STATE_FILE_PATH, JSON.stringify(data));
+    fs2.writeFileSync(STATE_FILE_PATH, JSON.stringify(data));
   } catch {
   }
 }
 function loadSessionsFromDisk(tracker, logger) {
   try {
-    if (!fs.existsSync(STATE_FILE_PATH)) return;
-    const data = JSON.parse(fs.readFileSync(STATE_FILE_PATH, "utf8"));
+    if (!fs2.existsSync(STATE_FILE_PATH)) return;
+    const data = JSON.parse(fs2.readFileSync(STATE_FILE_PATH, "utf8"));
     if (Date.now() - new Date(data.savedAt).getTime() > 864e5) {
       logger.info("cohort-sync: disk session state too old (>24h), skipping");
       return;
@@ -12846,6 +12850,15 @@ function registerHooks(api, cfg) {
     agentIds: (config?.agents?.list ?? []).map((a) => a.id),
     agentMessageProviders: (config?.agents?.list ?? []).map((a) => ({ id: a.id, mp: a.messageProvider }))
   });
+  diag("CONFIG_DUMP", {
+    configKeys: config ? Object.keys(config) : [],
+    cronKeys: config?.cron ? Object.keys(config.cron) : [],
+    hasCronService: typeof config?.cron?.list === "function",
+    hasCronJobs: !!config?.cron?.jobs,
+    cronStorePath: config?.cron?.storePath ?? null,
+    apiKeys: api ? Object.keys(api).filter((k) => typeof api[k] !== "function") : [],
+    apiMethods: api ? Object.keys(api).filter((k) => typeof api[k] === "function") : []
+  });
   setConvexUrl(cfg);
   setLogger(logger);
   restoreFromHotReload(logger);
@@ -13116,7 +13129,7 @@ Do not attempt to make more comments until ${resetAt}.`
     }
     saveSessionsToDisk(tracker);
     try {
-      const cronJobs2 = await fetchCronJobs(logger);
+      const cronJobs2 = fetchCronJobs(logger);
       if (cronJobs2 !== null) {
         const resolvedJobs = cronJobs2.map((job) => ({
           ...job,
@@ -13506,7 +13519,7 @@ Do not attempt to make more comments until ${resetAt}.`
 }
 
 // src/cli.ts
-import { execFile as execFile3 } from "node:child_process";
+import { execFile as execFile2 } from "node:child_process";
 
 // src/device-auth.ts
 function baseUrl(apiUrl) {
@@ -13587,7 +13600,7 @@ init_keychain();
 function openBrowser(url) {
   const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", url] : [url];
-  execFile3(cmd, args, () => {
+  execFile2(cmd, args, () => {
   });
 }
 function registerCohortCli(ctx, cfg) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Syncs agent status and skills to Cohort dashboard",
   "type": "module",
   "main": "index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Syncs agent status and skills to Cohort dashboard",
   "license": "MIT",
   "homepage": "https://docs.cohort.bot/gateway",