@sentry/junior 0.94.0 → 0.95.0

package/dist/{chunk-YTNPU7I2.js → chunk-HDTO3A74.js}

@@ -1,9 +1,9 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-BTH37NCU.js";
+} from "./chunk-GVOUCI2O.js";
 import {
   logWarn
-} from "./chunk-S6QKIGRM.js";
+} from "./chunk-WPOJ443W.js";
 import {
   skillRoots
 } from "./chunk-6APU57E6.js";

package/dist/{chunk-YJ4OPVNA.js → chunk-HZNJLKKI.js}

@@ -4,7 +4,7 @@ import {
   juniorDestinations,
   juniorIdentities,
   juniorUsers
-} from "./chunk-NFXSLTYG.js";
+} from "./chunk-6ONME5IG.js";
 
 // src/api/people/shared.ts
 import { and, asc, desc, eq, sql } from "drizzle-orm";

package/dist/{chunk-HDNWZMUN.js → chunk-KDPCGVIT.js}

@@ -1,23 +1,27 @@
 import {
-  JUNIOR_THREAD_STATE_TTL_MS,
   buildConversationStatePatch
-} from "./chunk-PFXC67GJ.js";
+} from "./chunk-RAIB6WSG.js";
 import {
   abandonAgentTurnSessionRecord,
   getAgentTurnSessionRecord,
   upsertAgentTurnSessionRecord
-} from "./chunk-QL66APYJ.js";
+} from "./chunk-WAGQ377B.js";
+import {
+  JUNIOR_THREAD_STATE_TTL_MS,
+  persistConversationMessages
+} from "./chunk-CRRBJ3JP.js";
 import {
-  getStateAdapter
-} from "./chunk-7STN2ZSK.js";
+  sleep
+} from "./chunk-CZEX6KIQ.js";
 import {
   getPiMessageRole,
+  getStateAdapter,
   trimTrailingAssistantMessages
-} from "./chunk-NAPITCZ6.js";
+} from "./chunk-GUE7HTNR.js";
 import {
   getActiveTraceId,
   logException
-} from "./chunk-S6QKIGRM.js";
+} from "./chunk-WPOJ443W.js";
 import {
   isRecord,
   toOptionalString
@@ -144,6 +148,24 @@ function addAgentTurnUsage(...usages) {
   return hasAgentTurnUsage(components) ? components : void 0;
 }
 
+// src/chat/services/persist-retry.ts
+var PERSIST_ATTEMPTS = 3;
+async function persistWithRetry(persist) {
+  let lastError;
+  for (let attempt = 1; attempt <= PERSIST_ATTEMPTS; attempt += 1) {
+    try {
+      await persist();
+      return;
+    } catch (error) {
+      lastError = error;
+      if (attempt < PERSIST_ATTEMPTS) {
+        await sleep(attempt * 100);
+      }
+    }
+  }
+  throw lastError;
+}
+
 // src/chat/services/turn-session-record.ts
 var AGENT_CONTINUE_MAX_SLICES = 48;
 function logSessionRecordError(error, eventName, args, attributes, message) {
@@ -222,6 +244,8 @@ async function persistRunningSessionRecord(args) {
       ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
+      ...args.modelId ? { modelId: args.modelId } : {},
+      ...args.reasoningLevel ? { reasoningLevel: args.reasoningLevel } : {},
       ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
       ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {},
       ...(args.turnStartMessageIndex ?? latestSessionRecord?.turnStartMessageIndex) !== void 0 ? {
@@ -243,55 +267,54 @@ async function persistRunningSessionRecord(args) {
   }
 }
 async function persistCompletedSessionRecord(args) {
-  let sliceId = args.sliceId;
-  try {
-    const latestSessionRecord = await getAgentTurnSessionRecord(
+  let latestSessionRecord;
+  await persistWithRetry(async () => {
+    latestSessionRecord = await getAgentTurnSessionRecord(
       args.conversationId,
       args.sessionId
     );
-    sliceId = sliceId ?? latestSessionRecord?.sliceId;
-    if (sliceId === void 0) {
-      throw new Error(
-        "Completed session record requires a slice id from the caller or the latest stored record"
-      );
-    }
-    await upsertAgentTurnSessionRecord({
-      ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
-      conversationId: args.conversationId,
-      cumulativeDurationMs: addDurationMs(
-        latestSessionRecord?.cumulativeDurationMs,
-        args.currentDurationMs
-      ),
-      cumulativeUsage: addAgentTurnUsage(
-        latestSessionRecord?.cumulativeUsage,
-        args.currentUsage
-      ),
-      ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-      ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-      ...args.destinationVisibility ? { destinationVisibility: args.destinationVisibility } : {},
-      sessionId: args.sessionId,
-      sliceId,
-      state: "completed",
-      piMessages: args.allMessages,
-      ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-      ...args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames ? {
-        loadedSkillNames: args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames
-      } : {},
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {},
-      ...(args.turnStartMessageIndex ?? latestSessionRecord?.turnStartMessageIndex) !== void 0 ? {
-        turnStartMessageIndex: args.turnStartMessageIndex ?? latestSessionRecord?.turnStartMessageIndex
-      } : {}
-    });
-  } catch (recordError) {
-    logSessionRecordError(
-      recordError,
-      "agent_turn_completed_session_record_failed",
-      args,
-      sliceId !== void 0 ? { "app.ai.resume_slice_id": sliceId } : {},
-      "Failed to persist completed turn session record"
+  });
+  const sliceId = args.sliceId ?? latestSessionRecord?.sliceId;
+  if (sliceId === void 0) {
+    throw new Error(
+      "Completed session record requires a slice id from the caller or the latest stored record"
     );
   }
+  const modelId = latestSessionRecord?.modelId ?? args.modelId ?? args.logContext.modelId;
+  const reasoningLevel = args.reasoningLevel ?? latestSessionRecord?.reasoningLevel;
+  const target = {
+    ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
+    conversationId: args.conversationId,
+    cumulativeDurationMs: addDurationMs(
+      latestSessionRecord?.cumulativeDurationMs,
+      args.currentDurationMs
+    ),
+    cumulativeUsage: addAgentTurnUsage(
+      latestSessionRecord?.cumulativeUsage,
+      args.currentUsage
+    ),
+    ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
+    ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
+    ...args.destinationVisibility ? { destinationVisibility: args.destinationVisibility } : {},
+    sessionId: args.sessionId,
+    sliceId,
+    state: "completed",
+    piMessages: args.allMessages,
+    ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
+    ...args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames ? {
+      loadedSkillNames: args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames
+    } : {},
+    ...modelId ? { modelId } : {},
+    ...reasoningLevel ? { reasoningLevel } : {},
+    ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
+    ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {},
+    ...(args.turnStartMessageIndex ?? latestSessionRecord?.turnStartMessageIndex) !== void 0 ? {
+      turnStartMessageIndex: args.turnStartMessageIndex ?? latestSessionRecord?.turnStartMessageIndex
+    } : {}
+  };
+  await persistWithRetry(async () => {
+    await upsertAgentTurnSessionRecord(target);
+  });
 }
 async function completeDeliveredTurn(args) {
   await persistCompletedSessionRecord({
@@ -307,7 +330,9 @@ async function completeDeliveredTurn(args) {
     allMessages: args.messages,
     loadedSkillNames: args.loadedSkillNames,
     logContext: args.logContext,
+    modelId: args.logContext.modelId,
     actor: args.actor,
+    reasoningLevel: args.reasoningLevel,
     surface: args.surface,
     turnStartMessageIndex: args.turnStartMessageIndex
   });
@@ -345,6 +370,10 @@ async function persistAuthPauseSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
+      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
+        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
+      } : {},
       resumeReason: "auth",
       resumedFromSliceId: args.currentSliceId,
       errorMessage: args.errorMessage,
@@ -405,6 +434,10 @@ async function persistTimeoutSessionRecord(args) {
         piMessages,
         ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
         ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
+        ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+        ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
+          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
+        } : {},
         resumeReason: "timeout",
         resumedFromSliceId: latestSessionRecord?.resumedFromSliceId,
         errorMessage: `Agent continuation exceeded slice limit (${AGENT_CONTINUE_MAX_SLICES})`,
@@ -425,6 +458,10 @@ async function persistTimeoutSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
+      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
+        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
+      } : {},
       resumeReason: "timeout",
       resumedFromSliceId: args.currentSliceId,
       errorMessage: args.errorMessage,
@@ -477,6 +514,10 @@ async function persistYieldSessionRecord(args) {
       piMessages,
       ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
+      ...args.modelId ?? latestSessionRecord?.modelId ? { modelId: args.modelId ?? latestSessionRecord?.modelId } : {},
+      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
+        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
+      } : {},
       resumeReason: "yield",
       resumedFromSliceId: latestSessionRecord?.resumedFromSliceId,
       errorMessage: args.errorMessage,
@@ -791,6 +832,15 @@ function getPersistedSandboxState(state) {
   };
 }
 async function persistThreadState(thread, patch) {
+  if (patch.conversation) {
+    await persistConversationMessages({
+      conversation: patch.conversation,
+      conversationId: toOptionalString(thread.id) ?? toOptionalString(thread.runId)
+    });
+  }
+  await persistThreadRuntimeState(thread, patch);
+}
+async function persistThreadRuntimeState(thread, patch) {
   const payload = buildThreadStatePayload(patch);
   if (Object.keys(payload).length === 0) {
     return;
@@ -812,6 +862,12 @@ async function getPersistedChannelState(channelId) {
   ) ?? {};
 }
 async function persistThreadStateById(threadId, patch) {
+  if (patch.conversation) {
+    await persistConversationMessages({
+      conversation: patch.conversation,
+      conversationId: threadId
+    });
+  }
   const payload = buildThreadStatePayload(patch);
   if (Object.keys(payload).length === 0) {
     return;
@@ -854,6 +910,12 @@ function getChannelConfigurationServiceById(channelId) {
   });
 }
 
+// src/chat/interruption-marker.ts
+var INTERRUPTED_MARKER = "\n\n[Response interrupted before completion]";
+function getInterruptionMarker() {
+  return INTERRUPTED_MARKER;
+}
+
 // src/chat/services/pending-auth.ts
 var AUTH_LINK_REUSE_WINDOW_MS = 10 * 60 * 1e3;
 var NON_REQUEST_SKIPPED_REASON_PREFIXES = [
@@ -933,6 +995,7 @@ export {
   markTurnFailed,
   hasAgentTurnUsage,
   addAgentTurnUsage,
+  persistWithRetry,
   loadTurnSessionRecord,
   persistRunningSessionRecord,
   persistCompletedSessionRecord,
@@ -940,6 +1003,7 @@ export {
   persistAuthPauseSessionRecord,
   persistTimeoutSessionRecord,
   persistYieldSessionRecord,
+  getInterruptionMarker,
   canReusePendingAuthLink,
   getConversationPendingAuth,
   clearPendingAuth,
@@ -949,6 +1013,7 @@ export {
   mergeArtifactsState,
   getPersistedSandboxState,
   persistThreadState,
+  persistThreadRuntimeState,
   getPersistedThreadState,
   persistThreadStateById,
   getChannelConfigurationService,

package/dist/chunk-N4RNJ32C.js

@@ -0,0 +1,48 @@
+import {
+  escapeXml,
+  unescapeXml
+} from "./chunk-GUE7HTNR.js";
+
+// src/chat/advisor-request.ts
+var TASK_OPEN = "<advisor-task>\n";
+var TASK_CLOSE = "\n</advisor-task>";
+var CONTEXT_OPEN = "<executor-context>\n";
+var CONTEXT_CLOSE = "\n</executor-context>";
+function renderAdvisorRequest(question, context) {
+  return [
+    TASK_OPEN,
+    escapeXml(question),
+    TASK_CLOSE,
+    "\n\n",
+    CONTEXT_OPEN,
+    escapeXml(context),
+    CONTEXT_CLOSE
+  ].join("");
+}
+function unwrapAdvisorRequest(text) {
+  if (!text.startsWith(TASK_OPEN) || !text.endsWith(CONTEXT_CLOSE)) {
+    return void 0;
+  }
+  const taskEnd = text.indexOf(TASK_CLOSE, TASK_OPEN.length);
+  if (taskEnd < 0) {
+    return void 0;
+  }
+  const contextStart = taskEnd + TASK_CLOSE.length + 2;
+  if (!text.startsWith(CONTEXT_OPEN, contextStart)) {
+    return void 0;
+  }
+  const task = text.slice(TASK_OPEN.length, taskEnd);
+  const context = text.slice(
+    contextStart + CONTEXT_OPEN.length,
+    -CONTEXT_CLOSE.length
+  );
+  return `${unescapeXml(task)}
+
+Executor context:
+${unescapeXml(context)}`;
+}
+
+export {
+  renderAdvisorRequest,
+  unwrapAdvisorRequest
+};

package/dist/{chunk-UUB3D2XI.js → chunk-NSCHU54X.js}

@@ -1,19 +1,20 @@
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-TNUUATT7.js";
+} from "./chunk-E3E2XNCN.js";
 import {
-  SANDBOX_WORKSPACE_ROOT
-} from "./chunk-G3E7SCME.js";
+  SANDBOX_WORKSPACE_ROOT,
+  sleep
+} from "./chunk-CZEX6KIQ.js";
 import {
   getDb
-} from "./chunk-NFXSLTYG.js";
+} from "./chunk-6ONME5IG.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken
-} from "./chunk-NAPITCZ6.js";
+} from "./chunk-GUE7HTNR.js";
 import {
   isActorUserId,
   logInfo,
@@ -22,12 +23,12 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-S6QKIGRM.js";
+} from "./chunk-WPOJ443W.js";
 import {
   parseSlackChannelReferenceId,
   parseSlackMessageTs,
   parseSlackTeamId
-} from "./chunk-LFLTJQVR.js";
+} from "./chunk-7FBGKXPE.js";
 
 // src/chat/plugins/agent-hooks.ts
 import { promptMessageSchema } from "@sentry/junior-plugin-api";
@@ -314,9 +315,6 @@ function mapSlackError(error) {
   }
   return new SlackActionError(message, "internal_error", baseOptions);
 }
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 var MAX_RETRY_DELAY_MS = 1e4;
 var MAX_TOTAL_RETRY_DELAY_MS = 2e4;
 var CONNECTION_ERROR_CODES = /* @__PURE__ */ new Set([

package/dist/{chunk-PFXC67GJ.js → chunk-RAIB6WSG.js}

@@ -5,69 +5,11 @@ import {
 } from "./chunk-OB42YVAE.js";
 
 // src/chat/state/conversation.ts
-function coerceRole(value) {
-  return value === "assistant" || value === "system" || value === "user" ? value : "user";
-}
-function coerceAuthor(value) {
-  if (!isRecord(value)) return void 0;
-  const author = {
-    fullName: toOptionalString(value.fullName),
-    userId: toOptionalString(value.userId),
-    userName: toOptionalString(value.userName)
-  };
-  if (typeof value.isBot === "boolean") {
-    author.isBot = value.isBot;
-  }
-  if (!author.fullName && !author.userId && !author.userName && author.isBot === void 0) {
-    return void 0;
-  }
-  return author;
-}
-function coerceMessageMeta(value) {
-  if (!isRecord(value)) return void 0;
-  const meta = {};
-  const attachmentCount = toOptionalNumber(value.attachmentCount);
-  if (typeof attachmentCount === "number" && attachmentCount > 0) {
-    meta.attachmentCount = attachmentCount;
-  }
-  if (typeof value.explicitMention === "boolean") {
-    meta.explicitMention = value.explicitMention;
-  }
-  const imageAttachmentCount = toOptionalNumber(value.imageAttachmentCount);
-  if (typeof imageAttachmentCount === "number" && imageAttachmentCount > 0) {
-    meta.imageAttachmentCount = imageAttachmentCount;
-  }
-  if (typeof value.replied === "boolean") {
-    meta.replied = value.replied;
-  }
-  if (typeof value.skippedReason === "string" && value.skippedReason.trim().length > 0) {
-    meta.skippedReason = value.skippedReason;
-  }
-  if (typeof value.slackTs === "string" && value.slackTs.trim().length > 0) {
-    meta.slackTs = value.slackTs;
-  }
-  if (Array.isArray(value.imageFileIds)) {
-    const imageFileIds = value.imageFileIds.filter(
-      (entry) => typeof entry === "string" && entry.trim().length > 0
-    );
-    if (imageFileIds.length > 0) {
-      meta.imageFileIds = imageFileIds;
-    }
-  }
-  if (typeof value.imagesHydrated === "boolean") {
-    meta.imagesHydrated = value.imagesHydrated;
-  }
-  if (meta.attachmentCount === void 0 && meta.explicitMention === void 0 && meta.imageAttachmentCount === void 0 && meta.replied === void 0 && meta.skippedReason === void 0 && meta.slackTs === void 0 && meta.imageFileIds === void 0 && meta.imagesHydrated === void 0) {
-    return void 0;
-  }
-  return meta;
-}
 function defaultConversationState() {
   const nowMs = Date.now();
   return {
     schemaVersion: 1,
     messages: [],
-    piMessages: [],
     compactions: [],
     backfill: {},
     processing: {},
@@ -111,23 +53,7 @@ function coerceThreadConversationState(value) {
   const root = value;
   const rawConversation = isRecord(root.conversation) ? root.conversation : {};
   const base = defaultConversationState();
-  const rawMessages = Array.isArray(rawConversation.messages) ? rawConversation.messages : [];
   const messages = [];
-  for (const item of rawMessages) {
-    if (!isRecord(item)) continue;
-    const id = toOptionalString(item.id);
-    const text = toOptionalString(item.text);
-    const createdAtMs = toOptionalNumber(item.createdAtMs);
-    if (!id || !text || !createdAtMs) continue;
-    messages.push({
-      id,
-      role: coerceRole(item.role),
-      text,
-      createdAtMs,
-      author: coerceAuthor(item.author),
-      meta: coerceMessageMeta(item.meta)
-    });
-  }
   const rawCompactions = Array.isArray(rawConversation.compactions) ? rawConversation.compactions : [];
   const compactions = [];
   for (const item of rawCompactions) {
@@ -181,7 +107,6 @@ function coerceThreadConversationState(value) {
   return {
     schemaVersion: 1,
     messages,
-    piMessages: Array.isArray(rawConversation.piMessages) ? rawConversation.piMessages : [],
     compactions,
     backfill,
     processing,
@@ -193,9 +118,14 @@ function coerceThreadConversationState(value) {
   };
 }
 function buildConversationStatePatch(conversation) {
+  const {
+    compactions: _compactions,
+    messages: _messages,
+    ...scratch
+  } = conversation;
   return {
     conversation: {
-      ...conversation,
+      ...scratch,
       schemaVersion: 1,
       stats: {
         ...conversation.stats,
@@ -206,11 +136,7 @@ function buildConversationStatePatch(conversation) {
   };
 }
 
-// src/chat/state/ttl.ts
-var JUNIOR_THREAD_STATE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
-
 export {
-  JUNIOR_THREAD_STATE_TTL_MS,
   coerceThreadConversationState,
   buildConversationStatePatch
 };