@sentry/junior 0.189.0 → 0.191.0

package/dist/app.js

@@ -1,15 +1,15 @@
 import {
   processConversationWork
-} from "./chunk-UCWO5MKP.js";
+} from "./chunk-X6PQKQTY.js";
 import {
   bindSpawnAgent
-} from "./chunk-ZUPDSJUE.js";
+} from "./chunk-WBNQYVCM.js";
 import {
   createAgentInvocationWorker,
   enqueueAgentInvocation,
   listPendingAgentInvocationMailboxAppends,
   resolveAgentInvocationId
-} from "./chunk-YNZPOFF3.js";
+} from "./chunk-AWFSSFAX.js";
 import {
   GET as GET2,
   GET2 as GET3,
@@ -37,12 +37,12 @@ import {
   startProcessingReaction,
   stripLeadingBotMention,
   wakePausedTurn
-} from "./chunk-WMUAKAIF.js";
+} from "./chunk-VGYZ3YZM.js";
 import "./chunk-FA6POGLH.js";
 import {
   AgentRunError,
   executeTurn
-} from "./chunk-WYDF6PGK.js";
+} from "./chunk-CCPOZMS4.js";
 import {
   buildDeliveredTurnStatePatch,
   completeAuthPauseTurn,
@@ -53,7 +53,7 @@ import {
   getTurnUserSlackMessageTs,
   persistAuthPauseTurnState,
   requireTurnFailureEventId
-} from "./chunk-7R5JRPCY.js";
+} from "./chunk-K2NKG42A.js";
 import {
   claimDispatchMailboxAppend,
   confirmDispatchMailboxAppend,
@@ -73,11 +73,11 @@ import {
   processPluginTask,
   resolveTurnSessionRouting,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-4RHJ3CXR.js";
+} from "./chunk-Q32BSFN4.js";
 import {
   ConversationTurnLifecycleService,
   getTurnLifecycle
-} from "./chunk-WWYUYKKV.js";
+} from "./chunk-TH6LMEOW.js";
 import {
   coerceThreadConversationState,
   getLocationConfigurationService,
@@ -86,7 +86,7 @@ import {
   persistThreadRuntimeState,
   persistThreadState,
   persistThreadStateById
-} from "./chunk-MRXMFB4L.js";
+} from "./chunk-SGRL7NV6.js";
 import {
   GET,
   appendAndEnqueueWebMessage,
@@ -101,24 +101,24 @@ import {
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,
   webActorFromEmail
-} from "./chunk-SR6OMO5C.js";
+} from "./chunk-5IMKUVMS.js";
 import {
   createWebAuthorization,
   deleteWebAuthorization
-} from "./chunk-VKQWU4PO.js";
+} from "./chunk-ZRN3OS7M.js";
 import {
   recordTaskExecution
-} from "./chunk-LHKZKAZ4.js";
+} from "./chunk-ZJRGWZZ2.js";
 import "./chunk-UTL3MHPC.js";
 import {
   createVercelPluginTaskCallback,
   queueCallback,
   registerVercelPluginTaskDevConsumer
-} from "./chunk-KN32OWL2.js";
+} from "./chunk-RZS4F5K4.js";
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
-} from "./chunk-OEIITG5F.js";
+} from "./chunk-BVWC5DBM.js";
 import {
   defineJuniorPlugins,
   pluginCatalogConfigFromEnv,
@@ -158,11 +158,11 @@ import {
   shouldEmitDevAgentTrace,
   shouldPropagateSandboxEgressTrace,
   unpublishedArtifactHeaders
-} from "./chunk-QNIOBNOY.js";
+} from "./chunk-NY5SJGJZ.js";
 import {
   AuthorizationFlowDisabledError,
   PluginCredentialFailureError
-} from "./chunk-AC7MDOJW.js";
+} from "./chunk-HNMRX2EN.js";
 import "./chunk-6Y5B5PEX.js";
 import "./chunk-DIB4GX3G.js";
 import {
@@ -170,14 +170,14 @@ import {
   deleteMcpAuthSessionsForUserProvider,
   deleteMcpServerSessionId,
   deleteMcpStoredOAuthCredentials
-} from "./chunk-YYZNESC3.js";
+} from "./chunk-CECRMPXJ.js";
 import {
   RetryableDeliveryError,
   createAgentRunner,
   formatProviderLabel,
   postSlackMessage,
   startOAuthFlow
-} from "./chunk-PCPSX4ES.js";
+} from "./chunk-GQN4REF5.js";
 import {
   ConversationTurnBoundaryError,
   CooperativeTurnYieldError,
@@ -193,7 +193,7 @@ import {
   markTurnCompleted,
   markTurnFailed,
   startActiveTurn
-} from "./chunk-GP32KD2J.js";
+} from "./chunk-WCSXTDOL.js";
 import {
   abandonTurnRecord,
   appendThreadContextMessages,
@@ -229,7 +229,7 @@ import {
   trimTrailingAssistantMessages,
   turnHasReply,
   upsertConversationMessage
-} from "./chunk-MFSET7Q7.js";
+} from "./chunk-KTW62MG5.js";
 import {
   getExperimentalFeatures,
   isExperimentalFeatureEnabled,
@@ -249,10 +249,10 @@ import {
   scheduledRunId,
   scheduledRunSchema,
   withScheduledTaskLock
-} from "./chunk-CMWIMFM6.js";
+} from "./chunk-LOYTPSAK.js";
 import {
   parseSlackThreadId
-} from "./chunk-MVPLEPSI.js";
+} from "./chunk-DP6H3U2X.js";
 import {
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
   appendAndEnqueueInboundMessage,
@@ -267,16 +267,16 @@ import {
   removeActiveConversation,
   requestConversationWork,
   stopConversationWork
-} from "./chunk-WN6VLHOU.js";
+} from "./chunk-3PDR63SX.js";
 import {
   buildDeterministicAssistantMessageId,
   buildDeterministicTurnId
 } from "./chunk-DA2KGZZI.js";
