@sentry/junior 0.85.0 → 0.87.0

package/dist/{chunk-MTE5NRPJ.js → chunk-BRSQQRG6.js}

@@ -1,6 +1,6 @@
 import {
   getStateAdapter
-} from "./chunk-RUB77TGS.js";
+} from "./chunk-GB5DFM4D.js";
 import {
   logException,
   logInfo,

package/dist/{chunk-EENOFKDN.js → chunk-ENPSU7L7.js}

@@ -4,14 +4,14 @@ import {
 import {
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-RUB77TGS.js";
+} from "./chunk-GB5DFM4D.js";
 import {
   parseDestination,
   sameDestination
-} from "./chunk-C2PSUWK3.js";
+} from "./chunk-GGD6WK6V.js";
 import {
   getChatConfig
-} from "./chunk-BU2AWPEN.js";
+} from "./chunk-ZU2ALUVQ.js";
 import {
   parseStoredSlackRequester
 } from "./chunk-IXTBFABZ.js";
@@ -38,11 +38,23 @@ var InvalidConversationRecordError = class extends Error {
     this.name = "InvalidConversationRecordError";
   }
 };
+function isInvalidConversationRecordError(error) {
+  return error instanceof InvalidConversationRecordError;
+}
+var ConversationMutationFencedError = class extends Error {
+  constructor(conversationId) {
+    super(
+      `Conversation mutation lock was lost before write for ${conversationId}`
+    );
+    this.name = "ConversationMutationFencedError";
+  }
+};
 var CONVERSATION_BY_ACTIVITY_INDEX_KEY = `${CONVERSATION_PREFIX}:by-activity`;
 var CONVERSATION_ACTIVE_INDEX_KEY = `${CONVERSATION_PREFIX}:active`;
 var CONVERSATION_WORK_LEASE_TTL_MS = 9e4;
 var CONVERSATION_WORK_CHECK_IN_INTERVAL_MS = 15e3;
 var CONVERSATION_WORK_STALE_ENQUEUE_MS = 6e4;
+var CONVERSATION_WORK_MAX_DELIVERY_ATTEMPTS = 5;
 function conversationKey(conversationId) {
   return `${CONVERSATION_PREFIX}:${conversationId}`;
 }
@@ -58,6 +70,15 @@ function now() {
 function compareMessages(left, right) {
   return left.createdAtMs - right.createdAtMs || left.receivedAtMs - right.receivedAtMs || left.inboundMessageId.localeCompare(right.inboundMessageId);
 }
+function inputHasAttachments(input) {
+  return Array.isArray(input.attachments) && input.attachments.length > 0;
+}
+function upgradedPendingMessage(stored, duplicate) {
+  if (!inputHasAttachments(duplicate.input) || inputHasAttachments(stored.input)) {
+    return stored;
+  }
+  return { ...stored, input: duplicate.input };
+}
 function compareIndexDescending(left, right) {
   return right.score - left.score || right.conversationId.localeCompare(left.conversationId);
 }
@@ -122,9 +143,13 @@ function normalizeMessage(value) {
     createdAtMs,
     receivedAtMs,
     input,
-    injectedAtMs: toOptionalNumber(value.injectedAtMs)
+    injectedAtMs: toOptionalNumber(value.injectedAtMs),
+    attemptCount: toOptionalNumber(value.attemptCount)
   };
 }
+function isFinalAttempt(message) {
+  return (message.attemptCount ?? 0) >= CONVERSATION_WORK_MAX_DELIVERY_ATTEMPTS - 1;
+}
 function normalizeRequester(value) {
   return parseStoredSlackRequester(value);
 }
@@ -517,7 +542,7 @@ async function withConversationMutation(args, callback) {
   const state = await getConnectedState(args.state);
   const lock = await acquireMutationLock(state, args.conversationId);
   try {
-    return await callback(state);
+    return await callback(state, lock);
   } finally {
     await state.releaseLock(lock);
   }
@@ -533,7 +558,7 @@ async function readConversation(state, conversationId) {
   }
   return conversation;
 }
