@sentry/junior 0.139.0 → 0.141.0

package/dist/{chunk-PJW6U46K.js → chunk-PIQKV7IR.js}

@@ -5,10 +5,10 @@ import {
   JUNIOR_NATIVE_EVENT_NAMESPACE,
   ToolInputError,
   addAgentTurnUsage,
-  agentTurnUsageSchema,
+  agentsInstructionsUpdatedEvent,
   authenticationLinkedEvent,
   authenticationUnlinkedEvent
-} from "./chunk-CDQ4YIZM.js";
+} from "./chunk-HLXXQI5Q.js";
 import {
   agentHistoryItemSchema,
   bindProviderConversation,
@@ -21,20 +21,20 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-QTBKPZDA.js";
+} from "./chunk-5MFCEKR6.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   sleep
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-MXTVUV3I.js";
+} from "./chunk-6U44QGXL.js";
 import {
   botConfig,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-75I3UBIL.js";
+} from "./chunk-BBLO66XT.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
@@ -49,7 +49,7 @@ import {
   setSpanAttributes,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-2ECYPYKP.js";
+} from "./chunk-UFEU4UX6.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -1214,6 +1214,59 @@ async function recordAuthenticationAccountChange(action, args) {
 async function recordAuthenticationLinked(args) {
   await recordAuthenticationAccountChange("linked", args);
 }