-import "./chunk-O35GZCKL.js";
+import "./chunk-WNIVCR74.js";
 import {
   getSandboxResourceConfig,
   setSandboxResourceConfig
-} from "./chunk-6AUR6PWR.js";
+} from "./chunk-CUUE5MGF.js";
 import "./chunk-PDO5BLNM.js";
 import "./chunk-UIE3R5XU.js";
 import {
@@ -285,7 +285,7 @@ import {
 } from "./chunk-X6GDDWQH.js";
 import {
   getTurnRequestDeadline
-} from "./chunk-S3SGZUOI.js";
+} from "./chunk-MFZOIKET.js";
 import {
   getVercelConversationWorkQueue,
   resolveConversationWorkQueueTopic,
@@ -321,7 +321,7 @@ import {
   verifyEventTaskCredentialSubject,
   verifyScheduledTaskCredentialSubject,
   verifySlackDirectCredentialSubject
-} from "./chunk-MI6ZBDTS.js";
+} from "./chunk-NK3UEKAW.js";
 import "./chunk-3Y47VMHV.js";
 import {
   createSlackDestination,
@@ -333,7 +333,7 @@ import {
   requireSlackDestination,
   withConversationEventLock,
   withConversationMutationLock
-} from "./chunk-CUYFCI4G.js";
+} from "./chunk-S7NSFCCW.js";
 import {
   juniorAgentBindings,
   juniorAgentInvocations,
@@ -341,13 +341,13 @@ import {
   juniorConversations,
   juniorSchedulerRuns,
   juniorSchedulerTasks
-} from "./chunk-5VWAY27R.js";
-import "./chunk-WDHPN2GH.js";
+} from "./chunk-SEIZ2XLD.js";
+import "./chunk-7PYCRKQL.js";
 import {
   acquireActiveLock,
   getStateAdapter,
   withActiveLock
-} from "./chunk-5CXCGDIL.js";
+} from "./chunk-YNRLCUCB.js";
 import {
   instructionProvenanceFor
 } from "./chunk-GFBR4S3Q.js";