-async function writeConversation(state, conversation) {
+async function writeConversation(state, lock, conversation) {
   const execution = executionWithPendingMessages(
     conversation.execution,
     conversation.execution.pendingMessages
@@ -542,6 +567,13 @@ async function writeConversation(state, conversation) {
     ...conversation,
     execution
   };
+  const fenced = await state.extendLock(
+    lock,
+    CONVERSATION_MUTATION_LOCK_TTL_MS
+  );
+  if (!fenced) {
+    throw new ConversationMutationFencedError(next.conversationId);
+  }
   await state.set(
     conversationKey(next.conversationId),
     next,
@@ -605,7 +637,7 @@ async function appendInboundMessage(args) {
   const nowMs = args.nowMs ?? now();
   return await withConversationMutation(
     { conversationId: args.message.conversationId, state: args.state },
-    async (state) => {
+    async (state, lock) => {
       const current = await readConversation(state, args.message.conversationId) ?? emptyConversation({
         conversationId: args.message.conversationId,
         destination: args.message.destination,
@@ -630,11 +662,15 @@ async function appendInboundMessage(args) {
         const nextStatus = current.execution.status === "idle" ? "pending" : current.execution.status;
         await writeConversation(
           state,
+          lock,
           withExecutionUpdate(
             current,
             {
               ...current.execution,
-              status: nextStatus
+              status: nextStatus,
+              pendingMessages: current.execution.pendingMessages.map(
+                (message) => message.inboundMessageId === args.message.inboundMessageId ? upgradedPendingMessage(message, args.message) : message
+              )
             },
             nowMs
           )
@@ -650,6 +686,7 @@ async function appendInboundMessage(args) {
       };
       await writeConversation(
         state,
+        lock,
         withExecutionUpdate(
           next,
           {
@@ -673,7 +710,7 @@ async function appendInboundMessage(args) {
 }
 async function requestConversationWork(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const existing = await readConversation(state, args.conversationId);
     if (existing) {
       assertSameConversationDestination({
@@ -690,6 +727,7 @@ async function requestConversationWork(args) {
     const status = current.execution.lease ? "awaiting_resume" : "pending";
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         {
           ...current,
@@ -708,7 +746,7 @@ async function requestConversationWork(args) {
 async function recordConversationActivity(args) {
   const nowMs = args.nowMs ?? now();
   const activityAtMs = args.activityAtMs ?? nowMs;
-  await withConversationMutation(args, async (state) => {
+  await withConversationMutation(args, async (state, lock) => {
     const existing = await readConversation(state, args.conversationId);
     if (existing && args.destination) {
       assertSameConversationDestination({
@@ -723,7 +761,7 @@ async function recordConversationActivity(args) {
       nowMs,
       source: args.source
     });
-    await writeConversation(state, {
+    await writeConversation(state, lock, {
       ...current,
       ...current.destination ?? args.destination ? { destination: current.destination ?? args.destination } : {},
       ...current.source ?? args.source ? { source: current.source ?? args.source } : {},
@@ -741,7 +779,7 @@ async function recordConversationActivity(args) {
 }
 async function recordConversationExecution(args) {
   const nowMs = args.updatedAtMs;
-  await withConversationMutation(args, async (state) => {
+  await withConversationMutation(args, async (state, lock) => {
     const existing = await readConversation(state, args.conversationId);
     if (existing && args.destination) {
       assertSameConversationDestination({
@@ -758,6 +796,7 @@ async function recordConversationExecution(args) {
     });
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         {
           ...current,
@@ -783,13 +822,14 @@ async function recordConversationExecution(args) {
 }
 async function markConversationWorkEnqueued(args) {
   const nowMs = args.nowMs ?? now();
-  await withConversationMutation(args, async (state) => {
+  await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current) {
       return;
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -803,13 +843,14 @@ async function markConversationWorkEnqueued(args) {
 }
 async function clearConsumedConversationWake(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || hasRunnableWork(current) || current.execution.lastEnqueuedAtMs === void 0) {
       return false;
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -824,7 +865,7 @@ async function clearConsumedConversationWake(args) {
 }
 async function startConversationWork(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current) {
       return { status: "no_work" };
@@ -846,6 +887,7 @@ async function startConversationWork(args) {
     };
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -867,13 +909,14 @@ async function startConversationWork(args) {
 }
 async function checkInConversationWork(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       return false;
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -904,12 +947,12 @@ async function drainConversationMailbox(args) {
   if (pending.length === 0) {
     return [];
   }
-  const acknowledgedIds = await args.inject(pending);
-  const offeredIds = new Set(
+  const acknowledgedIds = await args.handle(pending);
+  const pendingIds = new Set(
     pending.map((message) => message.inboundMessageId)
   );
   for (const inboundMessageId of acknowledgedIds ?? []) {
-    if (!offeredIds.has(inboundMessageId)) {
+    if (!pendingIds.has(inboundMessageId)) {
       throw new Error(
         `Conversation mailbox acknowledgement is not pending for ${args.conversationId}`
       );
@@ -918,7 +961,7 @@ async function drainConversationMailbox(args) {
   const drainedIds = new Set(
     acknowledgedIds ?? pending.map((message) => message.inboundMessageId)
   );
-  await withConversationMutation(args, async (state) => {
+  await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       throw new Error(
@@ -930,6 +973,7 @@ async function drainConversationMailbox(args) {
     );
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -943,10 +987,10 @@ async function drainConversationMailbox(args) {
   });
   return pending.filter((message) => drainedIds.has(message.inboundMessageId));
 }
-async function markConversationMessagesInjected(args) {
+async function ackMessages(args) {
   const nowMs = args.nowMs ?? now();
   const inboundMessageIds = new Set(args.inboundMessageIds);
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       return false;
@@ -962,6 +1006,7 @@ async function markConversationMessagesInjected(args) {
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -976,7 +1021,7 @@ async function markConversationMessagesInjected(args) {
 }
 async function requestConversationContinuation(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       return false;
@@ -988,6 +1033,7 @@ async function requestConversationContinuation(args) {
     });
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -1002,13 +1048,14 @@ async function requestConversationContinuation(args) {
 }
 async function releaseConversationWork(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       return false;
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -1024,7 +1071,7 @@ async function releaseConversationWork(args) {
 }
 async function completeConversationWork(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current || current.execution.lease?.token !== args.leaseToken) {
       return "lost_lease";
@@ -1034,6 +1081,7 @@ async function completeConversationWork(args) {
     const runnable = needsRun || hasPending;
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -1048,15 +1096,101 @@ async function completeConversationWork(args) {
     return runnable ? "pending" : "completed";
   });
 }
+async function recordAttemptFailure(args) {
+  const nowMs = args.nowMs ?? now();
+  return await withConversationMutation(args, async (state, lock) => {
+    const current = await readConversation(state, args.conversationId);
+    if (!current || current.execution.lease?.token !== args.leaseToken) {
+      return {
+        status: "lost_lease",
+        pendingCount: 0,
+        deadLetteredMessages: []
+      };
+    }
+    const pendingIds = new Set(
+      current.execution.pendingMessages.map(
+        (message) => message.inboundMessageId
+      )
+    );
+    if (args.inboundMessageIds.length === 0 || args.inboundMessageIds.some((id) => !pendingIds.has(id))) {
+      return {
+        status: "skipped",
+        pendingCount: current.execution.pendingMessages.length,
+        deadLetteredMessages: []
+      };
+    }
+    const attemptedIds = new Set(args.inboundMessageIds);
+    const deadLetteredMessages = [];
+    const pendingMessages2 = [];
+    for (const message of current.execution.pendingMessages) {
+      if (!attemptedIds.has(message.inboundMessageId)) {
+        pendingMessages2.push(message);
+        continue;
+      }
+      const attempted = {
+        ...message,
+        attemptCount: (message.attemptCount ?? 0) + 1
+      };
+      if (attempted.attemptCount >= CONVERSATION_WORK_MAX_DELIVERY_ATTEMPTS) {
+        deadLetteredMessages.push(attempted);
+        continue;
+      }
+      pendingMessages2.push(attempted);
+    }
+    await writeConversation(
+      state,
+      lock,
+      withExecutionUpdate(
+        current,
+        {
+          ...current.execution,
+          pendingMessages: pendingMessages2
+        },
+        nowMs
+      )
+    );
+    return {
+      status: "recorded",
+      pendingCount: pendingMessages2.length,
+      deadLetteredMessages
+    };
+  });
+}
+async function deadLetterAttempt(args) {
+  const nowMs = args.nowMs ?? now();
+  return await withConversationMutation(args, async (state, lock) => {
+    const current = await readConversation(state, args.conversationId);
+    if (!current || current.execution.lease?.token !== args.leaseToken) {
+      return "lost_lease";
+    }
+    const runnable = pendingMessages(current).length > 0;
+    await writeConversation(
+      state,
+      lock,
+      withExecutionUpdate(
+        current,
+        {
+          ...current.execution,
+          lease: void 0,
+          status: runnable ? "pending" : "failed",
+          runId: runnable ? current.execution.runId : void 0
+        },
+        nowMs
+      )
+    );
+    return runnable ? "pending" : "failed";
+  });
+}
 async function clearExpiredConversationLease(args) {
   const nowMs = args.nowMs ?? now();
-  return await withConversationMutation(args, async (state) => {
+  return await withConversationMutation(args, async (state, lock) => {
     const current = await readConversation(state, args.conversationId);
     if (!current?.execution.lease || current.execution.lease.expiresAtMs > nowMs) {
       return false;
     }
     await writeConversation(
       state,
+      lock,
       withExecutionUpdate(
         current,
         {
@@ -1120,8 +1254,10 @@ async function listConversationsByActivity(args = {}) {
 }
 
 export {
+  isInvalidConversationRecordError,
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
+  isFinalAttempt,
   getConversation,
   getConversationWorkState,
   appendInboundMessage,
@@ -1133,10 +1269,12 @@ export {
   startConversationWork,
   checkInConversationWork,
   drainConversationMailbox,
-  markConversationMessagesInjected,
+  ackMessages,
   requestConversationContinuation,
   releaseConversationWork,
   completeConversationWork,
+  recordAttemptFailure,
+  deadLetterAttempt,
   clearExpiredConversationLease,
   removeActiveConversation,
   listActiveConversationIds,

package/dist/{chunk-RUB77TGS.js → chunk-GB5DFM4D.js}

@@ -1,6 +1,6 @@
 import {
   getChatConfig
-} from "./chunk-BU2AWPEN.js";
+} from "./chunk-ZU2ALUVQ.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";