@sentry/junior 0.136.1 → 0.138.0

package/dist/{chunk-NVVBEJUB.js → chunk-TUUDXEXU.js}

@@ -1,3 +1,6 @@
+import {
+  JUNIOR_THREAD_STATE_TTL_MS
+} from "./chunk-3Y47VMHV.js";
 import {
   JUNIOR_NATIVE_EVENT_NAMESPACE,
   ToolInputError,
@@ -18,18 +21,20 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-HIRIWTWD.js";
+} from "./chunk-SIPKWSXK.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
-  getStateAdapter,
   sleep
-} from "./chunk-4YQ6I6VF.js";
+} from "./chunk-EM225ITJ.js";
+import {
+  getStateAdapter
+} from "./chunk-BOLJOV5T.js";
 import {
   botConfig,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-XCZ6COFO.js";
+} from "./chunk-BYW4B4PR.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
@@ -44,7 +49,7 @@ import {
   setSpanAttributes,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-XWPA5KZF.js";
+} from "./chunk-JNNJZURV.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -1396,30 +1401,10 @@ function getAssistantReplyText(message) {
   return decision.kind === "deliver" ? decision.text : 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/state/turn-session.ts
 import { THREAD_STATE_TTL_MS } from "chat";
 import {
-  actorSchema,
-  destinationSchema,
-  sourceSchema
+  actorSchema
 } from "@sentry/junior-plugin-api";
 import { z as z2 } from "zod";
 