@@ -369,17 +369,17 @@ import {
   isProviderRetryError,
   setProfiles,
   setSlackReactionConfig
-} from "./chunk-BYBSI5TI.js";
+} from "./chunk-2JAWOTUT.js";
 import {
   defaultModelId,
   modelIdForProfile
 } from "./chunk-D4YV5TDV.js";
-import "./chunk-DYXVAO2E.js";
-import "./chunk-YYSEH2WC.js";
+import "./chunk-BVYUIVXE.js";
+import "./chunk-6KISW5UY.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-E3PDZPGV.js";
-import "./chunk-ZV6PFUA4.js";
+} from "./chunk-EQZUBYRF.js";
+import "./chunk-QRNJO7DZ.js";
 import {
   credentialContextForActor
 } from "./chunk-CEMMLV5L.js";
@@ -415,13 +415,13 @@ import {
   withContext,
   withLogContext,
   withSpan
-} from "./chunk-PY3EIEAF.js";
+} from "./chunk-L4JLLS6C.js";
 import {
   continueTrace
 } from "./chunk-PEQXYSSE.js";
 import {
   JUNIOR_VERSION
-} from "./chunk-NY2F7BZA.js";
+} from "./chunk-ZNFNGDT7.js";
 
 // src/app.ts
 import { createRequire } from "module";
@@ -597,7 +597,6 @@ function buildAgentDispatchInboundMessage(dispatch2, nowMs = Date.now()) {
       }
     },
     receivedAtMs: nowMs,
-    publishExternally: true,
     source: "plugin"
   };
 }
