@sentry/junior 0.95.0 → 0.97.0

package/dist/app.js

@@ -5,7 +5,15 @@ import {
   processPluginTask,
   requireTurnFailureEventId,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-XX4N4E6C.js";
+} from "./chunk-T533JLM3.js";
+import {
+  buildSentryConversationUrl
+} from "./chunk-LVUKF5CE.js";
+import {
+  conversationVisibilityFromSlackChannelType,
+  resolveSlackChannelTypeFromMessage,
+  resolveSlackConversationContext
+} from "./chunk-NG2AV7IB.js";
 import {
   CONVERSATION_WORK_CHECK_IN_INTERVAL_MS,
   CONVERSATION_WORK_STALE_ENQUEUE_MS,
@@ -29,7 +37,11 @@ import {
   requestConversationContinuation,
   requestConversationWork,
   startConversationWork
-} from "./chunk-5XMNOD3S.js";
+} from "./chunk-FBHZJFHI.js";
+import {
+  GET
+} from "./chunk-QNVHH5PU.js";
+import "./chunk-CEA3A3UA.js";
 import {
   getVercelConversationWorkQueue,
   resolveConversationWorkQueueTopic,
@@ -40,17 +52,10 @@ import {
   createVercelQueueClient,
   verifyPluginTaskQueueMessage
 } from "./chunk-KNFROR7R.js";
-import {
-  GET,
-  buildSentryConversationUrl,
-  conversationVisibilityFromSlackChannelType,
-  resolveSlackChannelTypeFromMessage,
-  resolveSlackConversationContext
-} from "./chunk-EKNJM5IG.js";
 import {
   validatePluginEgressCredentialHooks,
   validatePluginRegistrations
-} from "./chunk-AYP4ERVZ.js";
+} from "./chunk-D5KZYS4T.js";
 import {
   defineJuniorPlugins,
   pluginCatalogConfigFromEnv,
@@ -66,6 +71,7 @@ import {
   buildSlackOutputMessage,
   buildSteeringPiMessage,
   createAgentRunner,
+  createContextCompactor,
   createUserTokenStore,
   deleteMcpAuthSession,
   deleteMcpAuthSessionsForUserProvider,
@@ -98,7 +104,7 @@ import {
   splitSlackReplyText,
   startOAuthFlow,
   truncateStatusText
-} from "./chunk-HCXXB35T.js";
+} from "./chunk-XIRPQQVE.js";
 import {
   CooperativeTurnYieldError,
   TurnInputCommitLostError,
@@ -127,31 +133,26 @@ import {
   persistWithRetry,
   persistYieldSessionRecord,
   startActiveTurn
-} from "./chunk-KDPCGVIT.js";
-import {
-  coerceThreadConversationState
-} from "./chunk-RAIB6WSG.js";
-import "./chunk-WCMQJE4F.js";
-import "./chunk-CM5EZD5F.js";
-import "./chunk-N4RNJ32C.js";
+} from "./chunk-WGXMTFNU.js";
 import {
+  JUNIOR_THREAD_STATE_TTL_MS,
   abandonAgentTurnSessionRecord,
-  commitMessages,
+  coerceThreadConversationState,
   failAgentTurnSessionRecord,
   getAgentTurnSessionRecord,
   listAgentTurnSessionSummariesForConversation,
+  recordAgentTurnSessionSummary
+} from "./chunk-WJOSZOON.js";
+import {
+  commitMessages,
+  loadConversationProjection,
   loadProjection,
-  loadProjectionWithProvenance,
-  recordAgentTurnSessionSummary,
   recordAuthorizationCompleted
-} from "./chunk-WAGQ377B.js";
+} from "./chunk-GUAP3H7O.js";
 import {
-  JUNIOR_THREAD_STATE_TTL_MS,
   buildConversationContext,
   createConversationMemoryService,
-  estimateTextTokens,
   generateConversationId,
-  getAgentContextCompactionTriggerTokens,
   getConversationMessageSlackTs,
   getThreadTitleSourceMessage,
   hydrateConversationMessages,
@@ -162,36 +163,37 @@ import {
   persistConversationMessages,
   updateConversationStats,
   upsertConversationMessage
-} from "./chunk-CRRBJ3JP.js";
+} from "./chunk-3F4OPKGF.js";
+import "./chunk-H66UCBPW.js";
+import "./chunk-PDO5BLNM.js";
+import "./chunk-CM5EZD5F.js";
 import {
-  SlackActionError,
   bindSlackDirectCredentialSubject,
-  downloadPrivateSlackFile,
-  getHeaderString,
   getPluginApiRoutes,
   getPluginRoutes,
   getPluginSlackConversationLink,
   getPlugins,
+  setPlugins,
+  validatePlugins,
+  verifySlackDirectCredentialSubject
+} from "./chunk-5HLDPVYS.js";
+import {
+  SlackActionError,
+  downloadPrivateSlackFile,
+  getHeaderString,
   getSlackClient,
   getWorkspaceTeamId,
   isDmChannel,
   normalizeSlackConversationId,
   runWithSlackInstallationToken,
-  runWithWorkspaceTeamId,
-  setPlugins,
-  validatePlugins,
-  verifySlackDirectCredentialSubject
-} from "./chunk-NSCHU54X.js";
+  runWithWorkspaceTeamId
+} from "./chunk-WTYEKPXU.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-E3E2XNCN.js";
-import {
-  sleep
-} from "./chunk-CZEX6KIQ.js";
+} from "./chunk-EOWXRY5E.js";
 import {
   contextProvenance,
-  getAgentStepStore,
   getConversationStore,
   getDb,
   getSqlExecutor,
@@ -200,9 +202,14 @@ import {
   juniorConversationMessages,
   juniorConversations,
   juniorDestinations
-} from "./chunk-6ONME5IG.js";
+} from "./chunk-35BNLDOJ.js";
+import "./chunk-G3E7SCME.js";
+import {
+  sleep
+} from "./chunk-4ZNGQH7C.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
+  STANDARD_MODEL_PROFILE,
   acquireActiveLock,
   botConfig,
   completeObject,