@@ -1784,6 +1769,11 @@ function agentTurnSessionConversationIndexKey(conversationId) {
 var AGENT_TURN_SESSION_INDEX_KEY = `${AGENT_TURN_SESSION_PREFIX}:index`;
 var AGENT_TURN_SESSION_INDEX_MAX_LENGTH = 5e3;
 var AGENT_TURN_SESSION_TTL_MS = THREAD_STATE_TTL_MS;
+function definedProps(values) {
+  return Object.fromEntries(
+    Object.entries(values).filter(([, value]) => value !== void 0)
+  );
+}
 var agentTurnSessionStatusSchema = z2.enum([
   "running",
   "awaiting_resume",
@@ -1811,15 +1801,14 @@ var agentTurnSessionSummarySchema = z2.object({
   conversationId: z2.string().min(1),
   cumulativeDurationMs: nonNegativeNumberSchema,
   cumulativeUsage: agentTurnUsageSchema.optional(),
-  destination: destinationSchema.optional(),
   dispatchId: z2.string().min(1).optional(),
   dispatchOutcome: z2.enum(["blocked", "completed", "failed"]).optional(),
   resultMessageId: z2.string().min(1).optional(),
-  source: sourceSchema.optional(),
   lastProgressAtMs: nonNegativeNumberSchema,
   loadedSkillNames: z2.array(z2.string()).optional(),
   modelId: z2.string().min(1).optional(),
   reasoningLevel: z2.string().min(1).optional(),
+  // TODO(#1267): Remove actor from this projection once resume rebuilds it.
   actor: actorSchema.optional(),
   resumeReason: agentTurnResumeReasonSchema.optional(),
   resumedFromSliceId: z2.number().int().nonnegative().optional(),
@@ -1830,7 +1819,7 @@ var agentTurnSessionSummarySchema = z2.object({
   surface: agentTurnSurfaceSchema.optional(),
   traceId: z2.string().optional(),
   updatedAtMs: nonNegativeNumberSchema
-}).strict();
+}).strip();
 var storedAgentTurnSessionRecordSchema = agentTurnSessionSummarySchema.extend({
   actors: z2.array(actorSchema).optional(),
   committedSeq: seqCursorSchema,
@@ -1838,7 +1827,7 @@ var storedAgentTurnSessionRecordSchema = agentTurnSessionSummarySchema.extend({
   errorMessage: z2.string().optional(),
   turnStartSeq: seqCursorSchema.optional(),
   runtimeContext: z2.array(piMessageSchema).optional()
-}).strict();
+}).strip();
 function conversationExecutionFromSummary(summary) {
   const status = summary.state === "completed" || summary.state === "abandoned" ? "idle" : summary.state;
   return {
@@ -1857,38 +1846,44 @@ function parseAgentTurnSessionSummary(value) {
   return agentTurnSessionSummarySchema.parse(value);
 }
 async function appendAgentTurnSessionSummary(summary, ttlMs) {
+  const projectedSummary = agentTurnSessionSummarySchema.parse(summary);
   const stateAdapter = getStateAdapter();
   await Promise.all([
-    stateAdapter.appendToList(AGENT_TURN_SESSION_INDEX_KEY, summary, {
+    stateAdapter.appendToList(AGENT_TURN_SESSION_INDEX_KEY, projectedSummary, {
       maxLength: AGENT_TURN_SESSION_INDEX_MAX_LENGTH,
       ttlMs
     }),
     stateAdapter.appendToList(
-      agentTurnSessionConversationIndexKey(summary.conversationId),
-      summary,
+      agentTurnSessionConversationIndexKey(projectedSummary.conversationId),
+      projectedSummary,
       { ttlMs }
     )
   ]);
 }
 async function recordConversationActivityMetadata(args) {
   const conversationStore = args.conversationStore ?? getConversationStore();
-  const source = args.summary.destination?.platform === "local" ? "local" : args.summary.surface;
+  const conversation = await conversationStore.get({
+    conversationId: args.summary.conversationId
+  });
+  const isChild = Boolean(conversation?.lineage);
+  const destination = isChild ? void 0 : args.destination;
+  const activitySource = isChild ? "internal" : destination?.platform === "local" ? "local" : destination ? args.summary.surface : void 0;
   await conversationStore.recordActivity({
     activityAtMs: args.summary.updatedAtMs,
     channelName: args.summary.channelName,
     conversationId: args.summary.conversationId,
-    destination: args.summary.destination,
+    destination,
     nowMs: args.nowMs,
     actor: sessionLogActor(args.summary.actor),
-    source,
-    ...args.summary.source ? { sessionSource: args.summary.source } : {},
-    visibility: args.destinationVisibility
+    ...definedProps({ source: activitySource }),
+    ...args.source ? { sessionSource: args.source } : {},
+    visibility: isChild ? void 0 : args.destinationVisibility
   });
   await conversationStore.recordExecution({
     channelName: args.summary.channelName,
     conversationId: args.summary.conversationId,
     createdAtMs: args.summary.startedAtMs,
-    destination: args.summary.destination,
+    destination,
     execution: conversationExecutionFromSummary(args.summary),
     lastActivityAtMs: args.summary.updatedAtMs,
     metrics: {
@@ -1896,16 +1891,15 @@ async function recordConversationActivityMetadata(args) {
       ...args.summary.cumulativeUsage ? { usage: args.summary.cumulativeUsage } : {}
     },
     actor: sessionLogActor(args.summary.actor),
-    source,
+    ...definedProps({ source: activitySource }),
     updatedAtMs: args.nowMs,
-    visibility: args.destinationVisibility
+    visibility: isChild ? void 0 : args.destinationVisibility
   });
 }
 function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true) {
   const restoredProjection = restoreVolatileContext && (stored.state === "running" || stored.state === "awaiting_resume") ? restoreRuntimeContext(piProjection, stored.runtimeContext) : piProjection;
   return {
     version: stored.version,
-    ...stored.channelName ? { channelName: stored.channelName } : {},
     conversationId: stored.conversationId,
     sessionId: stored.sessionId,
     sliceId: stored.sliceId,
@@ -1917,22 +1911,23 @@ function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessag
     piMessageProvenance: restoredProjection.provenance,
     actors: stored.actors ?? instructionActors(piProjection.provenance),
     cumulativeDurationMs: stored.cumulativeDurationMs,
-    ...stored.destination ? { destination: stored.destination } : {},
-    ...stored.dispatchId ? { dispatchId: stored.dispatchId } : {},
-    ...stored.dispatchOutcome ? { dispatchOutcome: stored.dispatchOutcome } : {},
-    ...stored.resultMessageId ? { resultMessageId: stored.resultMessageId } : {},
-    ...stored.source ? { source: stored.source } : {},
-    ...stored.cumulativeUsage ? { cumulativeUsage: stored.cumulativeUsage } : {},
-    ...stored.resumeReason ? { resumeReason: stored.resumeReason } : {},
-    ...stored.errorMessage ? { errorMessage: stored.errorMessage } : {},
-    ...stored.loadedSkillNames ? { loadedSkillNames: stored.loadedSkillNames } : {},
-    ...stored.modelId ? { modelId: stored.modelId } : {},
-    ...stored.reasoningLevel ? { reasoningLevel: stored.reasoningLevel } : {},
-    ...stored.actor ? { actor: stored.actor } : {},
-    ...stored.resumedFromSliceId !== void 0 ? { resumedFromSliceId: stored.resumedFromSliceId } : {},
-    ...stored.surface ? { surface: stored.surface } : {},
-    ...stored.traceId ? { traceId: stored.traceId } : {},
-    ...turnStartMessageIndex !== void 0 ? { turnStartMessageIndex } : {}
+    ...definedProps({
+      actor: stored.actor,
+      channelName: stored.channelName,
+      cumulativeUsage: stored.cumulativeUsage,
+      dispatchId: stored.dispatchId,
+      dispatchOutcome: stored.dispatchOutcome,
+      errorMessage: stored.errorMessage,
+      loadedSkillNames: stored.loadedSkillNames,
+      modelId: stored.modelId,
+      reasoningLevel: stored.reasoningLevel,
+      resumeReason: stored.resumeReason,
+      resultMessageId: stored.resultMessageId,
+      resumedFromSliceId: stored.resumedFromSliceId,
+      surface: stored.surface,
+      traceId: stored.traceId,
+      turnStartMessageIndex
+    })
   };
 }
 function restoreRuntimeContext(projection, runtimeContext) {
@@ -2027,7 +2022,6 @@ function buildStoredRecord(args) {
   const nowMs = Date.now();
   return {
     version: (args.previousVersion ?? 0) + 1,
-    ...args.channelName ? { channelName: args.channelName } : {},
     conversationId: args.conversationId,
     sessionId: args.sessionId,
     sliceId: args.sliceId,
@@ -2036,40 +2030,44 @@ function buildStoredRecord(args) {
     lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
     updatedAtMs: nowMs,
     committedSeq: args.committedSeq,
-    ...args.historyVersion !== void 0 ? { historyVersion: args.historyVersion } : {},
-    ...args.turnStartSeq !== void 0 ? { turnStartSeq: args.turnStartSeq } : {},
-    ...args.runtimeContext && args.runtimeContext.length > 0 ? { runtimeContext: args.runtimeContext } : {},
     cumulativeDurationMs: args.cumulativeDurationMs,
-    ...args.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage } : {},
-    ...args.destination ? { destination: args.destination } : {},
-    ...args.dispatchId ? { dispatchId: args.dispatchId } : {},
-    ...args.dispatchOutcome ? { dispatchOutcome: args.dispatchOutcome } : {},
-    ...args.resultMessageId ? { resultMessageId: args.resultMessageId } : {},
-    ...args.source ? { source: args.source } : {},
-    ...args.actor ? { actor: args.actor } : {},
-    ...args.actors ? { actors: args.actors } : {},
-    ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-    ...args.modelId ? { modelId: args.modelId } : {},
-    ...args.reasoningLevel ? { reasoningLevel: args.reasoningLevel } : {},
-    ...args.resumeReason ? { resumeReason: args.resumeReason } : {},
-    ...args.errorMessage ? { errorMessage: args.errorMessage } : {},
-    ...args.resumedFromSliceId !== void 0 ? { resumedFromSliceId: args.resumedFromSliceId } : {},
-    ...args.surface ? { surface: args.surface } : {},
-    ...args.traceId ? { traceId: args.traceId } : {}
+    ...definedProps({
+      actor: args.actor,
+      actors: args.actors,
+      channelName: args.channelName,
+      cumulativeUsage: args.cumulativeUsage,
+      dispatchId: args.dispatchId,
+      dispatchOutcome: args.dispatchOutcome,
+      errorMessage: args.errorMessage,
+      historyVersion: args.historyVersion,
+      loadedSkillNames: args.loadedSkillNames,
+      modelId: args.modelId,
+      reasoningLevel: args.reasoningLevel,
+      resumeReason: args.resumeReason,
+      resultMessageId: args.resultMessageId,
+      resumedFromSliceId: args.resumedFromSliceId,
+      runtimeContext: args.runtimeContext && args.runtimeContext.length > 0 ? args.runtimeContext : void 0,
+      surface: args.surface,
+      traceId: args.traceId,
+      turnStartSeq: args.turnStartSeq
+    })
   };
 }
 async function setStoredRecord(args) {
   const stateAdapter = getStateAdapter();
   await stateAdapter.connect();
+  const storedRecord = storedAgentTurnSessionRecordSchema.parse(args.record);
   await recordConversationActivityMetadata({
     conversationStore: args.conversationStore,
+    destination: args.destination,
     destinationVisibility: args.destinationVisibility,
     nowMs: Date.now(),
-    summary: args.record
+    source: args.source,
+    summary: storedRecord
   });
   await stateAdapter.set(
-    agentTurnSessionKey(args.record.conversationId, args.record.sessionId),
-    args.record,
+    agentTurnSessionKey(storedRecord.conversationId, storedRecord.sessionId),
+    storedRecord,
     args.ttlMs
   );
   const {
@@ -2080,10 +2078,10 @@ async function setStoredRecord(args) {
     turnStartSeq: _turnStartSeq,
     runtimeContext: _runtimeContext,
     ...summary
-  } = args.record;
+  } = storedRecord;
   await appendAgentTurnSessionSummary(summary, args.ttlMs);
   return materializeAgentTurnSessionRecord(
-    args.record,
+    storedRecord,
     {
       messages: [...args.piMessages],
       provenance: [...args.piMessageProvenance]
@@ -2103,37 +2101,39 @@ async function updateAgentTurnSessionState(args) {
     piMessages: args.existing.piMessages,
     piMessageProvenance: args.existing.piMessageProvenance,
     ttlMs: AGENT_TURN_SESSION_TTL_MS,
-    ...args.existing.turnStartMessageIndex !== void 0 ? { turnStartMessageIndex: args.existing.turnStartMessageIndex } : {},
+    ...definedProps({
+      turnStartMessageIndex: args.existing.turnStartMessageIndex
+    }),
     record: buildStoredRecord({
       conversationId: args.existing.conversationId,
       sessionId: args.existing.sessionId,
       sliceId: args.existing.sliceId,
       state: args.state,
       committedSeq: parsed.committedSeq,
-      ...parsed.historyVersion !== void 0 ? { historyVersion: parsed.historyVersion } : {},
-      ...parsed.turnStartSeq !== void 0 ? { turnStartSeq: parsed.turnStartSeq } : {},
-      ...parsed.runtimeContext ? { runtimeContext: parsed.runtimeContext } : {},
-      ...parsed.channelName ? { channelName: parsed.channelName } : {},
       startedAtMs: parsed.startedAtMs,
       lastProgressAtMs: parsed.lastProgressAtMs,
       previousVersion: parsed.version,
       cumulativeDurationMs: args.existing.cumulativeDurationMs,
-      ...args.existing.cumulativeUsage ? { cumulativeUsage: args.existing.cumulativeUsage } : {},
-      ...args.existing.destination ? { destination: args.existing.destination } : {},
-      ...args.existing.dispatchId ? { dispatchId: args.existing.dispatchId } : {},
-      ...args.existing.dispatchOutcome ? { dispatchOutcome: args.existing.dispatchOutcome } : {},
-      ...args.existing.resultMessageId ? { resultMessageId: args.existing.resultMessageId } : {},
-      ...args.existing.source ? { source: args.existing.source } : {},
-      ...args.existing.loadedSkillNames ? { loadedSkillNames: args.existing.loadedSkillNames } : {},
-      ...args.existing.modelId ? { modelId: args.existing.modelId } : {},
-      ...args.existing.reasoningLevel ? { reasoningLevel: args.existing.reasoningLevel } : {},
-      ...args.existing.actor ? { actor: args.existing.actor } : {},
       actors: args.existing.actors,
-      ...args.existing.resumeReason ? { resumeReason: args.existing.resumeReason } : {},
-      ...args.existing.resumedFromSliceId !== void 0 ? { resumedFromSliceId: args.existing.resumedFromSliceId } : {},
-      ...args.existing.surface ? { surface: args.existing.surface } : {},
-      ...args.existing.traceId ? { traceId: args.existing.traceId } : {},
-      ...args.errorMessage ?? args.existing.errorMessage ? { errorMessage: args.errorMessage ?? args.existing.errorMessage } : {}
+      ...definedProps({
+        actor: args.existing.actor,
+        channelName: parsed.channelName,
+        cumulativeUsage: args.existing.cumulativeUsage,
+        dispatchId: args.existing.dispatchId,
+        dispatchOutcome: args.existing.dispatchOutcome,
+        errorMessage: args.errorMessage ?? args.existing.errorMessage,
+        historyVersion: parsed.historyVersion,
+        loadedSkillNames: args.existing.loadedSkillNames,
+        modelId: args.existing.modelId,
+        reasoningLevel: args.existing.reasoningLevel,
+        resumeReason: args.existing.resumeReason,
+        resultMessageId: args.existing.resultMessageId,
+        resumedFromSliceId: args.existing.resumedFromSliceId,
+        runtimeContext: parsed.runtimeContext,
+        surface: args.existing.surface,
+        traceId: args.existing.traceId,
+        turnStartSeq: parsed.turnStartSeq
+      })
     })
   });
 }
@@ -2171,51 +2171,47 @@ async function upsertAgentTurnSessionRecord(args) {
   const turnStartMessageIndex = durableTurnStartMessageIndex ?? (turnStartSeq === void 0 ? void 0 : commit.messageSeqs.filter((seq) => seq <= turnStartSeq).length);
   return await setStoredRecord({
     conversationStore: args.conversationStore,
+    destination: args.destination,
     destinationVisibility: args.destinationVisibility,
+    source: args.source,
     piMessages: commit.messages,
     piMessageProvenance: commit.provenance,
     ttlMs,
-    ...turnStartMessageIndex !== void 0 ? { turnStartMessageIndex } : {},
+    turnStartMessageIndex,
     record: buildStoredRecord({
-      ...args.channelName ?? existingRecord?.channelName ? { channelName: args.channelName ?? existingRecord?.channelName } : {},
       conversationId: args.conversationId,
       sessionId: args.sessionId,
       sliceId: args.sliceId,
       state: args.state,
-      ...existingRecord?.startedAtMs !== void 0 ? { startedAtMs: existingRecord.startedAtMs } : {},
-      ...args.lastProgressAtMs !== void 0 ? { lastProgressAtMs: args.lastProgressAtMs } : {},
       committedSeq: commit.committedSeq,
       historyVersion: commit.historyVersion,
-      ...turnStartSeq !== void 0 ? { turnStartSeq } : {},
-      ...retainedRuntimeContext ? { runtimeContext: retainedRuntimeContext } : {},
       previousVersion: existingRecord?.version,
       cumulativeDurationMs: args.cumulativeDurationMs ?? existingRecord?.cumulativeDurationMs ?? 0,
-      ...args.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage } : {},
-      ...args.destination ?? existingRecord?.destination ? { destination: args.destination ?? existingRecord?.destination } : {},
-      ...args.dispatchId ?? existingRecord?.dispatchId ? { dispatchId: args.dispatchId ?? existingRecord?.dispatchId } : {},
-      ...args.dispatchOutcome ?? existingRecord?.dispatchOutcome ? {
-        dispatchOutcome: args.dispatchOutcome ?? existingRecord?.dispatchOutcome
-      } : {},
-      ...args.resultMessageId ?? existingRecord?.resultMessageId ? {
-        resultMessageId: args.resultMessageId ?? existingRecord?.resultMessageId
-      } : {},
-      ...args.source ?? existingRecord?.source ? { source: args.source ?? existingRecord?.source } : {},
-      ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
       modelId: args.modelId,
-      ...args.reasoningLevel ?? existingRecord?.reasoningLevel ? {
-        reasoningLevel: args.reasoningLevel ?? existingRecord?.reasoningLevel
-      } : {},
-      ...args.actor ?? existingRecord?.actor ? { actor: args.actor ?? existingRecord?.actor } : {},
       actors: instructionActors([
         ...(existingRecord?.actors ?? []).map(instructionProvenanceFor),
         ...(args.actors ?? []).map(instructionProvenanceFor),
         ...commit.provenance
       ]),
-      ...args.resumeReason ? { resumeReason: args.resumeReason } : {},
-      ...args.errorMessage ? { errorMessage: args.errorMessage } : {},
-      ...args.resumedFromSliceId !== void 0 ? { resumedFromSliceId: args.resumedFromSliceId } : {},
-      ...args.surface ?? existingRecord?.surface ? { surface: args.surface ?? existingRecord?.surface } : {},
-      ...args.traceId ?? existingRecord?.traceId ? { traceId: args.traceId ?? existingRecord?.traceId } : {}
+      ...definedProps({
+        actor: args.actor ?? existingRecord?.actor,
+        channelName: args.channelName ?? existingRecord?.channelName,
+        cumulativeUsage: args.cumulativeUsage,
+        dispatchId: args.dispatchId ?? existingRecord?.dispatchId,
+        dispatchOutcome: args.dispatchOutcome ?? existingRecord?.dispatchOutcome,
+        errorMessage: args.errorMessage,
+        lastProgressAtMs: args.lastProgressAtMs,
+        loadedSkillNames: args.loadedSkillNames,
+        reasoningLevel: args.reasoningLevel ?? existingRecord?.reasoningLevel,
+        resumeReason: args.resumeReason,
+        resultMessageId: args.resultMessageId ?? existingRecord?.resultMessageId,
+        resumedFromSliceId: args.resumedFromSliceId,
+        runtimeContext: retainedRuntimeContext,
+        startedAtMs: existingRecord?.startedAtMs,
+        surface: args.surface ?? existingRecord?.surface,
+        traceId: args.traceId ?? existingRecord?.traceId,
+        turnStartSeq
+      })
     })
   });
 }
@@ -2238,7 +2234,6 @@ async function recordAgentTurnSessionSummary(args) {
   const ttlMs = Math.max(1, args.ttlMs ?? AGENT_TURN_SESSION_TTL_MS);
   const summary = {
     version: existing?.version ?? 0,
-    ...args.channelName ?? existing?.channelName ? { channelName: args.channelName ?? existing?.channelName } : {},
     conversationId: args.conversationId,
     sessionId: args.sessionId,
     sliceId: args.sliceId,
@@ -2247,24 +2242,27 @@ async function recordAgentTurnSessionSummary(args) {
     state: args.state,
     updatedAtMs: nowMs,
     cumulativeDurationMs: args.cumulativeDurationMs ?? existing?.cumulativeDurationMs ?? 0,
-    ...args.cumulativeUsage ?? existing?.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage ?? existing?.cumulativeUsage } : {},
-    ...args.destination ?? existing?.destination ? { destination: args.destination ?? existing?.destination } : {},
-    ...args.dispatchId ?? existingDispatchId ? { dispatchId: args.dispatchId ?? existingDispatchId } : {},
-    ...args.dispatchOutcome ?? existingDispatchOutcome ? { dispatchOutcome: args.dispatchOutcome ?? existingDispatchOutcome } : {},
-    ...args.resultMessageId ?? existingResultMessageId ? { resultMessageId: args.resultMessageId ?? existingResultMessageId } : {},
-    ...args.source ?? existing?.source ? { source: args.source ?? existing?.source } : {},
-    ...args.actor ?? existing?.actor ? { actor: args.actor ?? existing?.actor } : {},
-    ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : existing?.loadedSkillNames ? { loadedSkillNames: existing.loadedSkillNames } : {},
-    ...args.modelId ?? existing?.modelId ? { modelId: args.modelId ?? existing?.modelId } : {},
-    ...args.reasoningLevel ?? existing?.reasoningLevel ? { reasoningLevel: args.reasoningLevel ?? existing?.reasoningLevel } : {},
-    ...args.resumeReason ? { resumeReason: args.resumeReason } : {},
-    ...args.surface ?? existing?.surface ? { surface: args.surface ?? existing?.surface } : {},
-    ...args.traceId ?? existing?.traceId ? { traceId: args.traceId ?? existing?.traceId } : {}
+    ...definedProps({
+      actor: args.actor ?? existing?.actor,
+      channelName: args.channelName ?? existing?.channelName,
+      cumulativeUsage: args.cumulativeUsage ?? existing?.cumulativeUsage,
+      dispatchId: args.dispatchId ?? existingDispatchId,
+      dispatchOutcome: args.dispatchOutcome ?? existingDispatchOutcome,
+      loadedSkillNames: args.loadedSkillNames ?? existing?.loadedSkillNames,
+      modelId: args.modelId ?? existing?.modelId,
+      reasoningLevel: args.reasoningLevel ?? existing?.reasoningLevel,
+      resumeReason: args.resumeReason,
+      resultMessageId: args.resultMessageId ?? existingResultMessageId,
+      surface: args.surface ?? existing?.surface,
+      traceId: args.traceId ?? existing?.traceId
+    })
   };
   await recordConversationActivityMetadata({
     conversationStore: args.conversationStore,
+    destination: args.destination,
     destinationVisibility: args.destinationVisibility,
     nowMs,
+    source: args.source,
     summary
   });
   await appendAgentTurnSessionSummary(summary, ttlMs);
@@ -2339,6 +2337,24 @@ async function failAgentTurnSessionRecord(args) {
   });
 }
 
+// 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-limit.ts
 var TurnSliceLimitExceededError = class extends Error {
   constructor(maxSlices) {
@@ -2351,6 +2367,32 @@ function buildTurnLimitResponse(eventId) {
 }
 
 // src/chat/services/turn-session-record.ts
+function definedProps2(values) {
+  return Object.fromEntries(
+    Object.entries(values).filter(([, value]) => value !== void 0)
+  );
+}
+function sessionWriteContext(args, latest) {
+  return {
+    conversationId: args.conversationId,
+    modelId: args.modelId,
+    sessionId: args.sessionId,
+    ...definedProps2({
+      actor: args.actor ?? latest?.actor,
+      channelName: args.channelName ?? latest?.channelName,
+      destination: args.destination,
+      destinationVisibility: args.destinationVisibility,
+      dispatchId: args.dispatchId ?? latest?.dispatchId,
+      // Caller-resolved: some paths inherit these, others stay caller-only.
+      loadedSkillNames: args.loadedSkillNames,
+      reasoningLevel: args.reasoningLevel,
+      source: args.source,
+      surface: args.surface ?? latest?.surface,
+      traceId: getActiveTraceId() ?? latest?.traceId,
+      turnStartMessageIndex: args.turnStartMessageIndex ?? latest?.turnStartMessageIndex
+    })
+  };
+}
 function logSessionRecordError(error, eventName, args, attributes) {
   logException(error, eventName, {
     "app.ai.resume_conversation_id": args.conversationId,
@@ -2398,29 +2440,33 @@ async function persistRunningSessionRecord(args) {
       args.sessionId
     );
     await upsertAgentTurnSessionRecord({
-      ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
-      conversationId: args.conversationId,
+      ...sessionWriteContext(
+        {
+          actor: args.actor,
+          channelName: args.channelName,
+          conversationId: args.conversationId,
+          destination: args.destination,
+          destinationVisibility: args.destinationVisibility,
+          dispatchId: args.dispatchId,
+          loadedSkillNames: args.loadedSkillNames,
+          modelId: args.modelId,
+          reasoningLevel: args.reasoningLevel,
+          sessionId: args.sessionId,
+          source: args.source,
+          surface: args.surface,
+          turnStartMessageIndex: args.turnStartMessageIndex
+        },
+        latestSessionRecord
+      ),
+      ...definedProps2({
+        trailingMessageProvenance: args.trailingMessageProvenance,
+        turnContexts: args.turnContexts
+      }),
       cumulativeDurationMs: latestSessionRecord?.cumulativeDurationMs,
       cumulativeUsage: latestSessionRecord?.cumulativeUsage,
-      ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-      destinationVisibility: args.destinationVisibility,
-      ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-      ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-      sessionId: args.sessionId,
-      sliceId: args.sliceId,
-      state: "running",
       piMessages: args.messages,
-      ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
-      ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-      ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      modelId: args.modelId,
-      ...args.reasoningLevel ? { reasoningLevel: args.reasoningLevel } : {},
-      ...args.turnContexts ? { turnContexts: args.turnContexts } : {},
-      ...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
-      } : {}
+      sliceId: args.sliceId,
+      state: "running"
     });
     return true;
   } catch (recordError) {
@@ -2449,45 +2495,41 @@ async function persistCompletedSessionRecord(args) {
       "Completed session record requires a slice id from the caller or the latest stored record"
     );
   }
-  const modelId = args.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
+    ...sessionWriteContext(
+      {
+        actor: args.actor,
+        channelName: args.channelName,
+        conversationId: args.conversationId,
+        destination: args.destination,
+        destinationVisibility: args.destinationVisibility,
+        dispatchId: args.dispatchId,
+        loadedSkillNames: args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames,
+        modelId: args.modelId,
+        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+        sessionId: args.sessionId,
+        source: args.source,
+        surface: args.surface,
+        turnStartMessageIndex: args.turnStartMessageIndex
+      },
+      latestSessionRecord
     ),
-    ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-    ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-    ...args.dispatchOutcome ?? latestSessionRecord?.dispatchOutcome ? {
-      dispatchOutcome: args.dispatchOutcome ?? latestSessionRecord?.dispatchOutcome
-    } : {},
-    ...args.errorMessage ? { errorMessage: args.errorMessage } : {},
-    ...args.resultMessageId ?? latestSessionRecord?.resultMessageId ? {
+    ...definedProps2({
+      cumulativeDurationMs: addDurationMs(
+        latestSessionRecord?.cumulativeDurationMs,
+        args.currentDurationMs
+      ),
+      cumulativeUsage: addAgentTurnUsage(
+        latestSessionRecord?.cumulativeUsage,
+        args.currentUsage
+      ),
+      dispatchOutcome: args.dispatchOutcome ?? latestSessionRecord?.dispatchOutcome,
+      errorMessage: args.errorMessage,
       resultMessageId: args.resultMessageId ?? latestSessionRecord?.resultMessageId
-    } : {},
-    ...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,
-    ...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
-    } : {}
+    sliceId,
+    state: "completed"
   };
   await persistWithRetry(async () => {
     await upsertAgentTurnSessionRecord(target);
@@ -2532,35 +2574,40 @@ async function persistAuthPauseSessionRecord(args) {
       return void 0;
     }
     return 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
+      ...sessionWriteContext(
+        {
+          actor: args.actor,
+          channelName: args.channelName,
+          conversationId: args.conversationId,
+          destination: args.destination,
+          destinationVisibility: args.destinationVisibility,
+          dispatchId: args.dispatchId,
+          // Auth-pause keeps caller-owned skill names only.
+          loadedSkillNames: args.loadedSkillNames,
+          modelId: args.modelId,
+          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          sessionId: args.sessionId,
+          source: args.source,
+          surface: args.surface
+        },
+        latestSessionRecord
       ),
-      ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-      destinationVisibility: args.destinationVisibility,
-      ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-      ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-      sessionId: args.sessionId,
-      sliceId: nextSliceId,
-      state: "awaiting_resume",
+      ...definedProps2({
+        cumulativeDurationMs: addDurationMs(
+          latestSessionRecord?.cumulativeDurationMs,
+          args.currentDurationMs
+        ),
+        cumulativeUsage: addAgentTurnUsage(
+          latestSessionRecord?.cumulativeUsage,
+          args.currentUsage
+        )
+      }),
+      errorMessage: args.errorMessage,
       piMessages,
-      ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-      ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      modelId: args.modelId,
-      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
-        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
-      } : {},
       resumeReason: "auth",
       resumedFromSliceId: args.currentSliceId,
-      errorMessage: args.errorMessage,
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+      sliceId: nextSliceId,
+      state: "awaiting_resume"
     });
   } catch (recordError) {
     logSessionRecordError(
@@ -2597,63 +2644,51 @@ async function persistContinuationSessionRecord(args) {
       latestSessionRecord?.cumulativeUsage,
       args.currentUsage
     );
+    const shared = {
+      ...sessionWriteContext(
+        {
+          actor: args.actor,
+          channelName: args.channelName,
+          conversationId: args.conversationId,
+          destination: args.destination,
+          destinationVisibility: args.destinationVisibility,
+          dispatchId: args.dispatchId,
+          // Continuation keeps caller-owned skill names only.
+          loadedSkillNames: args.loadedSkillNames,
+          modelId: args.modelId,
+          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          sessionId: args.sessionId,
+          source: args.source,
+          surface: args.surface
+        },
+        latestSessionRecord
+      ),
+      ...definedProps2({
+        cumulativeDurationMs,
+        cumulativeUsage
+      }),
+      piMessages,
+      resumeReason: args.resumeReason
+    };
     if (nextSliceId > botConfig.maxSlicesPerTurn) {
       return await upsertAgentTurnSessionRecord({
-        ...args.channelName ?? latestSessionRecord?.channelName ? {
-          channelName: args.channelName ?? latestSessionRecord?.channelName
-        } : {},
-        conversationId: args.conversationId,
-        cumulativeDurationMs,
-        cumulativeUsage,
-        ...args.destination ?? latestSessionRecord?.destination ? {
-          destination: args.destination ?? latestSessionRecord?.destination
-        } : {},
-        destinationVisibility: args.destinationVisibility,
-        ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-        ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-        sessionId: args.sessionId,
-        sliceId: args.currentSliceId,
-        state: "failed",
-        piMessages,
-        ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-        ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-        modelId: args.modelId,
-        ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
-          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
-        } : {},
-        resumeReason: args.resumeReason,
-        resumedFromSliceId: latestSessionRecord?.resumedFromSliceId,
+        ...shared,
+        ...definedProps2({
+          resumedFromSliceId: latestSessionRecord?.resumedFromSliceId
+        }),
         errorMessage: new TurnSliceLimitExceededError(
           botConfig.maxSlicesPerTurn
         ).message,
-        ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-        ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+        sliceId: args.currentSliceId,
+        state: "failed"
       });
     }
     return await upsertAgentTurnSessionRecord({
-      ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
-      conversationId: args.conversationId,
-      cumulativeDurationMs,
-      cumulativeUsage,
-      ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-      destinationVisibility: args.destinationVisibility,
-      ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-      ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-      sessionId: args.sessionId,
-      sliceId: nextSliceId,
-      state: "awaiting_resume",
-      piMessages,
-      ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-      ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      modelId: args.modelId,
-      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
-        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
-      } : {},
-      resumeReason: args.resumeReason,
-      resumedFromSliceId: args.currentSliceId,
+      ...shared,
       errorMessage: args.errorMessage,
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+      resumedFromSliceId: args.currentSliceId,
+      sliceId: nextSliceId,
+      state: "awaiting_resume"
     });
   } catch (recordError) {
     logSessionRecordError(
@@ -2679,34 +2714,39 @@ async function persistYieldSessionRecord(args) {
       args.sessionId
     );
     return 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
+      ...sessionWriteContext(
+        {
+          actor: args.actor,
+          channelName: args.channelName,
+          conversationId: args.conversationId,
+          destination: args.destination,
+          dispatchId: args.dispatchId,
+          // Yield keeps caller-owned skill names only.
+          loadedSkillNames: args.loadedSkillNames,
+          modelId: args.modelId,
+          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          sessionId: args.sessionId,
+          source: args.source,
+          surface: args.surface
+        },
+        latestSessionRecord
       ),
-      ...args.destination ?? latestSessionRecord?.destination ? { destination: args.destination ?? latestSessionRecord?.destination } : {},
-      ...args.dispatchId ?? latestSessionRecord?.dispatchId ? { dispatchId: args.dispatchId ?? latestSessionRecord?.dispatchId } : {},
-      ...args.source ?? latestSessionRecord?.source ? { source: args.source ?? latestSessionRecord?.source } : {},
-      sessionId: args.sessionId,
-      sliceId: args.currentSliceId,
-      state: "awaiting_resume",
+      ...definedProps2({
+        cumulativeDurationMs: addDurationMs(
+          latestSessionRecord?.cumulativeDurationMs,
+          args.currentDurationMs
+        ),
+        cumulativeUsage: addAgentTurnUsage(
+          latestSessionRecord?.cumulativeUsage,
+          args.currentUsage
+        ),
+        resumedFromSliceId: latestSessionRecord?.resumedFromSliceId
+      }),
+      errorMessage: args.errorMessage,
       piMessages,
-      ...args.surface ?? latestSessionRecord?.surface ? { surface: args.surface ?? latestSessionRecord?.surface } : {},
-      ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      modelId: args.modelId,
-      ...args.reasoningLevel ?? latestSessionRecord?.reasoningLevel ? {
-        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel
-      } : {},
       resumeReason: "yield",
-      resumedFromSliceId: latestSessionRecord?.resumedFromSliceId,
-      errorMessage: args.errorMessage,
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+      sliceId: args.currentSliceId,
+      state: "awaiting_resume"
     });
   } catch (recordError) {
     logSessionRecordError(
@@ -3086,9 +3126,6 @@ function createChannelConfigurationService(storage) {
   };
 }
 
-// src/chat/state/ttl.ts
-var JUNIOR_THREAD_STATE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
-
 // src/chat/runtime/thread-state.ts
 function threadStateKey(threadId) {
   return `thread-state:${threadId}`;
@@ -3381,7 +3418,6 @@ export {
   persistAuthPauseSessionRecord,
   persistContinuationSessionRecord,
   persistYieldSessionRecord,
-  JUNIOR_THREAD_STATE_TTL_MS,
   canReusePendingAuthLink,
   getConversationPendingAuth,
   clearPendingAuth,