@cfio/cohort-sync 0.6.0 → 0.7.0

package/dist/index.js

@@ -16,6 +16,14 @@ __export(keychain_exports, {
   setCredential: () => setCredential
 });
 import { execFile } from "node:child_process";
+import os3 from "node:os";
+function assertMacOS(operation) {
+  if (os3.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`
+    );
+  }
+}
 function securityCmd(args) {
   return new Promise((resolve, reject) => {
     execFile("security", args, { timeout: 5e3 }, (err, stdout, stderr) => {
@@ -37,6 +45,7 @@ function isNotFoundError(err) {
   return false;
 }
 async function setCredential(apiUrl, apiKey) {
+  assertMacOS("storing credentials");
   await securityCmd([
     "add-generic-password",
     "-s",
@@ -49,6 +58,7 @@ async function setCredential(apiUrl, apiKey) {
   ]);
 }
 async function getCredential(apiUrl) {
+  assertMacOS("reading credentials");
   try {
     const { stdout } = await securityCmd([
       "find-generic-password",
@@ -65,6 +75,7 @@ async function getCredential(apiUrl) {
   }
 }
 async function deleteCredential(apiUrl) {
+  assertMacOS("deleting credentials");
   try {
     await securityCmd([
       "delete-generic-password",
@@ -7630,14 +7641,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 os3 = __require("os");
+    var os4 = __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 || os3.arch();
-    var platform = process.env.npm_config_platform || os3.platform();
+    var arch = process.env.npm_config_arch || os4.arch();
+    var platform = process.env.npm_config_platform || os4.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];
@@ -11627,6 +11638,7 @@ var pushActivityFromPluginRef = makeFunctionReference("activityFeed:pushActivity
 var upsertCronSnapshotFromPluginRef = makeFunctionReference("telemetryPlugin:upsertCronSnapshotFromPlugin");
 var getPendingCommandsForPlugin = makeFunctionReference("gatewayCommands:getPendingForPlugin");
 var acknowledgeCommandRef = makeFunctionReference("gatewayCommands:acknowledgeCommand");
+var failCommandRef = makeFunctionReference("gatewayCommands:failCommand");
 var addCommentFromPluginRef = makeFunctionReference("comments:addCommentFromPlugin");
 var HOT_KEY = "__cohort_sync__";
 function getHotState() {
@@ -11644,7 +11656,8 @@ function getHotState() {
       gatewayPort: null,
       gatewayToken: null,
       gatewayProtocolClient: null,
-      commandSubscription: null
+      commandSubscription: null,
+      cronRunNowPoll: null
     };
     globalThis[HOT_KEY] = state;
   }
@@ -11689,6 +11702,13 @@ function restoreFromHotReload(logger) {
     client = state.client;
     savedConvexUrl = state.convexUrl;
     logger.info("cohort-sync: recovered ConvexClient after hot-reload");
+  } else if (client && state.client && client !== state.client) {
+    try {
+      state.client.close();
+    } catch {
+    }
+    state.client = client;
+    logger.info("cohort-sync: closed orphaned ConvexClient from hot state");
   }
   if (unsubscribers.length === 0 && state.unsubscribers.length > 0) {
     unsubscribers.push(...state.unsubscribers);
@@ -11837,16 +11857,20 @@ function initCommandSubscription(cfg, logger, resolveAgentName) {
                     if (runResult?.ok && runResult?.ran) {
                       const jobId = cmd.payload?.jobId;
                       let polls = 0;
+                      const hs = getHotState();
+                      if (hs.cronRunNowPoll) clearInterval(hs.cronRunNowPoll);
                       const pollInterval = setInterval(async () => {
                         polls++;
                         if (polls >= 15) {
                           clearInterval(pollInterval);
+                          hs.cronRunNowPoll = null;
                           return;
                         }
                         try {
                           const pollClient = getHotState().gatewayProtocolClient;
                           if (!pollClient || !pollClient.isAlive()) {
                             clearInterval(pollInterval);
+                            hs.cronRunNowPoll = null;
                             return;
                           }
                           const pollResult = await pollClient.request("cron.list");
@@ -11854,12 +11878,14 @@ function initCommandSubscription(cfg, logger, resolveAgentName) {
                           const job = freshJobs.find((j) => j.id === jobId);
                           if (job && !job.state?.runningAtMs) {
                             clearInterval(pollInterval);
+                            hs.cronRunNowPoll = null;
                             const mapped = freshJobs.map((j) => mapCronJob(j, resolveAgentName));
                             await pushCronSnapshot(cfg.apiKey, mapped);
                           }
                         } catch {
                         }
                       }, 2e3);
+                      hs.cronRunNowPoll = pollInterval;
                     }
                     break;
                   }
@@ -11911,6 +11937,15 @@ function initCommandSubscription(cfg, logger, resolveAgentName) {
             }
           } catch (err) {
             logger.error(`cohort-sync: failed to process command ${cmd._id}: ${String(err)}`);
+            try {
+              await c.mutation(failCommandRef, {
+                commandId: cmd._id,
+                apiKey: cfg.apiKey,
+                reason: String(err).slice(0, 500)
+              });
+            } catch (failErr) {
+              logger.error(`cohort-sync: failed to mark command ${cmd._id} as failed: ${String(failErr)}`);
+            }
           }
         }
       } finally {
@@ -12015,7 +12050,9 @@ function clearIntervalsFromHot() {
   const state = getHotState();
   if (state.intervals.heartbeat) clearInterval(state.intervals.heartbeat);
   if (state.intervals.activityFlush) clearInterval(state.intervals.activityFlush);
+  if (state.cronRunNowPoll) clearInterval(state.cronRunNowPoll);
   state.intervals = { heartbeat: null, activityFlush: null };
+  state.cronRunNowPoll = null;
 }
 function addActivityToHot(entry) {
   const state = getHotState();
@@ -13421,10 +13458,7 @@ function getOrCreateTracker() {
   state.tracker = fresh;
   return fresh;
 }
-var STATE_FILE_PATH = path3.join(
-  path3.dirname(new URL(import.meta.url).pathname),
-  ".session-state.json"
-);
+var STATE_FILE_PATH = "";
 function saveSessionsToDisk(tracker) {
   try {
     const state = tracker.exportState();
@@ -13488,6 +13522,7 @@ async function fetchAgentContext(apiKey, apiUrl, logger) {
   }
 }
 function registerHooks(api, cfg) {
+  STATE_FILE_PATH = path3.join(cfg.stateDir, "session-state.json");
   const { logger, config } = api;
   const nameMap = cfg.agentNameMap;
   const tracker = getOrCreateTracker();
@@ -13612,18 +13647,19 @@ function registerHooks(api, cfg) {
     logger.info(`cohort-sync: flushed ${pendingActivity.length} pending activity entries before hot-reload`);
   }
   clearIntervalsFromHot();
+  const heartbeatMs = cfg.syncIntervalMs ?? 12e4;
   heartbeatInterval = setInterval(() => {
     pushHeartbeat().catch((err) => {
       logger.warn(`cohort-sync: heartbeat tick failed: ${String(err)}`);
     });
-  }, 12e4);
+  }, heartbeatMs);
   activityFlushInterval = setInterval(() => {
     flushActivityBuffer().catch((err) => {
       logger.warn(`cohort-sync: activity flush tick failed: ${String(err)}`);
     });
   }, 3e3);
   saveIntervalsToHot(heartbeatInterval, activityFlushInterval);
-  logger.info("cohort-sync: intervals created (heartbeat=2m, activityFlush=3s)");
+  logger.info(`cohort-sync: intervals created (heartbeat=${heartbeatMs / 1e3}s, activityFlush=3s)`);
   {
     const hotState = getHotState();
     if (hotState.commandSubscription) {
@@ -14299,7 +14335,7 @@ function registerCohortCli(ctx, cfg) {
         agents.push({ id, name });
       }
     } else {
-      agents.push({ id: "main", name: "openclaw-cohort-sync" });
+      agents.push({ id: "main", name: "main" });
     }
     const manifest = { agents };
     logger.info("cohort: Starting device authorization...");
@@ -14359,40 +14395,10 @@ function registerCohortCli(ctx, cfg) {
 // index.ts
 init_keychain();
 var DEFAULT_API_URL = "https://fortunate-chipmunk-286.convex.site";
-async function doActivate(api) {
-  const cfg = api.pluginConfig;
-  const apiUrl = cfg?.apiUrl ?? DEFAULT_API_URL;
-  api.logger.info(`cohort-sync: activating (api: ${apiUrl})`);
-  let apiKey = cfg?.apiKey;
-  if (!apiKey) {
-    try {
-      apiKey = await getCredential(apiUrl) ?? void 0;
-    } catch (err) {
-      api.logger.error(
-        `cohort-sync: keychain lookup failed: ${err instanceof Error ? err.message : String(err)}`
-      );
-    }
-  }
-  if (!apiKey) {
-    api.logger.warn(
-      "cohort-sync: no API key found \u2014 run 'openclaw cohort auth' to authenticate"
-    );
-    return;
-  }
-  api.logger.info(`cohort-sync: activated (api: ${apiUrl})`);
-  registerHooks(api, {
-    apiUrl,
-    apiKey,
-    agentNameMap: cfg?.agentNameMap
-  });
-}
 var plugin = {
   id: "cohort-sync",
   name: "Cohort Sync",
   description: "Syncs agent status and skills to Cohort dashboard",
-  // register() is synchronous — the SDK does not await it.
-  // We register CLI here, then self-activate async (the gateway does not
-  // call activate() for extension-directory plugins).
   register(api) {
     const cfg = api.pluginConfig;
     const apiUrl = cfg?.apiUrl ?? DEFAULT_API_URL;
@@ -14404,15 +14410,40 @@ var plugin = {
       }),
       { commands: ["cohort"] }
     );
-    doActivate(api).catch(
-      (err) => api.logger.error(
-        `cohort-sync: self-activation failed: ${err instanceof Error ? err.message : String(err)}`
-      )
-    );
-  },
-  // activate() kept for forward-compatibility if gateway adds activate() support.
-  async activate(api) {
-    return doActivate(api);
+    api.registerService({
+      id: "cohort-sync-core",
+      async start(svcCtx) {
+        api.logger.info(`cohort-sync: service starting (api: ${apiUrl})`);
+        let apiKey = cfg?.apiKey;
+        if (!apiKey) {
+          try {
+            apiKey = await getCredential(apiUrl) ?? void 0;
+          } catch (err) {
+            api.logger.error(
+              `cohort-sync: keychain lookup failed: ${err instanceof Error ? err.message : String(err)}`
+            );
+          }
+        }
+        if (!apiKey) {
+          api.logger.warn(
+            "cohort-sync: no API key found \u2014 run 'openclaw cohort auth' to authenticate"
+          );
+          return;
+        }
+        api.logger.info(`cohort-sync: activated (api: ${apiUrl})`);
+        registerHooks(api, {
+          apiUrl,
+          apiKey,
+          stateDir: svcCtx.stateDir,
+          agentNameMap: cfg?.agentNameMap,
+          syncIntervalMs: cfg?.syncIntervalMs
+        });
+      },
+      async stop() {
+        closeSubscription();
+        api.logger.info("cohort-sync: service stopped");
+      }
+    });
   }
 };
 var index_default = plugin;

package/dist/openclaw.plugin.json

@@ -22,6 +22,12 @@
       "label": "Agent Name Map",
       "advanced": true,
       "help": "Map OpenClaw agent IDs to Cohort display names (e.g. {\"main\": \"yuki\"})"
+    },
+    "convexUrl": {
+      "label": "Convex WebSocket URL",
+      "placeholder": "https://fortunate-chipmunk-286.convex.cloud",
+      "advanced": true,
+      "help": "Override the auto-derived Convex WebSocket URL (rarely needed)"
     }
   },
   "configSchema": {
@@ -42,7 +48,11 @@
         "additionalProperties": {
           "type": "string"
         }
+      },
+      "convexUrl": {
+        "type": "string"
       }
     }
-  }
+  },
+  "version": "0.7.0"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "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.6.0",
+  "version": "0.7.0",
   "description": "Syncs agent status and skills to Cohort dashboard",
   "license": "MIT",
   "homepage": "https://docs.cohort.bot/gateway",
@@ -23,7 +23,7 @@
     "build": "node scripts/build.mjs",
     "postinstall": "node scripts/postinstall.mjs",
     "prepublishOnly": "node scripts/build.mjs",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "echo 'Skipped: openclaw types loosely pinned, build uses esbuild not tsc'",
     "test": "vitest run"
   },
   "files": [