@cfio/cohort-sync 0.12.1 → 0.14.0

package/dist/index.js

@@ -11700,14 +11700,16 @@ async function executeCommand(cmd, gwClient, cfg, resolveAgentName, logger) {
     throw new Error(`Cron message exceeds maximum length of ${MAX_CRON_MESSAGE_LENGTH} characters`);
   }
   if (cmd.type === "restart") {
-    if (gwClient && gwClient.isAlive()) {
-      logger.warn(`cohort-sync: RESTART command received (id=${cmd._id}), issuing graceful gateway restart`);
-      await gwClient.request("gateway.restart", { reason: "Cohort restart command" });
-    } else {
-      logger.warn(`cohort-sync: RESTART command received (id=${cmd._id}), no gateway client \u2014 falling back to SIGTERM`);
-      await new Promise((r) => setTimeout(r, 500));
-      process.kill(process.pid, "SIGTERM");
+    if (cfg.commandsRestartEnabled !== true) {
+      throw new Error(
+        "Gateway restart is not authorized. Set `commands.restart: true` in your OpenClaw config and restart the gateway once. See https://docs.cohort.bot/gateway/restart"
+      );
     }
+    logger.warn(
+      `cohort-sync: RESTART command received (id=${cmd._id}), sending SIGUSR1 for graceful in-process restart`
+    );
+    await new Promise((r) => setTimeout(r, 500));
+    process.kill(process.pid, "SIGUSR1");
     return;
   }
   if (cmd.type.startsWith("cron")) {
@@ -13110,6 +13112,9 @@ var AgentStateTracker = class {
         contextTokens: 0,
         contextLimit: 0,
         compactions: 0,
+        cacheReadTokens: 0,
+        cacheWriteTokens: 0,
+        lastSessionKey: void 0,
         sessions: /* @__PURE__ */ new Map(),
         lastPushedTelemetry: null,
         lastPushedSessions: null
@@ -13170,6 +13175,8 @@ var AgentStateTracker = class {
     if (data.model) state.model = data.model;
     if (data.tokensIn !== void 0) state.tokensIn += data.tokensIn;
     if (data.tokensOut !== void 0) state.tokensOut += data.tokensOut;
+    if (data.cacheReadTokens !== void 0) state.cacheReadTokens += data.cacheReadTokens;
+    if (data.cacheWriteTokens !== void 0) state.cacheWriteTokens += data.cacheWriteTokens;
     if (data.contextTokens !== void 0) state.contextTokens = data.contextTokens;
     if (data.contextLimit !== void 0) state.contextLimit = data.contextLimit;
     state.status = "working";
@@ -13183,6 +13190,15 @@ var AgentStateTracker = class {
       }
     }
   }
+  /**
+   * Set the last-observed session key for cost attribution. The server extracts
+   * the Cohort task number from this key. Called from the llm_output hook.
+   */
+  updateSessionKey(agentName, sessionKey) {
+    if (!sessionKey) return;
+    const state = this.getOrCreate(agentName);
+    state.lastSessionKey = sessionKey;
+  }
   updateFromCompaction(agentName, data) {
     const state = this.getOrCreate(agentName);
     state.compactions += 1;
@@ -13205,7 +13221,10 @@ var AgentStateTracker = class {
       tokensIn: state.tokensIn,
       tokensOut: state.tokensOut,
       compactions: state.compactions,
-      activeSessions: state.sessions.size
+      activeSessions: state.sessions.size,
+      cacheReadTokens: state.cacheReadTokens,
+      cacheWriteTokens: state.cacheWriteTokens,
+      sessionKey: state.lastSessionKey
     };
   }
   getSessionsSnapshot(agentName) {
@@ -13353,7 +13372,7 @@ function dumpCtx(ctx) {
 function dumpEvent(event) {
   return dumpCtx(event);
 }
-var PLUGIN_VERSION = true ? "0.12.1" : "unknown";
+var PLUGIN_VERSION = true ? "0.14.0" : "unknown";
 function resolveGatewayToken(api) {
   const token = api.config?.gateway?.auth?.token;
   return typeof token === "string" ? token : null;
@@ -13559,7 +13578,7 @@ async function handleGatewayStart(event, state) {
       tracker.updateStatus(agentName, "idle");
       const snapshot = tracker.getTelemetrySnapshot(agentName);
       if (snapshot) {
-        await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+        await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
         tracker.markTelemetryPushed(agentName);
       }
     } catch (err) {
@@ -13573,7 +13592,7 @@ async function handleGatewayStart(event, state) {
       const agentName = state.resolveAgentName(agentId);
       const snapshot = tracker.getTelemetrySnapshot(agentName);
       if (snapshot) {
-        await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} }).catch(() => {
+        await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} }).catch(() => {
         });
       }
     }
@@ -13651,7 +13670,7 @@ function registerHookHandlers(api, logger, getState) {
       if (tracker.shouldPushTelemetry(agentName)) {
         const snapshot = tracker.getTelemetrySnapshot(agentName);
         if (snapshot) {
-          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
           tracker.markTelemetryPushed(agentName);
         }
       }
@@ -13697,9 +13716,12 @@ function registerHookHandlers(api, logger, getState) {
         model,
         tokensIn: usage.input ?? 0,
         tokensOut: usage.output ?? 0,
+        cacheReadTokens: usage.cacheRead ?? 0,
+        cacheWriteTokens: usage.cacheWrite ?? 0,
         contextTokens,
         contextLimit
       });
+      tracker.updateSessionKey(agentName, sessionKey);
       if (sessionKey && !tracker.hasSession(agentName, sessionKey)) {
         tracker.addSession(agentName, sessionKey);
         log.info(`cohort-sync: inferred session for ${agentName} from llm_output (${sessionKey})`);
@@ -13710,7 +13732,7 @@ function registerHookHandlers(api, logger, getState) {
       if (tracker.shouldPushTelemetry(agentName)) {
         const snapshot = tracker.getTelemetrySnapshot(agentName);
         if (snapshot) {
-          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
           tracker.markTelemetryPushed(agentName);
         }
       }
@@ -13738,7 +13760,7 @@ function registerHookHandlers(api, logger, getState) {
       if (tracker.shouldPushTelemetry(agentName)) {
         const snapshot = tracker.getTelemetrySnapshot(agentName);
         if (snapshot) {
-          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
           tracker.markTelemetryPushed(agentName);
         }
       }
@@ -13780,7 +13802,7 @@ function registerHookHandlers(api, logger, getState) {
       if (tracker.shouldPushTelemetry(agentName)) {
         const snapshot = tracker.getTelemetrySnapshot(agentName);
         if (snapshot) {
-          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
           tracker.markTelemetryPushed(agentName);
         }
       }
@@ -13984,7 +14006,7 @@ function registerHookHandlers(api, logger, getState) {
         tracker.updateStatus(agentName, "unreachable");
         const snapshot = tracker.getTelemetrySnapshot(agentName);
         if (snapshot) {
-          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
+          await pushTelemetry(cfg.apiKey, { ...snapshot, pluginVersion: PLUGIN_VERSION, commandsRestartEnabled: cfg.commandsRestartEnabled, ...state.latestPluginVersion ? { latestPluginVersion: state.latestPluginVersion } : {} });
         }
       } catch (err) {
         log.warn(`cohort-sync: final unreachable push failed for ${agentName}: ${String(err)}`);
@@ -14455,11 +14477,13 @@ Do not attempt more comments until tomorrow.`);
         }
         api.logger.info(`cohort-sync: activated (api: ${apiUrl2})`);
         if (!sharedHookState) {
+          const commandsRestartEnabled = api.config?.commands?.restart === true;
           sharedHookState = initializeHookState(api, {
             apiUrl: apiUrl2,
             apiKey: apiKey2,
             stateDir: svcCtx.stateDir,
-            agentNameMap: cfg?.agentNameMap
+            agentNameMap: cfg?.agentNameMap,
+            commandsRestartEnabled
           });
         }
       },

package/dist/openclaw.plugin.json

@@ -55,5 +55,5 @@
       }
     }
   },
-  "version": "0.12.1"
+  "version": "0.14.0"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "OpenClaw plugin — syncs agent telemetry, sessions, and activity to the Cohort dashboard",
   "type": "module",
   "main": "index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "OpenClaw plugin — syncs agent telemetry, sessions, and activity to the Cohort dashboard",
   "license": "MIT",
   "homepage": "https://docs.cohort.bot/gateway",
@@ -24,6 +24,7 @@
     "postinstall": "node scripts/postinstall.mjs",
     "prepublishOnly": "node scripts/build.mjs",
     "typecheck": "echo 'Skipped: openclaw types loosely pinned, build uses esbuild not tsc'",
+    "pretest": "node scripts/build.mjs",
     "test": "vitest run"
   },
   "files": [