@sentry/junior 0.91.0 → 0.92.1

package/dist/app.js

@@ -17,7 +17,7 @@ import {
   scheduleSessionCompletedPluginTasks,
   updateConversationStats,
   upsertConversationMessage
-} from "./chunk-AOISHLSF.js";
+} from "./chunk-O6ZYIHFC.js";
 import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
@@ -41,7 +41,7 @@ import {
   requestConversationContinuation,
   requestConversationWork,
   startConversationWork
-} from "./chunk-IX76WFJV.js";
+} from "./chunk-TF5VLGA7.js";
 import {
   getVercelConversationWorkQueue,
   resolveConversationWorkQueueTopic,
@@ -60,11 +60,11 @@ import {
   resolveSlackChannelTypeFromMessage,
   resolveSlackConversationContext,
   setConversationTitle
-} from "./chunk-QCKGI74V.js";
+} from "./chunk-PGR4WGZW.js";
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
-} from "./chunk-TYUXD3FN.js";
+} from "./chunk-MC4ZZE4Q.js";
 import {
   defineJuniorPlugins,
   pluginCatalogConfigFromEnv,
@@ -81,6 +81,9 @@ import {
   createAgentRunner,
   createUserTokenStore,
   deleteMcpAuthSession,
+  deleteMcpAuthSessionsForUserProvider,
+  deleteMcpServerSessionId,
+  deleteMcpStoredOAuthCredentials,
   deliverResourceEventSubscription,
   executeAgentRun,
   executeCredentialedEgressRequest,
@@ -102,9 +105,8 @@ import {
   setConfigDefaults,
   shouldEmitDevAgentTrace,
   shouldPropagateSandboxEgressTrace,
-  startOAuthFlow,
-  unlinkProvider
-} from "./chunk-ZGDTBSQ7.js";
+  startOAuthFlow
+} from "./chunk-56SIBIVF.js";
 import {
   CooperativeTurnYieldError,
   TurnInputCommitLostError,
@@ -131,32 +133,33 @@ import {
   persistThreadStateById,
   persistYieldSessionRecord,
   startActiveTurn
-} from "./chunk-ONFOWI2D.js";
+} from "./chunk-Z4FOYQXW.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   coerceThreadConversationState
-} from "./chunk-KC42JAAQ.js";
-import "./chunk-5GBUZI6M.js";
+} from "./chunk-PFXC67GJ.js";
+import "./chunk-H7KUZAMZ.js";
 import {
   buildSlackOutputMessage,
   escapeSlackMrkdwnText,
   formatSlackLink,
   normalizeSlackStatusText,
   splitSlackReplyText,
-  truncateStatusText,
-  unwrapCurrentInstruction
-} from "./chunk-PIB4EOW6.js";
+  truncateStatusText
+} from "./chunk-IWKVXO3F.js";
 import {
   abandonAgentTurnSessionRecord,
   commitMessages,
-  escapeXml,
+  contextProvenance,
   failAgentTurnSessionRecord,
   getAgentTurnSessionRecord,
+  instructionProvenanceFor,
   listAgentTurnSessionSummariesForConversation,
   loadProjection,
+  loadProjectionWithProvenance,
   recordAgentTurnSessionSummary,
   recordAuthorizationCompleted
-} from "./chunk-GCWD2VHP.js";
+} from "./chunk-OQQU3SD6.js";
 import {
   SlackActionError,
   bindSlackDirectCredentialSubject,
@@ -175,25 +178,26 @@ import {
   setPlugins,
   validatePlugins,
   verifySlackDirectCredentialSubject
-} from "./chunk-DACFZ5CI.js";
+} from "./chunk-7K3JALTQ.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-NW7AXDA5.js";
+} from "./chunk-OZJXGX4U.js";
 import "./chunk-G3E7SCME.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-RS6ANWVT.js";
+} from "./chunk-ZATRYQLR.js";
 import {
   getConversationStore,
   getDb
-} from "./chunk-2S7M37HY.js";
+} from "./chunk-NIFONS4W.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
   completeObject,
   completeText,
+  escapeXml,
   getChatConfig,
   getRuntimeMetadata,
   getSlackBotToken,
@@ -205,14 +209,15 @@ import {
   normalizeSlackEmojiName,
   setSlackReactionConfig,
   stripRuntimeTurnContext,
-  trimTrailingAssistantMessages
-} from "./chunk-HXL2ZV74.js";
+  trimTrailingAssistantMessages,
+  unwrapCurrentInstruction
+} from "./chunk-3F54A3YM.js";
 import {
   parseSlackThreadId,
   readSlackRawMessageContext,
   resolveSlackChannelIdFromMessage,
   resolveSlackChannelIdFromThreadId
-} from "./chunk-3MPOMK3K.js";
+} from "./chunk-YYBX2BD5.js";
 import {
   createSlackDestination,
   destinationKey,
@@ -222,22 +227,23 @@ import {
 } from "./chunk-GHGPTPBL.js";
 import {
   discoverSkills
-} from "./chunk-AN2437E3.js";
+} from "./chunk-YTNPU7I2.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse,
   pluginCatalogRuntime
-} from "./chunk-XP7F4LYB.js";
+} from "./chunk-BTH37NCU.js";
 import {
   buildTurnFailureResponse,
+  createActor,
   createChatSdkLogger,
   createRequestContext,
-  createRequester,
-  createSlackRequester,
-  createSlackResumeRequester,
+  createSlackActor,
+  createSlackResumeActor,
   getActiveTraceId,
   isActorUserId,
+  isUserActor,
   logError,
   logException,
   logInfo,
@@ -247,10 +253,10 @@ import {
   setSpanAttributes,
   setSpanStatus,
   setTags,
-  toStoredSlackRequester,
+  toStoredSlackActor,
   withContext,
   withSpan
-} from "./chunk-ZUK7BL63.js";
+} from "./chunk-S6QKIGRM.js";
 import {
   toOptionalString
 } from "./chunk-OB42YVAE.js";
