@sentry/junior 0.94.0 → 0.96.0

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

@@ -1,19 +1,20 @@
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-TNUUATT7.js";
+} from "./chunk-2NAZZPPS.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-RITD7E5L.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken
-} from "./chunk-NAPITCZ6.js";
+} from "./chunk-YDVEH3SB.js";
 import {
   isActorUserId,
   logInfo,
@@ -22,12 +23,12 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-S6QKIGRM.js";
+} from "./chunk-I35CTGPO.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-HDNWZMUN.js → chunk-UKHVMPX5.js}

@@ -1,23 +1,28 @@
 import {
-  JUNIOR_THREAD_STATE_TTL_MS,
   buildConversationStatePatch
-} from "./chunk-PFXC67GJ.js";
+} from "./chunk-RAIB6WSG.js";
 import {
   abandonAgentTurnSessionRecord,
+  addAgentTurnUsage,
   getAgentTurnSessionRecord,
   upsertAgentTurnSessionRecord
-} from "./chunk-QL66APYJ.js";
+} from "./chunk-MNTINMWR.js";
 import {
-  getStateAdapter
-} from "./chunk-7STN2ZSK.js";
+  JUNIOR_THREAD_STATE_TTL_MS,
+  persistConversationMessages
+} from "./chunk-5C6XTTFI.js";
+import {
+  sleep
+} from "./chunk-CZEX6KIQ.js";
 import {
   getPiMessageRole,
+  getStateAdapter,
   trimTrailingAssistantMessages
-} from "./chunk-NAPITCZ6.js";
+} from "./chunk-YDVEH3SB.js";
 import {
   getActiveTraceId,
   logException
-} from "./chunk-S6QKIGRM.js";
+} from "./chunk-I35CTGPO.js";
 import {
   isRecord,
   toOptionalString
@@ -89,59 +94,22 @@ function markTurnFailed(args) {
   args.updateConversationStats(args.conversation);
 }
 
-// src/chat/usage.ts
-var COMPONENT_USAGE_FIELDS = [
-  "inputTokens",
-  "outputTokens",
-  "cachedInputTokens",
-  "cacheCreationTokens"
-];
-function hasAgentTurnUsage(usage) {
-  return Boolean(
-    usage && Object.values(usage).some(
-      (value) => typeof value === "number" && Number.isFinite(value)
-    )
-  );
-}
-function getFiniteCount(value) {
-  return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : void 0;
-}
-function getComponentTotal(usage) {
-  let total;
-  for (const field of COMPONENT_USAGE_FIELDS) {
-    const value = getFiniteCount(usage[field]);
-    if (value === void 0) continue;
-    total = (total ?? 0) + value;
-  }
-  return total;
-}
-function addAgentTurnUsage(...usages) {
-  const components = {};
-  let componentTotal;
-  let totalOnlyTokens;
-  for (const usage of usages) {
-    if (!usage) continue;
-    const usageComponentTotal = getComponentTotal(usage);
-    if (usageComponentTotal !== void 0) {
-      componentTotal = (componentTotal ?? 0) + usageComponentTotal;
-      for (const field of COMPONENT_USAGE_FIELDS) {
-        const value = getFiniteCount(usage[field]);
-        if (value === void 0) continue;
-        components[field] = (components[field] ?? 0) + value;
+// 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);
       }
-      continue;
-    }
-    const totalTokens = getFiniteCount(usage.totalTokens);
-    if (totalTokens !== void 0) {
-      totalOnlyTokens = (totalOnlyTokens ?? 0) + totalTokens;
     }
   }
-  if (totalOnlyTokens !== void 0) {
-    return {
-      totalTokens: totalOnlyTokens + (componentTotal ?? 0)
-    };
-  }
-  return hasAgentTurnUsage(components) ? components : void 0;
+  throw lastError;
 }
 
 // src/chat/services/turn-session-record.ts
@@ -222,6 +190,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 +213,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 +276,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 +316,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 +380,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 +404,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 +460,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 +778,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 +808,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 +856,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 = [
@@ -931,8 +939,7 @@ export {
   markTurnClosed,
   markTurnCompleted,
   markTurnFailed,
-  hasAgentTurnUsage,
-  addAgentTurnUsage,
+  persistWithRetry,
   loadTurnSessionRecord,
   persistRunningSessionRecord,
   persistCompletedSessionRecord,
@@ -940,6 +947,7 @@ export {
   persistAuthPauseSessionRecord,
   persistTimeoutSessionRecord,
   persistYieldSessionRecord,
+  getInterruptionMarker,
   canReusePendingAuthLink,
   getConversationPendingAuth,
   clearPendingAuth,
@@ -949,6 +957,7 @@ export {
   mergeArtifactsState,
   getPersistedSandboxState,
   persistThreadState,
+  persistThreadRuntimeState,
   getPersistedThreadState,
   persistThreadStateById,
   getChannelConfigurationService,

package/dist/chunk-WM6KHPBQ.js

@@ -0,0 +1,48 @@
+import {
+  escapeXml,
+  unescapeXml
+} from "./chunk-YDVEH3SB.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-MC4ZZE4Q.js → chunk-YDT7SNCN.js}

@@ -1,6 +1,6 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-BTH37NCU.js";
+} from "./chunk-L7CDEIVJ.js";
 
 // src/chat/plugins/validation.ts
 import { isDeepStrictEqual } from "util";