@sentry/junior 0.140.0 → 0.142.0

package/dist/{chunk-BMFRFSTM.js → chunk-B2H7NI5C.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,35 +21,28 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-WSWM6A3R.js";
+} from "./chunk-SCHH6264.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   sleep
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-J5H65GY2.js";
+} from "./chunk-NWO5IB7V.js";
 import {
   botConfig,
-  escapeXml,
-  resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-S3FAOKQU.js";
+} from "./chunk-A646AKNB.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
-import {
-  parseSlackMessageTs
-} from "./chunk-F3B2YJ76.js";
 import {
   getActiveTraceId,
   isRecord,
   logException,
-  logWarn,
-  setSpanAttributes,
   toOptionalNumber,
   toOptionalString
-} from "./chunk-NPL66ZWL.js";
+} from "./chunk-XAW6IN6M.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";
@@ -188,392 +181,6 @@ function stripRuntimeTurnContext(messages) {
   });
 }
 
-// src/chat/services/context-budget.ts
-var COMPACTION_TRIGGER_RATIO = 0.9;
-var CONTEXT_INPUT_LIMIT_RATIO = 0.95;
-var COMPACTION_TARGET_RATIO = 0.8;
-var FALLBACK_CONTEXT_WINDOW_TOKENS = 4e5;
-function positiveInteger(value, fallback) {
-  return Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
-}
-function estimateTextTokens(text) {
-  return Math.ceil(text.length / 4);
-}
-function calculateContextCompactionTriggerTokens(model) {
-  const contextWindow = positiveInteger(
-    model.contextWindow,
-    FALLBACK_CONTEXT_WINDOW_TOKENS
-  );
-  return Math.max(1, Math.floor(contextWindow * COMPACTION_TRIGGER_RATIO));
-}
-function calculateContextInputLimitTokens(model) {
-  const contextWindow = positiveInteger(
-    model.contextWindow,
-    FALLBACK_CONTEXT_WINDOW_TOKENS
-  );
-  return Math.max(1, Math.floor(contextWindow * CONTEXT_INPUT_LIMIT_RATIO));
-}
-function calculateContextCompactionTargetTokens(triggerTokens) {
-  return Math.max(1, Math.floor(triggerTokens * COMPACTION_TARGET_RATIO));
-}
-function getModelContextBudget(modelId) {
-  const model = resolveGatewayModel(modelId);
-  const advertisedContextWindow = positiveInteger(
-    model.contextWindow,
-    FALLBACK_CONTEXT_WINDOW_TOKENS
-  );
-  return {
-    contextWindow: Math.min(
-      botConfig.contextWindowTokens,
-      advertisedContextWindow
-    )
-  };
-}
-function getAgentContextCompactionTriggerTokens(modelId) {
-  return calculateContextCompactionTriggerTokens(
-    getModelContextBudget(modelId)
-  );
-}
-function getAgentContextInputLimitTokens(modelId) {
-  return calculateContextInputLimitTokens(getModelContextBudget(modelId));
-}
-function getConversationContextCompactionTriggerTokens() {
-  return calculateContextCompactionTriggerTokens(
-    getModelContextBudget(botConfig.fastModelId)
-  );
-}
-
-// src/chat/services/conversation-memory.ts
-var CONTEXT_MIN_LIVE_MESSAGES = 12;
-var CONTEXT_COMPACTION_BATCH_SIZE = 24;
-var CONTEXT_MAX_COMPACTIONS = 16;
-var CONTEXT_MAX_MESSAGE_CHARS = 3200;
-var SLACK_USER_ID_DISPLAY_PATTERN = /^[UW][A-Z0-9]{5,}$/;
-function generateConversationId(prefix) {
-  return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
-}
-function normalizeConversationText(text) {
-  return text.replace(/\r\n?/g, "\n").trim();
-}
-function buildImageContextSuffix(message, conversation) {
-  const byFileId = conversation?.vision.byFileId;
-  const imageFileIds = message.meta?.imageFileIds ?? [];
-  if (!byFileId || imageFileIds.length === 0) {
-    return "";
-  }
-  const summaries = imageFileIds.map((fileId) => byFileId[fileId]?.summary?.trim()).filter((summary) => Boolean(summary));
-  if (summaries.length === 0) {
-    return "";
-  }
-  return ` [image context: ${summaries.join(" | ")}]`;
-}
-function renderConversationMessageLine(message, conversation) {
-  const displayName = conversationAuthorDisplayName(message);
-  const text = message.text.replace(/\s+/g, " ").slice(0, CONTEXT_MAX_MESSAGE_CHARS);
-  const markers = [];
-  if (message.meta?.replied === false) {
-    markers.push(
-      `assistant skipped: ${message.meta?.skippedReason ?? "no-reply route"}`
-    );
-  }
-  if (message.meta?.explicitMention) {
-    markers.push("explicit mention");
-  }
-  const markerSuffix = markers.length > 0 ? ` (${markers.join("; ")})` : "";
-  const imageContext = buildImageContextSuffix(message, conversation);
-  return `[${message.role}] ${displayName}: ${text}${imageContext}${markerSuffix}`;
-}
-function conversationAuthorDisplayName(message) {
-  const author = message.author;
-  const fullName = authorDisplayField(author?.fullName, author?.userId);
-  const userName = authorDisplayField(author?.userName, author?.userId);
-  return fullName ?? userName ?? (message.role === "assistant" ? botConfig.userName : message.role);
-}
-function authorDisplayField(value, userId) {
-  if (!value || value === userId || SLACK_USER_ID_DISPLAY_PATTERN.test(value)) {
-    return void 0;
-  }
-  return value;
-}
-function updateConversationStats(conversation) {
-  const contextText = buildConversationContext(conversation);
-  conversation.stats.estimatedContextTokens = estimateTextTokens(
-    contextText ?? ""
-  );
-  conversation.stats.totalMessageCount = conversation.messages.length;
-  conversation.stats.updatedAtMs = Date.now();
-}
-function upsertConversationMessage(conversation, message) {
-  const existingIndex = conversation.messages.findIndex(
-    (entry) => entry.id === message.id
-  );
-  if (existingIndex >= 0) {
-    conversation.messages[existingIndex] = {
-      ...conversation.messages[existingIndex],
-      ...message,
-      meta: {
-        ...conversation.messages[existingIndex]?.meta,
-        ...message.meta
-      }
-    };
-    updateConversationStats(conversation);
-    return message.id;
-  }
-  conversation.messages.push(message);
-  updateConversationStats(conversation);
-  return message.id;
-}
-function recordDeliveredAssistantMessage(args) {
-  const prefix = `${args.sessionId}:assistant:`;
-  const ordinal = args.conversation.messages.filter(
-    (message) => message.id.startsWith(prefix)
-  ).length + 1;
-  const messageId = `${prefix}${ordinal}`;
-  markConversationMessage(args.conversation, args.userMessageId, {
-    replied: true,
-    skippedReason: void 0
-  });
-  upsertConversationMessage(args.conversation, {
-    id: messageId,
-    role: "assistant",
-    text: normalizeConversationText(args.text),
-    createdAtMs: Date.now(),
-    author: {
-      userName: botConfig.userName,
-      isBot: true
-    },
-    meta: {
-      replied: true
-    }
-  });
-  return messageId;
-}
-function turnHasReply(conversation, turnId) {
-  const assistantPrefix = `${turnId}:assistant:`;
-  return conversation.messages.some(
-    (message) => message.role === "assistant" && message.id.startsWith(assistantPrefix)
-  );
-}
-function markConversationMessage(conversation, messageId, patch) {
-  if (!messageId) return;
-  const messageIndex = conversation.messages.findIndex(
-    (entry) => entry.id === messageId
-  );
-  if (messageIndex < 0) return;
-  const current = conversation.messages[messageIndex];
-  conversation.messages[messageIndex] = {
-    ...current,
-    meta: {
-      ...current.meta ?? {},
-      ...patch
-    }
-  };
-  updateConversationStats(conversation);
-}
-function buildConversationContext(conversation, options = {}) {
-  const messages = conversation.messages.filter(
-    (entry) => entry.id !== options.excludeMessageId
-  );
-  if (messages.length === 0 && conversation.compactions.length === 0) {
-    return void 0;
-  }
-  const lines = [];
-  if (conversation.compactions.length > 0) {
-    lines.push("<thread-compactions>");
-    for (const [index, compaction] of conversation.compactions.entries()) {
-      lines.push(
-        `  <compaction index="${index + 1}" covered_messages="${compaction.coveredMessageCount}" created_at="${new Date(compaction.createdAtMs).toISOString()}">`,
-        compaction.summary,
-        "  </compaction>"
-      );
-    }
-    lines.push("</thread-compactions>");
-  }
-  if (messages.length > 0) {
-    if (lines.length > 0) {
-      lines.push("");
-    }
-    lines.push("<thread-transcript>");
-    for (const [index, message] of messages.entries()) {
-      const author = escapeXml(conversationAuthorDisplayName(message));
-      const actorIdAttr = message.author?.userId ? ` actor_id="${escapeXml(message.author.userId)}"` : "";
-      const ts = new Date(message.createdAtMs).toISOString();
-      const slackTsAttr = message.meta?.slackTs ? ` slack_ts="${escapeXml(message.meta.slackTs)}"` : "";
-      lines.push(
-        `  <message index="${index + 1}" ts="${ts}" role="${message.role}" author="${author}"${actorIdAttr}${slackTsAttr}>`,
-        renderConversationMessageLine(message, conversation),
-        "  </message>"
-      );
-    }
-    lines.push("</thread-transcript>");
-  }
-  return lines.join("\n");
-}
-function pruneCompactions(compactions) {
-  if (compactions.length <= CONTEXT_MAX_COMPACTIONS) {
-    return compactions;
-  }
-  const overflowCount = compactions.length - CONTEXT_MAX_COMPACTIONS + 1;
-  const merged = compactions.slice(0, overflowCount);
-  const mergedSummary = merged.map((entry) => entry.summary).join("\n").slice(0, 3500);
-  const coveredMessageCount = merged.reduce(
-    (count, entry) => count + entry.coveredMessageCount,
-    0
-  );
-  const compacted = {
-    id: generateConversationId("compaction"),
-    createdAtMs: Date.now(),
-    summary: mergedSummary,
-    coveredMessageCount
-  };
-  return [compacted, ...compactions.slice(overflowCount)];
-}
-async function summarizeConversationChunk(messages, conversation, context, deps) {
-  const transcript = messages.map((message) => renderConversationMessageLine(message, conversation)).join("\n");
-  try {
-    const result = await deps.completeText({
-      modelId: botConfig.fastModelId,
-      temperature: 0,
-      messages: [
-        {
-          role: "user",
-          content: [
-            "Summarize the following older Slack thread transcript segment for future assistant turns.",
-            "Keep the summary factual and concise. Do not invent details.",
-            "",
-            "Output exactly three XML sections in this order:",
-            "<active-asks> one bullet per outstanding user ask that has not been narrowed, answered, or replaced by a later turn. Omit the section body if none. </active-asks>",
-            "<resolved-or-replaced-asks> one bullet per ask that has been replaced, narrowed, answered, or already acted on in this segment. Include the replacement/outcome inline. Omit the section body if none. </resolved-or-replaced-asks>",
-            "<facts> one bullet per durable fact useful regardless of scope: names, ids, URLs, decisions, locations, preferences, constraints that remain true. Omit the section body if none. </facts>",
-            "",
-            "Do not output any text outside the three sections.",
-            "",
-            transcript
-          ].join("\n"),
-          timestamp: Date.now()
-        }
-      ],
-      metadata: {
-        modelId: botConfig.fastModelId,
-        threadId: context.threadId ?? "",
-        channelId: context.channelId ?? "",
-        actorId: context.actorId ?? "",
-        runId: context.runId ?? ""
-      }
-    });
-    const summary = result.text.trim();
-    if (summary.length > 0) {
-      return summary.slice(0, 3500);
-    }
-  } catch (error) {
-    logWarn("conversation.compaction.summary.failed", {
-      "exception.message": error instanceof Error ? error.message : String(error),
-      "app.compaction_messages_covered": messages.length
-    });
-  }
-  return transcript.slice(0, 2800);
-}
-async function generateThreadTitleWithDeps(sourceText, deps) {
-  const result = await deps.completeText({
-    modelId: botConfig.fastModelId,
-    temperature: 0,
-    messages: [
-      {
-        role: "user",
-        content: [
-          "Generate a concise 5-8 word Slack conversation title from the first user message below.",
-          "Capture the user's main request.",
-          "Reply with ONLY the title, with no quotes or trailing punctuation.",
-          "",
-          `First user message: ${sourceText.slice(0, 500)}`
-        ].join("\n"),
-        timestamp: Date.now()
-      }
-    ],
-    metadata: {
-      modelId: botConfig.fastModelId
-    }
-  });
-  return result.text.trim().slice(0, 60);
-}
-function getThreadTitleSourceMessage(conversation) {
-  let firstMessage;
-  for (const message of conversation.messages) {
-    if (!isHumanConversationMessage(message)) {
-      continue;
-    }
-    if (!firstMessage) {
-      firstMessage = message;
-      continue;
-    }
-    if (message.createdAtMs < firstMessage.createdAtMs) {
-      firstMessage = message;
-      continue;
-    }
-    if (message.createdAtMs === firstMessage.createdAtMs && message.id < firstMessage.id) {
-      firstMessage = message;
-    }
-  }
-  return firstMessage;
-}
-async function compactConversationIfNeededWithDeps(conversation, context, deps) {
-  updateConversationStats(conversation);
-  let estimatedTokens = conversation.stats.estimatedContextTokens;
-  setSpanAttributes({
-    "app.context_tokens_estimated": estimatedTokens
-  });
-  const triggerTokens = getConversationContextCompactionTriggerTokens();
-  const targetTokens = calculateContextCompactionTargetTokens(triggerTokens);
-  while (estimatedTokens > triggerTokens && conversation.messages.length > CONTEXT_MIN_LIVE_MESSAGES) {
-    const compactCount = Math.min(
-      CONTEXT_COMPACTION_BATCH_SIZE,
-      conversation.messages.length - CONTEXT_MIN_LIVE_MESSAGES
-    );
-    if (compactCount <= 0) {
-      break;
-    }
-    const compactedChunk = conversation.messages.slice(0, compactCount);
-    const summary = await summarizeConversationChunk(
-      compactedChunk,
-      conversation,
-      context,
-      deps
-    );
-    conversation.compactions.push({
-      id: generateConversationId("compaction"),
-      createdAtMs: Date.now(),
-      summary,
-      coveredMessageCount: compactedChunk.length
-    });
-    conversation.compactions = pruneCompactions(conversation.compactions);
-    conversation.messages = conversation.messages.slice(compactCount);
-    conversation.stats.compactedMessageCount += compactCount;
-    updateConversationStats(conversation);
-    estimatedTokens = conversation.stats.estimatedContextTokens;
-    setSpanAttributes({
-      "app.compaction_messages_covered": compactCount,
-      "app.compaction.trigger_tokens": triggerTokens,
-      "app.compaction.target_tokens": targetTokens,
-      "app.context_tokens_estimated": estimatedTokens
-    });
-    if (estimatedTokens <= targetTokens) {
-      break;
-    }
-  }
-}
-function createConversationMemoryService(deps) {
-  return {
-    compactConversationIfNeeded: async (conversation, context) => await compactConversationIfNeededWithDeps(conversation, context, deps),
-    generateThreadTitle: async (sourceText) => await generateThreadTitleWithDeps(sourceText, deps)
-  };
-}
-function isHumanConversationMessage(message) {
-  return message.role === "user" && message.author?.isBot !== true;
-}
-function getConversationMessageSlackTs(message) {
-  return parseSlackMessageTs(message.meta?.slackTs);
-}
-
 // src/chat/conversations/messages.ts
 import { createHash } from "crypto";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