@@ -584,8 +590,8 @@ var dispatchStatusSchema = z.enum([
   "blocked"
 ]);
 var dispatchActorSchema = z.object({
-  type: z.literal("system"),
-  id: nonEmptyExactStringSchema
+  platform: z.literal("system"),
+  name: nonEmptyExactStringSchema
 }).strict();
 var credentialSubjectBindingSchema = z.object({
   type: z.literal("slack-direct-conversation"),
@@ -772,7 +778,7 @@ async function createOrGetDispatch(args) {
     }
     const metadata = normalizeMetadata(args.options.metadata);
     const record = {
-      actor: { type: "system", id: args.plugin },
+      actor: { platform: "system", name: args.plugin },
       attempt: 0,
       createdAtMs: args.nowMs,
       ...args.options.credentialSubject ? { credentialSubject: args.options.credentialSubject } : {},
@@ -850,7 +856,7 @@ function upsertDispatchUserMessage(args) {
     ),
     createdAtMs: args.nowMs,
     author: {
-      userName: `system:${args.dispatch.actor.id}`,
+      userName: `system:${args.dispatch.actor.name}`,
       isBot: true
     },
     meta: {
@@ -923,8 +929,8 @@ async function runAgentDispatchSlice(callback, deps) {
     slackThreadId: conversationId,
     slackChannelId: dispatch.destination.channelId,
     runId: dispatch.id,
-    actorType: dispatch.actor.type,
-    actorId: dispatch.actor.id,
+    actorType: dispatch.actor.platform,
+    actorId: dispatch.actor.name,
     assistantUserName: botConfig.userName
   };
   const destinationLockId = getDispatchDestinationLockId(dispatch.destination);
@@ -1143,6 +1149,7 @@ async function runAgentDispatchSlice(callback, deps) {
         usage: reply.diagnostics.usage,
         destination: dispatch.destination,
         source: dispatch.source,
+        actor: dispatch.actor,
         surface: "api",
         logContext: {
           threadId: conversationId,
@@ -1276,7 +1283,7 @@ async function recordExecutionMetadata(args) {
         updatedAtMs: conversation.execution.updatedAtMs
       },
       lastActivityAtMs: conversation.lastActivityAtMs,
-      requester: conversation.requester,
+      actor: conversation.actor,
       source: conversation.source,
       title: conversation.title,
       updatedAtMs: conversation.updatedAtMs
@@ -1573,53 +1580,51 @@ async function runWithSlackInstallation(args) {
 
 // src/chat/services/message-actor-identity.ts
 var messageActors = /* @__PURE__ */ new WeakMap();
-function canonicalUserId(author, requester) {
+function canonicalUserId(author, actor) {
   const authorUserId = parseActorUserId(author.userId);
-  if (authorUserId && authorUserId !== requester.userId) {
-    throw new Error("Message requester user id mismatch");
+  if (authorUserId && authorUserId !== actor.userId) {
+    throw new Error("Message actor user id mismatch");
   }
-  const userId = authorUserId ?? requester.userId;
+  const userId = authorUserId ?? actor.userId;
   if (!userId) {
-    throw new Error("Message requester requires a user id");
+    throw new Error("Message actor requires a user id");
   }
   return userId;
 }
-function requesterFromAuthor(author) {
+function actorFromAuthor(author) {
   const userId = parseActorUserId(author.userId);
   return userId ? { userId } : void 0;
 }
-function applyRequesterToAuthor(author, requester) {
-  if (!isActorUserId(requester.userId)) {
-    throw new Error("Message requester requires a user id");
+function applyActorToAuthor(author, actor) {
+  if (!isActorUserId(actor.userId)) {
+    throw new Error("Message actor requires a user id");
   }
-  author.userId = requester.userId;
-  author.userName = requester.userName ?? "";
-  author.fullName = requester.fullName ?? "";
+  author.userId = actor.userId;
+  author.userName = actor.userName ?? "";
+  author.fullName = actor.fullName ?? "";
 }
-function bindMessageActorIdentity(message, requester) {
-  const userId = canonicalUserId(message.author, requester);
-  const actorRequester = createRequester(requester, {
-    platform: requester.platform,
-    ...requester.platform === "slack" ? { teamId: requester.teamId } : {},
+function bindMessageActorIdentity(message, actor) {
+  const userId = canonicalUserId(message.author, actor);
+  const currentActor = createActor(actor, {
+    platform: actor.platform,
+    ...actor.platform === "slack" ? { teamId: actor.teamId } : {},
     userId
   });
-  if (!actorRequester) {
-    throw new Error("Message requester requires a user id");
+  if (!currentActor) {
+    throw new Error("Message actor requires a user id");
   }
-  messageActors.set(message, actorRequester);
-  applyRequesterToAuthor(message.author, actorRequester);
-  return actorRequester;
+  messageActors.set(message, currentActor);
+  applyActorToAuthor(message.author, currentActor);
+  return currentActor;
 }
 function getMessageActorIdentity(message) {
-  return messageActors.get(message) ?? requesterFromAuthor(message.author);
+  return messageActors.get(message) ?? actorFromAuthor(message.author);
 }
 async function ensureSlackMessageActorIdentity(message, teamId, lookupSlackUser2) {
   const existing = messageActors.get(message);
   if (existing) {
     if (existing.platform !== "slack") {
-      throw new Error(
-        "Slack message actor identity requires a Slack requester"
-      );
+      throw new Error("Slack message actor identity requires a Slack actor");
     }
     return existing;
   }
@@ -1627,14 +1632,14 @@ async function ensureSlackMessageActorIdentity(message, teamId, lookupSlackUser2
   if (!userId) {
     throw new Error("Slack message actor identity requires a user id");
   }
-  const requester = bindMessageActorIdentity(
+  const actor = bindMessageActorIdentity(
     message,
-    createSlackRequester(teamId, userId, await lookupSlackUser2(teamId, userId))
+    createSlackActor(teamId, userId, await lookupSlackUser2(teamId, userId))
   );
-  if (requester.platform !== "slack") {
-    throw new Error("Slack message actor identity requires a Slack requester");
+  if (actor.platform !== "slack") {
+    throw new Error("Slack message actor identity requires a Slack actor");
   }
-  return requester;
+  return actor;
 }
 
 // src/chat/slack/user.ts
@@ -1719,8 +1724,8 @@ async function lookupSlackUser(teamId, userId) {
     return null;
   }
 }
-async function lookupSlackRequester(teamId, userId) {
-  return createSlackRequester(
+async function lookupSlackActor(teamId, userId) {
+  return createSlackActor(
     teamId,
     userId,
     await lookupSlackUser(teamId, userId)
@@ -3772,8 +3777,8 @@ function getResumeLogContext(args, lockKey) {
   return {
     conversationId: routing?.correlation?.conversationId ?? lockKey,
     slackThreadId: routing?.correlation?.threadId ?? lockKey,
-    slackUserId: routing?.requester?.userId ?? routing?.correlation?.requesterId,
-    slackUserName: routing?.requester?.userName,
+    slackUserId: isUserActor(routing?.actor) ? routing.actor.userId : routing?.correlation?.actorId,
+    slackUserName: isUserActor(routing?.actor) ? routing.actor.userName : void 0,
     slackChannelId: args.channelId,
     runId: routing?.correlation?.runId,
     assistantUserName: botConfig.userName,
@@ -3849,7 +3854,7 @@ function createResumeReplyContext(args, statusSession) {
         threadId: replyContext.routing.correlation?.threadId ?? threadId,
         channelId: replyContext.routing.correlation?.channelId ?? args.channelId,
         threadTs: replyContext.routing.correlation?.threadTs ?? args.threadTs,
-        requesterId: replyContext.routing.correlation?.requesterId ?? replyContext.routing.requester?.userId
+        actorId: replyContext.routing.correlation?.actorId ?? (isUserActor(replyContext.routing.actor) ? replyContext.routing.actor.userId : void 0)
       }
     },
     policy: {
@@ -3909,18 +3914,25 @@ async function resumeSlackTurn(args) {
     if (preparedArgs) {
       runArgs = { ...args, ...preparedArgs };
     }
-    if (!runArgs.replyContext?.routing.requester?.userId) {
+    const activeReplyContext = runArgs.replyContext;
+    if (!activeReplyContext) {
       throw new Error(
-        "Resumed turn requires replyContext.routing.requester.userId"
+        "Resumed turn requires replyContext.routing.actor.userId"
       );
     }
-    const credentialContext = runArgs.replyContext.routing.credentialContext;
+    const resumeActor = activeReplyContext.routing.actor;
+    if (!isUserActor(resumeActor)) {
+      throw new Error(
+        "Resumed turn requires replyContext.routing.actor.userId"
+      );
+    }
+    const credentialContext = activeReplyContext.routing.credentialContext;
     if (!credentialContext) {
       throw new Error("Resumed turn requires replyContext.credentialContext");
     }
-    if (credentialContext.actor.type !== "user" || credentialContext.actor.userId !== runArgs.replyContext.routing.requester.userId) {
+    if (!("type" in credentialContext.actor) || credentialContext.actor.userId !== resumeActor.userId) {
       throw new Error(
-        "Resumed turn credential actor must match replyContext.routing.requester.userId"
+        "Resumed turn credential actor must match replyContext.routing.actor.userId"
       );
     }
     if (runArgs.messageTs) {
@@ -3963,7 +3975,7 @@ async function resumeSlackTurn(args) {
         deferredPauseKind = "auth";
         deferredAuthInfo = {
           providerDisplayName: outcome.providerDisplayName,
-          requesterId: runArgs.replyContext?.routing.requester?.userId
+          actorId: resumeActor.userId
         };
         deferredPauseHandler = async () => {
           await onAuthPause({
@@ -4015,11 +4027,11 @@ async function resumeSlackTurn(args) {
           currentUsage: reply.diagnostics.usage,
           destination: replyContext.routing.destination,
           source: replyContext.routing.source,
-          requester: replyContext.routing.requester,
+          actor: replyContext.routing.actor,
           surface: "slack",
           logContext: {
             threadId: replyContext.routing.correlation.threadId,
-            requesterId: replyContext.routing.requester?.userId,
+            actorId: isUserActor(replyContext.routing.actor) ? replyContext.routing.actor.userId : void 0,
             channelId: runArgs.channelId,
             runId: replyContext.routing.correlation.runId,
             assistantUserName: botConfig.userName,
@@ -4105,7 +4117,7 @@ async function resumeSlackTurn(args) {
           runArgs.channelId,
           runArgs.threadTs,
           buildAuthPauseResponse(
-            deferredAuthInfo.requesterId,
+            deferredAuthInfo.actorId,
             deferredAuthInfo.providerDisplayName
           ),
           footer
@@ -4349,7 +4361,7 @@ async function resumeAuthorizedMcpTurn(args) {
     conversation,
     kind: "mcp",
     provider,
-    requesterId: authSession.userId
+    actorId: authSession.userId
   });
   const resolvedSessionId = pendingAuth?.sessionId ?? authSession.sessionId;
   const userMessage2 = getTurnUserMessage(conversation, resolvedSessionId);
@@ -4386,7 +4398,7 @@ async function resumeAuthorizedMcpTurn(args) {
         conversation: lockedConversation,
         kind: "mcp",
         provider,
-        requesterId: authSession.userId
+        actorId: authSession.userId
       });
       const lockedSessionId = lockedPendingAuth?.sessionId ?? authSession.sessionId;
       if (lockedSessionId !== resolvedSessionId) {
@@ -4431,10 +4443,10 @@ async function resumeAuthorizedMcpTurn(args) {
       const lockedChannelConfiguration = getChannelConfigurationServiceById(
         authSession.channelId
       );
-      let requester;
+      let actor;
       try {
-        requester = createSlackResumeRequester({
-          requester: lockedSessionRecord.requester,
+        actor = createSlackResumeActor({
+          actor: isUserActor(lockedSessionRecord.actor) ? lockedSessionRecord.actor : void 0,
           teamId: destination.teamId,
           userId: authSession.userId
         });
@@ -4443,7 +4455,7 @@ async function resumeAuthorizedMcpTurn(args) {
           conversationId: authSession.conversationId,
           expectedVersion: lockedSessionRecord.version,
           sessionId: lockedSessionId,
-          errorMessage: "Stored Slack requester identity did not match OAuth requester"
+          errorMessage: "Stored Slack actor identity did not match OAuth actor"
         });
         return false;
       }
@@ -4460,7 +4472,7 @@ async function resumeAuthorizedMcpTurn(args) {
         conversationId: authSession.conversationId,
         kind: "mcp",
         provider,
-        requesterId: authSession.userId,
+        actorId: authSession.userId,
         authorizationId: mcpAuthorizationId({
           provider,
           sessionId: lockedSessionId
@@ -4479,9 +4491,9 @@ async function resumeAuthorizedMcpTurn(args) {
           },
           routing: {
             credentialContext: {
-              actor: { type: "user", userId: requester.userId }
+              actor: { type: "user", userId: actor.userId }
             },
-            requester,
+            actor,
             destination,
             source: lockedSessionRecord.source,
             correlation: {
@@ -4489,7 +4501,7 @@ async function resumeAuthorizedMcpTurn(args) {
               turnId: lockedSessionId,
               channelId: authSession.channelId,
               threadTs: authSession.threadTs,
-              requesterId: requester.userId
+              actorId: actor.userId
             },
             toolChannelId: authSession.toolChannelId ?? lockedArtifacts.assistantContextChannelId ?? authSession.channelId
           },
@@ -4860,7 +4872,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
     conversation,
     kind: "plugin",
     provider: stored.provider,
-    requesterId: stored.userId,
+    actorId: stored.userId,
     ...stored.scope ? { scope: stored.scope } : {}
   });
   const resolvedSessionId = pendingAuth?.sessionId ?? stored.resumeSessionId;
@@ -4916,7 +4928,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
         conversation: lockedConversation,
         kind: "plugin",
         provider: stored.provider,
-        requesterId: stored.userId,
+        actorId: stored.userId,
         ...stored.scope ? { scope: stored.scope } : {}
       });
       const lockedSessionId = lockedPendingAuth?.sessionId ?? stored.resumeSessionId;
@@ -4962,10 +4974,10 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
       const lockedChannelConfiguration = getChannelConfigurationServiceById(
         stored.channelId
       );
-      let requester;
+      let actor;
       try {
-        requester = createSlackResumeRequester({
-          requester: lockedSessionRecord.requester,
+        actor = createSlackResumeActor({
+          actor: isUserActor(lockedSessionRecord.actor) ? lockedSessionRecord.actor : void 0,
           teamId: destination.teamId,
           userId: lockedUserMessage.author.userId
         });
@@ -4974,7 +4986,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
           conversationId: stored.resumeConversationId,
           expectedVersion: lockedSessionRecord.version,
           sessionId: lockedSessionId,
-          errorMessage: "Stored Slack requester identity did not match OAuth requester"
+          errorMessage: "Stored Slack actor identity did not match OAuth actor"
         });
         return false;
       }
@@ -4991,7 +5003,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
         conversationId: stored.resumeConversationId,
         kind: "plugin",
         provider: stored.provider,
-        requesterId: stored.userId,
+        actorId: stored.userId,
         authorizationId: pluginAuthorizationId({
           provider: stored.provider,
           sessionId: lockedSessionId
@@ -5012,10 +5024,10 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
             credentialContext: {
               actor: {
                 type: "user",
-                userId: requester.userId
+                userId: actor.userId
               }
             },
-            requester,
+            actor,
             destination,
             source: lockedSessionRecord.source,
             correlation: {
@@ -5023,7 +5035,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
               turnId: lockedSessionId,
               channelId: stored.channelId,
               threadTs: stored.threadTs,
-              requesterId: requester.userId
+              actorId: actor.userId
             },
             toolChannelId: lockedArtifacts.assistantContextChannelId ?? stored.channelId
           },
@@ -5116,10 +5128,7 @@ async function resumePendingOAuthMessage(stored, options) {
     stored.destination,
     "OAuth pending message resume"
   );
-  const requester = await lookupSlackRequester(
-    destination.teamId,
-    stored.userId
-  );
+  const actor = await lookupSlackActor(destination.teamId, stored.userId);
   const messageTs = getTurnUserSlackMessageTs(latestUserMessage);
   await resumeAuthorizedRequest({
     messageText: stored.pendingMessage,
@@ -5137,14 +5146,14 @@ async function resumePendingOAuthMessage(stored, options) {
         credentialContext: {
           actor: { type: "user", userId: stored.userId }
         },
-        requester,
+        actor,
         destination: stored.destination,
         source,
         correlation: {
           conversationId: threadId,
           channelId: stored.channelId,
           threadTs: stored.threadTs,
-          requesterId: stored.userId
+          actorId: stored.userId
         }
       },
       policy: {
@@ -5326,6 +5335,23 @@ async function GET4(request, provider, waitUntil, options) {
         }
       } catch (error) {
         if (error instanceof ResumeTurnBusyError) {
+          logWarn(
+            "oauth_callback_resume_busy",
+            {
+              ...stored.resumeConversationId && {
+                conversationId: stored.resumeConversationId
+              },
+              ...stored.userId && { actorId: stored.userId },
+              ...stored.channelId && { channelId: stored.channelId }
+            },
+            {
+              "app.credential.provider": stored.provider,
+              ...stored.resumeSessionId && {
+                "app.ai.session_id": stored.resumeSessionId
+              }
+            },
+            "OAuth callback resume was busy; user must send another message to continue"
+          );
           return;
         }
         throw error;
@@ -5836,17 +5862,17 @@ function isExternalSlackUser(raw) {
 async function postEphemeral(event, text) {
   await event.channel.postEphemeral(event.user, text, { fallbackToDM: false });
 }
-function requireRequesterId(event) {
+function requireActorId(event) {
   const userId = parseActorUserId(event.user.userId);
   if (!userId) {
-    throw new Error("Slack slash command requires a requester user id");
+    throw new Error("Slack slash command requires a actor user id");
   }
   return userId;
 }
 function getCommandName() {
   return getChatConfig().slack.slashCommand;
 }
-async function handleLink(event, requesterId, provider) {
+async function handleLink(event, actorId, provider) {
   if (!pluginCatalogRuntime.isProvider(provider)) {
     await postEphemeral(event, `Unknown provider: \`${provider}\``);
     return;
@@ -5860,7 +5886,7 @@ async function handleLink(event, requesterId, provider) {
   }
   const raw = event.raw;
   const result = await startOAuthFlow(provider, {
-    requesterId,
+    actorId,
     channelId: raw.channel_id
   });
   if (!result.ok) {
@@ -5879,7 +5905,7 @@ async function handleLink(event, requesterId, provider) {
     );
   }
 }
-async function handleUnlink(event, requesterId, provider) {
+async function handleUnlink(event, actorId, provider) {
   if (!pluginCatalogRuntime.isProvider(provider)) {
     await postEphemeral(event, `Unknown provider: \`${provider}\``);
     return;
@@ -5892,10 +5918,10 @@ async function handleUnlink(event, requesterId, provider) {
     return;
   }
   const tokenStore = createUserTokenStore();
-  await tokenStore.delete(requesterId, provider);
+  await tokenStore.delete(actorId, provider);
   logInfo(
     "slash_command_unlink",
-    { slackUserId: requesterId },
+    { slackUserId: actorId },
     { "app.credential.provider": provider },
     `Unlinked ${formatProviderLabel(provider)} account via ${getCommandName()} slash command`
   );
@@ -5921,14 +5947,24 @@ async function handleSlashCommand(event) {
     return;
   }
   const normalized = provider.toLowerCase();
-  const requesterId = requireRequesterId(event);
+  const actorId = requireActorId(event);
   if (subcommand === "link") {
-    await handleLink(event, requesterId, normalized);
+    await handleLink(event, actorId, normalized);
   } else {
-    await handleUnlink(event, requesterId, normalized);
+    await handleUnlink(event, actorId, normalized);
   }
 }
 
+// src/chat/credentials/unlink-provider.ts
+async function unlinkProvider(userId, provider, userTokenStore) {
+  await Promise.all([
+    userTokenStore.delete(userId, provider),
+    deleteMcpStoredOAuthCredentials(userId, provider),
+    deleteMcpServerSessionId(userId, provider),
+    deleteMcpAuthSessionsForUserProvider(userId, provider)
+  ]);
+}
+
 // src/chat/ingress/slack-webhook.ts
 var IGNORED_MESSAGE_SUBTYPES = /* @__PURE__ */ new Set([
   "message_changed",
@@ -6202,7 +6238,7 @@ async function handleSlashCommandForm(args) {
     "Slack slash command payload"
   );
   const teamId = args.params.get("team_id") ?? void 0;
-  const userIdentity = createRequester(
+  const userIdentity = createActor(
     {
       platform: "slack",
       teamId,
@@ -7424,7 +7460,7 @@ async function decideSubscribedThreadReply(args) {
         modelId: args.modelId,
         threadId: args.input.context.threadId ?? "",
         channelId: args.input.context.channelId ?? "",
-        requesterId: args.input.context.requesterId ?? "",
+        actorId: args.input.context.actorId ?? "",
         runId: args.input.context.runId ?? ""
       }
     });
@@ -7558,15 +7594,15 @@ function buildLogContext(deps, args) {
   return {
     conversationId: args.threadId ?? args.runId,
     slackThreadId: args.threadId,
-    slackUserId: args.requesterId,
-    slackUserName: args.requesterUserName,
+    slackUserId: args.actorId,
+    slackUserName: args.actorUserName,
     slackChannelId: args.channelId,
     runId: args.runId,
     assistantUserName: deps.assistantUserName,
     modelId: deps.modelId
   };
 }
-function requesterUserName(message) {
+function actorUserName(message) {
   return getMessageActorIdentity(message)?.userName;
 }
 function isResourceEventNotificationMessage2(message) {
@@ -7643,7 +7679,7 @@ function createSlackTurnRuntime(deps) {
     const { message } = candidate;
     const context = {
       threadId: deps.getThreadId(thread, message),
-      requesterId: message.author.userId,
+      actorId: message.author.userId,
       channelId: deps.getChannelId(thread, message),
       runId: deps.getRunId(thread, message)
     };
@@ -7676,8 +7712,8 @@ function createSlackTurnRuntime(deps) {
       "subscribed_message_reply_skipped",
       logContext({
         threadId: args.context.threadId,
-        requesterId: args.context.requesterId,
-        requesterUserName: requesterUserName(args.message),
+        actorId: args.context.actorId,
+        actorUserName: actorUserName(args.message),
         channelId: args.context.channelId,
         runId: args.context.runId
       }),
@@ -7801,8 +7837,8 @@ function createSlackTurnRuntime(deps) {
           pending: skippedSteeringMessages,
           context: logContext({
             threadId: deps.getThreadId(thread, message),
-            requesterId: message.author.userId,
-            requesterUserName: requesterUserName(message),
+            actorId: message.author.userId,
+            actorUserName: actorUserName(message),
             channelId: deps.getChannelId(thread, message),
             runId: deps.getRunId(thread, message)
           })
@@ -7815,8 +7851,8 @@ function createSlackTurnRuntime(deps) {
         const context = logContext({
           threadId,
           channelId,
-          requesterId: message.author.userId,
-          requesterUserName: requesterUserName(message),
+          actorId: message.author.userId,
+          actorUserName: actorUserName(message),
           runId
         });
         processingReaction = await processingReactions.start(context, message);
@@ -7888,8 +7924,8 @@ function createSlackTurnRuntime(deps) {
         }
         const errorContext = logContext({
           threadId: deps.getThreadId(thread, message),
-          requesterId: message.author.userId,
-          requesterUserName: requesterUserName(message),
+          actorId: message.author.userId,
+          actorUserName: actorUserName(message),
           channelId: deps.getChannelId(thread, message),
           runId: deps.getRunId(thread, message)
         });
@@ -7901,8 +7937,8 @@ function createSlackTurnRuntime(deps) {
             "mention_handler_read_only_channel",
             logContext({
               threadId: deps.getThreadId(thread, message),
-              requesterId: message.author.userId,
-              requesterUserName: requesterUserName(message),
+              actorId: message.author.userId,
+              actorUserName: actorUserName(message),
               channelId: deps.getChannelId(thread, message),
               runId: deps.getRunId(thread, message)
             }),
@@ -7943,8 +7979,8 @@ function createSlackTurnRuntime(deps) {
             pending: skippedSteeringMessages,
             context: logContext({
               threadId: deps.getThreadId(thread, message),
-              requesterId: message.author.userId,
-              requesterUserName: requesterUserName(message),
+              actorId: message.author.userId,
+              actorUserName: actorUserName(message),
               channelId: deps.getChannelId(thread, message),
               runId: deps.getRunId(thread, message)
             })
@@ -7966,8 +8002,8 @@ function createSlackTurnRuntime(deps) {
           pending: skippedSteeringMessages,
           context: logContext({
             threadId: deps.getThreadId(thread, message),
-            requesterId: message.author.userId,
-            requesterUserName: requesterUserName(message),
+            actorId: message.author.userId,
+            actorUserName: actorUserName(message),
             channelId: deps.getChannelId(thread, message),
             runId: deps.getRunId(thread, message)
           })
@@ -7978,11 +8014,11 @@ function createSlackTurnRuntime(deps) {
         const channelId = deps.getChannelId(thread, message);
         const runId = deps.getRunId(thread, message);
         const isResourceEventNotification = isResourceEventNotificationMessage2(message);
-        const requesterId = isResourceEventNotification ? void 0 : message.author.userId;
+        const actorId = isResourceEventNotification ? void 0 : message.author.userId;
         const turnContext = logContext({
           threadId,
-          requesterId,
-          requesterUserName: requesterUserName(message),
+          actorId,
+          actorUserName: actorUserName(message),
           channelId,
           runId
         });
@@ -8002,7 +8038,7 @@ function createSlackTurnRuntime(deps) {
           };
           const threadContext = {
             threadId,
-            requesterId,
+            actorId,
             channelId,
             runId
           };
@@ -8148,8 +8184,8 @@ function createSlackTurnRuntime(deps) {
         }
         const errorContext = logContext({
           threadId: deps.getThreadId(thread, message),
-          requesterId: message.author.userId,
-          requesterUserName: requesterUserName(message),
+          actorId: message.author.userId,
+          actorUserName: actorUserName(message),
           channelId: deps.getChannelId(thread, message),
           runId: deps.getRunId(thread, message)
         });
@@ -8161,8 +8197,8 @@ function createSlackTurnRuntime(deps) {
             "subscribed_message_handler_read_only_channel",
             logContext({
               threadId: deps.getThreadId(thread, message),
-              requesterId: message.author.userId,
-              requesterUserName: requesterUserName(message),
+              actorId: message.author.userId,
+              actorUserName: actorUserName(message),
               channelId: deps.getChannelId(thread, message),
               runId: deps.getRunId(thread, message)
             }),
@@ -8203,8 +8239,8 @@ function createSlackTurnRuntime(deps) {
             pending: skippedSteeringMessages,
             context: logContext({
               threadId: deps.getThreadId(thread, message),
-              requesterId: message.author.userId,
-              requesterUserName: requesterUserName(message),
+              actorId: message.author.userId,
+              actorUserName: actorUserName(message),
               channelId: deps.getChannelId(thread, message),
               runId: deps.getRunId(thread, message)
             })
@@ -8323,12 +8359,13 @@ function userMessage(text) {
     timestamp: Date.now()
   };
 }
-function selectRetainedUserMessages(messages, maxTokens = RETAINED_USER_MESSAGE_TOKENS) {
-  const stripped = stripRuntimeTurnContext(messages);
+function selectRetainedUserMessageEntries(messages, maxTokens = RETAINED_USER_MESSAGE_TOKENS) {
   const selected = [];
   let remaining = maxTokens;
-  for (const message of [...stripped].reverse()) {
-    if (message.role !== "user" || remaining <= 0) {
+  for (let sourceIndex = messages.length - 1; sourceIndex >= 0; sourceIndex -= 1) {
+    const stripped = stripRuntimeTurnContext([messages[sourceIndex]]);
+    const message = stripped[0];
+    if (!message || message.role !== "user" || remaining <= 0) {
       continue;
     }
     const text = sanitizeText(messageText(message));
@@ -8337,17 +8374,17 @@ function selectRetainedUserMessages(messages, maxTokens = RETAINED_USER_MESSAGE_
     }
     const tokens = estimateTextTokens(text);
     if (tokens <= remaining) {
-      selected.push(text);
+      selected.push({ message: userMessage(text), sourceIndex });
       remaining -= tokens;
       continue;
     }
     const truncated = truncateToTokenBudget(text, remaining);
     if (truncated) {
-      selected.push(truncated);
+      selected.push({ message: userMessage(truncated), sourceIndex });
     }
     break;
   }
-  return selected.reverse().map(userMessage);
+  return selected.reverse();
 }
 function renderMessageForSummary(message) {
   const role = message.role;
@@ -8424,7 +8461,7 @@ async function summarizeContext(args, deps) {
       modelId: botConfig.fastModelId,
       threadId: args.metadata?.threadId ?? "",
       channelId: args.metadata?.channelId ?? "",
-      requesterId: args.metadata?.requesterId ?? "",
+      actorId: args.metadata?.actorId ?? "",
       runId: args.metadata?.runId ?? ""
     }
   });
@@ -8443,11 +8480,12 @@ function estimateHistoryTokens(messages) {
   );
   return Math.max(usageEstimate, structuralEstimate);
 }
-function buildReplacementHistory(args) {
+function buildReplacementProvenance(args) {
   return [
-    ...selectRetainedUserMessages(args.messages),
-    userMessage(`${COMPACTION_SUMMARY_PREFIX}
-${args.summary}`)
+    ...args.retained.map(
+      (entry) => args.sourceProvenance[entry.sourceIndex] ?? contextProvenance
+    ),
+    contextProvenance
   ];
 }
 function loadCompactionSource(messages) {
@@ -8484,7 +8522,7 @@ async function maybeCompactWithDeps(args, deps) {
       "context_compaction_summary_failed",
       {
         slackThreadId: args.metadata?.threadId,
-        slackUserId: args.metadata?.requesterId,
+        slackUserId: args.metadata?.actorId,
         slackChannelId: args.metadata?.channelId,
         runId: args.metadata?.runId,
         assistantUserName: botConfig.userName,
@@ -8503,13 +8541,24 @@ async function maybeCompactWithDeps(args, deps) {
   });
 }
 async function writeCompactedThreadContext(args, sourceMessages, summary, context) {
-  const replacement = buildReplacementHistory({
-    messages: trimTrailingAssistantMessages(sourceMessages),
-    summary
+  const sourceProjection = await loadProjectionWithProvenance({
+    conversationId: args.conversationId
   });
+  const retained = selectRetainedUserMessageEntries(
+    trimTrailingAssistantMessages(sourceProjection.messages)
+  );
+  const replacement = [
+    ...retained.map((entry) => entry.message),
+    userMessage(`${COMPACTION_SUMMARY_PREFIX}
+${summary}`)
+  ];
   await commitMessages({
     conversationId: args.conversationId,
     messages: replacement,
+    provenance: buildReplacementProvenance({
+      retained,
+      sourceProvenance: sourceProjection.provenance
+    }),
     ttlMs: THREAD_STATE_TTL_MS3
   });
   updateConversationStats(args.conversation);
@@ -8544,7 +8593,7 @@ function createSubscribedReplyPolicy(deps) {
           "subscribed_message_classifier_failed",
           {
             slackThreadId: input.context.threadId,
-            slackUserId: input.context.requesterId,
+            slackUserId: input.context.actorId,
             slackChannelId: input.context.channelId,
             runId: input.context.runId,
             assistantUserName: botConfig.userName,
@@ -8725,7 +8774,7 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
           metadata: {
             threadId: context.threadId ?? "",
             channelId: context.channelId ?? "",
-            requesterId: context.requesterId ?? "",
+            actorId: context.actorId ?? "",
             runId: context.runId ?? "",
             filename: attachment.name ?? ""
           }
@@ -8755,7 +8804,7 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
           "attachment_skipped_size_limit",
           {
             slackThreadId: context.threadId,
-            slackUserId: context.requesterId,
+            slackUserId: context.actorId,
             slackChannelId: context.channelId,
             runId: context.runId,
             assistantUserName: botConfig.userName,
@@ -8780,7 +8829,7 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
           "image_attachment_processing_failed",
           {
             slackThreadId: context.threadId,
-            slackUserId: context.requesterId,
+            slackUserId: context.actorId,
             slackChannelId: context.channelId,
             runId: context.runId,
             assistantUserName: botConfig.userName,
@@ -8799,7 +8848,7 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
         "attachment_resolution_failed",
         {
           slackThreadId: context.threadId,
-          slackUserId: context.requesterId,
+          slackUserId: context.actorId,
           slackChannelId: context.channelId,
           runId: context.runId,
           assistantUserName: botConfig.userName,
@@ -8835,7 +8884,7 @@ async function summarizeConversationImage(args, deps) {
       metadata: {
         threadId: args.context.threadId ?? "",
         channelId: args.context.channelId ?? "",
-        requesterId: args.context.requesterId ?? "",
+        actorId: args.context.actorId ?? "",
         runId: args.context.runId ?? "",
         fileId: args.fileId
       }
@@ -8849,7 +8898,7 @@ async function summarizeConversationImage(args, deps) {
       "conversation_image_vision_failed",
       {
         slackThreadId: args.context.threadId,
-        slackUserId: args.context.requesterId,
+        slackUserId: args.context.actorId,
         slackChannelId: args.context.channelId,
         runId: args.context.runId,
         assistantUserName: botConfig.userName,
@@ -8905,7 +8954,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
       "conversation_image_replies_fetch_failed",
       {
         slackThreadId: context.threadId,
-        slackUserId: context.requesterId,
+        slackUserId: context.actorId,
         slackChannelId: context.channelId,
         runId: context.runId,
         assistantUserName: botConfig.userName,
@@ -8972,7 +9021,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
           "conversation_image_skipped_size_limit",
           {
             slackThreadId: context.threadId,
-            slackUserId: context.requesterId,
+            slackUserId: context.actorId,
             slackChannelId: context.channelId,
             runId: context.runId,
             assistantUserName: botConfig.userName,
@@ -8999,7 +9048,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
           "conversation_image_download_failed",
           {
             slackThreadId: context.threadId,
-            slackUserId: context.requesterId,
+            slackUserId: context.actorId,
             slackChannelId: context.channelId,
             runId: context.runId,
             assistantUserName: botConfig.userName,
@@ -9019,7 +9068,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
           "conversation_image_skipped_size_limit",
           {
             slackThreadId: context.threadId,
-            slackUserId: context.requesterId,
+            slackUserId: context.actorId,
             slackChannelId: context.channelId,
             runId: context.runId,
             assistantUserName: botConfig.userName,
@@ -9062,7 +9111,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
       "conversation_image_context_hydrated",
       {
         slackThreadId: context.threadId,
-        slackUserId: context.requesterId,
+        slackUserId: context.actorId,
         slackChannelId: context.channelId,
         runId: context.runId,
         assistantUserName: botConfig.userName,
@@ -9168,7 +9217,7 @@ function maybeUpdateAssistantTitle(args) {
         "thread_title_generation_failed",
         {
           slackThreadId: args.threadId,
-          slackUserId: args.requesterId,
+          slackUserId: args.actorId,
           slackChannelId: args.channelId,
           runId: args.runId,
           assistantUserName: args.assistantUserName,
@@ -9202,7 +9251,7 @@ function maybeUpdateAssistantTitle(args) {
             "thread_title_generation_permission_denied",
             {
               slackThreadId: args.threadId,
-              slackUserId: args.requesterId,
+              slackUserId: args.actorId,
               slackChannelId: args.channelId,
               runId: args.runId,
               assistantUserName: args.assistantUserName,
@@ -9216,7 +9265,7 @@ function maybeUpdateAssistantTitle(args) {
             "thread_title_slack_update_failed",
             {
               slackThreadId: args.threadId,
-              slackUserId: args.requesterId,
+              slackUserId: args.actorId,
               slackChannelId: args.channelId,
               runId: args.runId,
               assistantUserName: args.assistantUserName,
@@ -9249,7 +9298,7 @@ async function maybeApplyProviderDefaultConfigRequest(args) {
   await args.channelConfiguration.set({
     key: "github.repo",
     value: repo,
-    updatedBy: args.requesterId,
+    updatedBy: args.actorId,
     source: "provider-default-config"
   });
   return {
@@ -9269,8 +9318,8 @@ function collectCanvasUrls(artifacts) {
     ].filter((url) => typeof url === "string" && url !== "")
   );
 }
-function turnRequester(requester) {
-  return toStoredSlackRequester(requester);
+function turnActor(actor) {
+  return toStoredSlackActor(actor);
 }
 function parkedInputKey(message) {
   if (message.role !== "user") {
@@ -9330,12 +9379,27 @@ function queuedInstructionActor(queued) {
     ...slackTs ? { slackTs } : {}
   };
 }
+function queuedInstructionProvenance(queued, teamId) {
+  if (isResourceEventMessage(queued.message)) {
+    return contextProvenance;
+  }
+  const identity = getMessageActorIdentity(queued.message);
+  const author = identity && "platform" in identity ? identity : createActor(
+    { userId: parseActorUserId(queued.message.author.userId) },
+    {
+      platform: "slack",
+      teamId,
+      userId: parseActorUserId(queued.message.author.userId)
+    }
+  );
+  return instructionProvenanceFor(author);
+}
 function isResourceEventMessage(message) {
   const raw = message.raw && typeof message.raw === "object" ? message.raw : void 0;
   return raw?.event_type === "resource_event";
 }
 function resourceEventCredentialContext(message) {
-  return isResourceEventMessage(message) ? { actor: { type: "system", id: "resource-event" } } : void 0;
+  return isResourceEventMessage(message) ? { actor: { platform: "system", name: "resource-event" } } : void 0;
 }
 async function resolveChannelName(thread) {
   const existingName = thread.channel.name?.trim();
@@ -9466,13 +9530,14 @@ function createReplyToThread(deps) {
         const credentialContext = resourceEventCredentialContext(message) ?? {
           actor: { type: "user", userId: message.author.userId }
         };
-        const requester = credentialContext.actor.type === "user" ? await ensureSlackMessageActorIdentity(
+        const actor = "type" in credentialContext.actor ? await ensureSlackMessageActorIdentity(
           message,
           teamId,
           deps.services.lookupSlackUser
         ) : void 0;
-        const storedRequester = requester ? turnRequester(requester) : void 0;
-        const slackRequesterId = requester?.userId;
+        const executionActor = "type" in credentialContext.actor ? actor : credentialContext.actor;
+        const storedActor = actor ? turnActor(actor) : void 0;
+        const slackActorId = actor?.userId;
         const preparedState = options.preparedState ?? await deps.prepareTurnState({
           thread,
           message,
@@ -9483,7 +9548,7 @@ function createReplyToThread(deps) {
           queuedMessages: options.queuedMessages,
           context: {
             threadId,
-            requesterId: slackRequesterId,
+            actorId: slackActorId,
             channelId,
             runId
           }
@@ -9508,11 +9573,11 @@ function createReplyToThread(deps) {
           await options.beforeFirstResponsePost?.();
         };
         const postAuthPauseNotice = async (providerDisplayName) => {
-          if (!requester) {
-            throw new Error("Slack auth pause notice requires a requester");
+          if (!actor) {
+            throw new Error("Slack auth pause notice requires an actor");
           }
           const text = buildAuthPauseResponse(
-            requester.userId,
+            actor.userId,
             providerDisplayName
           );
           const footer = buildSlackReplyFooter({ conversationId });
@@ -9555,6 +9620,7 @@ function createReplyToThread(deps) {
               const attachments = queued.message.attachments;
               return {
                 actor: queuedInstructionActor(queued),
+                provenance: queuedInstructionProvenance(queued, teamId),
                 text: queued.userText,
                 timestampMs: queued.message.metadata.dateSent.getTime(),
                 omittedImageAttachmentCount: !isVisionEnabled() && hasPotentialImageAttachment(attachments) ? countPotentialImageAttachments(attachments) : 0,
@@ -9562,7 +9628,7 @@ function createReplyToThread(deps) {
                   attachments,
                   {
                     threadId,
-                    requesterId: isResourceEventMessage(queued.message) ? void 0 : queued.message.author.userId,
+                    actorId: isResourceEventMessage(queued.message) ? void 0 : queued.message.author.userId,
                     channelId,
                     runId,
                     conversation: preparedState.conversation,
@@ -9573,26 +9639,8 @@ function createReplyToThread(deps) {
             })
           );
         };
-        const appendParkedTurnInput = async (parkedSessionId) => {
-          if (!conversationId) {
-            return true;
-          }
-          const parkedMessages = [
-            ...options.queuedMessages ?? [],
-            {
-              explicitMention: Boolean(
-                options.explicitMention || message.isMention
-              ),
-              message,
-              rawText: currentText.rawText,
-              userText: currentText.userText
-            }
-          ].filter(
-            // Redelivery of the parked turn's own message must not duplicate
-            // the prompt that already started the session.
-            (queued) => buildDeterministicTurnId(queued.message.id) !== parkedSessionId
-          );
-          if (parkedMessages.length === 0) {
+        const drainParkedInputToSessionLog = async (pairs) => {
+          if (!conversationId || pairs.length === 0) {
             return true;
           }
           const stateAdapter = getStateAdapter();
@@ -9602,13 +9650,14 @@ function createReplyToThread(deps) {
             return false;
           }
           try {
-            const piMessages = (await resolveSteeringMessages(parkedMessages)).map(buildSteeringPiMessage);
-            const projection = await loadProjection({ conversationId });
+            const projection = await loadProjectionWithProvenance({
+              conversationId
+            });
             const appendedKeys = new Set(
-              projection.map(parkedInputKey).filter((key) => key !== void 0)
+              projection.messages.map(parkedInputKey).filter((key) => key !== void 0)
             );
-            const missing = piMessages.filter((piMessage) => {
-              const key = parkedInputKey(piMessage);
+            const missing = pairs.filter((pair) => {
+              const key = parkedInputKey(pair.message);
               return key === void 0 || !appendedKeys.has(key);
             });
             if (missing.length === 0) {
@@ -9616,8 +9665,14 @@ function createReplyToThread(deps) {
             }
             await commitMessages({
               conversationId,
-              messages: [...projection, ...missing],
-              requester: storedRequester,
+              messages: [
+                ...projection.messages,
+                ...missing.map((pair) => pair.message)
+              ],
+              provenance: [
+                ...projection.provenance,
+                ...missing.map((pair) => pair.provenance)
+              ],
               ttlMs: THREAD_STATE_TTL_MS4
             });
             return true;
@@ -9625,6 +9680,34 @@ function createReplyToThread(deps) {
             await stateAdapter.releaseLock(lock);
           }
         };
+        const appendParkedTurnInput = async (parkedSessionId) => {
+          if (!conversationId) {
+            return true;
+          }
+          const parkedMessages = [
+            ...options.queuedMessages ?? [],
+            {
+              explicitMention: Boolean(
+                options.explicitMention || message.isMention
+              ),
+              message,
+              rawText: currentText.rawText,
+              userText: currentText.userText
+            }
+          ].filter(
+            // Redelivery of the parked turn's own message must not duplicate
+            // the prompt that already started the session.
+            (queued) => buildDeterministicTurnId(queued.message.id) !== parkedSessionId
+          );
+          if (parkedMessages.length === 0) {
+            return true;
+          }
+          const parkedPairs = (await resolveSteeringMessages(parkedMessages)).map((steering) => ({
+            message: buildSteeringPiMessage(steering),
+            provenance: steering.provenance
+          }));
+          return drainParkedInputToSessionLog(parkedPairs);
+        };
         if (preparedState.userMessageAlreadyReplied) {
           await persistThreadState(thread, {
             conversation: preparedState.conversation
@@ -9704,7 +9787,7 @@ function createReplyToThread(deps) {
         }
         const configReply = await maybeApplyProviderDefaultConfigRequest({
           channelConfiguration: preparedState.channelConfiguration,
-          requesterId: requester?.userId,
+          actorId: actor?.userId,
           text: effectiveUserText
         });
         if (configReply) {
@@ -9753,7 +9836,7 @@ function createReplyToThread(deps) {
             startedAtMs: turnStartedAtMs,
             state: "running",
             surface: "slack",
-            requester,
+            actor,
             destination,
             destinationVisibility,
             source,
@@ -9770,7 +9853,7 @@ function createReplyToThread(deps) {
           void initConversationContext(conversationId, {
             channelName,
             originSurface: "slack",
-            originRequester: storedRequester,
+            originActor: storedActor,
             startedAtMs: turnStartedAtMs
           }).catch((error) => {
             logException(
@@ -9817,15 +9900,15 @@ function createReplyToThread(deps) {
           conversation: preparedState.conversation
         });
         await options.onTurnStatePersisted?.();
-        if (requester) {
+        if (actor) {
           setSentryUser({
-            id: requester.userId,
-            ...requester.userName ? { username: requester.userName } : {},
-            ...requester.email ? { email: requester.email } : {}
+            id: actor.userId,
+            ...actor.userName ? { username: actor.userName } : {},
+            ...actor.email ? { email: actor.email } : {}
           });
         }
-        if (requester?.userName) {
-          setTags({ slackUserName: requester.userName });
+        if (actor?.userName) {
+          setTags({ slackUserName: actor.userName });
         }
         const turnAttachments = collectTurnAttachments(
           message,
@@ -9835,7 +9918,7 @@ function createReplyToThread(deps) {
           turnAttachments,
           {
             threadId,
-            requesterId: slackRequesterId,
+            actorId: slackActorId,
             channelId,
             runId,
             conversation: preparedState.conversation,
@@ -9891,7 +9974,7 @@ function createReplyToThread(deps) {
               conversationId,
               metadata: {
                 threadId,
-                requesterId: slackRequesterId,
+                actorId: slackActorId,
                 channelId,
                 runId
               },
@@ -9906,16 +9989,29 @@ function createReplyToThread(deps) {
             }
           }
           const hasDurablePromptHistory = Boolean(piMessages?.length);
-          const queuedInstructionPiMessages = (await resolveSteeringMessages(
+          const batchedInstructions = (await resolveSteeringMessages(
             (options.queuedMessages ?? []).filter(
               (queued) => queued.explicitMention
             )
-          )).map(buildSteeringPiMessage);
-          if (queuedInstructionPiMessages.length > 0) {
-            piMessages = [
-              ...piMessages ?? [],
-              ...queuedInstructionPiMessages
-            ];
+          )).map((steering) => ({
+            message: buildSteeringPiMessage(steering),
+            provenance: steering.provenance
+          }));
+          if (!await drainParkedInputToSessionLog(batchedInstructions)) {
+            shouldPersistFailureState = false;
+            throw new TurnInputDeferredError();
+          }
+          if (batchedInstructions.length > 0) {
+            const presentKeys = new Set(
+              (piMessages ?? []).map(parkedInputKey).filter((key) => key !== void 0)
+            );
+            const newlyBatched = batchedInstructions.map((entry) => entry.message).filter((batchedMessage) => {
+              const key = parkedInputKey(batchedMessage);
+              return key === void 0 || !presentKeys.has(key);
+            });
+            if (newlyBatched.length > 0) {
+              piMessages = [...piMessages ?? [], ...newlyBatched];
+            }
           }
           status.start();
           const assistantTitleTask = maybeUpdateAssistantTitle({
@@ -9927,7 +10023,7 @@ function createReplyToThread(deps) {
             generateThreadTitle: deps.services.generateThreadTitle,
             getSlackAdapter: deps.getSlackAdapter,
             modelId: botConfig.fastModelId,
-            requesterId: slackRequesterId,
+            actorId: slackActorId,
             runId,
             threadId
           });
@@ -9980,8 +10076,8 @@ function createReplyToThread(deps) {
             );
           });
           const toolChannelId = preparedState.artifacts.assistantContextChannelId ?? channelId;
-          const activeInstructionAuthorId = requester?.userId ?? parseActorUserId(message.author.userId);
-          const activeInstructionAuthorName = requester?.fullName ?? requester?.userName;
+          const activeInstructionAuthorId = actor?.userId ?? parseActorUserId(message.author.userId);
+          const activeInstructionAuthorName = actor?.fullName ?? actor?.userName;
           const promptConversationContext = appendRecentThreadMessagesToContext(
             preparedState.conversationContext,
             options.queuedMessages ?? []
@@ -10014,7 +10110,7 @@ function createReplyToThread(deps) {
             },
             routing: {
               credentialContext,
-              requester,
+              actor,
               slackConversation,
               source,
               destination,
@@ -10029,7 +10125,7 @@ function createReplyToThread(deps) {
                 runId,
                 channelId,
                 channelName,
-                requesterId: slackRequesterId
+                actorId: slackActorId
               },
               toolChannelId
             },
@@ -10083,7 +10179,7 @@ function createReplyToThread(deps) {
             }
           });
           if (outcome.status === "awaiting_auth") {
-            if (!requester) {
+            if (!actor) {
               const text = `I could not act on this subscribed event because ${outcome.providerDisplayName} needs user authorization. Ask me in this thread to connect ${outcome.providerDisplayName} before retrying.`;
               await postThreadReply(
                 buildSlackOutputMessage(text),
@@ -10277,13 +10373,13 @@ function createReplyToThread(deps) {
                 messages: reply.piMessages,
                 logContext: {
                   threadId,
-                  requesterId: slackRequesterId,
+                  actorId: slackActorId,
                   channelId,
                   runId,
                   assistantUserName: botConfig.userName,
                   modelId: reply.diagnostics.modelId
                 },
-                requester,
+                actor: executionActor,
                 surface: "slack"
               });
             } else if (conversationId) {
@@ -10296,7 +10392,7 @@ function createReplyToThread(deps) {
                 sliceId: 1,
                 startedAtMs: message.metadata.dateSent.getTime(),
                 state: "completed",
-                requester,
+                actor: executionActor,
                 destination,
                 destinationVisibility,
                 source,
@@ -10367,6 +10463,10 @@ function createReplyToThread(deps) {
             shouldPersistFailureState = false;
             throw error;
           }
+          if (error instanceof TurnInputDeferredError) {
+            shouldPersistFailureState = false;
+            throw error;
+          }
           if (error === agentContinueScheduleError) {
             shouldPersistFailureState = true;
             throw error;
@@ -10449,7 +10549,7 @@ function createReplyToThread(deps) {
                   sliceId: 1,
                   startedAtMs: message.metadata.dateSent.getTime(),
                   state: "failed",
-                  requester,
+                  actor,
                   destination,
                   destinationVisibility,
                   source,
@@ -10685,7 +10785,7 @@ function createPrepareTurnState(deps) {
       await deps.hydrateConversationVisionContext(conversation, {
         threadId: args.context.threadId,
         channelId: args.context.channelId,
-        requesterId: args.context.requesterId,
+        actorId: args.context.actorId,
         runId: args.context.runId,
         threadTs: getThreadTs(args.context.threadId)
       });
@@ -10693,7 +10793,7 @@ function createPrepareTurnState(deps) {
     await deps.compactConversationIfNeeded(conversation, {
       threadId: args.context.threadId,
       channelId: args.context.channelId,
-      requesterId: args.context.requesterId,
+      actorId: args.context.actorId,
       runId: args.context.runId
     });
     const conversationContext = buildConversationContext(conversation, {
@@ -10977,11 +11077,11 @@ async function failContinuationStartup(args) {
     );
   }
 }
-async function resolveContinuationRequester(args) {
-  const stored = args.sessionRecordRequester;
+async function resolveContinuationActor(args) {
+  const stored = args.sessionRecordActor;
   if (stored?.platform === "slack" && stored.teamId === args.teamId && stored.userId === args.userId) {
-    return createSlackResumeRequester({
-      requester: stored,
+    return createSlackResumeActor({
+      actor: stored,
       teamId: args.teamId,
       userId: args.userId
     });
@@ -10989,12 +11089,12 @@ async function resolveContinuationRequester(args) {
   const work = await getConversationWorkState2({
     conversationId: args.conversationId
   });
-  const workRequester = work?.requester;
-  if (workRequester && workRequester.teamId === args.teamId && workRequester.slackUserId === args.userId) {
-    return createSlackRequester(args.teamId, args.userId, {
-      email: workRequester.email,
-      fullName: workRequester.fullName,
-      userName: workRequester.slackUserName
+  const workActor = work?.actor;
+  if (workActor && workActor.teamId === args.teamId && workActor.slackUserId === args.userId) {
+    return createSlackActor(args.teamId, args.userId, {
+      email: workActor.email,
+      fullName: workActor.fullName,
+      userName: workActor.slackUserName
     });
   }
   return void 0;
@@ -11062,16 +11162,16 @@ async function continueSlackAgentRun(payload, options) {
           payload.destination,
           "Slack continuation"
         );
-        const requester = await resolveContinuationRequester({
+        const actor = await resolveContinuationActor({
           conversationId: payload.conversationId,
-          sessionRecordRequester: activeSessionRecord.requester,
+          sessionRecordActor: activeSessionRecord.actor,
           teamId: destination.teamId,
           userId: userMessage2.author.userId
         });
-        if (!requester) {
+        if (!actor) {
           await failStrandedSessionWithFallback({
             conversationId: payload.conversationId,
-            errorMessage: "Stored Slack requester missing for continuation",
+            errorMessage: "Stored Slack actor missing for continuation",
             sessionRecord: activeSessionRecord
           });
           return false;
@@ -11098,10 +11198,10 @@ async function continueSlackAgentRun(payload, options) {
               credentialContext: {
                 actor: {
                   type: "user",
-                  userId: requester.userId
+                  userId: actor.userId
                 }
               },
-              requester,
+              actor,
               destination: payload.destination,
               source: activeSessionRecord.source,
               correlation: {
@@ -11109,7 +11209,7 @@ async function continueSlackAgentRun(payload, options) {
                 turnId: payload.sessionId,
                 channelId: thread.channelId,
                 threadTs: thread.threadTs,
-                requesterId: requester.userId
+                actorId: actor.userId
               },
               toolChannelId: artifacts.assistantContextChannelId ?? thread.channelId
             },
@@ -11255,7 +11355,7 @@ async function recoverStrandedRunningSession(args) {
     messages: sessionRecord.piMessages,
     errorMessage: "Recovered running session after hard worker death",
     logContext: { modelId: botConfig.modelId },
-    requester: sessionRecord.requester,
+    actor: sessionRecord.actor,
     surface: sessionRecord.surface
   });
   if (!parked) {