@@ -217,18 +224,19 @@ import {
   getSlackSigningSecret,
   getStateAdapter,
   isProviderRetryError,
+  modelIdForProfile,
   normalizeSlackEmojiName,
+  retainRuntimeTurnContext,
   setSlackReactionConfig,
   stripRuntimeTurnContext,
-  trimTrailingAssistantMessages,
-  unwrapCurrentInstruction
-} from "./chunk-GUE7HTNR.js";
+  trimTrailingAssistantMessages
+} from "./chunk-EEZCY5WX.js";
 import {
   parseSlackThreadId,
   readSlackRawMessageContext,
   resolveSlackChannelIdFromMessage,
   resolveSlackChannelIdFromThreadId
-} from "./chunk-GY34VGP5.js";
+} from "./chunk-LVA4I4H7.js";
 import {
   createSlackDestination,
   destinationKey,
@@ -238,13 +246,13 @@ import {
 } from "./chunk-B7PUBQQM.js";
 import {
   discoverSkills
-} from "./chunk-HDTO3A74.js";
+} from "./chunk-3ECW2K2O.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse,
   pluginCatalogRuntime
-} from "./chunk-GVOUCI2O.js";
+} from "./chunk-LMJPRYHP.js";
 import {
   buildTurnFailureResponse,
   createActor,
@@ -266,21 +274,22 @@ import {
   setTags,
   withContext,
   withSpan
-} from "./chunk-WPOJ443W.js";
+} from "./chunk-I35CTGPO.js";
 import {
   toOptionalString
 } from "./chunk-OB42YVAE.js";
 import {
   continueTrace
-} from "./chunk-3DA7X2U3.js";
-import {
-  homeDir
-} from "./chunk-6APU57E6.js";
+} from "./chunk-6GWA276C.js";
+import "./chunk-B3IT5END.js";
 import {
   JUNIOR_PLUGIN_TASK_CALLBACK_ROUTE,
   parseSlackChannelId,
   parseSlackMessageTs
 } from "./chunk-7FBGKXPE.js";