@@ -714,7 +321,6 @@ async function hydrateConversationMessages(args) {
   );
   args.conversation.compactions = history.compaction ? projectConversationMessageSummaries([history.compaction]) : [];
   args.conversation.messages = projectConversationMessages(history);
-  updateConversationStats(args.conversation);
 }
 async function persistConversationMessages(args) {
   if (!args.conversationId || args.conversation.messages.length === 0) return;
@@ -1214,6 +820,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,
@@ -1334,7 +993,6 @@ function isTurnInputDeferredError(error) {
 }
 function startActiveTurn(args) {
   args.conversation.processing.activeTurnId = args.nextTurnId;
-  args.updateConversationStats(args.conversation);
 }
 function clearActiveTurn(conversation, sessionId) {
   if (!sessionId || conversation.processing.activeTurnId === sessionId) {
@@ -1344,12 +1002,10 @@ function clearActiveTurn(conversation, sessionId) {
 function markTurnClosed(args) {
   clearActiveTurn(args.conversation, args.sessionId);
   args.conversation.processing.lastCompletedAtMs = args.nowMs;
-  args.updateConversationStats(args.conversation);
 }
 function markTurnCompleted(args) {
   clearActiveTurn(args.conversation, args.sessionId);
   args.conversation.processing.lastCompletedAtMs = args.nowMs;
-  args.updateConversationStats(args.conversation);
 }
 function markTurnFailed(args) {
   clearActiveTurn(args.conversation, args.sessionId);
@@ -1358,7 +1014,6 @@ function markTurnFailed(args) {
     replied: false,
     skippedReason: "reply failed"
   });
-  args.updateConversationStats(args.conversation);
 }
 
 // src/chat/no-reply.ts
@@ -1402,9 +1057,6 @@ function getAssistantReplyText(message) {
 }
 
 // src/chat/state/turn-session.ts
-import {
-  actorSchema
-} from "@sentry/junior-plugin-api";
 import { z as z2 } from "zod";
 
 // src/chat/repository-instructions.ts
@@ -1420,7 +1072,7 @@ var RIPGREP_EXCLUDED_GLOBS = [
 ];
 var DEFAULT_SEARCH_COMMAND_TIMEOUT_MS = 3e4;
 var SKIPPED_DIRECTORIES = /* @__PURE__ */ new Set([".git", "node_modules"]);
-function positiveInteger2(value) {
+function positiveInteger(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) {
     return void 0;
   }
@@ -1767,6 +1419,9 @@ function agentTurnSessionConversationIndexKey(conversationId) {
 // src/chat/state/turn-session.ts
 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)
@@ -1807,18 +1462,12 @@ var agentTurnSessionSummarySchema = z2.object({
   updatedAtMs: nonNegativeNumberSchema
 }).strip();
 var storedAgentTurnSessionRecordSchema = 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(),
   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),
@@ -1828,7 +1477,6 @@ var storedAgentTurnSessionRecordSchema = z2.object({
   surface: agentTurnSurfaceSchema.optional(),
   traceId: z2.string().optional(),
   updatedAtMs: nonNegativeNumberSchema,
-  actors: z2.array(actorSchema).optional(),
   committedSeq: seqCursorSchema,
   historyVersion: z2.number().int().nonnegative().optional(),
   errorMessage: z2.string().optional(),
@@ -1908,7 +1556,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,
@@ -1921,17 +1569,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,
@@ -2008,11 +1656,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) {
@@ -2041,18 +1696,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,
@@ -2074,7 +1722,7 @@ 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),
@@ -2091,7 +1739,9 @@ async function setStoredRecord(args) {
       messages: [...args.piMessages],
       provenance: [...args.piMessageProvenance]
     },
-    args.turnStartMessageIndex
+    args.turnStartMessageIndex,
+    true,
+    args.runtimeMetadata
   );
 }
 async function updateAgentTurnSessionState(args) {
@@ -2106,6 +1756,16 @@ async function updateAgentTurnSessionState(args) {
     piMessages: args.existing.piMessages,
     piMessageProvenance: args.existing.piMessageProvenance,
     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
     }),
@@ -2118,18 +1778,11 @@ 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,
@@ -2145,6 +1798,13 @@ 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(
@@ -2181,6 +1841,16 @@ 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 }),
@@ -2193,22 +1863,11 @@ 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,
@@ -2226,6 +1885,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;
@@ -2255,16 +1922,16 @@ async function recordAgentTurnSessionSummary(args) {
   };
   await recordConversationActivityMetadata({
     actor: args.actor,
-    conversationStore: args.conversationStore,
+    conversationStore,
     destination: args.destination,
     destinationVisibility: args.destinationVisibility,
     nowMs,
     source: args.source,
     summary: {
       ...summary,
-      channelName: args.channelName ?? stored?.channelName,
-      cumulativeDurationMs: args.cumulativeDurationMs ?? stored?.cumulativeDurationMs ?? 0,
-      cumulativeUsage: args.cumulativeUsage ?? stored?.cumulativeUsage,
+      channelName: args.channelName ?? conversation?.channelName,
+      cumulativeDurationMs: args.cumulativeDurationMs ?? executionMetrics?.durationMs ?? 0,
+      cumulativeUsage: args.cumulativeUsage ?? executionMetrics?.usage,
       startedAtMs: stored?.startedAtMs ?? args.startedAtMs ?? nowMs
     }
   });
@@ -2493,9 +2160,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,
@@ -2574,7 +2241,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
@@ -2645,7 +2312,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
@@ -2713,7 +2380,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
@@ -2752,19 +2419,11 @@ async function persistYieldSessionRecord(args) {
 
 // src/chat/state/conversation.ts
 function defaultConversationState() {
-  const nowMs = Date.now();
   return {
     schemaVersion: 1,
     messages: [],
     compactions: [],
-    backfill: {},
     processing: {},
-    stats: {
-      estimatedContextTokens: 0,
-      totalMessageCount: 0,
-      compactedMessageCount: 0,
-      updatedAtMs: nowMs
-    },
     vision: {
       byFileId: {}
     }
@@ -2799,27 +2458,14 @@ function coerceThreadConversationState(value) {
   }
   const root = value;
   const rawConversation = isRecord(root.conversation) ? root.conversation : {};
-  const base = defaultConversationState();
   const messages = [];
   const compactions = [];
-  const rawBackfill = isRecord(rawConversation.backfill) ? rawConversation.backfill : {};
-  const backfill = {
-    completedAtMs: toOptionalNumber(rawBackfill.completedAtMs),
-    source: rawBackfill.source === "recent_messages" || rawBackfill.source === "thread_fetch" ? rawBackfill.source : void 0
-  };
   const rawProcessing = isRecord(rawConversation.processing) ? rawConversation.processing : {};
   const processing = {
     activeTurnId: toOptionalString(rawProcessing.activeTurnId),
     lastCompletedAtMs: toOptionalNumber(rawProcessing.lastCompletedAtMs),
     pendingAuth: coercePendingAuthState(rawProcessing.pendingAuth)
   };
-  const rawStats = isRecord(rawConversation.stats) ? rawConversation.stats : {};
-  const stats = {
-    estimatedContextTokens: toOptionalNumber(rawStats.estimatedContextTokens) ?? base.stats.estimatedContextTokens,
-    totalMessageCount: toOptionalNumber(rawStats.totalMessageCount) ?? messages.length,
-    compactedMessageCount: toOptionalNumber(rawStats.compactedMessageCount) ?? 0,
-    updatedAtMs: toOptionalNumber(rawStats.updatedAtMs) ?? base.stats.updatedAtMs
-  };
   const rawVision = isRecord(rawConversation.vision) ? rawConversation.vision : {};
   const rawVisionByFileId = isRecord(rawVision.byFileId) ? rawVision.byFileId : {};
   const byFileId = {};
@@ -2838,9 +2484,7 @@ function coerceThreadConversationState(value) {
     schemaVersion: 1,
     messages,
     compactions,
-    backfill,
     processing,
-    stats,
     vision: {
       backfillCompletedAtMs: toOptionalNumber(rawVision.backfillCompletedAtMs),
       byFileId
@@ -2848,19 +2492,13 @@ function coerceThreadConversationState(value) {
   };
 }
 function buildConversationStatePatch(conversation) {
-  const {
-    compactions: _compactions,
-    messages: _messages,
-    ...scratch
-  } = conversation;
   return {
     conversation: {
-      ...scratch,
       schemaVersion: 1,
-      stats: {
-        ...conversation.stats,
-        totalMessageCount: conversation.messages.length,
-        updatedAtMs: Date.now()
+      processing: { ...conversation.processing },
+      vision: {
+        backfillCompletedAtMs: conversation.vision.backfillCompletedAtMs,
+        byFileId: { ...conversation.vision.byFileId }
       }
     }
   };
@@ -3136,6 +2774,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;
@@ -3172,11 +2823,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();
@@ -3199,26 +2853,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
       });
     }
@@ -3228,15 +2877,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
+      });
     }
   });
 }
