@cfio/cohort-sync 0.31.1 → 0.31.3

package/dist/index.js

@@ -4115,8 +4115,8 @@ function serializePaginatedPathAndArgs(udfPath, args, options) {
   });
   return result;
 }
-function serializedQueryTokenIsPaginated(token) {
-  return JSON.parse(token).type === "paginated";
+function serializedQueryTokenIsPaginated(token2) {
+  return JSON.parse(token2).type === "paginated";
 }
 
 // ../../node_modules/.pnpm/convex@1.33.0_patch_hash=l43bztwr6e2lbmpd6ao6hmcg24_react@19.2.1/node_modules/convex/dist/esm/browser/sync/local_state.js
@@ -5768,13 +5768,13 @@ function base64UrlDecode(str) {
     return atob(output);
   }
 }
-function jwtDecode(token, options) {
-  if (typeof token !== "string") {
+function jwtDecode(token2, options) {
+  if (typeof token2 !== "string") {
     throw new InvalidTokenError("Invalid token specified: must be a string");
   }
   options || (options = {});
   const pos = options.header === true ? 0 : 1;
-  const part = token.split(".")[pos];
+  const part = token2.split(".")[pos];
   if (typeof part !== "string") {
     throw new InvalidTokenError(
       `Invalid token specified: missing part #${pos + 1}`
@@ -5831,19 +5831,19 @@ var AuthenticationManager = class {
     this.resetAuthState();
     this._logVerbose("pausing WS for auth token fetch");
     this.pauseSocket();
-    const token = await this.fetchTokenAndGuardAgainstRace(fetchToken, {
+    const token2 = await this.fetchTokenAndGuardAgainstRace(fetchToken, {
       forceRefreshToken: false
     });
-    if (token.isFromOutdatedConfig) {
+    if (token2.isFromOutdatedConfig) {
       return;
     }
-    if (token.value) {
+    if (token2.value) {
       this.setAuthState({
         state: "waitingForServerConfirmationOfCachedToken",
         config: { fetchToken, onAuthChange: onChange },
         hasRetried: false
       });
-      this.authenticate(token.value);
+      this.authenticate(token2.value);
     } else {
       this.setAuthState({
         state: "initialRefetch",
@@ -5921,21 +5921,21 @@ var AuthenticationManager = class {
       );
     }
     await this.stopSocket();
-    const token = await this.fetchTokenAndGuardAgainstRace(
+    const token2 = await this.fetchTokenAndGuardAgainstRace(
       this.authState.config.fetchToken,
       {
         forceRefreshToken: true
       }
     );
-    if (token.isFromOutdatedConfig) {
+    if (token2.isFromOutdatedConfig) {
       return;
     }
-    if (token.value && this.syncState.isNewAuth(token.value)) {
-      this.authenticate(token.value);
+    if (token2.value && this.syncState.isNewAuth(token2.value)) {
+      this.authenticate(token2.value);
       this.setAuthState({
         state: "waitingForServerConfirmationOfFreshToken",
         config: this.authState.config,
-        token: token.value,
+        token: token2.value,
         hadAuth: this.authState.state === "notRefetching" || this.authState.state === "waitingForScheduledRefetch"
       });
     } else {
@@ -5955,24 +5955,24 @@ var AuthenticationManager = class {
       return;
     }
     this._logVerbose("refetching auth token");
-    const token = await this.fetchTokenAndGuardAgainstRace(
+    const token2 = await this.fetchTokenAndGuardAgainstRace(
       this.authState.config.fetchToken,
       {
         forceRefreshToken: true
       }
     );
-    if (token.isFromOutdatedConfig) {
+    if (token2.isFromOutdatedConfig) {
       return;
     }
-    if (token.value) {
-      if (this.syncState.isNewAuth(token.value)) {
+    if (token2.value) {
+      if (this.syncState.isNewAuth(token2.value)) {
         this.setAuthState({
           state: "waitingForServerConfirmationOfFreshToken",
           hadAuth: this.syncState.hasAuth(),
-          token: token.value,
+          token: token2.value,
           config: this.authState.config
         });
-        this.authenticate(token.value);
+        this.authenticate(token2.value);
       } else {
         this.setAuthState({
           state: "notRefetching",
@@ -5991,11 +5991,11 @@ var AuthenticationManager = class {
     );
     this.tryRestartSocket();
   }
-  scheduleTokenRefetch(token) {
+  scheduleTokenRefetch(token2) {
     if (this.authState.state === "noAuth") {
       return;
     }
-    const decodedToken = this.decodeToken(token);
+    const decodedToken = this.decodeToken(token2);
     if (!decodedToken) {
       this.logger.error(
         "Auth token is not a valid JWT, cannot refetch the token"
@@ -6046,14 +6046,14 @@ var AuthenticationManager = class {
     this._logVerbose(
       `fetching token with config version ${originalConfigVersion}`
     );
-    const token = await fetchToken(fetchArgs);
+    const token2 = await fetchToken(fetchArgs);
     if (this.configVersion !== originalConfigVersion) {
       this._logVerbose(
         `stale config version, expected ${originalConfigVersion}, got ${this.configVersion}`
       );
       return { isFromOutdatedConfig: true };
     }
-    return { isFromOutdatedConfig: false, value: token };
+    return { isFromOutdatedConfig: false, value: token2 };
   }
   stop() {
     this.resetAuthState();
@@ -6096,9 +6096,9 @@ var AuthenticationManager = class {
     }
     this.authState = newAuth;
   }
-  decodeToken(token) {
+  decodeToken(token2) {
     try {
-      return jwtDecode(token);
+      return jwtDecode(token2);
     } catch (e) {
       this._logVerbose(
         `Error decoding token: ${e instanceof Error ? e.message : "Unknown error"}`
@@ -6241,8 +6241,8 @@ var BaseConvexClient = class {
     this.authenticationManager = new AuthenticationManager(
       this.state,
       {
-        authenticate: (token) => {
-          const message = this.state.setAuth(token);
+        authenticate: (token2) => {
+          const message = this.state.setAuth(token2);
           this.webSocketManager.sendMessage(message);
           return message.baseVersion;
         },
@@ -6435,10 +6435,10 @@ var BaseConvexClient = class {
       new Set(completedRequests.keys())
     );
     this.handleTransition({
-      queries: changedQueryTokens.map((token) => {
-        const optimisticResult = this.optimisticQueryResults.rawQueryResult(token);
+      queries: changedQueryTokens.map((token2) => {
+        const optimisticResult = this.optimisticQueryResults.rawQueryResult(token2);
         return {
-          token,
+          token: token2,
           modification: {
             kind: "Updated",
             result: optimisticResult
@@ -6701,10 +6701,10 @@ var BaseConvexClient = class {
           wrappedUpdate,
           requestId
         );
-        const changedQueries = changedQueryTokens.map((token) => {
-          const localResult = this.localQueryResultByToken(token);
+        const changedQueries = changedQueryTokens.map((token2) => {
+          const localResult = this.localQueryResultByToken(token2);
           return {
-            token,
+            token: token2,
             modification: {
               kind: "Updated",
               result: localResult === void 0 ? void 0 : {
@@ -6888,22 +6888,22 @@ var PaginatedQueryClient = class {
    */
   subscribe(name, args, options) {
     const canonicalizedUdfPath = canonicalizeUdfPath(name);
-    const token = serializePaginatedPathAndArgs(
+    const token2 = serializePaginatedPathAndArgs(
       canonicalizedUdfPath,
       args,
       options
     );
-    const unsubscribe = () => this.removePaginatedQuerySubscriber(token);
-    const existingEntry = this.paginatedQuerySet.get(token);
+    const unsubscribe = () => this.removePaginatedQuerySubscriber(token2);
+    const existingEntry = this.paginatedQuerySet.get(token2);
     if (existingEntry) {
       existingEntry.numSubscribers += 1;
       return {
-        paginatedQueryToken: token,
+        paginatedQueryToken: token2,
         unsubscribe
       };
     }
-    this.paginatedQuerySet.set(token, {
-      token,
+    this.paginatedQuerySet.set(token2, {
+      token: token2,
       canonicalizedUdfPath,
       args,
       numSubscribers: 1,
@@ -6915,9 +6915,9 @@ var PaginatedQueryClient = class {
       skip: false,
       id: options.id
     });
-    this.addPageToPaginatedQuery(token, null, options.initialNumItems);
+    this.addPageToPaginatedQuery(token2, null, options.initialNumItems);
     return {
-      paginatedQueryToken: token,
+      paginatedQueryToken: token2,
       unsubscribe
     };
   }
@@ -6928,18 +6928,18 @@ var PaginatedQueryClient = class {
    */
   localQueryResult(name, args, options) {
     const canonicalizedUdfPath = canonicalizeUdfPath(name);
-    const token = serializePaginatedPathAndArgs(
+    const token2 = serializePaginatedPathAndArgs(
       canonicalizedUdfPath,
       args,
       options
     );
-    return this.localQueryResultByToken(token);
+    return this.localQueryResultByToken(token2);
   }
   /**
    * @internal
    */
-  localQueryResultByToken(token) {
-    const paginatedQuery = this.paginatedQuerySet.get(token);
+  localQueryResultByToken(token2) {
+    const paginatedQuery = this.paginatedQuerySet.get(token2);
     if (!paginatedQuery) {
       return void 0;
     }
@@ -6949,7 +6949,7 @@ var PaginatedQueryClient = class {
         results: [],
         status: "LoadingFirstPage",
         loadMore: (numItems) => {
-          return this.loadMoreOfPaginatedQuery(token, numItems);
+          return this.loadMoreOfPaginatedQuery(token2, numItems);
         }
       };
     }
@@ -6979,7 +6979,7 @@ var PaginatedQueryClient = class {
       results: allResults,
       status,
       loadMore: (numItems) => {
-        return this.loadMoreOfPaginatedQuery(token, numItems);
+        return this.loadMoreOfPaginatedQuery(token2, numItems);
       }
     };
   }
@@ -6990,13 +6990,13 @@ var PaginatedQueryClient = class {
     if (changed.length > 0) {
       this.processPaginatedQuerySplits(
         changed,
-        (token) => this.client.localQueryResultByToken(token)
+        (token2) => this.client.localQueryResultByToken(token2)
       );
-      paginatedQueries = changed.map((token) => ({
-        token,
+      paginatedQueries = changed.map((token2) => ({
+        token: token2,
         modification: {
           kind: "Updated",
-          result: this.localQueryResultByToken(token)
+          result: this.localQueryResultByToken(token2)
         }
       }));
     }
@@ -7017,9 +7017,9 @@ var PaginatedQueryClient = class {
    *
    * @internal
    */
-  loadMoreOfPaginatedQuery(token, numItems) {
-    this.mustGetPaginatedQuery(token);
-    const lastPageToken = this.queryTokenForLastPageOfPaginatedQuery(token);
+  loadMoreOfPaginatedQuery(token2, numItems) {
+    this.mustGetPaginatedQuery(token2);
+    const lastPageToken = this.queryTokenForLastPageOfPaginatedQuery(token2);
     const lastPageResult = this.client.localQueryResultByToken(lastPageToken);
     if (!lastPageResult) {
       return false;
@@ -7029,7 +7029,7 @@ var PaginatedQueryClient = class {
       return false;
     }
     this.addPageToPaginatedQuery(
-      token,
+      token2,
       paginationResult.continueCursor,
       numItems
     );
@@ -7039,10 +7039,10 @@ var PaginatedQueryClient = class {
       queries: [],
       paginatedQueries: [
         {
-          token,
+          token: token2,
           modification: {
             kind: "Updated",
-            result: this.localQueryResultByToken(token)
+            result: this.localQueryResultByToken(token2)
           }
         }
       ]
@@ -7149,8 +7149,8 @@ var PaginatedQueryClient = class {
   /**
    * @internal
    */
-  addPageToPaginatedQuery(token, continueCursor, numItems) {
-    const paginatedQuery = this.mustGetPaginatedQuery(token);
+  addPageToPaginatedQuery(token2, continueCursor, numItems) {
+    const paginatedQuery = this.mustGetPaginatedQuery(token2);
     const pageKey = paginatedQuery.nextPageKey++;
     const paginationOpts = {
       cursor: continueCursor,
@@ -7169,8 +7169,8 @@ var PaginatedQueryClient = class {
     paginatedQuery.pageKeyToQuery.set(pageKey, subscription);
     return subscription;
   }
-  removePaginatedQuerySubscriber(token) {
-    const paginatedQuery = this.paginatedQuerySet.get(token);
+  removePaginatedQuerySubscriber(token2) {
+    const paginatedQuery = this.paginatedQuerySet.get(token2);
     if (!paginatedQuery) {
       return;
     }
@@ -7181,7 +7181,7 @@ var PaginatedQueryClient = class {
     for (const subscription of paginatedQuery.pageKeyToQuery.values()) {
       subscription.unsubscribe();
     }
-    this.paginatedQuerySet.delete(token);
+    this.paginatedQuerySet.delete(token2);
   }
   completePaginatedQuerySplit(paginatedQuery, pageKey, splitKey1, splitKey2) {
     const originalQuery = paginatedQuery.pageKeyToQuery.get(pageKey);
@@ -7202,18 +7202,18 @@ var PaginatedQueryClient = class {
       (sub) => sub.queryToken
     );
   }
-  queryTokenForLastPageOfPaginatedQuery(token) {
-    const paginatedQuery = this.mustGetPaginatedQuery(token);
+  queryTokenForLastPageOfPaginatedQuery(token2) {
+    const paginatedQuery = this.mustGetPaginatedQuery(token2);
     const lastPageKey = paginatedQuery.pageKeys[paginatedQuery.pageKeys.length - 1];
     if (lastPageKey === void 0) {
-      throw new Error(`No pages for paginated query ${token}`);
+      throw new Error(`No pages for paginated query ${token2}`);
     }
     return paginatedQuery.pageKeyToQuery.get(lastPageKey).queryToken;
   }
-  mustGetPaginatedQuery(token) {
-    const paginatedQuery = this.paginatedQuerySet.get(token);
+  mustGetPaginatedQuery(token2) {
+    const paginatedQuery = this.paginatedQuerySet.get(token2);
     if (!paginatedQuery) {
-      throw new Error("paginated query no longer exists for token " + token);
+      throw new Error("paginated query no longer exists for token " + token2);
     }
     return paginatedQuery;
   }
@@ -7483,12 +7483,12 @@ var ConvexClient = class {
   /**
    * @internal
    */
-  setAdminAuth(token, identity) {
+  setAdminAuth(token2, identity) {
     if (this.closed) {
       throw new Error("ConvexClient has already been closed.");
     }
     if (this.disabled) return;
-    this.client.setAdminAuth(token, identity);
+    this.client.setAdminAuth(token2, identity);
   }
   /**
    * @internal
@@ -10082,16 +10082,16 @@ var require_extension = __commonJS({
         throw new SyntaxError("Unexpected end of input");
       }
       if (end === -1) end = i;
-      const token = header.slice(start, end);
+      const token2 = header.slice(start, end);
       if (extensionName === void 0) {
-        push(offers, token, params);
+        push(offers, token2, params);
       } else {
         if (paramName === void 0) {
-          push(params, token, true);
+          push(params, token2, true);
         } else if (mustUnescape) {
-          push(params, paramName, token.replace(/\\/g, ""));
+          push(params, paramName, token2.replace(/\\/g, ""));
         } else {
-          push(params, paramName, token);
+          push(params, paramName, token2);
         }
         push(offers, extensionName, params);
       }
@@ -11923,6 +11923,34 @@ function isUnauthorizedError(err) {
   if (!data || typeof data !== "object") return false;
   return data.code === "UNAUTHORIZED";
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function appErrorMessageFromData(data) {
+  if (!isRecord(data)) return null;
+  return typeof data.message === "string" ? data.message : null;
+}
+function getConvexAppErrorMessage(err) {
+  if (err instanceof ConvexError) {
+    const message = appErrorMessageFromData(err.data);
+    if (message) return message;
+  }
+  if (isRecord(err)) {
+    const message = appErrorMessageFromData(err.data);
+    if (message) return message;
+  }
+  if (err instanceof Error) {
+    const prefix = "Uncaught ConvexError: ";
+    if (err.message.startsWith(prefix)) {
+      try {
+        return appErrorMessageFromData(JSON.parse(err.message.slice(prefix.length)));
+      } catch {
+        return null;
+      }
+    }
+  }
+  return null;
+}
 function tripAuthCircuit() {
   if (authCircuitOpen) return;
   authCircuitOpen = true;
@@ -12443,7 +12471,7 @@ var ALLOWED_METHODS = /* @__PURE__ */ new Set([
   // reload without minting an admin-scope key.
   "secrets.reload"
 ]);
-function buildConnectFrame(id, token, pluginVersion, identity, nonce) {
+function buildConnectFrame(id, token2, pluginVersion, identity, nonce) {
   const signedAtMs = Date.now();
   const payload = buildDeviceAuthPayloadV3({
     deviceId: identity.deviceId,
@@ -12452,7 +12480,7 @@ function buildConnectFrame(id, token, pluginVersion, identity, nonce) {
     role: "operator",
     scopes: ["operator.read", "operator.write", "operator.admin"],
     signedAtMs,
-    token,
+    token: token2,
     nonce,
     platform: process.platform,
     deviceFamily: null
@@ -12478,7 +12506,7 @@ function buildConnectFrame(id, token, pluginVersion, identity, nonce) {
       },
       role: "operator",
       scopes: ["operator.read", "operator.write", "operator.admin"],
-      auth: { token },
+      auth: { token: token2 },
       device: {
         id: identity.deviceId,
         publicKey: identity.publicKeyPem,
@@ -12541,12 +12569,12 @@ var GatewayClient = class {
    * @param logger - RuntimeLogger from plugin SDK
    * @param pluginVersion - Version string for the connect frame userAgent
    */
-  constructor(port, token, logger, pluginVersion = "0.5.0") {
+  constructor(port, token2, logger, pluginVersion = "0.5.0") {
     this.port = port;
     this.logger = logger;
     this.pluginVersion = pluginVersion;
     this.deviceIdentity = loadOrCreateDeviceIdentity();
-    this._getToken = () => token;
+    this._getToken = () => token2;
   }
   /** Token accessor — closure over constructor param */
   _getToken;
@@ -13522,6 +13550,52 @@ function getToolRuntime() {
   };
 }
 
+// src/llm-usage.ts
+function token(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
+}
+function objectValue(value) {
+  return value !== null && typeof value === "object" ? value : {};
+}
+function normalizeLlmUsage(raw) {
+  const usage = objectValue(raw);
+  const promptDetails = objectValue(usage.prompt_tokens_details);
+  const inputDetails = objectValue(usage.input_tokens_details);
+  const inputTokens = token(usage.input) || token(usage.prompt_tokens) || token(usage.input_tokens);
+  const outputTokens = token(usage.output) || token(usage.completion_tokens) || token(usage.output_tokens);
+  const cachedInputTokens = token(usage.cacheRead) || token(promptDetails.cached_tokens) || token(inputDetails.cached_tokens);
+  const cacheWriteTokens = token(usage.cacheWrite);
+  return {
+    inputTokens,
+    outputTokens,
+    cachedInputTokens,
+    cacheWriteTokens,
+    contextTokens: inputTokens + cachedInputTokens + cacheWriteTokens
+  };
+}
+
+// src/model-context.ts
+function bareModelId(model) {
+  const lower = model.toLowerCase();
+  const slash = lower.lastIndexOf("/");
+  return slash >= 0 ? lower.slice(slash + 1) : lower;
+}
+function getModelContextLimit(model) {
+  const m = bareModelId(model);
+  if (m === "gpt-5.5" || m === "gpt-5.5-pro") return 1e6;
+  if (m === "gpt-5.4" || m === "gpt-5.4-pro") return 105e4;
+  if (m === "gpt-5.4-mini" || m === "gpt-5.4-nano") return 4e5;
+  if (m.includes("opus") || m.includes("sonnet") || m.includes("haiku")) return 2e5;
+  if (m.includes("gpt-4o")) return 128e3;
+  if (m.includes("gpt-4-turbo") || m.includes("gpt-4-1")) return 128e3;
+  if (m.includes("gpt-4")) return 8192;
+  if (m.includes("o3") || m.includes("o4-mini")) return 2e5;
+  if (m.includes("gemini-2")) return 1e6;
+  if (m.includes("gemini")) return 128e3;
+  if (m.includes("deepseek")) return 128e3;
+  return 2e5;
+}
+
 // src/hooks.ts
 var REDACT_KEYS = /* @__PURE__ */ new Set([
   "token",
@@ -13561,10 +13635,10 @@ function dumpCtx(ctx) {
 function dumpEvent(event) {
   return dumpCtx(event);
 }
-var PLUGIN_VERSION = true ? "0.31.1" : "unknown";
+var PLUGIN_VERSION = true ? "0.31.3" : "unknown";
 function resolveGatewayToken(api) {
-  const token = api.config?.gateway?.auth?.token;
-  return typeof token === "string" ? token : null;
+  const token2 = api.config?.gateway?.auth?.token;
+  return typeof token2 === "string" ? token2 : null;
 }
 function registerCronEventHandlers(client2, cfg, resolveAgentName, cronTimestampTracker, logger) {
   if (client2.availableEvents.has("cron")) {
@@ -13662,8 +13736,8 @@ function loadSessionsFromDisk(tracker, stateFilePath, logger) {
   } catch {
   }
 }
-function initGatewayClient(port, token, cfg, resolveAgentName, cronTimestampTracker, logger) {
-  const client2 = new GatewayClient(port, token, logger, PLUGIN_VERSION);
+function initGatewayClient(port, token2, cfg, resolveAgentName, cronTimestampTracker, logger) {
+  const client2 = new GatewayClient(port, token2, logger, PLUGIN_VERSION);
   const onConnected = async () => {
     logger.debug(`cohort-sync: gateway 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})`);
@@ -13748,12 +13822,12 @@ async function handleGatewayStart(event, state) {
   }
   logger.debug("cohort-sync: gateway start: bridge after seed", { bridge: Object.fromEntries(getChannelAgentBridge()) });
   state.gatewayPort = event.port;
-  const token = resolveGatewayToken(api);
-  if (token) {
-    state.gatewayToken = token;
+  const token2 = resolveGatewayToken(api);
+  if (token2) {
+    state.gatewayToken = token2;
     logger.debug("cohort-sync: gateway client connecting", { port: event.port, hasToken: true });
     try {
-      const client2 = initGatewayClient(event.port, token, cfg, state.resolveAgentName, state.cronTimestampTracker, logger);
+      const client2 = initGatewayClient(event.port, token2, cfg, state.resolveAgentName, state.cronTimestampTracker, logger);
       state.persistentGwClient = client2;
       state.gwClientInitialized = true;
       if (state.commandUnsubscriber) {
@@ -13983,8 +14057,7 @@ function registerHookHandlers(api, logger, getState) {
       failureKind: event.failureKind
     });
     try {
-      const agentId = ctx.agentId ?? "main";
-      const agentName = state.resolveAgentName(agentId);
+      const agentName = resolveAgentFromContext(state, ctx);
       const entry = buildActivityEntry(agentName, "model_call_ended", {
         outcome: event.outcome,
         errorCategory: event.errorCategory,
@@ -14003,28 +14076,27 @@ function registerHookHandlers(api, logger, getState) {
     const state = getState();
     if (!state) return;
     const { cfg, tracker, logger: log } = state;
-    const usage = event.usage ?? {};
-    const contextTokens = (usage.input ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
+    const usage = normalizeLlmUsage(event.usage);
     const model = event.model ?? state.resolveModel(ctx.agentId ?? "main");
     const contextLimit = state.getModelContextLimit(model);
     const agentId = ctx.agentId ?? "main";
     const agentName = state.resolveAgentName(agentId);
     try {
       const sessionKey = ctx.sessionKey;
+      if (sessionKey && !tracker.hasSession(agentName, sessionKey)) {
+        tracker.addSession(agentName, sessionKey);
+        log.info(`cohort-sync: inferred session for ${agentName} from llm_output (${sessionKey})`);
+      }
       tracker.updateFromLlmOutput(agentName, sessionKey, {
         model,
-        tokensIn: usage.input ?? 0,
-        tokensOut: usage.output ?? 0,
-        cacheReadTokens: usage.cacheRead ?? 0,
-        cacheWriteTokens: usage.cacheWrite ?? 0,
-        contextTokens,
+        tokensIn: usage.inputTokens,
+        tokensOut: usage.outputTokens,
+        cacheReadTokens: usage.cachedInputTokens,
+        cacheWriteTokens: usage.cacheWriteTokens,
+        contextTokens: usage.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})`);
-      }
       if (sessionKey) {
         tracker.setSessionAgent(sessionKey, agentName);
       }
@@ -14386,17 +14458,8 @@ function initializeHookState(api, cfg) {
     if (m && typeof m === "object" && "primary" in m) return String(m.primary);
     return "unknown";
   }
-  function getModelContextLimit(model) {
-    const m = model.toLowerCase();
-    if (m.includes("opus") || m.includes("sonnet") || m.includes("haiku")) return 2e5;
-    if (m.includes("gpt-4o")) return 128e3;
-    if (m.includes("gpt-4-turbo") || m.includes("gpt-4-1")) return 128e3;
-    if (m.includes("gpt-4")) return 8192;
-    if (m.includes("o3") || m.includes("o4-mini")) return 2e5;
-    if (m.includes("gemini-2")) return 1e6;
-    if (m.includes("gemini")) return 128e3;
-    if (m.includes("deepseek")) return 128e3;
-    return 2e5;
+  function getModelContextLimit2(model) {
+    return getModelContextLimit(model);
   }
   const cronStorePath = api.config?.cron?.store ?? path2.join(os2.homedir(), ".openclaw", "cron", "jobs.json");
   const activityBatch = new MicroBatch({
@@ -14457,7 +14520,7 @@ function initializeHookState(api, cfg) {
     config,
     resolveAgentName,
     resolveModel,
-    getModelContextLimit,
+    getModelContextLimit: getModelContextLimit2,
     activityBatch,
     cronStorePath,
     stateFilePath,
@@ -14621,6 +14684,21 @@ var plugin = definePluginEntry({
               content: params.comment,
               noReply: params.no_reply ?? false
             });
+            if ("rejected" in result && result.rejected) {
+              if (result.reason === "AGENT_COMMENTS_LOCKED") {
+                return textResult(
+                  `Cannot comment on task #${params.task_number}.
+Reason: ${result.message}
+Do not re-attempt unless a human unlocks comments.`,
+                  result
+                );
+              }
+              return textResult(
+                `Cannot comment on task #${params.task_number}.
+Reason: ${result.message}`,
+                result
+              );
+            }
             const lines = [`Comment posted on task #${params.task_number}.`];
             if (result.stats) {
               lines.push("");
@@ -14631,7 +14709,10 @@ var plugin = definePluginEntry({
             }
             return textResult(lines.join("\n"), result);
           } catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
+            const msg = [
+              getConvexAppErrorMessage(err),
+              err instanceof Error ? err.message : String(err)
+            ].filter(Boolean).join("\n");
             if (msg.includes("AGENT_COMMENTS_LOCKED")) {
               return textResult(`Cannot comment on task #${params.task_number}.
 Reason: Agent comments are locked on this task.

package/dist/openclaw.plugin.json

@@ -72,5 +72,5 @@
       }
     }
   },
-  "version": "0.31.1"
+  "version": "0.31.3"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfio/cohort-sync",
-  "version": "0.31.1",
+  "version": "0.31.3",
   "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.31.1",
+  "version": "0.31.3",
   "description": "OpenClaw plugin — syncs agent telemetry, sessions, and activity to the Cohort dashboard",
   "license": "MIT",
   "homepage": "https://docs.cohort.bot/gateway",