+import {
+  homeDir
+} from "./chunk-3V7OFJZC.js";
 import "./chunk-MLKGABMK.js";
 
 // src/app.ts
@@ -1138,6 +1147,7 @@ async function runAgentDispatchSlice(callback, deps) {
         sessionId: turnId,
         sliceId: 1,
         messages: reply.piMessages,
+        modelId: reply.diagnostics.modelId,
         durationMs: reply.diagnostics.durationMs,
         usage: reply.diagnostics.usage,
         reasoningLevel: reply.diagnostics.thinkingLevel,
@@ -1149,8 +1159,7 @@ async function runAgentDispatchSlice(callback, deps) {
           threadId: conversationId,
           channelId: dispatch.destination.channelId,
           runId: dispatch.id,
-          assistantUserName: botConfig.userName,
-          modelId: reply.diagnostics.modelId
+          assistantUserName: botConfig.userName
         }
       });
     }
@@ -1276,6 +1285,7 @@ async function recordExecutionMetadata(args) {
       updatedAtMs: conversation.execution.updatedAtMs
     },
     lastActivityAtMs: conversation.lastActivityAtMs,
+    metrics: null,
     actor: conversation.actor,
     source: conversation.source,
     title: conversation.title,
@@ -2116,12 +2126,16 @@ function buildSlackInboundMessage(args) {
 }
 
 // src/chat/resource-events/notification.ts