@@ -3323,20 +2966,6 @@ export {
   historyItemFromPiMessage,
   piMessageFromHistoryItem,
   persistConversationMessageSummaries,
-  estimateTextTokens,
-  getAgentContextCompactionTriggerTokens,
-  getAgentContextInputLimitTokens,
-  normalizeConversationText,
-  updateConversationStats,
-  upsertConversationMessage,
-  recordDeliveredAssistantMessage,
-  turnHasReply,
-  markConversationMessage,
-  buildConversationContext,
-  getThreadTitleSourceMessage,
-  createConversationMemoryService,
-  isHumanConversationMessage,
-  getConversationMessageSlackTs,
   hydrateConversationMessages,
   persistConversationMessages,
   loadProjection,
@@ -3349,6 +2978,7 @@ export {
   recordAuthorizationRequested,
   recordAuthorizationCompleted,
   recordAuthenticationLinked,
+  recordAgentsInstructionsUpdated,
   loadTurnRoute,
   recordTurnRoute,
   recordToolExecutionStarted,
@@ -3356,7 +2986,7 @@ export {
   MAX_TEXT_CHARS,
   RIPGREP_EXCLUDED_GLOBS,
   DEFAULT_SEARCH_COMMAND_TIMEOUT_MS,
-  positiveInteger2 as positiveInteger,
+  positiveInteger,
   normalizeToLf,
   truncateText,
   isMissingPathError,