@@ -942,7 +941,7 @@ function dispatchOptionsErrorMessage(issues) {
     return "Dispatch source must not include unknown fields";
   }
   if (hasIssueAtPath(issues, ["source"])) {
-    return "Dispatch source platform is required";
+    return "Dispatch Source kind is required";
   }
   if (hasIssueUnderPath(issues, ["source", "teamId"])) {
     return "Dispatch source teamId must be a Slack team id";
@@ -3277,7 +3276,6 @@ function createSlackConversationWorker(options) {
     if (!latestRecord) {
       return { status: "completed" };
     }
-    const publishExternally = latestRecord.publishExternally ?? context.publishExternally;
     const latestMetadata = parseSlackMetadata(latestRecord.input.metadata);
     if (!latestMetadata) {
       throw new Error(
@@ -3341,9 +3339,7 @@ function createSlackConversationWorker(options) {
         };
         const drainSteeringMessages = async (accept) => {
           await context.attempt.drain(async (pendingRecords) => {
-            const candidates = pendingRecords.filter(
-              (record) => record.publishExternally === publishExternally
-            ).map((record) => ({
+            const candidates = pendingRecords.map((record) => ({
               inboundMessageId: record.inboundMessageId,
               message: restoreMessage({
                 adapter,
@@ -3360,7 +3356,6 @@ function createSlackConversationWorker(options) {
             await options.runtime.handleNewMention(thread, latestMessage, {
               conversationId: context.conversationId,
               destination,
-              publishExternally,
               messageContext,
               drainSteeringMessages,
               ack,
@@ -3374,7 +3369,6 @@ function createSlackConversationWorker(options) {
               {
                 conversationId: context.conversationId,
                 destination,
-                publishExternally,
                 messageContext,
                 drainSteeringMessages,
                 ack,
@@ -3426,7 +3420,6 @@ function buildSlackInboundMessage(args) {
     source: "slack",
     createdAtMs: args.message.metadata.dateSent.getTime(),
     receivedAtMs: args.receivedAtMs,
-    publishExternally: true,
     input: {
       text: args.message.text || " ",
       authorId,
@@ -3694,7 +3687,8 @@ async function handleUnlink(event, actorId, provider) {
     await postEphemeral(event, `Unknown provider: \`${provider}\``);
     return;
   }
-  if (!pluginCatalogRuntime.getOAuthConfig(provider)) {
+  const supportsUnlink = Boolean(pluginCatalogRuntime.getOAuthConfig(provider)) || Boolean(pluginCatalogRuntime.getDefinition(provider)?.manifest.mcp);
+  if (!supportsUnlink) {
     await postEphemeral(
       event,
       `${formatProviderLabel(provider)} doesn't support account unlinking.`
@@ -4978,9 +4972,6 @@ function buildLogContext(deps, args) {
 function actorUserName(message) {
   return getMessageActorIdentity(message)?.userName;
 }
-function shouldPublishExternally(publishExternally) {
-  return publishExternally !== false;
-}
 function createSlackTurnRuntime(deps) {
   const turnLifecycle = getTurnLifecycle();
   const logContext = (args) => buildLogContext(deps, args);
@@ -5295,7 +5286,6 @@ function createSlackTurnRuntime(deps) {
             conversationId: hooks.conversationId,
             destination: hooks.destination,
             queuedMessages,
-            publishExternally: shouldPublishExternally(hooks.publishExternally),
             ack,
             onToolInvocation: toolInvocationHook,
             onTurnCompleted,
@@ -5353,13 +5343,11 @@ function createSlackTurnRuntime(deps) {
           lifecycleError = error2;
         }
         await hooks.beforeFirstResponsePost?.();
-        if (shouldPublishExternally(hooks.publishExternally)) {
-          await postFallbackErrorReplyWithLogging({
-            thread,
-            eventId,
-            postFailureEventName: "mention.handler.failure_reply_post.failed"
-          });
-        }
+        await postFallbackErrorReplyWithLogging({
+          thread,
+          eventId,
+          postFailureEventName: "mention.handler.failure_reply_post.failed"
+        });
         if (lifecycleError) throw lifecycleError;
       } finally {
         if (completed) {
@@ -5584,7 +5572,6 @@ function createSlackTurnRuntime(deps) {
             conversationId: hooks.conversationId,
             destination: hooks.destination,
             preparedState,
-            publishExternally: shouldPublishExternally(hooks.publishExternally),
             beforeFirstResponsePost: hooks.beforeFirstResponsePost,
             queuedMessages,
             ack,
@@ -5644,13 +5631,11 @@ function createSlackTurnRuntime(deps) {
           lifecycleError = error2;
         }
         await hooks.beforeFirstResponsePost?.();
-        if (shouldPublishExternally(hooks.publishExternally)) {
-          await postFallbackErrorReplyWithLogging({
-            thread,
-            eventId,
-            postFailureEventName: "subscribed_message.handler.failure_reply_post.failed"
-          });
-        }
+        await postFallbackErrorReplyWithLogging({
+          thread,
+          eventId,
+          postFailureEventName: "subscribed_message.handler.failure_reply_post.failed"
+        });
         if (lifecycleError) throw lifecycleError;
       } finally {
         if (completed) {
@@ -6478,9 +6463,6 @@ async function loadPiMessagesForTurn(args) {
   }
   return {};
 }
-function shouldPublishExternally2(publishExternally) {
-  return publishExternally !== false;
-}
 function createSlackTurn(deps) {
   const turnLifecycle = getTurnLifecycle();
   return async function executeSlackTurn(thread, message, options) {
@@ -6624,9 +6606,6 @@ function createSlackTurn(deps) {
           );
           try {
             await beforeFirstResponsePost();
-            if (!shouldPublishExternally2(options.publishExternally)) {
-              return;
-            }
             if (channelId && threadTs) {
               await sendSlackReply({
                 channelId,
@@ -6781,9 +6760,7 @@ function createSlackTurn(deps) {
         });
         if (configReply) {
           await beforeFirstResponsePost();
-          if (shouldPublishExternally2(options.publishExternally)) {
-            await thread.post(buildSlackOutputMessage(configReply.text));
-          }
+          await thread.post(buildSlackOutputMessage(configReply.text));
           markConversationMessage(
             preparedState.conversation,
             preparedState.userMessageId,
@@ -6949,21 +6926,19 @@ function createSlackTurn(deps) {
           let slackMessageTs2 = [];
           await beforeFirstResponsePost();
           try {
-            if (shouldPublishExternally2(options.publishExternally)) {
-              if (channelId && thread.adapter.name === "slack") {
-                slackMessageTs2 = await sendSlackReply({
-                  channelId,
-                  conversationId,
-                  replyAttribution: options.execution?.dispatch?.replyAttribution,
-                  text,
-                  ...threadTs ? { threadTs } : void 0
-                });
-              } else {
-                for (const part of splitSlackReplyText(text)) {
-                  const postedMessageTs = (await thread.post(buildSlackOutputMessage(part))).id;
-                  if (postedMessageTs) {
-                    slackMessageTs2.push(postedMessageTs);
-                  }
+            if (channelId && thread.adapter.name === "slack") {
+              slackMessageTs2 = await sendSlackReply({
+                channelId,
+                conversationId,
+                replyAttribution: options.execution?.dispatch?.replyAttribution,
+                text,
+                ...threadTs ? { threadTs } : void 0
+              });
+            } else {
+              for (const part of splitSlackReplyText(text)) {
+                const postedMessageTs = (await thread.post(buildSlackOutputMessage(part))).id;
+                if (postedMessageTs) {
+                  slackMessageTs2.push(postedMessageTs);
                 }
               }
             }
@@ -7172,9 +7147,6 @@ function createSlackTurn(deps) {
             source,
             ...location ? { location } : void 0,
             destination,
-            publishExternally: shouldPublishExternally2(
-              options.publishExternally
-            ),
             surface: options.execution?.surface ?? "slack",
             dispatch: options.execution?.dispatch,
             toolChannelId,
@@ -7865,7 +7837,6 @@ function createSlackDispatchTurnRunner(options) {
       ack: hooks.ack,
       conversationId,
       destination: dispatch2.destination,
-      publishExternally: true,
       execution: {
         disabledFeatures: ["interactive-auth"],
         locationConfiguration: options.getLocationConfiguration(
@@ -8186,10 +8157,10 @@ async function resolveSlackResumeUserActor(args) {
 async function resolveResumeExecutionIdentity(args) {
   const routing = args.routingContext;
   if (routing?.credentialContext) {
-    const actor2 = routing.dispatch?.actor ?? routing.actor ?? (!("type" in routing.credentialContext.actor) ? routing.credentialContext.actor : void 0);
+    const actor2 = args.actor ?? routing.dispatch?.actor ?? routing.actor ?? (!("type" in routing.credentialContext.actor) ? routing.credentialContext.actor : void 0);
     return actor2 ? { actor: actor2, credentialContext: routing.credentialContext } : void 0;
   }
-  let actor = routing?.actor;
+  let actor = args.actor ?? routing?.actor;
   if (!actor && isResourceEventConversationMessage(args.userMessage)) {
     actor = RESOURCE_EVENT_SYSTEM_ACTOR;
   }
@@ -8305,6 +8276,7 @@ async function runPausedTurnInContext(payload, options, runOptions) {
           return false;
         }
         const identity = await resolveResumeExecutionIdentity({
+          actor: activeTurn.actor,
           conversationId: payload.conversationId,
           routingContext: options.routingContext,
           teamId: destination.teamId,
@@ -8370,11 +8342,6 @@ async function runPausedTurnInContext(payload, options, runOptions) {
             destination: routingDestination,
             ...dispatch2 ? { dispatch: dispatch2 } : void 0,
             ...routing.location ? { location: routing.location } : void 0,
-            // Slack resume publishes unless the checkpoint opted out.
-            // Missing means legacy/in-flight Slack turns still post.
-            // TODO(dcramer): Remove this missing-as-publish fallback after no
-            // stored Turn checkpoint can omit publishExternally.
-            publishExternally: activeTurn.publishExternally !== false,
             source,
             ...surface ? { surface } : void 0,
             toolChannelId: destination.channelId,
@@ -8602,9 +8569,9 @@ async function commitAssistantMessage(args) {
     text: args.text,
     userMessageId: args.userMessageId
   });
-  if (args.publishedMessage?.providerMessageId) {
+  if (args.deliveryResult?.providerMessageId) {
     markConversationMessage(args.conversation, conversationMessageId, {
-      slackTs: args.publishedMessage.providerMessageId
+      slackTs: args.deliveryResult.providerMessageId
     });
   }
   try {
@@ -8614,7 +8581,7 @@ async function commitAssistantMessage(args) {
         conversation: args.conversation,
         conversationMessageId,
         conversationId: args.conversationId,
-        providerConversationBindings: args.publishedMessage?.providerConversationBindings
+        providerConversationBindings: args.deliveryResult?.providerConversationBindings
       })
     );
   } catch (error) {
@@ -8630,18 +8597,24 @@ async function commitAssistantMessage(args) {
 
 // src/chat/task-execution/mailbox-turn.ts
 import {
+  createResourceEventSource,
   createLocalSource,
   createWebSource
 } from "@sentry/junior-plugin-api";
-function turnInputFactsFromConversationMessage(message) {
+function turnInputFactsFromConversationMessage(message, args) {
   if (isResourceEventConversationMessage(message)) {
     return {
-      actor: RESOURCE_EVENT_SYSTEM_ACTOR,
+      actor: args.savedActor ?? RESOURCE_EVENT_SYSTEM_ACTOR,
       author: message.author ?? RESOURCE_EVENT_MESSAGE_AUTHOR,
-      source: "resource_event"
+      // Stored Turns written before Source was saved can only restore the old
+      // provider stand-in from the Conversation.
+      source: args.savedSource ?? (args.location ? createWebSource(
+        args.conversationId,
+        args.visibility === "private" ? "private" : "public"
+      ) : createLocalSource(args.conversationId))
     };
   }
-  const actor = createActor(message.author, {
+  const actor = args.savedActor ?? createActor(message.author, {
     platform: "web",
     userId: message.author?.userId
   });
@@ -8651,22 +8624,20 @@ function turnInputFactsFromConversationMessage(message) {
   return {
     actor,
     author: message.author ?? { userId: actor.userId },
-    source: "web"
+    source: args.savedSource?.kind === "web" ? args.savedSource : createWebSource(
+      args.conversationId,
+      args.visibility === "private" ? "private" : "public"
+    )
   };
 }
 function sourceFromTurnInput(args) {
-  switch (args.source) {
-    case "resource_event":
-      return args.location ? createWebSource(
-        args.conversationId,
-        args.visibility === "private" ? "private" : "public"
-      ) : createLocalSource(args.conversationId);
-    case "web":
-      return createWebSource(
-        args.conversationId,
-        args.visibility === "private" ? "private" : "public"
-      );
+  if (args.source.kind === "web") {
+    return createWebSource(
+      args.conversationId,
+      args.visibility === "private" ? "private" : "public"
+    );
   }
+  return args.source;
 }
 function hasResourceEventActor(actors) {
   return Boolean(
@@ -8688,7 +8659,7 @@ async function getActiveConversationTurnId(conversationId) {
   const turnId = active[0]?.turnId;
   if (!turnId) return void 0;
   const record = await getTurnRecord(conversationId, turnId);
-  return record && record.surface === "api" && !record.dispatchId && (record.state === "paused" || record.state === "running") ? turnId : void 0;
+  return record && (record.source?.kind === "web" || !record.source && record.surface === "api") && !record.dispatchId && (record.state === "paused" || record.state === "running") ? turnId : void 0;
 }
 async function getActiveMailboxTurnId(conversationId) {
   const summaries = await listTurnSummaries(conversationId);
@@ -8697,7 +8668,7 @@ async function getActiveMailboxTurnId(conversationId) {
       (summary) => !summary.dispatchId && (summary.state === "paused" || summary.state === "running")
     ).map((summary) => getTurnRecord(conversationId, summary.turnId))
   )).filter(
-    (record) => record && !record.dispatchId && (record.surface === "api" || hasResourceEventActor(record.actors)) && (record.state === "paused" || record.state === "running")
+    (record) => record && !record.dispatchId && (record.source?.kind === "web" || record.source?.kind === "resource_event" || !record.source && (record.surface === "api" || hasResourceEventActor(record.actors))) && (record.state === "paused" || record.state === "running")
   );
   if (active.length > 1) {
     throw new Error(
@@ -8747,7 +8718,7 @@ function parseWebMessages(messages) {
         ...actor.userName ? { userName: actor.userName } : void 0
       },
       message: entry.message,
-      source: "web"
+      source: createWebSource(entry.message.conversationId)
     };
   });
 }
@@ -8768,7 +8739,12 @@ function parseResourceEventMessages(messages) {
       actor: RESOURCE_EVENT_SYSTEM_ACTOR,
       author: RESOURCE_EVENT_MESSAGE_AUTHOR,
       message,
-      source: "resource_event"
+      source: createResourceEventSource({
+        eventKey: message.input.metadata.resourceEvent.eventKey,
+        eventType: message.input.metadata.resourceEvent.eventType,
+        identifier: message.input.metadata.resourceEvent.identifier,
+        namespace: message.input.metadata.resourceEvent.namespace
+      })
     };
   });
 }
@@ -8850,7 +8826,7 @@ async function completeCancelledConversationTurn(args) {
   });
   await args.acknowledge();
 }
-function createConversationTurnWorker(agentRunner, publishMessage) {
+function createConversationTurnWorker(agentRunner, deliverMessage) {
   return async (context, resolved) => {
     const lifecycle = new ConversationTurnLifecycleService(
       getConversationEventStore()
@@ -8889,6 +8865,8 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
       conversation,
       conversationId: context.conversationId
     });
+    const savedTurn = isResume ? await getTurnRecord(context.conversationId, turnId) : void 0;
+    let savedMessageIsResourceEvent = false;
     if (isResume) {
       const userMessage = getTurnUserMessage(conversation, turnId);
       if (!userMessage) {
@@ -8896,7 +8874,14 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
           `Unable to locate the persisted user message for Turn "${turnId}"`
         );
       }
-      turnInputFacts = turnInputFactsFromConversationMessage(userMessage);
+      savedMessageIsResourceEvent = isResourceEventConversationMessage(userMessage);
+      turnInputFacts = turnInputFactsFromConversationMessage(userMessage, {
+        conversationId: context.conversationId,
+        location: storedConversation?.location,
+        savedActor: savedTurn?.actor,
+        savedSource: savedTurn?.source,
+        visibility: storedConversation?.visibility
+      });
       userMessageId = userMessage.id;
       text = userMessage.text;
       startedAtMs = userMessage.createdAtMs;
@@ -8910,14 +8895,13 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
     const { actor, author } = turnInputFacts;
     const source = sourceFromTurnInput({
       conversationId: context.conversationId,
-      location: storedConversation?.location,
       source: turnInputFacts.source,
       visibility: storedConversation?.visibility
     });
     const webActor = actor.platform === "web" ? actor : void 0;
-    const savedTurn = isResume ? await getTurnRecord(context.conversationId, turnId) : void 0;
-    const publish = turnInputFacts.source === "resource_event" && storedConversation?.location ? savedTurn?.publishExternally ?? true : false;
-    const surface = publish ? "slack" : "api";
+    const conversationLocation = storedConversation?.location;
+    const deliverToProvider = Boolean(conversationLocation) && (source.kind === "resource_event" || savedMessageIsResourceEvent);
+    const surface = deliverToProvider ? "slack" : "api";
     return await withLogContext(
       {
         conversationId: context.conversationId,
@@ -8977,7 +8961,7 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
             meta: {
               explicitMention: true,
               replied: false,
-              ...turnInputFacts.source === "web" ? { source: "web" } : void 0
+              ...source.kind === "web" ? { source: "web" } : void 0
             }
           });
           await persistConversationMessages({
@@ -9012,24 +8996,26 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
             return;
           }
           failureCode = "delivery_failed";
-          const location = storedConversation?.location;
-          if (publish && (!location || !publishMessage)) {
-            throw new Error(
-              `Conversation ${context.conversationId} cannot publish its system Turn`
-            );
+          let deliveryResult;
+          if (deliverToProvider) {
+            if (!conversationLocation || !deliverMessage) {
+              throw new Error(
+                `Conversation ${context.conversationId} cannot deliver to its Location`
+              );
+            }
+            deliveryResult = await deliverMessage({
+              conversationId: context.conversationId,
+              location: conversationLocation,
+              text: replyText
+            });
           }
-          const publishedMessage = publish && location && publishMessage ? await publishMessage({
-            conversationId: context.conversationId,
-            location,
-            text: replyText
-          }) : void 0;
           await commitAssistantMessage({
             ...agentMessage ? { agentMessage } : void 0,
             conversation,
             conversationId: context.conversationId,
-            ...publishedMessage ? { publishedMessage } : void 0,
+            ...deliveryResult ? { deliveryResult } : void 0,
             sessionId: turnId,
-            ...publishedMessage ? { source: "slack" } : turnInputFacts.source === "web" ? { source: "web" } : void 0,
+            ...deliveryResult ? { source: "slack" } : source.kind === "web" ? { source: "web" } : void 0,
             text: replyText,
             userMessageId
           });
@@ -9097,11 +9083,8 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
               // TODO(dcramer): Remove AgentRun.destination after agent and tool
               // code reads AgentRun.location and no Run consumer needs it.
               destination,
-              // TODO(dcramer): Remove AgentRun.publishExternally after the
-              // saved Turn publish choice controls optional Delivery.
-              publishExternally: publish,
               source,
-              ...storedConversation?.location ? { location: storedConversation.location } : void 0,
+              ...conversationLocation ? { location: conversationLocation } : void 0,
               surface,
               ...stopSignal ? { signal: stopSignal } : void 0,
               ...webActor ? {
@@ -9175,7 +9158,6 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
                   // TODO(dcramer): Remove checkpoint Destination after resume
                   // reads the Conversation Location.
                   destination,
-                  publishExternally: publish,
                   source,
                   actor,
                   surface
@@ -9304,11 +9286,11 @@ function createConversationTurnWorker(agentRunner, publishMessage) {
 }
 
 // src/chat/providers/slack/system-turn.ts
-function createSlackSystemTurnPublisher(args) {
+function createSlackSystemTurnDelivery(args) {
   return async ({ conversationId, location, text }) => {
     if (location.provider !== "slack") {
       throw new Error(
-        `Slack system Turn cannot publish to ${location.provider} Location`
+        `Slack system Turn cannot deliver to ${location.provider} Location`
       );
     }
     let messageIds;
@@ -9405,7 +9387,7 @@ function createConversationWork(options) {
   const invocationWorker = createAgentInvocationWorker(options.agentRunner);
   const conversationTurnWorker = createConversationTurnWorker(
     options.agentRunner,
-    createSlackSystemTurnPublisher({
+    createSlackSystemTurnDelivery({
       getSlackAdapter: options.getSlackAdapter,
       state: options.state
     })