-function eventText(subscription, event) {
+function renderResourceEventNotificationText(subscription, event) {
   const lines = [
     "[event notification]",
     "",
     "A subscribed resource changed.",
     "",
+    "Handling:",
+    "- This is a subscribed conversation update, not a user-authored command.",
+    "- Use the subscription intent to decide whether this event warrants action or a visible reply. Otherwise, stay silent.",
+    "",
     "Subscription:",
     `- resource: ${subscription.label}`,
     `- event: ${event.eventType}`,
@@ -2150,7 +2164,7 @@ async function enqueueResourceEventNotification(args) {
     message: createSlackResourceEventInboundMessage({
       event: args.event,
       subscription,
-      text: eventText(args.subscription, args.event)
+      text: renderResourceEventNotificationText(args.subscription, args.event)
     }),
     queue: args.queue,
     state: args.state
@@ -4227,6 +4241,7 @@ async function resumeSlackTurn(args) {
           conversationId: replyContext.routing.correlation.conversationId,
           sessionId: replyContext.routing.correlation.turnId,
           allMessages: reply.piMessages,
+          modelId: reply.diagnostics.modelId,
           currentDurationMs: reply.diagnostics.durationMs,
           currentUsage: reply.diagnostics.usage,
           destination: replyContext.routing.destination,
@@ -4238,8 +4253,7 @@ async function resumeSlackTurn(args) {
             actorId: isUserActor(replyContext.routing.actor) ? replyContext.routing.actor.userId : void 0,
             channelId: runArgs.channelId,
             runId: replyContext.routing.correlation.runId,
-            assistantUserName: botConfig.userName,
-            modelId: reply.diagnostics.modelId
+            assistantUserName: botConfig.userName
           }
         });
       }
@@ -4498,13 +4512,13 @@ async function persistCompletedReplyState(channelId, threadTs, sessionId, reply)
   const conversation = coerceThreadConversationState(currentState);
   await hydrateConversationMessages({ conversation, conversationId: threadId });
   const artifacts = coerceThreadArtifactsState(currentState);
-  const userMessage2 = getTurnUserMessage(conversation, sessionId);
+  const userMessage = getTurnUserMessage(conversation, sessionId);
   const statePatch = buildDeliveredTurnStatePatch({
     artifacts,
     conversation,
     reply,
     sessionId,
-    userMessageId: userMessage2?.id
+    userMessageId: userMessage?.id
   });
   await persistThreadStateById(threadId, {
     ...statePatch
@@ -4575,7 +4589,7 @@ async function resumeAuthorizedMcpTurn(args) {
     actorId: authSession.userId
   });
   const resolvedSessionId = pendingAuth?.sessionId ?? authSession.sessionId;
-  const userMessage2 = getTurnUserMessage(conversation, resolvedSessionId);
+  const userMessage = getTurnUserMessage(conversation, resolvedSessionId);
   if (pendingAuth) {
     if (!isPendingAuthLatestRequest(conversation, pendingAuth)) {
       clearPendingAuth(conversation, pendingAuth.sessionId);
@@ -4590,14 +4604,14 @@ async function resumeAuthorizedMcpTurn(args) {
   } else if (conversation.processing.activeTurnId !== authSession.sessionId) {
     return;
   }
-  if (!userMessage2) {
+  if (!userMessage) {
     return;
   }
   await resumeAuthorizedRequest({
-    messageText: userMessage2.text,
+    messageText: userMessage.text,
     channelId: authSession.channelId,
     threadTs: authSession.threadTs,
-    messageTs: getTurnUserSlackMessageTs(userMessage2),
+    messageTs: getTurnUserSlackMessageTs(userMessage),
     lockKey: threadId,
     connectedText: "",
     agentRunner,
@@ -5015,13 +5029,13 @@ async function persistCompletedOAuthReplyState(args) {
     conversationId: args.conversationId
   });
   const artifacts = coerceThreadArtifactsState(currentState);
-  const userMessage2 = getTurnUserMessage(conversation, args.sessionId);
+  const userMessage = getTurnUserMessage(conversation, args.sessionId);
   const statePatch = buildDeliveredTurnStatePatch({
     artifacts,
     conversation,
     reply: args.reply,
     sessionId: args.sessionId,
-    userMessageId: userMessage2?.id
+    userMessageId: userMessage?.id
   });
   await persistThreadStateById(args.conversationId, {
     ...statePatch
@@ -5101,7 +5115,7 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
     ...stored.scope ? { scope: stored.scope } : {}
   });
   const resolvedSessionId = pendingAuth?.sessionId ?? stored.resumeSessionId;
-  const userMessage2 = resolvedSessionId ? getTurnUserMessage(conversation, resolvedSessionId) : void 0;
+  const userMessage = resolvedSessionId ? getTurnUserMessage(conversation, resolvedSessionId) : void 0;
   if (pendingAuth) {
     if (!isPendingAuthLatestRequest(conversation, pendingAuth)) {
       clearPendingAuth(conversation, pendingAuth.sessionId);
@@ -5129,17 +5143,17 @@ async function resumeOAuthSessionRecordTurn(stored, options) {
   if (sessionRecord.state !== "awaiting_resume" || sessionRecord.resumeReason !== "auth") {
     return true;
   }
-  if (!userMessage2?.author?.userId) {
+  if (!userMessage?.author?.userId) {
     return false;
   }
   if (!pendingAuth && conversation.processing.activeTurnId !== stored.resumeSessionId) {
     return true;
   }
   await resumeSlackTurn({
-    messageText: pendingAuth ? userMessage2.text : stored.pendingMessage ?? userMessage2.text,
+    messageText: pendingAuth ? userMessage.text : stored.pendingMessage ?? userMessage.text,
     channelId: stored.channelId,
     threadTs: stored.threadTs,
-    messageTs: getTurnUserSlackMessageTs(userMessage2),
+    messageTs: getTurnUserSlackMessageTs(userMessage),
     lockKey: stored.resumeConversationId,
     initialText: "",
     agentRunner: options.agentRunner,
@@ -8534,293 +8548,6 @@ function createSlackTurnRuntime(deps) {
   };
 }
 
-// src/chat/services/context-compaction.ts
-import {
-  estimateContextTokens,
-  estimateTokens
-} from "@earendil-works/pi-agent-core";
-var RETAINED_USER_MESSAGE_TOKENS = 2e4;
-var MAX_SUMMARY_INPUT_CHARS = 8e4;
-var MAX_VISIBLE_CONTEXT_CHARS = 2e4;
-var MAX_SUMMARY_CHARS = 6e3;
-var MAX_RENDERED_MESSAGE_CHARS = 4e3;
-var COMPACTION_SUMMARY_PREFIX = "Context handoff summary for future Junior turns:";
-var OMITTED_OLDER_CONTEXT_NOTICE = "[older context omitted]";
-function textPart(value) {
-  if (value && typeof value === "object" && value.type === "text" && typeof value.text === "string") {
-    return value.text;
-  }
-  return void 0;
-}
-function messageText(message) {
-  const content = message.content;
-  const unwrapTask = message.role === "user";
-  const displayText = (text) => unwrapTask ? unwrapCurrentInstruction(text) ?? text : text;
-  if (!Array.isArray(content)) {
-    return typeof content === "string" ? displayText(content) : "";
-  }
-  return content.map(textPart).filter((text) => Boolean(text)).map(displayText).join("\n").trim();
-}
-function sanitizeText(text) {
-  return text.replace(
-    /<data_base64>[\s\S]*?<\/data_base64>/g,
-    "<data_base64>[omitted]</data_base64>"
-  ).replace(
-    /data:image\/[a-z0-9.+-]+;base64,[a-z0-9+/=]+/gi,
-    "[image data omitted]"
-  ).replaceAll("\0", " ").trim();
-}
-function truncateToTokenBudget(text, maxTokens) {
-  const maxChars = Math.max(0, maxTokens * 4);
-  if (text.length <= maxChars) {
-    return text;
-  }
-  return `${text.slice(0, Math.max(0, maxChars - 3)).trimEnd()}...`;
-}
-function isCompactionSummary(text) {
-  return text.trimStart().startsWith(COMPACTION_SUMMARY_PREFIX);
-}
-function isPayloadHeavy(text) {
-  return /<data_base64>[\s\S]*?<\/data_base64>|data:image\/[a-z0-9.+-]+;base64,/i.test(
-    text
-  );
-}
-function userMessage(text) {
-  return {
-    role: "user",
-    content: [{ type: "text", text }],
-    timestamp: Date.now()
-  };
-}
-function piMessageTimestamp(message) {
-  const timestamp = message.timestamp;
-  return typeof timestamp === "number" ? timestamp : Date.now();
-}
-function selectRetainedUserMessageEntries(messages, maxTokens = RETAINED_USER_MESSAGE_TOKENS) {
-  const selected = [];
-  let remaining = maxTokens;
-  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));
-    if (!text || isCompactionSummary(text) || isPayloadHeavy(text)) {
-      continue;
-    }
-    const tokens = estimateTextTokens(text);
-    if (tokens <= remaining) {
-      selected.push({ message: userMessage(text), sourceIndex });
-      remaining -= tokens;
-      continue;
-    }
-    const truncated = truncateToTokenBudget(text, remaining);
-    if (truncated) {
-      selected.push({ message: userMessage(truncated), sourceIndex });
-    }
-    break;
-  }
-  return selected.reverse();
-}
-function renderMessageForSummary(message) {
-  const role = message.role;
-  if (typeof role !== "string") {
-    return void 0;
-  }
-  const text = sanitizeText(messageText(message));
-  if (!text) {
-    return void 0;
-  }
-  const trimmed = text.length > MAX_RENDERED_MESSAGE_CHARS ? `${text.slice(0, MAX_RENDERED_MESSAGE_CHARS).trimEnd()}...` : text;
-  return `[${role}] ${trimmed}`;
-}
-function keepTail(text, maxChars) {
-  if (text.length <= maxChars) {
-    return text;
-  }
-  const prefix = `${OMITTED_OLDER_CONTEXT_NOTICE}
-`;
-  return `${prefix}${text.slice(Math.max(0, text.length - maxChars + prefix.length))}`;
-}
-function renderSummaryInput(piMessages, conversationContext) {
-  const lines = [];
-  const visibleContext = conversationContext?.trim();
-  if (visibleContext) {
-    lines.push(
-      "<visible-thread-context>",
-      keepTail(visibleContext, MAX_VISIBLE_CONTEXT_CHARS),
-      "</visible-thread-context>",
-      ""
-    );
-  }
-  const renderedPiMessages = stripRuntimeTurnContext(piMessages).map(renderMessageForSummary).filter((line) => Boolean(line));
-  if (renderedPiMessages.length > 0) {
-    const piEnvelopeChars = "<pi-history>\n</pi-history>".length + 2;
-    const piHistory = keepTail(
-      renderedPiMessages.join("\n"),
-      Math.max(
-        1,
-        MAX_SUMMARY_INPUT_CHARS - lines.join("\n").length - piEnvelopeChars
-      )
-    );
-    lines.push("<pi-history>", piHistory, "</pi-history>");
-  }
-  return keepTail(lines.join("\n"), MAX_SUMMARY_INPUT_CHARS);
-}
-async function summarizeContext(args, deps) {
-  const source = renderSummaryInput(args.piMessages, args.conversationContext);
-  const result = await deps.completeText({
-    modelId: botConfig.fastModelId,
-    messageAttributeMode: "metadata",
-    temperature: 0,
-    messages: [
-      {
-        role: "user",
-        content: [
-          "You are performing a CONTEXT CHECKPOINT COMPACTION for Junior.",
-          "Create a concise handoff summary for another model that will continue this Slack thread.",
-          "",
-          "Include:",
-          "- Current outstanding asks",
-          "- Key decisions, completed work, and outcomes",
-          "- Durable constraints, user preferences, IDs, URLs, artifacts, canvas links, sandbox references, and auth state",
-          "- Clear next steps and unresolved blockers",
-          "",
-          "Do not invent details. Do not include raw secrets or credentials.",
-          "",
-          source
-        ].join("\n"),
-        timestamp: Date.now()
-      }
-    ],
-    metadata: {
-      modelId: botConfig.fastModelId,
-      threadId: args.metadata?.threadId ?? "",
-      channelId: args.metadata?.channelId ?? "",
-      actorId: args.metadata?.actorId ?? "",
-      runId: args.metadata?.runId ?? ""
-    }
-  });
-  const summary = result.text.trim();
-  if (!summary) {
-    throw new Error("Compaction summary was empty");
-  }
-  return summary.slice(0, MAX_SUMMARY_CHARS);
-}
-function estimateHistoryTokens(messages) {
-  const stripped = stripRuntimeTurnContext(messages);
-  const usageEstimate = estimateContextTokens(stripped).tokens;
-  const structuralEstimate = stripped.reduce(
-    (total, message) => total + estimateTokens(message),
-    0
-  );
-  return Math.max(usageEstimate, structuralEstimate);
-}
-function buildReplacementProvenance(args) {
-  return [
-    ...args.retained.map(
-      (entry) => args.sourceProvenance[entry.sourceIndex] ?? contextProvenance
-    ),
-    contextProvenance
-  ];
-}
-function loadCompactionSource(messages) {
-  if (messages.length > 0) {
-    return {
-      estimatedTokens: estimateHistoryTokens(messages),
-      messages
-    };
-  }
-  return { reason: "missing_context" };
-}
-async function maybeCompactWithDeps(args, deps) {
-  const source = loadCompactionSource(args.piMessages);
-  if ("reason" in source) {
-    return { compacted: false, reason: source.reason };
-  }
-  const triggerTokens = deps.autoCompactionTriggerTokens ?? getAgentContextCompactionTriggerTokens();
-  if (source.estimatedTokens <= triggerTokens) {
-    return { compacted: false, reason: "below_threshold" };
-  }
-  args.onCompactionStart?.();
-  let summary;
-  try {
-    summary = await summarizeContext(
-      {
-        conversationContext: args.conversationContext,
-        piMessages: source.messages,
-        metadata: args.metadata
-      },
-      deps
-    );
-  } catch (error) {
-    logWarn(
-      "context_compaction_summary_failed",
-      {
-        slackThreadId: args.metadata?.threadId,
-        slackUserId: args.metadata?.actorId,
-        slackChannelId: args.metadata?.channelId,
-        runId: args.metadata?.runId,
-        assistantUserName: botConfig.userName,
-        modelId: botConfig.fastModelId
-      },
-      {
-        "exception.message": error instanceof Error ? error.message : String(error)
-      },
-      "Context compaction failed; continuing with prior history"
-    );
-    return { compacted: false, reason: "summary_failed" };
-  }
-  return await writeCompactedThreadContext(args, source.messages, summary, {
-    estimatedTokens: source.estimatedTokens,
-    triggerTokens
-  });
-}
-async function writeCompactedThreadContext(args, sourceMessages, summary, context) {
-  const stepStore = getAgentStepStore();
-  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}`)
-  ];
-  const replacementProvenance = buildReplacementProvenance({
-    retained,
-    sourceProvenance: sourceProjection.provenance
-  });
-  await stepStore.startEpoch(args.conversationId, {
-    reason: "compaction",
-    messages: replacement.map((message, index) => ({
-      message,
-      createdAtMs: piMessageTimestamp(message),
-      provenance: replacementProvenance[index]
-    }))
-  });
-  updateConversationStats(args.conversation);
-  setSpanAttributes({
-    "app.compaction.input_messages": sourceMessages.length,
-    "app.compaction.retained_messages": replacement.length - 1,
-    "app.compaction.summary_chars": summary.length,
-    ...context.triggerTokens !== void 0 ? { "app.compaction.trigger_tokens": context.triggerTokens } : {},
-    "app.context_tokens_estimated": context.estimatedTokens
-  });
-  return {
-    compacted: true,
-    piMessages: replacement
-  };
-}
-function createContextCompactor(deps) {
-  return {
-    maybeCompact: async (args) => await maybeCompactWithDeps(args, deps)
-  };
-}
-
 // src/chat/services/subscribed-reply-policy.ts
 function createSubscribedReplyPolicy(deps) {
   return async (args) => {
@@ -9885,7 +9612,7 @@ function createReplyToThread(deps) {
             return false;
           }
           try {
-            const projection = await loadProjectionWithProvenance({
+            const projection = await loadConversationProjection({
               conversationId
             });
             const appendedKeys = new Set(
@@ -9900,6 +9627,7 @@ function createReplyToThread(deps) {
             }
             await commitMessages({
               conversationId,
+              modelId: modelIdForProfile(botConfig, projection.modelProfile),
               messages: [
                 ...projection.messages,
                 ...missing.map((pair) => pair.message)
@@ -10576,13 +10304,13 @@ function createReplyToThread(deps) {
                 sessionId: turnId,
                 sliceId: 1,
                 messages: reply.piMessages,
+                modelId: reply.diagnostics.modelId,
                 logContext: {
                   threadId,
                   actorId: slackActorId,
                   channelId,
                   runId,
-                  assistantUserName: botConfig.userName,
-                  modelId: reply.diagnostics.modelId
+                  assistantUserName: botConfig.userName
                 },
                 actor: executionActor,
                 surface: "slack"
@@ -11215,7 +10943,7 @@ async function persistCompletedReplyState2(args) {
     conversationId: args.sessionRecord.conversationId
   });
   const artifacts = coerceThreadArtifactsState(currentState);
-  const userMessage2 = getTurnUserMessage(
+  const userMessage = getTurnUserMessage(
     conversation,
     args.sessionRecord.sessionId
   );
@@ -11224,7 +10952,7 @@ async function persistCompletedReplyState2(args) {
     conversation,
     reply: args.reply,
     sessionId: args.sessionRecord.sessionId,
-    userMessageId: userMessage2?.id
+    userMessageId: userMessage?.id
   });
   await persistThreadStateById(args.sessionRecord.conversationId, {
     ...statePatch
@@ -11366,8 +11094,8 @@ async function continueSlackAgentRun(payload, options) {
           conversationId: payload.conversationId
         });
         const artifacts = coerceThreadArtifactsState(currentState);
-        const userMessage2 = getTurnUserMessage(conversation, payload.sessionId);
-        if (!userMessage2?.author?.userId) {
+        const userMessage = getTurnUserMessage(conversation, payload.sessionId);
+        if (!userMessage?.author?.userId) {
           throw new Error(
             `Unable to locate the persisted user message for agent continuation session "${payload.sessionId}"`
           );
@@ -11379,7 +11107,7 @@ async function continueSlackAgentRun(payload, options) {
           thread.channelId
         );
         const conversationContext = buildConversationContext(conversation, {
-          excludeMessageId: userMessage2.id
+          excludeMessageId: userMessage.id
         });
         const sandbox = getPersistedSandboxState(currentState);
         const destination = requireSlackDestination(
@@ -11396,7 +11124,7 @@ async function continueSlackAgentRun(payload, options) {
             conversationId: payload.conversationId,
             sessionRecordActor: activeSessionRecord.actor,
             teamId: destination.teamId,
-            userId: userMessage2.author.userId
+            userId: userMessage.author.userId
           });
           if (!actor) {
             await failStrandedSessionWithFallback({
@@ -11423,8 +11151,8 @@ async function continueSlackAgentRun(payload, options) {
           return false;
         }
         return {
-          messageText: userMessage2.text,
-          messageTs: getTurnUserSlackMessageTs(userMessage2),
+          messageText: userMessage.text,
+          messageTs: getTurnUserSlackMessageTs(userMessage),
           replyContext: {
             input: {
               conversationContext,
@@ -11433,7 +11161,7 @@ async function continueSlackAgentRun(payload, options) {
               piMessages: await loadProjection({
                 conversationId: payload.conversationId
               }),
-              ...getTurnUserReplyAttachmentContext(userMessage2)
+              ...getTurnUserReplyAttachmentContext(userMessage)
             },
             routing: {
               credentialContext,
@@ -11585,6 +11313,15 @@ async function recoverStrandedRunningSession(args) {
   if (!sessionRecord || sessionRecord.state !== "running") {
     return false;
   }
+  const recoveryProjection = await loadConversationProjection({
+    conversationId: args.conversationId
+  });
+  const modelProfile = recoveryProjection.modelProfile;
+  const modelId = modelIdForProfile(botConfig, modelProfile);
+  const recoveryMessages = modelProfile !== STANDARD_MODEL_PROFILE ? [
+    ...stripRuntimeTurnContext(recoveryProjection.messages),
+    ...retainRuntimeTurnContext(sessionRecord.piMessages)
+  ] : sessionRecord.piMessages;
   const parked = await persistYieldSessionRecord({
     channelName: sessionRecord.channelName,
     conversationId: args.conversationId,
@@ -11592,9 +11329,10 @@ async function recoverStrandedRunningSession(args) {
     currentSliceId: sessionRecord.sliceId,
     destination: sessionRecord.destination,
     source: sessionRecord.source,
-    messages: sessionRecord.piMessages,
+    messages: recoveryMessages,
     errorMessage: "Recovered running session after hard worker death",
-    logContext: { modelId: botConfig.modelId },
+    logContext: {},
+    modelId,
     actor: sessionRecord.actor,
     surface: sessionRecord.surface
   });