+async function loadAgentsEvent(conversationId) {
+  const event = await getConversationEventStore().loadLatestStructuredEvent(
+    conversationId,
+    JUNIOR_NATIVE_EVENT_NAMESPACE,
+    agentsInstructionsUpdatedEvent.eventName
+  );
+  if (!event || event.data.type !== "structured_event") return void 0;
+  return {
+    content: agentsInstructionsUpdatedEvent.parse(
+      event.data.content
+    ),
+    seq: event.seq
+  };
+}
+function agentsInstructionsIdempotencyKey(args) {
+  const previous = args.previousSeq ?? "none";
+  return `native:${JUNIOR_NATIVE_EVENT_NAMESPACE}:agents_instructions_updated:${args.turnId}:${args.action}:${previous}->${args.fingerprint}`;
+}
+async function recordAgentsInstructionsUpdated(args) {
+  const previous = await loadAgentsEvent(args.conversationId);
+  const instructions = args.instructions;
+  if (previous && (!instructions && previous.content.action === "cleared" || instructions && previous.content.action !== "cleared" && previous.content.fingerprint === instructions.fingerprint && previous.content.directory === instructions.directory)) {
+    return;
+  }
+  const action = !instructions ? "cleared" : previous && previous.content.action !== "cleared" ? "replaced" : "loaded";
+  const fingerprint = instructions?.fingerprint ?? "cleared";
+  const content = agentsInstructionsUpdatedEvent.parse({
+    action,
+    fingerprint,
+    sources: instructions?.sources ?? [],
+    ...instructions ? { directory: instructions.directory } : {},
+    ...instructions ? { textBytes: Buffer.byteLength(instructions.text, "utf8") } : {}
+  });
+  await getConversationEventStore().append(args.conversationId, [
+    {
+      createdAtMs: Date.now(),
+      idempotencyKey: agentsInstructionsIdempotencyKey({
+        action,
+        fingerprint,
+        previousSeq: previous?.seq,
+        turnId: args.turnId
+      }),
+      data: {
+        type: "structured_event",
+        namespace: JUNIOR_NATIVE_EVENT_NAMESPACE,
+        name: agentsInstructionsUpdatedEvent.eventName,
+        version: agentsInstructionsUpdatedEvent.version,
+        turnId: args.turnId,
+        content
+      }
+    }
+  ]);
+}
 async function loadTurnRoute(args) {
   const event = await getConversationEventStore().loadByIdempotencyKey(
     args.conversationId,
@@ -1402,10 +1455,6 @@ function getAssistantReplyText(message) {
 }
 
 // src/chat/state/turn-session.ts
-import { THREAD_STATE_TTL_MS } from "chat";
-import {
-  actorSchema
-} from "@sentry/junior-plugin-api";
 import { z as z2 } from "zod";
 
 // src/chat/repository-instructions.ts
@@ -1766,9 +1815,11 @@ function agentTurnSessionConversationIndexKey(conversationId) {
 }
 
 // src/chat/state/turn-session.ts
-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;
+var AGENT_TURN_SESSION_RESUME_TTL_MS = 24 * 60 * 60 * 1e3;
+var AGENT_TURN_SESSION_TERMINAL_TTL_MS = 60 * 60 * 1e3;
+function executionMetricsForSession(conversation, sessionId) {
+  return conversation?.executionMetrics?.runId === sessionId ? conversation.executionMetrics : void 0;
+}
 function definedProps(values) {
   return Object.fromEntries(
     Object.entries(values).filter(([, value]) => value !== void 0)
@@ -1796,18 +1847,25 @@ var agentTurnResumeReasonSchema = z2.enum([
 var nonNegativeNumberSchema = z2.number().finite().nonnegative();
 var seqCursorSchema = z2.number().int().min(-1);
 var agentTurnSessionSummarySchema = z2.object({
-  channelName: z2.string().min(1).optional(),
   version: z2.number().int().nonnegative(),
   conversationId: z2.string().min(1),
-  cumulativeDurationMs: nonNegativeNumberSchema,
-  cumulativeUsage: agentTurnUsageSchema.optional(),
+  dispatchId: z2.string().min(1).optional(),
+  dispatchOutcome: z2.enum(["blocked", "completed", "failed"]).optional(),
+  resultMessageId: z2.string().min(1).optional(),
+  resumeReason: agentTurnResumeReasonSchema.optional(),
+  sessionId: z2.string().min(1),
+  sliceId: z2.number().int().nonnegative(),
+  state: agentTurnSessionStatusSchema,
+  surface: agentTurnSurfaceSchema.optional(),
+  updatedAtMs: nonNegativeNumberSchema
+}).strip();
+var storedAgentTurnSessionRecordSchema = z2.object({
+  version: z2.number().int().nonnegative(),
+  conversationId: z2.string().min(1),
   dispatchId: z2.string().min(1).optional(),
   dispatchOutcome: z2.enum(["blocked", "completed", "failed"]).optional(),
   resultMessageId: z2.string().min(1).optional(),
   lastProgressAtMs: nonNegativeNumberSchema,
-  loadedSkillNames: z2.array(z2.string()).optional(),
-  modelId: z2.string().min(1).optional(),
-  reasoningLevel: z2.string().min(1).optional(),
   resumeReason: agentTurnResumeReasonSchema.optional(),
   resumedFromSliceId: z2.number().int().nonnegative().optional(),
   sessionId: z2.string().min(1),
@@ -1816,10 +1874,7 @@ var agentTurnSessionSummarySchema = z2.object({
   state: agentTurnSessionStatusSchema,
   surface: agentTurnSurfaceSchema.optional(),
   traceId: z2.string().optional(),
-  updatedAtMs: nonNegativeNumberSchema
-}).strip();
-var storedAgentTurnSessionRecordSchema = agentTurnSessionSummarySchema.extend({
-  actors: z2.array(actorSchema).optional(),
+  updatedAtMs: nonNegativeNumberSchema,
   committedSeq: seqCursorSchema,
   historyVersion: z2.number().int().nonnegative().optional(),
   errorMessage: z2.string().optional(),
@@ -1843,20 +1898,25 @@ function parseAgentTurnSessionRecord(value) {
 function parseAgentTurnSessionSummary(value) {
   return agentTurnSessionSummarySchema.parse(value);
 }
+function agentTurnSessionRecordTtlMs(state, ttlMs) {
+  if (ttlMs !== void 0) {
+    return Math.max(1, ttlMs);
+  }
+  return state === "running" || state === "awaiting_resume" ? AGENT_TURN_SESSION_RESUME_TTL_MS : AGENT_TURN_SESSION_TERMINAL_TTL_MS;
+}
+function agentTurnSessionIndexTtlMs(ttlMs) {
+  return Math.max(1, ttlMs ?? AGENT_TURN_SESSION_RESUME_TTL_MS);
+}
+function projectAgentTurnSessionSummary(record) {
+  return agentTurnSessionSummarySchema.parse(record);
+}
 async function appendAgentTurnSessionSummary(summary, ttlMs) {
-  const projectedSummary = agentTurnSessionSummarySchema.parse(summary);
   const stateAdapter = getStateAdapter();
-  await Promise.all([
-    stateAdapter.appendToList(AGENT_TURN_SESSION_INDEX_KEY, projectedSummary, {
-      maxLength: AGENT_TURN_SESSION_INDEX_MAX_LENGTH,
-      ttlMs
-    }),
-    stateAdapter.appendToList(
-      agentTurnSessionConversationIndexKey(projectedSummary.conversationId),
-      projectedSummary,
-      { ttlMs }
-    )
-  ]);
+  await stateAdapter.appendToList(
+    agentTurnSessionConversationIndexKey(summary.conversationId),
+    agentTurnSessionSummarySchema.parse(summary),
+    { ttlMs }
+  );
 }
 async function recordConversationActivityMetadata(args) {
   const conversationStore = args.conversationStore ?? getConversationStore();
@@ -1894,7 +1954,7 @@ async function recordConversationActivityMetadata(args) {
     visibility: isChild ? void 0 : args.destinationVisibility
   });
 }
-function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true) {
+function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true, runtimeMetadata) {
   const restoredProjection = restoreVolatileContext && (stored.state === "running" || stored.state === "awaiting_resume") ? restoreRuntimeContext(piProjection, stored.runtimeContext) : piProjection;
   return {
     version: stored.version,
@@ -1907,17 +1967,17 @@ function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessag
     updatedAtMs: stored.updatedAtMs,
     piMessages: restoredProjection.messages,
     piMessageProvenance: restoredProjection.provenance,
-    actors: stored.actors ?? instructionActors(piProjection.provenance),
-    cumulativeDurationMs: stored.cumulativeDurationMs,
+    actors: instructionActors(piProjection.provenance),
+    cumulativeDurationMs: runtimeMetadata?.cumulativeDurationMs ?? 0,
     ...definedProps({
-      channelName: stored.channelName,
-      cumulativeUsage: stored.cumulativeUsage,
+      channelName: runtimeMetadata?.channelName,
+      cumulativeUsage: runtimeMetadata?.cumulativeUsage,
+      loadedSkillNames: runtimeMetadata?.loadedSkillNames,
+      modelId: runtimeMetadata?.modelId,
+      reasoningLevel: runtimeMetadata?.reasoningLevel,
       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,
@@ -1994,11 +2054,18 @@ async function materializeStoredAgentTurnSessionRecord(conversationId, sessionId
   const followsReplacement = followCurrentReplacement && (parsed.state === "running" || parsed.state === "awaiting_resume") && parsed.historyVersion !== void 0 && parsed.historyVersion !== currentHistoryVersion;
   const piProjection = followsReplacement ? projectConversationEvents(currentHistory) : pinnedProjection;
   const turnStartMessageIndex = followsReplacement ? 0 : parsed.turnStartSeq === void 0 ? void 0 : piProjection.seqs.filter((seq) => seq <= parsed.turnStartSeq).length;
+  const conversation = await getConversationStore().get({ conversationId });
+  const executionMetrics = executionMetricsForSession(conversation, sessionId);
   return materializeAgentTurnSessionRecord(
     parsed,
     piProjection,
     turnStartMessageIndex,
-    !followsReplacement && (parsed.historyVersion === void 0 || parsed.historyVersion === currentHistoryVersion)
+    !followsReplacement && (parsed.historyVersion === void 0 || parsed.historyVersion === currentHistoryVersion),
+    {
+      channelName: conversation?.channelName,
+      cumulativeDurationMs: executionMetrics?.durationMs,
+      cumulativeUsage: executionMetrics?.usage
+    }
   );
 }
 async function getAgentTurnSessionRecord(conversationId, sessionId) {
@@ -2027,18 +2094,11 @@ function buildStoredRecord(args) {
     lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
     updatedAtMs: nowMs,
     committedSeq: args.committedSeq,
-    cumulativeDurationMs: args.cumulativeDurationMs,
     ...definedProps({
-      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,
@@ -2060,30 +2120,26 @@ async function setStoredRecord(args) {
     destinationVisibility: args.destinationVisibility,
     nowMs: Date.now(),
     source: args.source,
-    summary: storedRecord
+    summary: { ...storedRecord, ...args.runtimeMetadata }
   });
   await stateAdapter.set(
     agentTurnSessionKey(storedRecord.conversationId, storedRecord.sessionId),
     storedRecord,
     args.ttlMs
   );
-  const {
-    actors: _actors,
-    committedSeq: _committedSeq,
-    historyVersion: _historyVersion,
-    errorMessage: _errorMessage,
-    turnStartSeq: _turnStartSeq,
-    runtimeContext: _runtimeContext,
-    ...summary
-  } = storedRecord;
-  await appendAgentTurnSessionSummary(summary, args.ttlMs);
+  await appendAgentTurnSessionSummary(
+    projectAgentTurnSessionSummary(storedRecord),
+    agentTurnSessionIndexTtlMs(args.indexTtlMs)
+  );
   return materializeAgentTurnSessionRecord(
     storedRecord,
     {
       messages: [...args.piMessages],
       provenance: [...args.piMessageProvenance]
     },
-    args.turnStartMessageIndex
+    args.turnStartMessageIndex,
+    true,
+    args.runtimeMetadata
   );
 }
 async function updateAgentTurnSessionState(args) {
@@ -2097,7 +2153,17 @@ async function updateAgentTurnSessionState(args) {
   return await setStoredRecord({
     piMessages: args.existing.piMessages,
     piMessageProvenance: args.existing.piMessageProvenance,
-    ttlMs: AGENT_TURN_SESSION_TTL_MS,
+    ttlMs: agentTurnSessionRecordTtlMs(args.state),
+    runtimeMetadata: {
+      cumulativeDurationMs: args.existing.cumulativeDurationMs,
+      ...definedProps({
+        channelName: args.existing.channelName,
+        cumulativeUsage: args.existing.cumulativeUsage,
+        loadedSkillNames: args.existing.loadedSkillNames,
+        modelId: args.existing.modelId,
+        reasoningLevel: args.existing.reasoningLevel
+      })
+    },
     ...definedProps({
       turnStartMessageIndex: args.existing.turnStartMessageIndex
     }),
@@ -2110,22 +2176,14 @@ async function updateAgentTurnSessionState(args) {
       startedAtMs: parsed.startedAtMs,
       lastProgressAtMs: parsed.lastProgressAtMs,
       previousVersion: parsed.version,
-      cumulativeDurationMs: args.existing.cumulativeDurationMs,
-      actors: args.existing.actors,
       ...definedProps({
-        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
@@ -2138,13 +2196,20 @@ async function upsertAgentTurnSessionRecord(args) {
     args.conversationId,
     args.sessionId
   );
+  const conversation = await (args.conversationStore ?? getConversationStore()).get({
+    conversationId: args.conversationId
+  });
+  const executionMetrics = executionMetricsForSession(
+    conversation,
+    args.sessionId
+  );
   const existingDispatchId = existingRecord?.dispatchId ?? (await listAgentTurnSessionSummariesForConversation(args.conversationId)).find((summary) => summary.sessionId === args.sessionId)?.dispatchId;
   if (existingDispatchId && args.dispatchId && existingDispatchId !== args.dispatchId) {
     throw new Error(
       `Turn session ${args.sessionId} dispatchId cannot be changed`
     );
   }
-  const ttlMs = Math.max(1, args.ttlMs ?? AGENT_TURN_SESSION_TTL_MS);
+  const ttlMs = agentTurnSessionRecordTtlMs(args.state, args.ttlMs);
   const instructionActor = args.actor;
   const commit = await commitMessages({
     conversationId: args.conversationId,
@@ -2174,6 +2239,19 @@ async function upsertAgentTurnSessionRecord(args) {
     piMessages: commit.messages,
     piMessageProvenance: commit.provenance,
     ttlMs,
+    // TODO(#1267): remove the temporary caller-to-SQL metadata write once the
+    // SQL-only turn-session readers have completed rollout.
+    runtimeMetadata: {
+      channelName: args.channelName ?? conversation?.channelName,
+      cumulativeDurationMs: args.cumulativeDurationMs ?? executionMetrics?.durationMs ?? 0,
+      cumulativeUsage: args.cumulativeUsage ?? executionMetrics?.usage,
+      loadedSkillNames: args.loadedSkillNames,
+      modelId: args.modelId,
+      reasoningLevel: args.reasoningLevel
+    },
+    // Pass through only an explicit override so indexes stay on the resume window
+    // by default even when the record takes a short terminal TTL.
+    ...definedProps({ indexTtlMs: args.ttlMs }),
     turnStartMessageIndex,
     record: buildStoredRecord({
       conversationId: args.conversationId,
@@ -2183,26 +2261,15 @@ async function upsertAgentTurnSessionRecord(args) {
       committedSeq: commit.committedSeq,
       historyVersion: commit.historyVersion,
       previousVersion: existingRecord?.version,
-      cumulativeDurationMs: args.cumulativeDurationMs ?? existingRecord?.cumulativeDurationMs ?? 0,
-      modelId: args.modelId,
-      actors: instructionActors([
-        ...(existingRecord?.actors ?? []).map(instructionProvenanceFor),
-        ...(args.actors ?? []).map(instructionProvenanceFor),
-        ...commit.provenance
-      ]),
       ...definedProps({
-        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,
+        runtimeContext: args.state === "running" || args.state === "awaiting_resume" ? retainedRuntimeContext : void 0,
         startedAtMs: existingRecord?.startedAtMs,
         surface: args.surface ?? existingRecord?.surface,
         traceId: args.traceId ?? existingRecord?.traceId,
@@ -2216,6 +2283,14 @@ async function recordAgentTurnSessionSummary(args) {
     args.conversationId,
     args.sessionId
   );
+  const conversationStore = args.conversationStore ?? getConversationStore();
+  const conversation = await conversationStore.get({
+    conversationId: args.conversationId
+  });
+  const executionMetrics = executionMetricsForSession(
+    conversation,
+    args.sessionId
+  );
   const priorSummary = (await listAgentTurnSessionSummariesForConversation(args.conversationId)).find((summary2) => summary2.sessionId === args.sessionId);
   const existing = stored ?? priorSummary;
   const existingDispatchId = existing?.dispatchId;
@@ -2227,43 +2302,41 @@ async function recordAgentTurnSessionSummary(args) {
     );
   }
   const nowMs = Date.now();
-  const ttlMs = Math.max(1, args.ttlMs ?? AGENT_TURN_SESSION_TTL_MS);
+  const ttlMs = agentTurnSessionIndexTtlMs(args.ttlMs);
   const summary = {
     version: existing?.version ?? 0,
     conversationId: args.conversationId,
     sessionId: args.sessionId,
     sliceId: args.sliceId,
-    startedAtMs: existing?.startedAtMs ?? args.startedAtMs ?? nowMs,
-    lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
     state: args.state,
     updatedAtMs: nowMs,
-    cumulativeDurationMs: args.cumulativeDurationMs ?? existing?.cumulativeDurationMs ?? 0,
     ...definedProps({
-      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
+      surface: args.surface ?? existing?.surface
     })
   };
   await recordConversationActivityMetadata({
     actor: args.actor,
-    conversationStore: args.conversationStore,
+    conversationStore,
     destination: args.destination,
     destinationVisibility: args.destinationVisibility,
     nowMs,
     source: args.source,
-    summary
+    summary: {
+      ...summary,
+      channelName: args.channelName ?? conversation?.channelName,
+      cumulativeDurationMs: args.cumulativeDurationMs ?? executionMetrics?.durationMs ?? 0,
+      cumulativeUsage: args.cumulativeUsage ?? executionMetrics?.usage,
+      startedAtMs: stored?.startedAtMs ?? args.startedAtMs ?? nowMs
+    }
   });
   await appendAgentTurnSessionSummary(summary, ttlMs);
 }
-async function readAgentTurnSessionSummariesFromIndex(key, stateAdapter) {
+async function readAgentTurnSessionSummariesFromIndex(key) {
+  const stateAdapter = getStateAdapter();
   await stateAdapter.connect();
   const values = await stateAdapter.getList(key);
   const summaries = /* @__PURE__ */ new Map();
@@ -2271,11 +2344,7 @@ async function readAgentTurnSessionSummariesFromIndex(key, stateAdapter) {
     let summary;
     try {
       summary = parseAgentTurnSessionSummary(value);
-    } catch (error) {
-      logWarn("agent.turn.session_summary_parse.failed", {
-        "app.state.key": key,
-        "exception.message": error instanceof Error ? error.message : String(error)
-      });
+    } catch {
       continue;
     }
     const summaryKey = `${summary.conversationId}:${summary.sessionId}`;
@@ -2288,20 +2357,8 @@ async function readAgentTurnSessionSummariesFromIndex(key, stateAdapter) {
   );
 }
 async function listAgentTurnSessionSummariesForConversation(conversationId) {
-  const stateAdapter = getStateAdapter();
-  const summaries = await listBoundedAgentTurnSessionSummariesForConversation(conversationId);
-  if (summaries.length > 0) {
-    return summaries;
-  }
-  return (await readAgentTurnSessionSummariesFromIndex(
-    AGENT_TURN_SESSION_INDEX_KEY,
-    stateAdapter
-  )).filter((summary) => summary.conversationId === conversationId);
-}
-async function listBoundedAgentTurnSessionSummariesForConversation(conversationId) {
   return readAgentTurnSessionSummariesFromIndex(
-    agentTurnSessionConversationIndexKey(conversationId),
-    getStateAdapter()
+    agentTurnSessionConversationIndexKey(conversationId)
   );
 }
 async function abandonAgentTurnSessionRecord(args) {
@@ -2501,9 +2558,9 @@ async function persistCompletedSessionRecord(args) {
         destination: args.destination,
         destinationVisibility: args.destinationVisibility,
         dispatchId: args.dispatchId,
-        loadedSkillNames: args.loadedSkillNames ?? latestSessionRecord?.loadedSkillNames,
+        loadedSkillNames: args.loadedSkillNames,
         modelId: args.modelId,
-        reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+        reasoningLevel: args.reasoningLevel,
         sessionId: args.sessionId,
         source: args.source,
         surface: args.surface,
@@ -2582,7 +2639,7 @@ async function persistAuthPauseSessionRecord(args) {
           // Auth-pause keeps caller-owned skill names only.
           loadedSkillNames: args.loadedSkillNames,
           modelId: args.modelId,
-          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          reasoningLevel: args.reasoningLevel,
           sessionId: args.sessionId,
           source: args.source,
           surface: args.surface
@@ -2653,7 +2710,7 @@ async function persistContinuationSessionRecord(args) {
           // Continuation keeps caller-owned skill names only.
           loadedSkillNames: args.loadedSkillNames,
           modelId: args.modelId,
-          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          reasoningLevel: args.reasoningLevel,
           sessionId: args.sessionId,
           source: args.source,
           surface: args.surface
@@ -2721,7 +2778,7 @@ async function persistYieldSessionRecord(args) {
           // Yield keeps caller-owned skill names only.
           loadedSkillNames: args.loadedSkillNames,
           modelId: args.modelId,
-          reasoningLevel: args.reasoningLevel ?? latestSessionRecord?.reasoningLevel,
+          reasoningLevel: args.reasoningLevel,
           sessionId: args.sessionId,
           source: args.source,
           surface: args.surface
@@ -3144,6 +3201,19 @@ function buildThreadStatePayload(patch) {
   }
   return payload;
 }
+async function mergePersistedState(key, payload) {
+  if (Object.keys(payload).length === 0) {
+    return;
+  }
+  const stateAdapter = getStateAdapter();
+  await stateAdapter.connect();
+  const existing = await stateAdapter.get(key) ?? {};
+  await stateAdapter.set(
+    key,
+    { ...existing, ...payload },
+    JUNIOR_THREAD_STATE_TTL_MS
+  );
+}
 function mergeArtifactsState(artifacts, patch) {
   if (!patch) {
     return artifacts;
@@ -3180,11 +3250,14 @@ async function persistThreadState(thread, patch) {
   await persistThreadRuntimeState(thread, patch);
 }
 async function persistThreadRuntimeState(thread, patch) {
-  const payload = buildThreadStatePayload(patch);
-  if (Object.keys(payload).length === 0) {
-    return;
+  const threadId = toOptionalString(thread.id) ?? toOptionalString(thread.runId);
+  if (!threadId) {
+    throw new Error("thread id is required to persist runtime scratch");
   }
-  await thread.setState(payload);
+  await mergePersistedState(
+    threadStateKey(threadId),
+    buildThreadStatePayload(patch)
+  );
 }
 async function getPersistedThreadState(threadId) {
   const stateAdapter = getStateAdapter();
@@ -3207,26 +3280,21 @@ async function persistThreadStateById(threadId, patch) {
       conversationId: threadId
     });
   }
-  const payload = buildThreadStatePayload(patch);
-  if (Object.keys(payload).length === 0) {
-    return;
-  }
-  const stateAdapter = getStateAdapter();
-  await stateAdapter.connect();
-  const key = threadStateKey(threadId);
-  const existing = await stateAdapter.get(key) ?? {};
-  await stateAdapter.set(
-    key,
-    { ...existing, ...payload },
-    JUNIOR_THREAD_STATE_TTL_MS
+  await mergePersistedState(
+    threadStateKey(threadId),
+    buildThreadStatePayload(patch)
   );
 }
 function getChannelConfigurationService(thread) {
   const channel = thread.channel;
+  const channelId = toOptionalString(thread.channelId) ?? toOptionalString(channel.id);
+  if (!channelId) {
+    throw new Error("channel id is required to load channel configuration");
+  }
   return createChannelConfigurationService({
-    load: async () => channel.state,
+    load: async () => await channel.state,
     save: async (state) => {
-      await channel.setState({
+      await mergePersistedState(channelStateKey(channelId), {
         configuration: state
       });
     }
@@ -3236,15 +3304,9 @@ function getChannelConfigurationServiceById(channelId) {
   return createChannelConfigurationService({
     load: async () => await getPersistedChannelState(channelId),
     save: async (state) => {
-      const stateAdapter = getStateAdapter();
-      await stateAdapter.connect();
-      const key = channelStateKey(channelId);
-      const existing = await stateAdapter.get(key) ?? {};
-      await stateAdapter.set(
-        key,
-        { ...existing, configuration: state },
-        JUNIOR_THREAD_STATE_TTL_MS
-      );
+      await mergePersistedState(channelStateKey(channelId), {
+        configuration: state
+      });
     }
   });
 }
@@ -3357,6 +3419,7 @@ export {
   recordAuthorizationRequested,
   recordAuthorizationCompleted,
   recordAuthenticationLinked,
+  recordAgentsInstructionsUpdated,
   loadTurnRoute,
   recordTurnRoute,
   recordToolExecutionStarted,

package/dist/{chunk-2ECYPYKP.js → chunk-UFEU4UX6.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-6GWA276C.js";
 import {
   getDeploymentTelemetryAttributes
-} from "./chunk-C2N6MNO4.js";
+} from "./chunk-OFQBDHVG.js";
 
 // src/chat/logging.ts
 import path from "path";