@sentry/junior 0.73.0 → 0.74.0

package/dist/app.js

@@ -5,7 +5,7 @@ import {
   pluginHookRegistrationsFromPluginSet,
   resolveConversationWorkQueueTopic,
   verifyConversationQueueMessage
-} from "./chunk-UOTZ3EEQ.js";
+} from "./chunk-YOHFWWBV.js";
 import {
   GET,
   buildSentryConversationUrl,
@@ -13,7 +13,7 @@ import {
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,
   setConversationTitle
-} from "./chunk-ZDA2HYX5.js";
+} from "./chunk-2LUZA3LY.js";
 import {
   AuthorizationFlowDisabledError,
   PluginCredentialFailureError,
@@ -85,7 +85,7 @@ import {
   updateConversationStats,
   uploadFilesToThread,
   upsertConversationMessage
-} from "./chunk-OQSYYOLM.js";
+} from "./chunk-SQGMG7OD.js";
 import {
   abandonAgentTurnSessionRecord,
   bindSlackDirectCredentialSubject,
@@ -99,6 +99,7 @@ import {
   getAgentPluginSlackConversationLink,
   getAgentPlugins,
   getAgentTurnSessionRecord,
+  getConfiguredConversationStore,
   getInterruptionMarker,
   listAgentTurnSessionSummariesForConversation,
   loadProjection,
@@ -110,7 +111,7 @@ import {
   truncateStatusText,
   validateAgentPlugins,
   verifySlackDirectCredentialSubject
-} from "./chunk-UZVHXZ7V.js";
+} from "./chunk-HYHKTFG2.js";
 import {
   discoverSkills
 } from "./chunk-OR6NQJ5E.js";
@@ -121,14 +122,13 @@ import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
   JUNIOR_THREAD_STATE_TTL_MS,
-  appendAndEnqueueInboundMessage,
+  appendInboundMessage,
   checkInConversationWork,
   clearExpiredConversationLease,
   completeConversationWork,
-  countPendingConversationMessages,
   drainConversationMailbox,
+  getConversation,
   getConversationWorkState,
-  hasRunnableConversationWork,
   listActiveConversationIds,
   markConversationMessagesInjected,
   markConversationWorkEnqueued,
@@ -137,7 +137,7 @@ import {
   requestConversationContinuation,
   requestConversationWork,
   startConversationWork
-} from "./chunk-AL5T52ZD.js";
+} from "./chunk-JL2SLRAT.js";
 import {
   createSlackDestination,
   destinationKey,
@@ -149,8 +149,8 @@ import {
   parseDestination,
   requireSlackDestination,
   sameDestination
-} from "./chunk-V4VYUY4A.js";
-import "./chunk-RY6AL5C7.js";
+} from "./chunk-YRDS7VKO.js";
+import "./chunk-6UP2Z2RZ.js";
 import "./chunk-G3E7SCME.js";
 import {
   CredentialUnavailableError,
@@ -169,7 +169,7 @@ import {
 import {
   ACTIVE_LOCK_TTL_MS,
   getStateAdapter
-} from "./chunk-DIMX5F3T.js";
+} from "./chunk-F6HWCPOC.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   GEN_AI_PROVIDER_NAME,
@@ -191,7 +191,7 @@ import {
   setSlackReactionConfig,
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages
-} from "./chunk-WS2EG3GW.js";
+} from "./chunk-GM7HTXYC.js";
 import {
   createRequester,
   createRequesterFromStoredSlackRequester,
@@ -1215,6 +1215,173 @@ async function POST(request, waitUntil, options = {}) {
 // src/handlers/heartbeat.ts
 import { timingSafeEqual as timingSafeEqual2 } from "crypto";
 
+// src/chat/task-execution/store.ts
+function metadataStore(options) {
+  return options.conversationStore ?? getConfiguredConversationStore();
+}
+function duplicateInboundNudgeIdempotencyKey(message, nowMs) {
+  return `duplicate:${message.conversationId}:${message.inboundMessageId}:${nowMs}`;
+}
+function hasRecentEnqueueMarker(conversation, nowMs) {
+  const lastEnqueuedAtMs = conversation.execution.lastEnqueuedAtMs;
+  return typeof lastEnqueuedAtMs === "number" && lastEnqueuedAtMs + CONVERSATION_WORK_STALE_ENQUEUE_MS > nowMs;
+}
+function now() {
+  return Date.now();
+}
+async function recordExecutionMetadata(args) {
+  try {
+    const conversation = await getConversation({
+      conversationId: args.conversationId,
+      state: args.state
+    });
+    if (!conversation) {
+      return;
+    }
+    await metadataStore(args).recordExecution({
+      channelName: conversation.channelName,
+      conversationId: conversation.conversationId,
+      createdAtMs: conversation.createdAtMs,
+      destination: conversation.destination,
+      execution: {
+        lastCheckpointAtMs: conversation.execution.lastCheckpointAtMs,
+        lastEnqueuedAtMs: conversation.execution.lastEnqueuedAtMs,
+        runId: conversation.execution.runId,
+        status: conversation.execution.status,
+        updatedAtMs: conversation.execution.updatedAtMs
+      },
+      lastActivityAtMs: conversation.lastActivityAtMs,
+      requester: conversation.requester,
+      source: conversation.source,
+      title: conversation.title,
+      updatedAtMs: conversation.updatedAtMs
+    });
+  } catch (error) {
+    logWarn(
+      "conversation_execution_metadata_update_failed",
+      { conversationId: args.conversationId },
+      {
+        "exception.message": error instanceof Error ? error.message : String(error)
+      },
+      "Failed to update conversation execution metadata"
+    );
+  }
+}
+async function getConversationWorkState2(args) {
+  return await getConversationWorkState(args);
+}
+function countPendingConversationMessages(conversation) {
+  return conversation.execution.pendingMessages.length;
+}
+function hasRunnableConversationWork(conversation) {
+  return conversation.execution.status !== "idle" || countPendingConversationMessages(conversation) > 0;
+}
+async function appendAndEnqueueInboundMessage(args) {
+  const nowMs = args.nowMs ?? now();
+  const appendResult = await appendInboundMessage({
+    message: args.message,
+    nowMs,
+    state: args.state
+  });
+  let idempotencyKey = args.message.inboundMessageId;
+  if (appendResult.status === "duplicate") {
+    const conversation = await getConversation({
+      conversationId: args.message.conversationId,
+      state: args.state
+    });
+    if (!conversation || hasRecentEnqueueMarker(conversation, nowMs)) {
+      return appendResult;
+    }
+    const duplicateStillPending = conversation.execution.pendingMessages.some(
+      (message) => message.inboundMessageId === args.message.inboundMessageId
+    );
+    if (!duplicateStillPending) {
+      return appendResult;
+    }
+    idempotencyKey = duplicateInboundNudgeIdempotencyKey(args.message, nowMs);
+  }
+  const queueResult = await args.queue.send(
+    {
+      conversationId: args.message.conversationId,
+      destination: args.message.destination
+    },
+    { idempotencyKey }
+  );
+  await markConversationWorkEnqueued2({
+    conversationId: args.message.conversationId,
+    conversationStore: args.conversationStore,
+    nowMs,
+    state: args.state
+  });
+  return {
+    ...appendResult,
+    queueMessageId: queueResult?.messageId
+  };
+}
+async function requestConversationWork2(args) {
+  const result = await requestConversationWork(args);
+  await recordExecutionMetadata({
+    conversationId: args.conversationId,
+    conversationStore: args.conversationStore,
+    state: args.state
+  });
+  return result;
+}
+async function markConversationWorkEnqueued2(args) {
+  await markConversationWorkEnqueued(args);
+  await recordExecutionMetadata(args);
+}
+async function startConversationWork2(args) {
+  const result = await startConversationWork(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function checkInConversationWork2(args) {
+  const result = await checkInConversationWork(args);
+  if (result) {
+    await recordExecutionMetadata(args);
+  }
+  return result;
+}
+async function drainConversationMailbox2(args) {
+  const result = await drainConversationMailbox(args);
+  if (result.length > 0) {
+    await recordExecutionMetadata(args);
+  }
+  return result;
+}
+async function markConversationMessagesInjected2(args) {
+  const result = await markConversationMessagesInjected(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function requestConversationContinuation2(args) {
+  const result = await requestConversationContinuation(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function releaseConversationWork2(args) {
+  const result = await releaseConversationWork(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function completeConversationWork2(args) {
+  const result = await completeConversationWork(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function clearExpiredConversationLease2(args) {
+  const result = await clearExpiredConversationLease(args);
+  await recordExecutionMetadata(args);
+  return result;
+}
+async function removeActiveConversation2(args) {
+  return await removeActiveConversation(args);
+}
+async function listActiveConversationIds2(args = {}) {
+  return await listActiveConversationIds(args);
+}
+
 // src/chat/task-execution/heartbeat.ts
 var DEFAULT_RECOVERY_LIMIT = 25;
 function heartbeatIdempotencyKey(reason, conversationId, nowMs) {
@@ -1228,7 +1395,7 @@ async function sendRecoveryNudge(args) {
     },
     { idempotencyKey: args.idempotencyKey }
   );
-  await markConversationWorkEnqueued({
+  await markConversationWorkEnqueued2({
     conversationId: args.conversationId,
     nowMs: args.nowMs,
     state: args.state
@@ -1240,26 +1407,26 @@ async function recoverConversationWork(args) {
     pendingCount: 0
   };
   const staleBeforeMs = args.nowMs - CONVERSATION_WORK_STALE_ENQUEUE_MS;
-  const ids = await listActiveConversationIds({
+  const ids = await listActiveConversationIds2({
     limit: args.limit ?? DEFAULT_RECOVERY_LIMIT,
     staleBeforeMs,
     state: args.state
   });
   for (const conversationId of ids) {
     try {
-      const work = await getConversationWorkState({
+      const work = await getConversationWorkState2({
         conversationId,
         state: args.state
       });
       if (!work) {
-        await removeActiveConversation({
+        await removeActiveConversation2({
           conversationId,
           state: args.state
         });
         continue;
       }
       if (work.execution.status === "idle") {
-        await removeActiveConversation({
+        await removeActiveConversation2({
           conversationId,
           state: args.state
         });
@@ -1270,7 +1437,7 @@ async function recoverConversationWork(args) {
         continue;
       }
       if (work.execution.lease && work.execution.lease.expiresAtMs <= args.nowMs) {
-        const cleared = await clearExpiredConversationLease({
+        const cleared = await clearExpiredConversationLease2({
           conversationId,
           nowMs: args.nowMs,
           state: args.state
@@ -1804,7 +1971,7 @@ var STATUS_UPDATE_DEBOUNCE_MS = 1e3;
 var STATUS_MIN_VISIBLE_MS = 1200;
 var STATUS_ROTATION_INTERVAL_MS = 3e4;
 function createAssistantStatusScheduler(args) {
-  const now2 = args.now ?? (() => Date.now());
+  const now3 = args.now ?? (() => Date.now());
   const setTimer = args.setTimer ?? ((callback, delayMs) => setTimeout(callback, delayMs));
   const clearTimer = args.clearTimer ?? ((timer) => clearTimeout(timer));
   const random = args.random ?? Math.random;
@@ -1868,7 +2035,7 @@ function createAssistantStatusScheduler(args) {
     }
     currentVisibleStatus = text;
     currentLoadingMessages = nextLoadingMessages;
-    lastStatusAt = now2();
+    lastStatusAt = now3();
     scheduleRotation();
     await enqueueStatusUpdate(async () => {
       await args.sendStatus(text, nextLoadingMessages);
@@ -1951,7 +2118,7 @@ function createAssistantStatusScheduler(args) {
         }
         return;
       }
-      const elapsed = now2() - lastStatusAt;
+      const elapsed = now3() - lastStatusAt;
       const waitMs = Math.max(
         STATUS_UPDATE_DEBOUNCE_MS - elapsed,
         STATUS_MIN_VISIBLE_MS - elapsed,
@@ -2773,7 +2940,7 @@ async function getAwaitingAgentContinueRequest(args) {
 }
 async function scheduleAgentContinue(request, options = {}) {
   const nowMs = options.nowMs ?? Date.now();
-  await requestConversationWork({
+  await requestConversationWork2({
     conversationId: request.conversationId,
     destination: request.destination,
     nowMs,
@@ -2795,7 +2962,7 @@ async function scheduleAgentContinue(request, options = {}) {
       ].join(":")
     }
   );
-  await markConversationWorkEnqueued({
+  await markConversationWorkEnqueued2({
     conversationId: request.conversationId,
     nowMs,
     state: options.state
@@ -3066,7 +3233,7 @@ async function resumeAuthorizedMcpTurn(args) {
           pendingAuth: lockedPendingAuth,
           channelConfiguration: lockedChannelConfiguration,
           sandbox: getPersistedSandboxState(lockedState),
-          onAuthPending: async (nextPendingAuth) => {
+          recordPendingAuth: async (nextPendingAuth) => {
             await applyPendingAuthUpdate({
               conversation: lockedConversation,
               conversationId: authSession.conversationId,
@@ -3851,7 +4018,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
           channelConfiguration: lockedChannelConfiguration,
           piMessages: lockedConversation.piMessages,
           sandbox: getPersistedSandboxState(lockedState),
-          onAuthPending: async (nextPendingAuth) => {
+          recordPendingAuth: async (nextPendingAuth) => {
             await applyPendingAuthUpdate({
               conversation: lockedConversation,
               conversationId: stored.resumeConversationId,
@@ -4367,9 +4534,9 @@ function buildJwksUrl(value) {
   return url;
 }
 async function getJwks(issuer) {
-  const now2 = Date.now();
+  const now3 = Date.now();
   const cached = jwksByIssuer.get(issuer);
-  if (cached && cached.expiresAtMs > now2) {
+  if (cached && cached.expiresAtMs > now3) {
     return cached.jwks;
   }
   if (cached) {
@@ -4394,7 +4561,7 @@ async function getJwks(issuer) {
   }
   jwksByIssuer.set(issuer, {
     jwks,
-    expiresAtMs: now2 + OIDC_DISCOVERY_CACHE_TTL_MS
+    expiresAtMs: now3 + OIDC_DISCOVERY_CACHE_TTL_MS
   });
   return jwks;
 }
@@ -7956,7 +8123,7 @@ function createReplyToThread(deps) {
                   artifacts: latestArtifacts
                 });
               },
-              onAuthPending: async (pendingAuth) => {
+              recordPendingAuth: async (pendingAuth) => {
                 await applyPendingAuthUpdate({
                   conversation: preparedState.conversation,
                   conversationId,
@@ -8875,7 +9042,7 @@ function createSlackConversationWorker(options) {
     const state = getConnectedState2(options.state);
     await state.connect();
     const records = getPendingRecords(
-      await getConversationWorkState({
+      await getConversationWorkState2({
         conversationId: context.conversationId,
         state
       })
@@ -8939,10 +9106,11 @@ function createSlackConversationWorker(options) {
           if (initialMessagesPersisted) {
             return true;
           }
-          const marked = await markConversationMessagesInjected({
+          const marked = await markConversationMessagesInjected2({
             conversationId: context.conversationId,
             inboundMessageIds: initialInboundMessageIds,
             leaseToken: context.leaseToken,
+            conversationStore: options.conversationStore,
             state
           });
           initialMessagesPersisted = marked;
@@ -9219,7 +9387,7 @@ async function continueSlackAgentRun(payload, options = {}) {
             channelConfiguration,
             piMessages: conversation.piMessages,
             sandbox,
-            onAuthPending: async (nextPendingAuth) => {
+            recordPendingAuth: async (nextPendingAuth) => {
               await applyPendingAuthUpdate({
                 conversation,
                 conversationId: payload.conversationId,
@@ -9394,7 +9562,11 @@ function getProductionSlackRuntime() {
   });
   return productionSlackRuntime;
 }
+function getProductionConversationStore() {
+  return getConfiguredConversationStore();
+}
 function createProductionSlackWebhookServices(options) {
+  const conversationStore = getProductionConversationStore();
   const runtime = createSlackRuntime({
     getSlackAdapter: getProductionSlackAdapter,
     services: options?.services
@@ -9402,27 +9574,33 @@ function createProductionSlackWebhookServices(options) {
   return {
     getSlackAdapter: getProductionSlackAdapter,
     getUserTokenStore: createUserTokenStore,
+    conversationStore,
     queue: getVercelConversationWorkQueue(),
     runtime
   };
 }
 function getProductionSlackWebhookServices() {
+  const conversationStore = getProductionConversationStore();
   return {
     getSlackAdapter: getProductionSlackAdapter,
     getUserTokenStore: createUserTokenStore,
+    conversationStore,
     queue: getVercelConversationWorkQueue(),
     runtime: getProductionSlackRuntime()
   };
 }
 function createProductionConversationWorkOptions(options) {
+  const conversationStore = getProductionConversationStore();
   const runtime = createSlackRuntime({
     getSlackAdapter: getProductionSlackAdapter,
     services: options?.services
   });
   return {
+    conversationStore,
     queue: getVercelConversationWorkQueue(),
     run: createSlackConversationWorker({
       getSlackAdapter: getProductionSlackAdapter,
+      conversationStore,
       resumeAwaitingContinuation: async (conversationId) => await resumeAwaitingSlackContinuation(conversationId, {
         generateReply: withSandboxTracePropagation(
           generateAssistantReply,
@@ -9733,6 +9911,7 @@ async function persistSlackMessage(args) {
   });
   await appendAndEnqueueInboundMessage({
     message: inbound,
+    conversationStore: args.conversationStore,
     queue: args.queue,
     state: args.state
   });
@@ -9754,6 +9933,7 @@ async function routeParsedMessage(args) {
     adapter: args.adapter,
     installation: args.installation,
     message: args.message,
+    conversationStore: args.conversationStore,
     queue: args.queue,
     receivedAtMs: args.receivedAtMs,
     route,
@@ -9780,6 +9960,7 @@ async function handleMessageChanged(args) {
     adapter: args.adapter,
     installation: args.installation,
     message: result.message,
+    conversationStore: args.conversationStore,
     queue: args.queue,
     receivedAtMs: args.receivedAtMs,
     route: "mention",
@@ -9821,6 +10002,7 @@ async function handleSlackEvent(args) {
           adapter,
           body: args.body,
           installation,
+          conversationStore: args.services.conversationStore,
           queue: args.services.queue,
           receivedAtMs,
           state
@@ -9870,6 +10052,7 @@ async function handleSlackEvent(args) {
             event,
             installation,
             message,
+            conversationStore: args.services.conversationStore,
             queue: args.services.queue,
             receivedAtMs,
             state
@@ -10301,7 +10484,7 @@ function isConversationQueueMessageRejectedError(error) {
 // src/chat/task-execution/worker.ts
 var CONVERSATION_WORK_DEFER_DELAY_MS = 15e3;
 var CONVERSATION_WORK_SOFT_YIELD_AFTER_MS = 24e4;
-function now(options) {
+function now2(options) {
   return options.nowMs?.() ?? Date.now();
 }
 function nudgeIdempotencyKey(reason, conversationId, nowMs) {
@@ -10318,26 +10501,29 @@ async function sendWakeNudge(args) {
       idempotencyKey: args.idempotencyKey
     }
   );
-  await markConversationWorkEnqueued({
+  await markConversationWorkEnqueued2({
     conversationId: args.conversationId,
+    conversationStore: args.options.conversationStore,
     nowMs: args.nowMs,
     state: args.options.state
   });
 }
 async function requestLostLeaseRecovery(args) {
-  const continuationMarked = await requestConversationContinuation({
+  const continuationMarked = await requestConversationContinuation2({
     conversationId: args.conversationId,
     destination: args.destination,
     leaseToken: args.leaseToken,
+    conversationStore: args.options.conversationStore,
     nowMs: args.nowMs,
     state: args.options.state
   });
   if (!continuationMarked) {
     return;
   }
-  const released = await releaseConversationWork({
+  const released = await releaseConversationWork2({
     conversationId: args.conversationId,
     leaseToken: args.leaseToken,
+    conversationStore: args.options.conversationStore,
     nowMs: args.nowMs,
     state: args.options.state
   });
@@ -10358,10 +10544,11 @@ async function requestLostLeaseRecovery(args) {
 }
 function startLeaseCheckIn(args) {
   const timer = setInterval(() => {
-    const nowMs = now(args.options);
-    void checkInConversationWork({
+    const nowMs = now2(args.options);
+    void checkInConversationWork2({
       conversationId: args.conversationId,
       leaseToken: args.leaseToken,
+      conversationStore: args.options.conversationStore,
       nowMs,
       state: args.options.state
     }).then(
@@ -10392,7 +10579,7 @@ function startLeaseCheckIn(args) {
 }
 async function processConversationWork(message, options) {
   const conversationId = message.conversationId;
-  const initial = await getConversationWorkState({
+  const initial = await getConversationWorkState2({
     conversationId,
     state: options.state
   });
@@ -10407,16 +10594,17 @@ async function processConversationWork(message, options) {
     );
   }
   const destination = initial.destination;
-  const lease = await startConversationWork({
+  const lease = await startConversationWork2({
     conversationId,
-    nowMs: now(options),
+    conversationStore: options.conversationStore,
+    nowMs: now2(options),
     state: options.state
   });
   if (lease.status === "no_work") {
     return { status: "no_work" };
   }
   if (lease.status === "active") {
-    const nudgeNowMs = now(options);
+    const nudgeNowMs = now2(options);
     await sendWakeNudge({
       conversationId,
       destination,
@@ -10435,7 +10623,7 @@ async function processConversationWork(message, options) {
     );
     return { status: "active" };
   }
-  const startedAtMs = now(options);
+  const startedAtMs = now2(options);
   const softYieldDeadlineMs = startedAtMs + (options.softYieldAfterMs ?? CONVERSATION_WORK_SOFT_YIELD_AFTER_MS);
   let leaseLost = false;
   const markLeaseLost = () => {
@@ -10460,12 +10648,13 @@ async function processConversationWork(message, options) {
     conversationId,
     destination,
     leaseToken: lease.leaseToken,
-    shouldYield: () => leaseLost || now(options) >= softYieldDeadlineMs,
+    shouldYield: () => leaseLost || now2(options) >= softYieldDeadlineMs,
     checkIn: async () => {
-      const checkedIn = await checkInConversationWork({
+      const checkedIn = await checkInConversationWork2({
         conversationId,
         leaseToken: lease.leaseToken,
-        nowMs: now(options),
+        conversationStore: options.conversationStore,
+        nowMs: now2(options),
         state: options.state
       });
       if (!checkedIn) {
@@ -10473,11 +10662,12 @@ async function processConversationWork(message, options) {
       }
       return checkedIn;
     },
-    drainMailbox: (inject) => drainConversationMailbox({
+    drainMailbox: (inject) => drainConversationMailbox2({
       conversationId,
       leaseToken: lease.leaseToken,
+      conversationStore: options.conversationStore,
       inject,
-      nowMs: now(options),
+      nowMs: now2(options),
       state: options.state
     })
   };
@@ -10488,7 +10678,7 @@ async function processConversationWork(message, options) {
         conversationId,
         destination,
         leaseToken: lease.leaseToken,
-        nowMs: now(options),
+        nowMs: now2(options),
         options
       });
       return { status: "lost_lease" };
@@ -10498,17 +10688,18 @@ async function processConversationWork(message, options) {
         conversationId,
         destination,
         leaseToken: lease.leaseToken,
-        nowMs: now(options),
+        nowMs: now2(options),
         options
       });
       return { status: "lost_lease" };
     }
     if (result.status === "yielded") {
-      const yieldNowMs = now(options);
-      const continuationMarked = await requestConversationContinuation({
+      const yieldNowMs = now2(options);
+      const continuationMarked = await requestConversationContinuation2({
         conversationId,
         destination,
         leaseToken: lease.leaseToken,
+        conversationStore: options.conversationStore,
         nowMs: yieldNowMs,
         state: options.state
       });
@@ -10526,9 +10717,10 @@ async function processConversationWork(message, options) {
         nowMs: yieldNowMs,
         options
       });
-      await releaseConversationWork({
+      await releaseConversationWork2({
         conversationId,
         leaseToken: lease.leaseToken,
+        conversationStore: options.conversationStore,
         nowMs: yieldNowMs,
         state: options.state
       });
@@ -10536,24 +10728,25 @@ async function processConversationWork(message, options) {
         "conversation_work_cooperative_yield",
         { conversationId },
         {
-          "app.worker.elapsed_ms": now(options) - startedAtMs,
+          "app.worker.elapsed_ms": now2(options) - startedAtMs,
           "app.worker.soft_yield_deadline_ms": softYieldDeadlineMs
         },
         "Conversation work yielded cooperatively"
       );
       return { status: "yielded" };
     }
-    const completion = await completeConversationWork({
+    const completion = await completeConversationWork2({
       conversationId,
       leaseToken: lease.leaseToken,
-      nowMs: now(options),
+      conversationStore: options.conversationStore,
+      nowMs: now2(options),
       state: options.state
     });
     if (completion === "lost_lease") {
       return { status: "lost_lease" };
     }
     if (completion === "pending") {
-      const nudgeNowMs = now(options);
+      const nudgeNowMs = now2(options);
       await sendWakeNudge({
         conversationId,
         destination,
@@ -10571,18 +10764,19 @@ async function processConversationWork(message, options) {
       "conversation_work_completed",
       { conversationId },
       {
-        "app.worker.elapsed_ms": now(options) - startedAtMs
+        "app.worker.elapsed_ms": now2(options) - startedAtMs
       },
       "Conversation work completed"
     );
     return { status: "completed" };
   } catch (error) {
-    const errorNowMs = now(options);
+    const errorNowMs = now2(options);
     try {
-      const continuationMarked = await requestConversationContinuation({
+      const continuationMarked = await requestConversationContinuation2({
         conversationId,
         destination,
         leaseToken: lease.leaseToken,
+        conversationStore: options.conversationStore,
         nowMs: errorNowMs,
         state: options.state
       });
@@ -10609,9 +10803,10 @@ async function processConversationWork(message, options) {
       );
     }
     try {
-      await releaseConversationWork({
+      await releaseConversationWork2({
         conversationId,
         leaseToken: lease.leaseToken,
+        conversationStore: options.conversationStore,
         nowMs: errorNowMs,
         state: options.state
       });
@@ -10630,7 +10825,7 @@ async function processConversationWork(message, options) {
         "conversation_work_failed",
         { conversationId },
         {
-          "app.worker.elapsed_ms": now(options) - startedAtMs
+          "app.worker.elapsed_ms": now2(options) - startedAtMs
         },
         "Conversation work failed"
       );
@@ -10665,6 +10860,7 @@ async function processConversationQueueMessage(message, options) {
   const parsed = parseConversationQueueMessage(message);
   return await processConversationWork(parsed, {
     checkInIntervalMs: options.checkInIntervalMs,
+    conversationStore: options.conversationStore,
     nowMs: options.nowMs,
     queue: options.queue ?? getVercelConversationWorkQueue(),
     run: options.run,