@cfio/cohort-sync 0.8.0 → 0.8.1

package/dist/index.js

@@ -16,9 +16,9 @@ __export(keychain_exports, {
   setCredential: () => setCredential
 });
 import { execFile } from "node:child_process";
-import os3 from "node:os";
+import os4 from "node:os";
 function assertMacOS(operation) {
-  if (os3.platform() !== "darwin") {
+  if (os4.platform() !== "darwin") {
     throw new Error(
       `cohort-sync: ${operation} requires macOS Keychain. On Linux/Windows, set your API key in OpenClaw config: plugins.entries.cohort-sync.config.apiKey`
     );
@@ -100,6 +100,7 @@ var init_keychain = __esm({
 
 // src/hooks.ts
 import fs3 from "node:fs";
+import os3 from "node:os";
 import path3 from "node:path";
 
 // ../../node_modules/.pnpm/@sinclair+typebox@0.34.48/node_modules/@sinclair/typebox/build/esm/type/guard/value.mjs
@@ -2930,6 +2931,9 @@ async function fullSync(agentName, model, cfg, logger, openClawAgents) {
   logger.info("cohort-sync: full sync complete");
 }
 
+// src/convex-bridge.ts
+import { createHash } from "crypto";
+
 // ../../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";
 
@@ -7860,14 +7864,14 @@ 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 fs4 = __require("fs");
     var path4 = __require("path");
-    var os4 = __require("os");
+    var os5 = __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 || os4.arch();
-    var platform = process.env.npm_config_platform || os4.platform();
+    var arch = process.env.npm_config_arch || os5.arch();
+    var platform = process.env.npm_config_platform || os5.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];
@@ -10219,7 +10223,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes, createHash } = __require("crypto");
+    var { randomBytes, createHash: createHash2 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -10876,7 +10880,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -11141,7 +11145,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash } = __require("crypto");
+    var { createHash: createHash2 } = __require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -11436,7 +11440,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -11773,7 +11777,6 @@ function reverseResolveAgentName(cohortName, forwardMap) {
 }
 
 // src/commands.ts
-var cronRunNowPoll = null;
 async function executeCommand(cmd, gwClient, cfg, resolveAgentName, logger) {
   if (cmd.type === "restart") {
     logger.info("cohort-sync: restart command, terminating in 500ms");
@@ -11806,41 +11809,7 @@ async function executeCommand(cmd, gwClient, cfg, resolveAgentName, logger) {
         });
         break;
       case "cronRunNow": {
-        const runResult = await gwClient.request(
-          "cron.run",
-          { jobId: cmd.payload?.jobId }
-        );
-        if (runResult?.ok && runResult?.ran) {
-          const jobId = cmd.payload?.jobId;
-          let polls = 0;
-          if (cronRunNowPoll) clearInterval(cronRunNowPoll);
-          const pollInterval = setInterval(async () => {
-            polls++;
-            if (polls >= 15) {
-              clearInterval(pollInterval);
-              cronRunNowPoll = null;
-              return;
-            }
-            try {
-              if (!gwClient || !gwClient.isAlive()) {
-                clearInterval(pollInterval);
-                cronRunNowPoll = null;
-                return;
-              }
-              const pollResult = await gwClient.request("cron.list");
-              const freshJobs = Array.isArray(pollResult) ? pollResult : pollResult?.jobs ?? [];
-              const job = freshJobs.find((j) => j.id === jobId);
-              if (job && !job.state?.runningAtMs) {
-                clearInterval(pollInterval);
-                cronRunNowPoll = null;
-                const mapped = freshJobs.map((j) => mapCronJob(j, resolveAgentName));
-                await pushCronSnapshot(cfg.apiKey, mapped);
-              }
-            } catch {
-            }
-          }, 2e3);
-          cronRunNowPoll = pollInterval;
-        }
+        await gwClient.request("cron.run", { jobId: cmd.payload?.jobId });
         break;
       }
       case "cronCreate": {
@@ -11875,7 +11844,7 @@ async function executeCommand(cmd, gwClient, cfg, resolveAgentName, logger) {
     }
     if (gwClient.isAlive()) {
       try {
-        const snapResult = await gwClient.request("cron.list");
+        const snapResult = await gwClient.request("cron.list", { includeDisabled: true });
         const freshJobs = Array.isArray(snapResult) ? snapResult : snapResult?.jobs ?? [];
         const mapped = freshJobs.map((j) => mapCronJob(j, resolveAgentName));
         await pushCronSnapshot(cfg.apiKey, mapped);
@@ -11889,7 +11858,14 @@ async function executeCommand(cmd, gwClient, cfg, resolveAgentName, logger) {
 }
 
 // src/convex-bridge.ts
+function hashApiKey(key) {
+  return createHash("sha256").update(key).digest("hex");
+}
 function deriveConvexUrl(apiUrl) {
+  const normalized = apiUrl.replace(/\/+$/, "");
+  if (/^https?:\/\/api\.cohort\.bot$/i.test(normalized)) {
+    return normalized.replace(/api\.cohort\.bot$/i, "ws.cohort.bot");
+  }
   return apiUrl.replace(/\.convex\.site\/?$/, ".convex.cloud");
 }
 var savedLogger = null;
@@ -11953,7 +11929,7 @@ async function pushTelemetry(apiKey, data) {
   const c = getClient();
   if (!c) return;
   try {
-    await c.mutation(upsertTelemetryFromPlugin, { apiKey, ...data });
+    await c.mutation(upsertTelemetryFromPlugin, { apiKeyHash: hashApiKey(apiKey), ...data });
   } catch (err) {
     getLogger().error(`cohort-sync: pushTelemetry failed: ${err}`);
   }
@@ -11962,7 +11938,7 @@ async function pushSessions(apiKey, agentName, sessions) {
   const c = getClient();
   if (!c) return;
   try {
-    await c.mutation(upsertSessionsFromPlugin, { apiKey, agentName, sessions });
+    await c.mutation(upsertSessionsFromPlugin, { apiKeyHash: hashApiKey(apiKey), agentName, sessions });
   } catch (err) {
     getLogger().error(`cohort-sync: pushSessions failed: ${err}`);
   }
@@ -11972,7 +11948,7 @@ async function pushActivity(apiKey, entries) {
   const c = getClient();
   if (!c) return;
   try {
-    await c.mutation(pushActivityFromPluginRef, { apiKey, entries });
+    await c.mutation(pushActivityFromPluginRef, { apiKeyHash: hashApiKey(apiKey), entries });
   } catch (err) {
     getLogger().error(`cohort-sync: pushActivity failed: ${err}`);
   }
@@ -11981,7 +11957,7 @@ async function pushCronSnapshot(apiKey, jobs) {
   const c = getClient();
   if (!c) return false;
   try {
-    await c.mutation(upsertCronSnapshotFromPluginRef, { apiKey, jobs });
+    await c.mutation(upsertCronSnapshotFromPluginRef, { apiKeyHash: hashApiKey(apiKey), jobs });
     return true;
   } catch (err) {
     getLogger().error(`cohort-sync: pushCronSnapshot failed: ${err}`);
@@ -11994,7 +11970,7 @@ async function callAddCommentFromPlugin(apiKey, args) {
     throw new Error("Convex client not initialized \u2014 subscription may not be active");
   }
   return await c.mutation(addCommentFromPluginRef, {
-    apiKey,
+    apiKeyHash: hashApiKey(apiKey),
     taskNumber: args.taskNumber,
     agentName: args.agentName,
     content: args.content,
@@ -12097,9 +12073,10 @@ async function startNotificationSubscription(port, cfg, hooksToken, logger) {
     const openclawAgentId = reverseNameMap[agentName] ?? agentName;
     logger.info(`cohort-sync: subscribing to notifications for agent "${agentName}" (openclawId: "${openclawAgentId}")`);
     let processing = false;
+    const apiKeyHash = hashApiKey(cfg.apiKey);
     const unsubscribe = c.onUpdate(
       getUndeliveredForPlugin,
-      { agent: agentName, apiKey: cfg.apiKey },
+      { agent: agentName, apiKeyHash },
       async (notifications) => {
         if (processing) return;
         processing = true;
@@ -12110,7 +12087,7 @@ async function startNotificationSubscription(port, cfg, hooksToken, logger) {
               logger.info(`cohort-sync: injected notification for task #${n.taskNumber} (${agentName})`);
               await c.mutation(markDeliveredByPlugin, {
                 notificationId: n._id,
-                apiKey: cfg.apiKey
+                apiKeyHash
               });
             } catch (err) {
               logger.warn(`cohort-sync: failed to inject notification ${n._id}: ${String(err)}`);
@@ -12134,9 +12111,10 @@ function startCommandSubscription(cfg, logger, resolveAgentName, gwClient) {
     return null;
   }
   let processing = false;
+  const apiKeyHash = hashApiKey(cfg.apiKey);
   const unsubscribe = c.onUpdate(
     getPendingCommandsForPlugin,
-    { apiKey: cfg.apiKey },
+    { apiKeyHash },
     async (commands) => {
       if (processing) return;
       if (commands.length === 0) return;
@@ -12147,7 +12125,7 @@ function startCommandSubscription(cfg, logger, resolveAgentName, gwClient) {
           try {
             await c.mutation(acknowledgeCommandRef, {
               commandId: cmd._id,
-              apiKey: cfg.apiKey
+              apiKeyHash
             });
             await executeCommand(cmd, gwClient, cfg, resolveAgentName, logger);
             if (cmd.type === "restart") return;
@@ -12156,7 +12134,7 @@ function startCommandSubscription(cfg, logger, resolveAgentName, gwClient) {
             try {
               await c.mutation(failCommandRef, {
                 commandId: cmd._id,
-                apiKey: cfg.apiKey,
+                apiKeyHash,
                 reason: String(err).slice(0, 500)
               });
             } catch (failErr) {
@@ -12302,7 +12280,7 @@ function buildConnectFrame(id, token, pluginVersion, identity, nonce) {
     clientId: "gateway-client",
     clientMode: "backend",
     role: "operator",
-    scopes: ["operator.read", "operator.write"],
+    scopes: ["operator.read", "operator.write", "operator.admin"],
     signedAtMs,
     token,
     nonce,
@@ -12324,7 +12302,7 @@ function buildConnectFrame(id, token, pluginVersion, identity, nonce) {
         mode: "backend"
       },
       role: "operator",
-      scopes: ["operator.read", "operator.write"],
+      scopes: ["operator.read", "operator.write", "operator.admin"],
       auth: { token },
       device: {
         id: identity.deviceId,
@@ -13495,37 +13473,35 @@ async function fetchAgentContext(apiKey, apiUrl, logger) {
     return POCKET_GUIDE;
   }
 }
-async function initGatewayClient(port, token, cfg, resolveAgentName, logger) {
+function initGatewayClient(port, token, cfg, resolveAgentName, logger) {
   const client2 = new GatewayClient(port, token, logger, PLUGIN_VERSION);
-  await client2.connect();
   persistentGwClient = client2;
   gwClientInitialized = true;
-  registerCronEventHandlers(client2, cfg, resolveAgentName);
-  if (client2.availableEvents.has("shutdown")) {
-    client2.on("shutdown", () => {
-      diag("GW_CLIENT_SHUTDOWN_EVENT", {});
-      logger.info("cohort-sync: gateway shutdown event received");
-    });
-  }
-  client2.onReconnect = async () => {
-    diag("GW_CLIENT_RECONNECTED_RESUBSCRIBE", {});
+  const onConnected = async () => {
+    diag("GW_CLIENT_CONNECTED", { methods: client2.availableMethods.size, events: client2.availableEvents.size });
+    logger.info(`cohort-sync: gateway client connected (methods=${client2.availableMethods.size}, events=${client2.availableEvents.size})`);
     registerCronEventHandlers(client2, cfg, resolveAgentName);
+    if (client2.availableEvents.has("shutdown")) {
+      client2.on("shutdown", () => {
+        diag("GW_CLIENT_SHUTDOWN_EVENT", {});
+        logger.info("cohort-sync: gateway shutdown event received");
+      });
+    }
     try {
-      const cronResult2 = await client2.request("cron.list", { includeDisabled: true });
-      const jobs2 = Array.isArray(cronResult2) ? cronResult2 : cronResult2?.jobs ?? [];
-      const mapped2 = jobs2.map((j) => mapCronJob(j, resolveAgentName));
-      await pushCronSnapshot(cfg.apiKey, mapped2);
-      diag("GW_CLIENT_RECONNECT_CRON_PUSH", { count: mapped2.length });
+      const cronResult = await client2.request("cron.list", { includeDisabled: true });
+      const jobs = Array.isArray(cronResult) ? cronResult : cronResult?.jobs ?? [];
+      const mapped = jobs.map((j) => mapCronJob(j, resolveAgentName));
+      await pushCronSnapshot(cfg.apiKey, mapped);
+      diag("GW_CLIENT_CRON_PUSH", { count: mapped.length });
     } catch (err) {
-      diag("GW_CLIENT_RECONNECT_CRON_FAILED", { error: String(err) });
+      diag("GW_CLIENT_CRON_PUSH_FAILED", { error: String(err) });
     }
   };
-  diag("GW_CLIENT_CONNECTED", { methods: client2.availableMethods.size, events: client2.availableEvents.size });
-  const cronResult = await client2.request("cron.list", { includeDisabled: true });
-  const jobs = Array.isArray(cronResult) ? cronResult : cronResult?.jobs ?? [];
-  const mapped = jobs.map((j) => mapCronJob(j, resolveAgentName));
-  await pushCronSnapshot(cfg.apiKey, mapped);
-  diag("GW_CLIENT_INITIAL_CRON_PUSH", { count: mapped.length });
+  client2.onReconnect = onConnected;
+  client2.connect().then(() => onConnected()).catch((err) => {
+    diag("GW_CLIENT_INITIAL_CONNECT_DEFERRED", { error: String(err) });
+    logger.warn(`cohort-sync: GW connect will retry: ${String(err)}`);
+  });
 }
 function registerHooks(api, cfg) {
   STATE_FILE_PATH = path3.join(cfg.stateDir, "session-state.json");
@@ -13535,6 +13511,12 @@ function registerHooks(api, cfg) {
   const convexUrl = cfg.convexUrl ?? deriveConvexUrl(cfg.apiUrl);
   createClient(convexUrl);
   setLogger(logger);
+  gatewayPort = api.config?.gateway?.port ?? null;
+  gatewayToken = resolveGatewayToken(api);
+  if (gatewayPort && gatewayToken) {
+    initGatewayClient(gatewayPort, gatewayToken, cfg, resolveAgentName, logger);
+  }
+  const cronStorePath = api.config?.cron?.store ?? path3.join(os3.homedir(), ".openclaw", "cron", "jobs.json");
   logger.info(`cohort-sync: registerHooks v${PLUGIN_VERSION}`);
   diag("REGISTER_HOOKS", {
     PLUGIN_VERSION,
@@ -13873,6 +13855,19 @@ Do not attempt to make more comments until ${resetAt}.`
           tracker2.markTelemetryPushed(agentName);
         }
       }
+      const sessionKey = ctx.sessionKey;
+      if (sessionKey && sessionKey.includes(":cron:")) {
+        try {
+          const raw = fs3.readFileSync(cronStorePath, "utf8");
+          const store = JSON.parse(raw);
+          const jobs = store.jobs ?? [];
+          const mapped = jobs.map((j) => mapCronJob(j, resolveAgentName));
+          await pushCronSnapshot(cfg.apiKey, mapped);
+          diag("CRON_AGENT_END_PUSH", { count: mapped.length, sessionKey });
+        } catch (err) {
+          diag("CRON_AGENT_END_PUSH_FAILED", { error: String(err) });
+        }
+      }
       if (event.success === false) {
         const entry = buildActivityEntry(agentName, "agent_end", {
           success: false,
@@ -14352,14 +14347,19 @@ function registerCohortCli(ctx, cfg) {
 
 // index.ts
 init_keychain();
-var DEFAULT_API_URL = "https://fortunate-chipmunk-286.convex.site";
 var plugin = {
   id: "cohort-sync",
   name: "Cohort Sync",
   description: "Syncs agent status and skills to Cohort dashboard",
   register(api) {
     const cfg = api.pluginConfig;
-    const apiUrl = cfg?.apiUrl ?? DEFAULT_API_URL;
+    const apiUrl = cfg?.apiUrl;
+    if (!apiUrl) {
+      api.logger.error(
+        "cohort-sync: apiUrl is required in plugin config \u2014 set it in your OpenClaw configuration"
+      );
+      return;
+    }
     api.registerCli(
       (ctx) => registerCohortCli(ctx, {
         apiUrl,

package/dist/openclaw.plugin.json

@@ -3,7 +3,7 @@
   "uiHints": {
     "apiUrl": {
       "label": "Cohort API URL",
-      "placeholder": "https://fortunate-chipmunk-286.convex.site",
+      "placeholder": "https://api.cohort.bot",
       "help": "Base URL for the Cohort telemetry API"
     },
     "apiKey": {
@@ -25,7 +25,7 @@
     },
     "convexUrl": {
       "label": "Convex WebSocket URL",
-      "placeholder": "https://fortunate-chipmunk-286.convex.cloud",
+      "placeholder": "https://ws.cohort.bot",
       "advanced": true,
       "help": "Override the auto-derived Convex WebSocket URL (rarely needed)"
     }
@@ -54,5 +54,5 @@
       }
     }
   },
-  "version": "0.8.0"
+  "version": "0.8.1"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "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.8.0",
+  "version": "0.8.1",
   "description": "Syncs agent status and skills to Cohort dashboard",
   "license": "MIT",
   "homepage": "https://docs.cohort.bot/gateway",