openmates 0.14.8-alpha.4 → 0.14.8-alpha.6

package/dist/{chunk-UZA2XUCF.js → chunk-7DQIT6E2.js}

@@ -3003,18 +3003,28 @@ async function buildTaskEventSystemMessage(params) {
   if (params.event.task_update_job_id) message.task_update_job_id = params.event.task_update_job_id;
   return message;
 }
+function taskUpdateJobBelongsToActiveTurn(job, activeChatId, taskEvents) {
+  if (taskEvents.some((event) => event.task_update_job_id === job.job_id)) return true;
+  return !job.chat_id || job.chat_id === activeChatId;
+}
 function buildTaskUpdateJobPersistPayload(params) {
-  assertTaskPersistPayloadEncrypted(params.encryptedTaskPayload);
+  const encryptedTaskPayload = pruneAbsentTaskPersistFields(params.encryptedTaskPayload);
+  assertTaskPersistPayloadEncrypted(encryptedTaskPayload);
   return {
     protocol_version: 1,
     job_id: params.jobId,
     lease_token: params.leaseToken,
     lease_generation: params.leaseGeneration,
     expected_task_version: params.expectedTaskVersion,
-    encrypted_task_payload: { ...params.encryptedTaskPayload },
+    encrypted_task_payload: encryptedTaskPayload,
     encrypted_task_event_message: params.encryptedTaskEventMessage ?? null
   };
 }
+function pruneAbsentTaskPersistFields(payload) {
+  return Object.fromEntries(
+    Object.entries(payload).filter(([, value]) => value !== void 0 && value !== null)
+  );
+}
 function formatTaskEventSystemContent(event) {
   const taskLabel = event.short_id || event.task_id;
   const title = event.title ? ` "${event.title}"` : "";
@@ -5280,8 +5290,8 @@ var OpenMatesClient = class _OpenMatesClient {
       }
     };
     const persistPendingTaskUpdateJobs = async (jobs, events) => {
-      const persistedJobIds = /* @__PURE__ */ new Set();
-      if (jobs.length === 0) return persistedJobIds;
+      const handledJobIds = /* @__PURE__ */ new Set();
+      if (jobs.length === 0) return handledJobIds;
       const masterKey = this.getMasterKeyBytes();
       let decryptedTasksCache = null;
       const eventByJobId = new Map(events.map((event) => [event.task_update_job_id, event]));
@@ -5354,6 +5364,10 @@ var OpenMatesClient = class _OpenMatesClient {
         }
       };
       for (const job of jobs) {
+        if (!taskUpdateJobBelongsToActiveTurn(job, chatId, events)) {
+          handledJobIds.add(job.job_id);
+          continue;
+        }
         const claimPromise = ws.waitForMessage(
           "task_update_job_claimed",
           (payload) => payload.job_id === job.job_id,
@@ -5400,7 +5414,7 @@ var OpenMatesClient = class _OpenMatesClient {
           await persistEncryptedSystemMessage(eventMessage, sourceChatId);
           persistedTaskEventIds.add(event.event_id);
           await confirmTaskEventPersisted();
-          persistedJobIds.add(job.job_id);
+          handledJobIds.add(job.job_id);
           continue;
         }
         if (!claim.lease_token || !Number.isSafeInteger(claim.lease_generation)) {
@@ -5436,6 +5450,7 @@ var OpenMatesClient = class _OpenMatesClient {
           });
           encryptedTaskPayload = {
             ...patch,
+            version: claim.expected_task_version,
             updated_at: typeof safeMetadata.updated_at === "number" ? safeMetadata.updated_at : patch.updated_at
           };
           if (typeof safeMetadata.primary_chat_id === "string") {
@@ -5464,10 +5479,10 @@ var OpenMatesClient = class _OpenMatesClient {
         await persistEncryptedSystemMessage(eventMessage, sourceChatId);
         persistedTaskEventIds.add(event.event_id);
         await confirmTaskEventPersisted();
-        persistedJobIds.add(job.job_id);
+        handledJobIds.add(job.job_id);
       }
       clearSyncCache();
-      return persistedJobIds;
+      return handledJobIds;
     };
     const streamOpts = {
       onStream: params.onStream,

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   getExtForLang,
   serializeToYaml
-} from "./chunk-UZA2XUCF.js";
+} from "./chunk-7DQIT6E2.js";
 import "./chunk-AXNRPVLE.js";
 export {
   getExtForLang,

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   renderSupportInfo,
   serializeToYaml,
   unwrapApiKeyMasterKey
-} from "./chunk-UZA2XUCF.js";
+} from "./chunk-7DQIT6E2.js";
 import "./chunk-AXNRPVLE.js";
 
 // src/generated/appSkills.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmates",
-  "version": "0.14.8-alpha.4",
+  "version": "0.14.8-alpha.6",
   "description": "OpenMates CLI and SDK",
   "type": "module",
   "main": "dist/index.js",