@sentry/junior 0.121.0 → 0.122.1

package/dist/{chunk-Z2XXPUZG.js → chunk-BXT63TNS.js}

@@ -13,17 +13,17 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-254MFDOF.js";
+} from "./chunk-M7KAZXTE.js";
 import {
   getStateAdapter,
   sleep
-} from "./chunk-UURFXX66.js";
+} from "./chunk-WFJ2EG4E.js";
 import {
   botConfig,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-IDXLBKPS.js";
+} from "./chunk-TI7SYDD4.js";
 import {
   toStoredSlackActor
 } from "./chunk-HZF5P5UN.js";
@@ -32,7 +32,7 @@ import {
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-JZ47AFSH.js";
+} from "./chunk-4JPJTFUH.js";
 import {
   isRecord,
   toOptionalNumber,
@@ -147,2192 +147,2231 @@ function stripRuntimeTurnContext(messages) {
   });
 }
 
-// src/chat/conversations/projection.ts
-import { isDeepStrictEqual } from "util";
-
-// src/chat/pi/messages.ts
-import { z } from "zod";
-var piMessageSchema = z.object({
-  role: z.string()
-}).passthrough().transform((value) => value);
-var piContentMessageSchema = z.object({
-  content: z.array(z.unknown()),
-  role: z.string().min(1)
-}).passthrough().transform((value) => value);
-
-// src/chat/pi/conversation-events.ts
-function authorizationObservationMessage(data, createdAtMs) {
-  const label = data.kind === "mcp" ? "MCP authorization" : "Authorization";
-  return piMessageSchema.parse({
-    role: "user",
-    content: [
-      {
-        type: "text",
-        text: `${label} completed for provider "${data.provider}". Continue the blocked request and retry the provider operation if needed.`
-      }
-    ],
-    timestamp: createdAtMs
-  });
-}
-function durableMessages(message) {
-  return stripRuntimeTurnContext([message]);
+// 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 historyItemFromPiMessage(message, provenance) {
-  const parsed = piMessageSchema.parse(message);
-  const { role, ...fields } = parsed;
-  if (role === "user") {
-    return agentHistoryItemSchema.parse({
-      ...fields,
-      type: "user_message",
-      provenance
-    });
-  }
-  if (role === "assistant") {
-    return agentHistoryItemSchema.parse({
-      ...fields,
-      type: "assistant_message"
-    });
-  }
-  if (role === "toolResult") {
-    return agentHistoryItemSchema.parse({
-      ...fields,
-      type: "tool_result"
-    });
-  }
-  throw new Error(`Unsupported durable agent message role "${role}"`);
+function estimateTextTokens(text) {
+  return Math.ceil(text.length / 4);
 }
-function piMessageFromHistoryItem(data) {
-  if (data.type === "user_message") {
-    const { type: _2, provenance: __, ...fields2 } = data;
-    return piMessageSchema.parse({ ...fields2, role: "user" });
-  }
-  if (data.type === "assistant_message") {
-    const { type: _2, ...fields2 } = data;
-    return piMessageSchema.parse({ ...fields2, role: "assistant" });
-  }
-  const { type: _, ...fields } = data;
-  return piMessageSchema.parse({ ...fields, role: "toolResult" });
+function calculateContextCompactionTriggerTokens(model) {
+  const contextWindow = positiveInteger(
+    model.contextWindow,
+    FALLBACK_CONTEXT_WINDOW_TOKENS
+  );
+  return Math.max(1, Math.floor(contextWindow * COMPACTION_TRIGGER_RATIO));
 }
-function historyItemProvenance(data) {
-  return data.type === "user_message" ? data.provenance : contextProvenance;
+function calculateContextInputLimitTokens(model) {
+  const contextWindow = positiveInteger(
+    model.contextWindow,
+    FALLBACK_CONTEXT_WINDOW_TOKENS
+  );
+  return Math.max(1, Math.floor(contextWindow * CONTEXT_INPUT_LIMIT_RATIO));
 }
-function projectConversationEvents(events, options) {
-  const messages = [];
-  const provenance = [];
-  const seqs = [];
-  let modelProfile = "standard";
-  let modelId;
-  for (const event of events) {
-    if (options?.maxSeq !== void 0 && event.seq > options.maxSeq) break;
-    if (event.data.type === "unknown") {
-      throw new Error(
-        `Unsupported conversation event "${event.data.originalType}" at seq ${event.seq} (schema version ${event.schemaVersion})`
-      );
-    }
-    if (event.data.type === "compaction" || event.data.type === "handoff") {
-      modelProfile = event.data.modelProfile;
-      modelId = event.data.modelId;
-      for (const replacement of event.data.replacementHistory) {
-        for (const message of durableMessages(
-          piMessageFromHistoryItem(replacement.item)
-        )) {
-          messages.push(message);
-          provenance.push(historyItemProvenance(replacement.item));
-          seqs.push(replacement.sourceEventSeq ?? event.seq);
-        }
-      }
-      continue;
-    }
-    if (event.data.type === "user_message" || event.data.type === "assistant_message" || event.data.type === "tool_result") {
-      for (const message of durableMessages(
-        piMessageFromHistoryItem(event.data)
-      )) {
-        messages.push(message);
-        provenance.push(historyItemProvenance(event.data));
-        seqs.push(event.seq);
-      }
-      continue;
-    }
-    if (event.data.type === "authorization_completed") {
-      messages.push(
-        authorizationObservationMessage(event.data, event.createdAtMs)
-      );
-      provenance.push(contextProvenance);
-      seqs.push(event.seq);
-    }
-  }
-  return { messages, provenance, seqs, modelProfile, modelId };
+function calculateContextCompactionTargetTokens(triggerTokens) {
+  return Math.max(1, Math.floor(triggerTokens * COMPACTION_TARGET_RATIO));
 }
-
-// src/chat/conversations/projection.ts
-function connectedMcpProvidersFromEvents(events) {
-  const providers = /* @__PURE__ */ new Set();
-  for (const event of events) {
-    if (event.data.type === "mcp_provider_connected") {
-      providers.add(event.data.provider);
-    }
-  }
-  return [...providers].sort((left, right) => left.localeCompare(right));
+function getModelContextBudget(modelId) {
+  const model = resolveGatewayModel(modelId);
+  const advertisedContextWindow = positiveInteger(
+    model.contextWindow,
+    FALLBACK_CONTEXT_WINDOW_TOKENS
+  );
+  return {
+    contextWindow: Math.min(
+      botConfig.contextWindowTokens,
+      advertisedContextWindow
+    )
+  };
 }
-function isUserMessage(message) {
-  return message.role === "user";
+function getAgentContextCompactionTriggerTokens(modelId) {
+  return calculateContextCompactionTriggerTokens(
+    getModelContextBudget(modelId)
+  );
 }
-function countMatchingPrefix(left, right) {
-  const limit = Math.min(left.length, right.length);
-  for (let index = 0; index < limit; index += 1) {
-    if (!isDeepStrictEqual(left[index], right[index])) {
-      return index;
-    }
-  }
-  return limit;
+function getAgentContextInputLimitTokens(modelId) {
+  return calculateContextInputLimitTokens(getModelContextBudget(modelId));
 }
-function normalizeDurableMessage(message) {
-  return piMessageSchema.parse(
-    JSON.parse(JSON.stringify(sanitizePostgresJson(message)))
+function getConversationContextCompactionTriggerTokens() {
+  return calculateContextCompactionTriggerTokens(
+    getModelContextBudget(botConfig.fastModelId)
   );
 }
-function resolveCommitProvenance(args) {
-  if (args.explicitProvenance) {
-    if (args.explicitProvenance.length !== args.nextMessages.length) {
-      throw new Error("commit provenance must align one-to-one with messages");
-    }
-    return args.explicitProvenance;
+
+// 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 "";
   }
-  if (args.existing.provenance.length !== args.existing.messages.length) {
-    throw new Error("committed provenance must align one-to-one with messages");
+  const summaries = imageFileIds.map((fileId) => byFileId[fileId]?.summary?.trim()).filter((summary) => Boolean(summary));
+  if (summaries.length === 0) {
+    return "";
   }
-  const matchingPrefix = args.matchingPrefix;
-  const provenance = args.nextMessages.map(
-    (_, index) => index < matchingPrefix ? args.existing.provenance[index] : contextProvenance
-  );
-  if (args.newMessageProvenance) {
-    for (let index = args.nextMessages.length - 1; index >= matchingPrefix; index -= 1) {
-      if (isUserMessage(args.nextMessages[index])) {
-        provenance[index] = args.newMessageProvenance;
-        break;
-      }
-    }
+  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 (args.trailingMessageProvenance) {
-    if (args.trailingMessageProvenance.length > provenance.length) {
-      throw new Error(
-        "trailing commit provenance cannot exceed committed messages"
-      );
-    }
-    const newMessageCount = args.nextMessages.length - matchingPrefix;
-    if (args.trailingMessageProvenance.length > newMessageCount) {
-      throw new Error(
-        "trailing commit provenance must align to newly committed messages"
-      );
-    }
-    const start = provenance.length - args.trailingMessageProvenance.length;
-    args.trailingMessageProvenance.forEach((entry, offset) => {
-      provenance[start + offset] = entry;
-    });
+  if (message.meta?.explicitMention) {
+    markers.push("explicit mention");
   }
-  return provenance;
-}
-async function loadProjection(args) {
-  const events = await getConversationEventStore().loadCurrentHistory(
-    args.conversationId
-  );
-  return projectConversationEvents(events).messages;
+  const markerSuffix = markers.length > 0 ? ` (${markers.join("; ")})` : "";
+  const imageContext = buildImageContextSuffix(message, conversation);
+  return `[${message.role}] ${displayName}: ${text}${imageContext}${markerSuffix}`;
 }
-async function loadConversationProjection(args) {
-  const events = await getConversationEventStore().loadCurrentHistory(
-    args.conversationId
-  );
-  return projectConversationEvents(events);
-}
-async function openConversationProjection(args) {
-  const events = await getConversationEventStore().loadCurrentHistory(
-    args.conversationId
-  );
-  return projectConversationEvents(events);
+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);
 }
-async function loadTurnProjection(args) {
-  const eventStore = getConversationEventStore();
-  if (args.committedSeq < 0) {
-    return projectConversationEvents(
-      await eventStore.loadCurrentHistory(args.conversationId)
-    );
-  }
-  const historyEvents = await eventStore.loadHistoryContaining(
-    args.conversationId,
-    args.committedSeq,
-    args.includeTail ? void 0 : args.committedSeq
-  );
-  if (!historyEvents) {
+function authorDisplayField(value, userId) {
+  if (!value || value === userId || SLACK_USER_ID_DISPLAY_PATTERN.test(value)) {
     return void 0;
   }
-  return projectConversationEvents(historyEvents);
-}
-async function loadConnectedMcpProviders(args) {
-  const events = await getConversationEventStore().loadCurrentHistory(
-    args.conversationId
-  );
-  return connectedMcpProvidersFromEvents(events);
-}
-function messageTimestamp(message) {
-  const timestamp = message.timestamp;
-  return typeof timestamp === "number" ? timestamp : Date.now();
+  return value;
 }
-async function commitMessages(args) {
-  const executor = args.executor ?? getSqlExecutor();
-  return await withConversationEventLock(
-    executor,
-    args.conversationId,
-    async () => executor.transaction(
-      async () => await commitMessagesLocked(args, executor)
-    )
+function updateConversationStats(conversation) {
+  const contextText = buildConversationContext(conversation);
+  conversation.stats.estimatedContextTokens = estimateTextTokens(
+    contextText ?? ""
   );
+  conversation.stats.totalMessageCount = conversation.messages.length;
+  conversation.stats.updatedAtMs = Date.now();
 }
-async function commitMessagesLocked(args, executor) {
-  const eventStore = createSqlConversationEventStore(executor);
-  const currentEvents = await eventStore.loadCurrentHistory(
-    args.conversationId
-  );
-  const current = projectConversationEvents(currentEvents);
-  const nextLocalMessages = stripRuntimeTurnContext(args.messages).map(
-    normalizeDurableMessage
-  );
-  const matchingPrefix = countMatchingPrefix(
-    current.messages,
-    nextLocalMessages
+function upsertConversationMessage(conversation, message) {
+  const existingIndex = conversation.messages.findIndex(
+    (entry) => entry.id === message.id
   );
-  const nextLocalProvenance = resolveCommitProvenance({
-    existing: current,
-    nextMessages: nextLocalMessages,
-    matchingPrefix,
-    ...args.provenance ? { explicitProvenance: args.provenance } : {},
-    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
-    ...args.newMessageProvenance ? { newMessageProvenance: args.newMessageProvenance } : {}
-  });
-  if (matchingPrefix === current.messages.length) {
-    const newMessages = nextLocalMessages.slice(matchingPrefix);
-    const turnContext = args.turnContext;
-    const turnContextEvents = turnContext?.contexts.map((context, index) => ({
-      idempotencyKey: `turn:${turnContext.turnId}:context:${context.pluginName}:${index}`,
-      createdAtMs: context.loadedAtMs,
-      data: {
-        type: "turn_context",
-        turnId: turnContext.turnId,
-        pluginName: context.pluginName,
-        kind: context.kind,
-        version: context.version,
-        content: context.content
+  if (existingIndex >= 0) {
+    conversation.messages[existingIndex] = {
+      ...conversation.messages[existingIndex],
+      ...message,
+      meta: {
+        ...conversation.messages[existingIndex]?.meta,
+        ...message.meta
       }
-    })) ?? [];
-    await eventStore.append(args.conversationId, [
-      ...newMessages.map((message, index) => ({
-        data: historyItemFromPiMessage(
-          message,
-          nextLocalProvenance[matchingPrefix + index]
-        ),
-        createdAtMs: messageTimestamp(message)
-      })),
-      ...turnContextEvents
-    ]);
-  } else {
-    throw new Error(
-      `Agent history for ${args.conversationId} changed before its committed boundary`
-    );
+    };
+    updateConversationStats(conversation);
+    return message.id;
   }
-  const committedEvents = await eventStore.loadCurrentHistory(
-    args.conversationId
-  );
-  const committed = projectConversationEvents(committedEvents);
-  return {
-    committedSeq: committedEvents.at(-1)?.seq ?? -1,
-    historyVersion: committedEvents.at(-1)?.historyVersion ?? 0,
-    messageSeqs: committed.seqs,
-    messages: nextLocalMessages,
-    provenance: nextLocalProvenance
-  };
+  conversation.messages.push(message);
+  updateConversationStats(conversation);
+  return message.id;
 }
-async function recordMcpProviderConnected(args) {
-  const eventStore = getConversationEventStore();
-  const events = await eventStore.loadCurrentHistory(args.conversationId);
-  if (connectedMcpProvidersFromEvents(events).includes(args.provider)) {
-    return;
-  }
-  await eventStore.append(args.conversationId, [
-    {
-      data: { type: "mcp_provider_connected", provider: args.provider },
-      createdAtMs: Date.now()
+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;
 }
-async function recordAuthorizationRequested(args) {
-  const eventStore = getConversationEventStore();
-  const events = await eventStore.loadCurrentHistory(args.conversationId);
-  if (events.some(
-    (event) => event.data.type === "authorization_requested" && event.data.authorizationId === args.authorizationId
-  )) {
-    return;
-  }
-  await eventStore.append(args.conversationId, [
-    {
-      data: {
-        type: "authorization_requested",
-        kind: args.kind,
-        provider: args.provider,
-        actorId: args.actorId,
-        authorizationId: args.authorizationId,
-        delivery: args.delivery
-      },
-      createdAtMs: Date.now()
-    }
-  ]);
+function turnHasReply(conversation, turnId) {
+  const assistantPrefix = `${turnId}:assistant:`;
+  return conversation.messages.some(
+    (message) => message.role === "assistant" && message.id.startsWith(assistantPrefix)
+  );
 }
-async function recordAuthorizationCompleted(args) {
-  const eventStore = getConversationEventStore();
-  const events = await eventStore.loadCurrentHistory(args.conversationId);
-  if (events.some(
-    (event) => event.data.type === "authorization_completed" && event.data.authorizationId === args.authorizationId
-  )) {
-    return;
-  }
-  await eventStore.append(args.conversationId, [
-    {
-      data: {
-        type: "authorization_completed",
-        kind: args.kind,
-        provider: args.provider,
-        actorId: args.actorId,
-        authorizationId: args.authorizationId
-      },
-      createdAtMs: Date.now()
+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);
 }
-async function loadTurnRoute(args) {
-  const event = await getConversationEventStore().loadByIdempotencyKey(
-    args.conversationId,
-    `turn:${args.turnId}:routed`
+function buildConversationContext(conversation, options = {}) {
+  const messages = conversation.messages.filter(
+    (entry) => entry.id !== options.excludeMessageId
   );
-  if (!event) {
+  if (messages.length === 0 && conversation.compactions.length === 0) {
     return void 0;
   }
-  if (event.data.type !== "turn_routed" || event.data.turnId !== args.turnId) {
-    throw new Error(`Turn route key for "${args.turnId}" has invalid data`);
+  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>");
   }
-  return event.data;
-}
-async function recordTurnRoute(args) {
-  await getConversationEventStore().append(args.conversationId, [
-    {
-      idempotencyKey: `turn:${args.turnId}:routed`,
-      createdAtMs: Date.now(),
-      data: {
-        type: "turn_routed",
-        turnId: args.turnId,
-        modelProfile: args.modelProfile,
-        modelId: args.modelId,
-        reasoningLevel: args.reasoningLevel,
-        ...args.confidence !== void 0 ? { confidence: args.confidence } : {},
-        source: args.source
-      }
+  if (messages.length > 0) {
+    if (lines.length > 0) {
+      lines.push("");
     }
-  ]);
-}
-async function recordToolExecutionStarted(args) {
-  await getConversationEventStore().append(args.conversationId, [
-    {
-      data: {
-        type: "tool_execution_started",
-        toolCallId: args.toolCallId,
-        toolName: args.toolName
-      },
-      createdAtMs: args.createdAtMs ?? Date.now()
+    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");
 }
-
-// src/chat/state/turn-id.ts
-function buildDeterministicTurnId(messageId) {
-  const sanitized = messageId.replace(/[^a-zA-Z0-9_-]/g, "_");
-  return `turn_${sanitized}`;
+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)];
 }
-function buildDeterministicAssistantMessageId(turnId) {
-  return `${turnId}:assistant:1`;
+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);
 }
-
-// src/chat/runtime/turn.ts
-var ConversationTurnBoundaryError = class extends Error {
-  eventId;
-  failureCode;
-  constructor(args) {
-    super(
-      args.cause instanceof Error ? args.cause.message : String(args.cause),
+async function generateThreadTitleWithDeps(sourceText, deps) {
+  const result = await deps.completeText({
+    modelId: botConfig.fastModelId,
+    temperature: 0,
+    messages: [
       {
-        cause: args.cause
+        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()
       }
-    );
-    this.name = "ConversationTurnBoundaryError";
-    this.eventId = args.eventId;
-    this.failureCode = args.failureCode;
-  }
-};
-function getConversationTurnBoundaryError(error) {
-  return error instanceof ConversationTurnBoundaryError ? error : void 0;
+    ],
+    metadata: {
+      modelId: botConfig.fastModelId
+    }
+  });
+  return result.text.trim().slice(0, 60);
 }
-var CooperativeTurnYieldError = class extends Error {
-  code = "cooperative_turn_yield";
-  constructor(message = "Agent turn yielded at a safe boundary") {
-    super(message);
-    this.name = "CooperativeTurnYieldError";
+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;
+    }
   }
-};
-function isCooperativeTurnYieldError(error) {
-  return error instanceof CooperativeTurnYieldError;
+  return firstMessage;
 }
-var TurnInputCommitLostError = class extends Error {
-  code = "turn_input_commit_lost";
-  constructor(message = "Turn input commit lost its durable owner") {
-    super(message);
-    this.name = "TurnInputCommitLostError";
+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 isTurnInputCommitLostError(error) {
-  return error instanceof TurnInputCommitLostError;
 }
-var TurnInputDeferredError = class extends Error {
-  code = "turn_input_deferred";
-  constructor(message = "Turn input is deferred until the active resume ends") {
-    super(message);
-    this.name = "TurnInputDeferredError";
-  }
-};
-function isTurnInputDeferredError(error) {
-  return error instanceof TurnInputDeferredError;
+function createConversationMemoryService(deps) {
+  return {
+    compactConversationIfNeeded: async (conversation, context) => await compactConversationIfNeededWithDeps(conversation, context, deps),
+    generateThreadTitle: async (sourceText) => await generateThreadTitleWithDeps(sourceText, deps)
+  };
 }
-function startActiveTurn(args) {
-  args.conversation.processing.activeTurnId = args.nextTurnId;
-  args.updateConversationStats(args.conversation);
+function isHumanConversationMessage(message) {
+  return message.role === "user" && message.author?.isBot !== true;
 }
-function clearActiveTurn(conversation, sessionId) {
-  if (!sessionId || conversation.processing.activeTurnId === sessionId) {
-    conversation.processing.activeTurnId = void 0;
+function getConversationMessageSlackTs(message) {
+  return parseSlackMessageTs(message.meta?.slackTs);
+}
+
+// src/chat/conversations/messages.ts
+import { createHash } from "crypto";
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
+
+// src/chat/conversations/message-summaries.ts
+import { isDeepStrictEqual } from "util";
+function projectConversationMessageSummaries(events) {
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    const data = events[index]?.data;
+    if (data?.type === "messages_summarized") {
+      return data.compactions;
+    }
   }
+  return [];
 }
-function markTurnClosed(args) {
-  clearActiveTurn(args.conversation, args.sessionId);
-  args.conversation.processing.lastCompletedAtMs = args.nowMs;
-  args.updateConversationStats(args.conversation);
+async function persistConversationMessageSummaries(args) {
+  const eventStore = getConversationEventStore();
+  const history = await eventStore.loadMessageHistory(args.conversationId);
+  const existing = history.compaction ? projectConversationMessageSummaries([history.compaction]) : [];
+  if (isDeepStrictEqual(existing, args.conversation.compactions)) {
+    return;
+  }
+  const liveMessageIds = new Set(
+    args.conversation.messages.map((message) => message.id)
+  );
+  const historyFromSeq = history.events.find(
+    (event) => event.data.type === "message" && liveMessageIds.has(event.data.messageId)
+  )?.seq;
+  const nextHistoryFromSeq = historyFromSeq ?? Math.max(history.historyFromSeq, (history.events.at(-1)?.seq ?? -1) + 1);
+  await eventStore.append(args.conversationId, [
+    {
+      data: {
+        type: "messages_summarized",
+        historyFromSeq: nextHistoryFromSeq,
+        compactions: args.conversation.compactions
+      },
+      createdAtMs: args.conversation.compactions.at(-1)?.createdAtMs ?? Date.now()
+    }
+  ]);
 }
-function markTurnCompleted(args) {
-  clearActiveTurn(args.conversation, args.sessionId);
-  args.conversation.processing.lastCompletedAtMs = args.nowMs;
-  args.updateConversationStats(args.conversation);
+
+// src/chat/conversations/message-projection.ts
+function isMessageEvent(event) {
+  return event.data.type === "message" || event.data.type === "message_updated" || event.data.type === "message_handled";
 }
-function markTurnFailed(args) {
-  clearActiveTurn(args.conversation, args.sessionId);
-  args.conversation.processing.lastCompletedAtMs = args.nowMs;
-  args.markConversationMessage(args.conversation, args.userMessageId, {
-    replied: false,
-    skippedReason: "reply failed"
-  });
-  args.updateConversationStats(args.conversation);
+function splitMeta(meta) {
+  const rest = { ...meta ?? {} };
+  const author = rest.author;
+  delete rest.author;
+  return {
+    ...author ? { author } : {},
+    ...Object.keys(rest).length > 0 ? { meta: rest } : {}
+  };
 }
-
-// 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);
+function missingBaselineError(event) {
+  return new Error(
+    `Message event ${event.data.type} at seq ${event.seq} references ${event.data.messageId} before message`
+  );
+}
+function projectConversationMessages(history) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const event of history.events) {
+    if (!isMessageEvent(event)) continue;
+    const data = event.data;
+    const current = byId.get(data.messageId);
+    if (data.type === "message" || data.type === "message_updated") {
+      const message = {
+        id: data.messageId,
+        role: data.role,
+        text: data.text,
+        createdAtMs: event.createdAtMs,
+        ...splitMeta(data.meta)
+      };
+      if (data.type === "message" && current)
+        throw new Error(
+          `Duplicate message event for ${data.messageId} at seq ${event.seq}`
+        );
+      if (data.type === "message_updated" && !current) {
+        if (history.historyFromSeq > 0) continue;
+        throw missingBaselineError(event);
       }
+      byId.set(data.messageId, {
+        message: {
+          ...message,
+          createdAtMs: current?.message.createdAtMs ?? message.createdAtMs
+        },
+        ...current?.repliedAtMs === void 0 ? {} : { repliedAtMs: current.repliedAtMs }
+      });
+      continue;
     }
+    if (!current) {
+      if (history.historyFromSeq > 0) continue;
+      throw missingBaselineError(event);
+    }
+    current.repliedAtMs ??= event.createdAtMs;
   }
-  throw lastError;
-}
-
-// src/chat/state/turn-session.ts
-import { THREAD_STATE_TTL_MS } from "chat";
-import {
-  actorSchema,
-  destinationSchema,
-  sourceSchema
-} from "@sentry/junior-plugin-api";
-import { z as z2 } from "zod";
-
-// src/chat/state/turn-session-keys.ts
-var AGENT_TURN_SESSION_PREFIX = "junior:agent_turn_session";
-function agentTurnSessionKey(conversationId, sessionId) {
-  return `${AGENT_TURN_SESSION_PREFIX}:${conversationId}:${sessionId}`;
-}
-function agentTurnSessionConversationIndexKey(conversationId) {
-  return `${AGENT_TURN_SESSION_PREFIX}:conversation:${conversationId}:index`;
+  return [...byId.values()].map(({ message, repliedAtMs }) => {
+    if (repliedAtMs === void 0) return message;
+    return {
+      ...message,
+      meta: { ...message.meta ?? {}, replied: true }
+    };
+  });
 }
 
-// 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 agentTurnSessionStatusSchema = z2.enum([
-  "running",
-  "awaiting_resume",
-  "completed",
-  "failed",
-  "abandoned"
-]);
-var agentTurnSurfaceSchema = z2.enum([
-  "slack",
-  "api",
-  "scheduler",
-  "internal"
-]);
-var agentTurnResumeReasonSchema = z2.enum([
-  "timeout",
-  "auth",
-  "yield",
-  "retry"
-]);
-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(),
-  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(),
-  actor: actorSchema.optional(),
-  resumeReason: agentTurnResumeReasonSchema.optional(),
-  resumedFromSliceId: z2.number().int().nonnegative().optional(),
-  sessionId: z2.string().min(1),
-  sliceId: z2.number().int().nonnegative(),
-  startedAtMs: nonNegativeNumberSchema,
-  state: agentTurnSessionStatusSchema,
-  surface: agentTurnSurfaceSchema.optional(),
-  traceId: z2.string().optional(),
-  updatedAtMs: nonNegativeNumberSchema
-}).strict();
-var storedAgentTurnSessionRecordSchema = agentTurnSessionSummarySchema.extend({
-  actors: z2.array(actorSchema).optional(),
-  committedSeq: seqCursorSchema,
-  historyVersion: z2.number().int().nonnegative().optional(),
-  errorMessage: z2.string().optional(),
-  turnStartSeq: seqCursorSchema.optional(),
-  runtimeContext: z2.array(piMessageSchema).optional()
-}).strict();
-function conversationExecutionFromSummary(summary) {
-  const status = summary.state === "completed" || summary.state === "abandoned" ? "idle" : summary.state;
+// src/chat/conversations/messages.ts
+function toStoredConversationMessage(message) {
+  const meta = {};
+  if (message.author) meta.author = message.author;
+  const { replied, ...restMeta } = message.meta ?? {};
+  Object.assign(meta, restMeta);
+  if (replied === false) meta.replied = false;
   return {
-    status,
-    runId: summary.sessionId,
-    updatedAtMs: summary.updatedAtMs
+    messageId: message.id,
+    role: message.role,
+    text: message.text,
+    ...Object.keys(meta).length > 0 ? { meta } : {},
+    createdAtMs: message.createdAtMs
   };
 }
-function sessionLogActor(actor) {
-  return actor?.platform === "slack" ? toStoredSlackActor(actor) : void 0;
-}
-function parseAgentTurnSessionRecord(value) {
-  return storedAgentTurnSessionRecordSchema.parse(value);
+function canonicalJson(value) {
+  if (Array.isArray(value)) return value.map(canonicalJson);
+  if (!value || typeof value !== "object") return value;
+  return Object.fromEntries(
+    Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, canonicalJson(item)])
+  );
 }
-function parseAgentTurnSessionSummary(value) {
-  return agentTurnSessionSummarySchema.parse(value);
+function messageStateKey(message) {
+  return createHash("sha256").update(JSON.stringify(canonicalJson(message))).digest("hex").slice(0, 32);
 }
-async function appendAgentTurnSessionSummary(summary, ttlMs) {
-  const stateAdapter = getStateAdapter();
-  await Promise.all([
-    stateAdapter.appendToList(AGENT_TURN_SESSION_INDEX_KEY, summary, {
-      maxLength: AGENT_TURN_SESSION_INDEX_MAX_LENGTH,
-      ttlMs
-    }),
-    stateAdapter.appendToList(
-      agentTurnSessionConversationIndexKey(summary.conversationId),
-      summary,
-      { ttlMs }
-    )
-  ]);
+async function hydrateConversationMessages(args) {
+  if (!args.conversationId) {
+    args.conversation.messages = [];
+    return;
+  }
+  const history = await getConversationEventStore().loadMessageHistory(
+    args.conversationId
+  );
+  args.conversation.compactions = history.compaction ? projectConversationMessageSummaries([history.compaction]) : [];
+  args.conversation.messages = projectConversationMessages(history);
+  updateConversationStats(args.conversation);
 }
-async function recordConversationActivityMetadata(args) {
-  const conversationStore = args.conversationStore ?? getConversationStore();
-  const source = args.summary.destination?.platform === "local" ? "local" : args.summary.surface;
-  await conversationStore.recordActivity({
-    activityAtMs: args.summary.updatedAtMs,
-    channelName: args.summary.channelName,
-    conversationId: args.summary.conversationId,
-    destination: args.summary.destination,
-    nowMs: args.nowMs,
-    actor: sessionLogActor(args.summary.actor),
-    source,
-    visibility: args.destinationVisibility
+async function persistConversationMessages(args) {
+  if (!args.conversationId || args.conversation.messages.length === 0) return;
+  await appendConversationMessages(getConversationEventStore(), {
+    ...args,
+    conversationId: args.conversationId
   });
-  await conversationStore.recordExecution({
-    channelName: args.summary.channelName,
-    conversationId: args.summary.conversationId,
-    createdAtMs: args.summary.startedAtMs,
-    destination: args.summary.destination,
-    execution: conversationExecutionFromSummary(args.summary),
-    lastActivityAtMs: args.summary.updatedAtMs,
-    metrics: {
-      durationMs: args.summary.cumulativeDurationMs,
-      ...args.summary.cumulativeUsage ? { usage: args.summary.cumulativeUsage } : {}
-    },
-    actor: sessionLogActor(args.summary.actor),
-    source,
-    updatedAtMs: args.nowMs,
-    visibility: args.destinationVisibility
+}
+async function appendConversationMessages(eventStore, args) {
+  if (args.conversation.messages.length === 0) return;
+  const history = await eventStore.loadMessageHistory(args.conversationId);
+  const existingMessages = new Map(
+    projectConversationMessages(history).map((message) => [
+      message.id,
+      message
+    ])
+  );
+  const handledAtMs = args.repliedAtMs ?? Date.now();
+  const events = args.conversation.messages.flatMap((message) => {
+    const stored = toStoredConversationMessage(message);
+    const existing = existingMessages.get(stored.messageId);
+    const changed = existing !== void 0 && !isDeepStrictEqual2(toStoredConversationMessage(existing), stored);
+    const messageEvent = existing ? changed ? [
+      {
+        idempotencyKey: `message:${stored.messageId}:update:${messageStateKey(stored)}`,
+        createdAtMs: handledAtMs,
+        data: {
+          type: "message_updated",
+          messageId: stored.messageId,
+          role: stored.role,
+          text: stored.text,
+          ...stored.authorIdentityId ? { authorIdentityId: stored.authorIdentityId } : {},
+          ...stored.meta ? { meta: stored.meta } : {}
+        }
+      }
+    ] : [] : [
+      {
+        idempotencyKey: `message:${stored.messageId}`,
+        createdAtMs: stored.createdAtMs,
+        data: {
+          type: "message",
+          messageId: stored.messageId,
+          role: stored.role,
+          text: stored.text,
+          ...stored.authorIdentityId ? { authorIdentityId: stored.authorIdentityId } : {},
+          ...stored.meta ? { meta: stored.meta } : {}
+        }
+      }
+    ];
+    return [
+      ...messageEvent,
+      ...message.meta?.replied === true ? [
+        {
+          idempotencyKey: `message:${stored.messageId}:handled`,
+          createdAtMs: handledAtMs,
+          data: {
+            type: "message_handled",
+            messageId: stored.messageId
+          }
+        }
+      ] : []
+    ];
   });
+  await eventStore.append(args.conversationId, events);
 }
-function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true) {
-  const piMessages = restoreVolatileContext && (stored.state === "running" || stored.state === "awaiting_resume") ? restoreRuntimeContext(piProjection.messages, stored.runtimeContext) : piProjection.messages;
-  return {
-    version: stored.version,
-    ...stored.channelName ? { channelName: stored.channelName } : {},
-    conversationId: stored.conversationId,
-    sessionId: stored.sessionId,
-    sliceId: stored.sliceId,
-    state: stored.state,
-    startedAtMs: stored.startedAtMs,
-    lastProgressAtMs: stored.lastProgressAtMs,
-    updatedAtMs: stored.updatedAtMs,
-    piMessages,
-    piMessageProvenance: piProjection.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 } : {}
-  };
+
+// src/chat/conversations/projection.ts
+import { isDeepStrictEqual as isDeepStrictEqual3 } from "util";
+
+// src/chat/pi/messages.ts
+import { z } from "zod";
+var piMessageSchema = z.object({
+  role: z.string()
+}).passthrough().transform((value) => value);
+var piContentMessageSchema = z.object({
+  content: z.array(z.unknown()),
+  role: z.string().min(1)
+}).passthrough().transform((value) => value);
+
+// src/chat/pi/conversation-events.ts
+function authorizationObservationMessage(data, createdAtMs) {
+  const label = data.kind === "mcp" ? "MCP authorization" : "Authorization";
+  return piMessageSchema.parse({
+    role: "user",
+    content: [
+      {
+        type: "text",
+        text: `${label} completed for provider "${data.provider}". Continue the blocked request and retry the provider operation if needed.`
+      }
+    ],
+    timestamp: createdAtMs
+  });
 }
-function restoreRuntimeContext(messages, runtimeContext) {
-  if (!runtimeContext || runtimeContext.length === 0) return messages;
-  const restored = [...messages];
-  const unmatchedRuntimeContext = [];
-  for (const runtimeMessage of runtimeContext) {
-    const runtime = runtimeMessage;
-    const targetIndex = restored.findIndex((message) => {
-      const candidate = message;
-      return candidate.role === "user" && candidate.timestamp === runtime.timestamp;
+function durableMessages(message) {
+  return stripRuntimeTurnContext([message]);
+}
+function historyItemFromPiMessage(message, provenance) {
+  const parsed = piMessageSchema.parse(message);
+  const { role, ...fields } = parsed;
+  if (role === "user") {
+    return agentHistoryItemSchema.parse({
+      ...fields,
+      type: "user_message",
+      provenance
     });
-    if (targetIndex < 0) {
-      unmatchedRuntimeContext.push(runtimeMessage);
-      continue;
-    }
-    const target = restored[targetIndex];
-    restored[targetIndex] = {
-      ...restored[targetIndex],
-      content: [
-        ...Array.isArray(runtime.content) ? runtime.content : [],
-        ...Array.isArray(target.content) ? target.content : []
-      ]
-    };
   }
-  return [...unmatchedRuntimeContext, ...restored];
-}
-async function getStoredAgentTurnSessionRecord(conversationId, sessionId) {
-  const stateAdapter = getStateAdapter();
-  await stateAdapter.connect();
-  const value = await stateAdapter.get(
-    agentTurnSessionKey(conversationId, sessionId)
-  );
-  return value == null ? void 0 : parseAgentTurnSessionRecord(value);
-}
-async function materializeStoredAgentTurnSessionRecord(conversationId, sessionId, followCurrentReplacement) {
-  const parsed = await getStoredAgentTurnSessionRecord(
-    conversationId,
-    sessionId
-  );
-  if (!parsed) {
-    return void 0;
+  if (role === "assistant") {
+    return agentHistoryItemSchema.parse({
+      ...fields,
+      type: "assistant_message"
+    });
   }
-  const pinnedProjection = await loadTurnProjection({
-    conversationId,
-    committedSeq: parsed.committedSeq,
-    // Unfinished records include the current-epoch tail so parked input
-    // appended after the last safe boundary stays model-visible on resume.
-    includeTail: parsed.state === "running" || parsed.state === "awaiting_resume"
-  });
-  if (!pinnedProjection) {
-    return void 0;
+  if (role === "toolResult") {
+    return agentHistoryItemSchema.parse({
+      ...fields,
+      type: "tool_result"
+    });
   }
-  const currentHistory = await getConversationEventStore().loadCurrentHistory(conversationId);
-  const currentHistoryVersion = currentHistory.at(-1)?.historyVersion ?? parsed.historyVersion ?? 0;
-  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;
-  return materializeAgentTurnSessionRecord(
-    parsed,
-    piProjection,
-    turnStartMessageIndex,
-    !followsReplacement && (parsed.historyVersion === void 0 || parsed.historyVersion === currentHistoryVersion)
-  );
+  throw new Error(`Unsupported durable agent message role "${role}"`);
 }
-async function getAgentTurnSessionRecord(conversationId, sessionId) {
-  return await materializeStoredAgentTurnSessionRecord(
-    conversationId,
-    sessionId,
-    false
-  );
+function piMessageFromHistoryItem(data) {
+  if (data.type === "user_message") {
+    const { type: _2, provenance: __, ...fields2 } = data;
+    return piMessageSchema.parse({ ...fields2, role: "user" });
+  }
+  if (data.type === "assistant_message") {
+    const { type: _2, ...fields2 } = data;
+    return piMessageSchema.parse({ ...fields2, role: "assistant" });
+  }
+  const { type: _, ...fields } = data;
+  return piMessageSchema.parse({ ...fields, role: "toolResult" });
 }
-async function getAgentTurnSessionRecordForResume(conversationId, sessionId) {
-  return await materializeStoredAgentTurnSessionRecord(
-    conversationId,
-    sessionId,
-    true
-  );
+function historyItemProvenance(data) {
+  return data.type === "user_message" ? data.provenance : contextProvenance;
 }
-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,
-    state: args.state,
-    startedAtMs: args.startedAtMs ?? nowMs,
-    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 } : {}
-  };
+function projectConversationEvents(events, options) {
+  const messages = [];
+  const provenance = [];
+  const seqs = [];
+  let modelProfile = "standard";
+  let modelId;
+  for (const event of events) {
+    if (options?.maxSeq !== void 0 && event.seq > options.maxSeq) break;
+    if (event.data.type === "unknown") {
+      throw new Error(
+        `Unsupported conversation event "${event.data.originalType}" at seq ${event.seq} (schema version ${event.schemaVersion})`
+      );
+    }
+    if (event.data.type === "compaction" || event.data.type === "handoff") {
+      modelProfile = event.data.modelProfile;
+      modelId = event.data.modelId;
+      for (const replacement of event.data.replacementHistory) {
+        for (const message of durableMessages(
+          piMessageFromHistoryItem(replacement.item)
+        )) {
+          messages.push(message);
+          provenance.push(historyItemProvenance(replacement.item));
+          seqs.push(replacement.sourceEventSeq ?? event.seq);
+        }
+      }
+      continue;
+    }
+    if (event.data.type === "user_message" || event.data.type === "assistant_message" || event.data.type === "tool_result") {
+      for (const message of durableMessages(
+        piMessageFromHistoryItem(event.data)
+      )) {
+        messages.push(message);
+        provenance.push(historyItemProvenance(event.data));
+        seqs.push(event.seq);
+      }
+      continue;
+    }
+    if (event.data.type === "authorization_completed") {
+      messages.push(
+        authorizationObservationMessage(event.data, event.createdAtMs)
+      );
+      provenance.push(contextProvenance);
+      seqs.push(event.seq);
+    }
+  }
+  return { messages, provenance, seqs, modelProfile, modelId };
 }
-async function setStoredRecord(args) {
-  const stateAdapter = getStateAdapter();
-  await stateAdapter.connect();
-  await recordConversationActivityMetadata({
-    conversationStore: args.conversationStore,
-    destinationVisibility: args.destinationVisibility,
-    nowMs: Date.now(),
-    summary: args.record
-  });
-  await stateAdapter.set(
-    agentTurnSessionKey(args.record.conversationId, args.record.sessionId),
-    args.record,
-    args.ttlMs
+
+// src/chat/conversations/projection.ts
+function connectedMcpProvidersFromEvents(events) {
+  const providers = /* @__PURE__ */ new Set();
+  for (const event of events) {
+    if (event.data.type === "mcp_provider_connected") {
+      providers.add(event.data.provider);
+    }
+  }
+  return [...providers].sort((left, right) => left.localeCompare(right));
+}
+function isUserMessage(message) {
+  return message.role === "user";
+}
+function countMatchingPrefix(left, right) {
+  const limit = Math.min(left.length, right.length);
+  for (let index = 0; index < limit; index += 1) {
+    if (!isDeepStrictEqual3(left[index], right[index])) {
+      return index;
+    }
+  }
+  return limit;
+}
+function normalizeDurableMessage(message) {
+  return piMessageSchema.parse(
+    JSON.parse(JSON.stringify(sanitizePostgresJson(message)))
   );
-  const {
-    actors: _actors,
-    committedSeq: _committedSeq,
-    historyVersion: _historyVersion,
-    errorMessage: _errorMessage,
-    turnStartSeq: _turnStartSeq,
-    runtimeContext: _runtimeContext,
-    ...summary
-  } = args.record;
-  await appendAgentTurnSessionSummary(summary, args.ttlMs);
-  return materializeAgentTurnSessionRecord(
-    args.record,
-    {
-      messages: [...args.piMessages],
-      provenance: [...args.piMessageProvenance]
-    },
-    args.turnStartMessageIndex
+}
+function resolveCommitProvenance(args) {
+  if (args.explicitProvenance) {
+    if (args.explicitProvenance.length !== args.nextMessages.length) {
+      throw new Error("commit provenance must align one-to-one with messages");
+    }
+    return args.explicitProvenance;
+  }
+  if (args.existing.provenance.length !== args.existing.messages.length) {
+    throw new Error("committed provenance must align one-to-one with messages");
+  }
+  const matchingPrefix = args.matchingPrefix;
+  const provenance = args.nextMessages.map(
+    (_, index) => index < matchingPrefix ? args.existing.provenance[index] : contextProvenance
+  );
+  if (args.newMessageProvenance) {
+    for (let index = args.nextMessages.length - 1; index >= matchingPrefix; index -= 1) {
+      if (isUserMessage(args.nextMessages[index])) {
+        provenance[index] = args.newMessageProvenance;
+        break;
+      }
+    }
+  }
+  if (args.trailingMessageProvenance) {
+    if (args.trailingMessageProvenance.length > provenance.length) {
+      throw new Error(
+        "trailing commit provenance cannot exceed committed messages"
+      );
+    }
+    const newMessageCount = args.nextMessages.length - matchingPrefix;
+    if (args.trailingMessageProvenance.length > newMessageCount) {
+      throw new Error(
+        "trailing commit provenance must align to newly committed messages"
+      );
+    }
+    const start = provenance.length - args.trailingMessageProvenance.length;
+    args.trailingMessageProvenance.forEach((entry, offset) => {
+      provenance[start + offset] = entry;
+    });
+  }
+  return provenance;
+}
+async function loadProjection(args) {
+  const events = await getConversationEventStore().loadCurrentHistory(
+    args.conversationId
   );
+  return projectConversationEvents(events).messages;
 }
-async function updateAgentTurnSessionState(args) {
-  const parsed = await getStoredAgentTurnSessionRecord(
-    args.existing.conversationId,
-    args.existing.sessionId
+async function loadConversationProjection(args) {
+  const events = await getConversationEventStore().loadCurrentHistory(
+    args.conversationId
   );
-  if (!parsed || parsed.version !== args.existing.version) {
+  return projectConversationEvents(events);
+}
+async function openConversationProjection(args) {
+  const events = await getConversationEventStore().loadCurrentHistory(
+    args.conversationId
+  );
+  return projectConversationEvents(events);
+}
+async function loadTurnProjection(args) {
+  const eventStore = getConversationEventStore();
+  if (args.committedSeq < 0) {
+    return projectConversationEvents(
+      await eventStore.loadCurrentHistory(args.conversationId)
+    );
+  }
+  const historyEvents = await eventStore.loadHistoryContaining(
+    args.conversationId,
+    args.committedSeq,
+    args.includeTail ? void 0 : args.committedSeq
+  );
+  if (!historyEvents) {
     return void 0;
   }
-  return await setStoredRecord({
-    piMessages: args.existing.piMessages,
-    piMessageProvenance: args.existing.piMessageProvenance,
-    ttlMs: AGENT_TURN_SESSION_TTL_MS,
-    ...args.existing.turnStartMessageIndex !== void 0 ? { 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 } : {}
-    })
-  });
+  return projectConversationEvents(historyEvents);
 }
-async function upsertAgentTurnSessionRecord(args) {
-  const existingRecord = await getStoredAgentTurnSessionRecord(
+async function loadConnectedMcpProviders(args) {
+  const events = await getConversationEventStore().loadCurrentHistory(
+    args.conversationId
+  );
+  return connectedMcpProvidersFromEvents(events);
+}
+function messageTimestamp(message) {
+  const timestamp = message.timestamp;
+  return typeof timestamp === "number" ? timestamp : Date.now();
+}
+async function commitMessages(args) {
+  const executor = args.executor ?? getSqlExecutor();
+  return await withConversationEventLock(
+    executor,
     args.conversationId,
-    args.sessionId
+    async () => executor.transaction(
+      async () => await commitMessagesLocked(args, executor)
+    )
   );
-  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 instructionActor = args.actor ?? existingRecord?.actor;
-  const commit = await commitMessages({
-    conversationId: args.conversationId,
-    messages: args.piMessages,
-    ...instructionActor ? { newMessageProvenance: instructionProvenanceFor(instructionActor) } : {},
-    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
-    ...args.turnContexts && args.turnContexts.length > 0 ? {
-      turnContext: {
-        contexts: args.turnContexts,
-        turnId: args.sessionId
-      }
-    } : {}
-  });
-  const durableTurnStartMessageIndex = args.turnStartMessageIndex === void 0 ? void 0 : stripRuntimeTurnContext(
-    args.piMessages.slice(0, args.turnStartMessageIndex)
-  ).length;
-  const runtimeContext = retainRuntimeTurnContext(args.piMessages);
-  const retainedRuntimeContext = runtimeContext.length > 0 ? runtimeContext : existingRecord?.historyVersion === commit.historyVersion ? existingRecord.runtimeContext : void 0;
-  const turnStartSeq = durableTurnStartMessageIndex === void 0 ? existingRecord?.turnStartSeq : durableTurnStartMessageIndex <= 0 ? -1 : commit.messageSeqs[durableTurnStartMessageIndex - 1] ?? commit.committedSeq;
-  const turnStartMessageIndex = durableTurnStartMessageIndex ?? (turnStartSeq === void 0 ? void 0 : commit.messageSeqs.filter((seq) => seq <= turnStartSeq).length);
-  return await setStoredRecord({
-    conversationStore: args.conversationStore,
-    destinationVisibility: args.destinationVisibility,
-    piMessages: commit.messages,
-    piMessageProvenance: commit.provenance,
-    ttlMs,
-    ...turnStartMessageIndex !== void 0 ? { 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 } : {}
-    })
-  });
 }
-async function recordAgentTurnSessionSummary(args) {
-  const stored = await getStoredAgentTurnSessionRecord(
+async function commitAcceptedReply(args) {
+  const executor = getSqlExecutor();
+  await withConversationEventLock(
+    executor,
     args.conversationId,
-    args.sessionId
-  );
-  const priorSummary = (await listAgentTurnSessionSummariesForConversation(args.conversationId)).find((summary2) => summary2.sessionId === args.sessionId);
-  const existing = stored ?? priorSummary;
-  const existingDispatchId = existing?.dispatchId;
-  const existingDispatchOutcome = priorSummary?.dispatchOutcome ?? stored?.dispatchOutcome;
-  const existingResultMessageId = priorSummary?.resultMessageId ?? stored?.resultMessageId;
-  if (existingDispatchId && args.dispatchId && existingDispatchId !== args.dispatchId) {
-    throw new Error(
-      `Turn session ${args.sessionId} dispatchId cannot be changed`
-    );
-  }
-  const nowMs = Date.now();
-  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,
-    startedAtMs: existing?.startedAtMs ?? args.startedAtMs ?? nowMs,
-    lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
-    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 } : {}
-  };
-  await recordConversationActivityMetadata({
-    conversationStore: args.conversationStore,
-    destinationVisibility: args.destinationVisibility,
-    nowMs,
-    summary
-  });
-  await appendAgentTurnSessionSummary(summary, ttlMs);
-}
-async function readAgentTurnSessionSummariesFromIndex(key, stateAdapter) {
-  await stateAdapter.connect();
-  const values = await stateAdapter.getList(key);
-  const summaries = /* @__PURE__ */ new Map();
-  for (const value of [...values].reverse()) {
-    let summary;
-    try {
-      summary = parseAgentTurnSessionSummary(value);
-    } catch (error) {
-      logWarn(
-        "agent_turn_session_summary_parse_failed",
-        {},
+    async () => executor.transaction(async () => {
+      const agentMessage = normalizeDurableMessage(args.agentMessage);
+      await createSqlConversationEventStore(executor).append(
+        args.conversationId,
+        [
+          {
+            idempotencyKey: `message:${args.conversationMessageId}:agent`,
+            data: historyItemFromPiMessage(agentMessage, contextProvenance),
+            createdAtMs: messageTimestamp(agentMessage)
+          }
+        ]
+      );
+      await appendConversationMessages(
+        createSqlConversationEventStore(executor),
         {
-          "app.state.key": key,
-          "exception.message": error instanceof Error ? error.message : String(error)
-        },
-        "Skipping an invalid turn-session summary index entry"
+          conversation: args.conversation,
+          conversationId: args.conversationId,
+          ...args.repliedAtMs === void 0 ? {} : { repliedAtMs: args.repliedAtMs }
+        }
       );
-      continue;
-    }
-    const summaryKey = `${summary.conversationId}:${summary.sessionId}`;
-    if (!summaries.has(summaryKey)) {
-      summaries.set(summaryKey, summary);
-    }
-  }
-  return [...summaries.values()].sort(
-    (left, right) => right.updatedAtMs - left.updatedAtMs
+    })
   );
 }
-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()
+async function commitMessagesLocked(args, executor) {
+  const eventStore = createSqlConversationEventStore(executor);
+  const currentEvents = await eventStore.loadCurrentHistory(
+    args.conversationId
   );
-}
-async function abandonAgentTurnSessionRecord(args) {
-  const existing = await getAgentTurnSessionRecord(
-    args.conversationId,
-    args.sessionId
+  const current = projectConversationEvents(currentEvents);
+  const nextLocalMessages = stripRuntimeTurnContext(args.messages).map(
+    normalizeDurableMessage
   );
-  if (!existing || existing.state === "completed" || existing.state === "failed" || existing.state === "abandoned") {
-    return void 0;
-  }
-  return await updateAgentTurnSessionState({
-    existing,
-    state: "abandoned",
-    errorMessage: args.errorMessage ?? existing.errorMessage
-  });
-}
-async function failAgentTurnSessionRecord(args) {
-  const existing = await getAgentTurnSessionRecord(
-    args.conversationId,
-    args.sessionId
+  const matchingPrefix = countMatchingPrefix(
+    current.messages,
+    nextLocalMessages
   );
-  if (!existing || existing.state === "completed" || existing.state === "failed" || existing.state === "abandoned" || existing.version !== args.expectedVersion) {
-    return void 0;
-  }
-  return await updateAgentTurnSessionState({
-    existing,
-    state: "failed",
-    errorMessage: args.errorMessage ?? existing.errorMessage
+  const nextLocalProvenance = resolveCommitProvenance({
+    existing: current,
+    nextMessages: nextLocalMessages,
+    matchingPrefix,
+    ...args.provenance ? { explicitProvenance: args.provenance } : {},
+    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
+    ...args.newMessageProvenance ? { newMessageProvenance: args.newMessageProvenance } : {}
   });
-}
-
-// src/chat/services/turn-limit.ts
-var TurnSliceLimitExceededError = class extends Error {
-  constructor(maxSlices) {
-    super(`Agent turn exceeded execution limit (${maxSlices} slices)`);
-    this.name = "TurnSliceLimitExceededError";
+  if (matchingPrefix === current.messages.length) {
+    const newMessages = nextLocalMessages.slice(matchingPrefix);
+    const turnContext = args.turnContext;
+    const turnContextEvents = turnContext?.contexts.map((context, index) => ({
+      idempotencyKey: `turn:${turnContext.turnId}:context:${context.pluginName}:${index}`,
+      createdAtMs: context.loadedAtMs,
+      data: {
+        type: "turn_context",
+        turnId: turnContext.turnId,
+        pluginName: context.pluginName,
+        kind: context.kind,
+        version: context.version,
+        content: context.content
+      }
+    })) ?? [];
+    await eventStore.append(args.conversationId, [
+      ...newMessages.map((message, index) => ({
+        data: historyItemFromPiMessage(
+          message,
+          nextLocalProvenance[matchingPrefix + index]
+        ),
+        createdAtMs: messageTimestamp(message)
+      })),
+      ...turnContextEvents
+    ]);
+  } else {
+    throw new Error(
+      `Agent history for ${args.conversationId} changed before its committed boundary`
+    );
   }
-};
-function buildTurnLimitResponse(eventId) {
-  return `I couldn't finish this request because this turn reached its execution limit. Please try again with a smaller or more specific request. Reference: \`event_id=${eventId}\`.`;
-}
-
-// src/chat/services/turn-session-record.ts
-function logSessionRecordError(error, eventName, args, attributes, message) {
-  logException(
-    error,
-    eventName,
-    {
-      messageConversationId: args.logContext.threadId,
-      userId: args.logContext.actorId,
-      destinationName: args.logContext.channelId,
-      runId: args.logContext.runId,
-      assistantUserName: args.logContext.assistantUserName,
-      modelId: args.modelId
-    },
-    {
-      "app.ai.resume_conversation_id": args.conversationId,
-      "app.ai.resume_session_id": args.sessionId,
-      ...attributes
-    },
-    message
+  const committedEvents = await eventStore.loadCurrentHistory(
+    args.conversationId
   );
+  const committed = projectConversationEvents(committedEvents);
+  return {
+    committedSeq: committedEvents.at(-1)?.seq ?? -1,
+    historyVersion: committedEvents.at(-1)?.historyVersion ?? 0,
+    messageSeqs: committed.seqs,
+    messages: nextLocalMessages,
+    provenance: nextLocalProvenance
+  };
 }
-function addDurationMs(prior, current) {
-  const total = [prior, current].reduce((sum, value) => {
-    if (typeof value !== "number" || !Number.isFinite(value)) {
-      return sum;
-    }
-    return (sum ?? 0) + Math.max(0, Math.floor(value));
-  }, void 0);
-  return total;
+async function recordMcpProviderConnected(args) {
+  const eventStore = getConversationEventStore();
+  const events = await eventStore.loadCurrentHistory(args.conversationId);
+  if (connectedMcpProvidersFromEvents(events).includes(args.provider)) {
+    return;
+  }
+  await eventStore.append(args.conversationId, [
+    {
+      data: { type: "mcp_provider_connected", provider: args.provider },
+      createdAtMs: Date.now()
+    }
+  ]);
 }
-function resumableBoundary(messages, fallbackMessages) {
-  const current = trimTrailingAssistantMessages(messages);
-  if (current.length > 0 && isContinuablePiBoundary(current)) {
-    return current;
+async function recordAuthorizationRequested(args) {
+  const eventStore = getConversationEventStore();
+  const events = await eventStore.loadCurrentHistory(args.conversationId);
+  if (events.some(
+    (event) => event.data.type === "authorization_requested" && event.data.authorizationId === args.authorizationId
+  )) {
+    return;
   }
-  return trimTrailingAssistantMessages(fallbackMessages ?? []);
+  await eventStore.append(args.conversationId, [
+    {
+      data: {
+        type: "authorization_requested",
+        kind: args.kind,
+        provider: args.provider,
+        actorId: args.actorId,
+        authorizationId: args.authorizationId,
+        delivery: args.delivery
+      },
+      createdAtMs: Date.now()
+    }
+  ]);
 }
-async function loadTurnSessionRecord(ctx) {
-  const existingSessionRecord = await getAgentTurnSessionRecordForResume(
-    ctx.conversationId,
-    ctx.sessionId
-  );
-  const hasAwaitingResumeRecord = Boolean(
-    existingSessionRecord && existingSessionRecord.state === "awaiting_resume"
-  );
-  return {
-    resumedFromSessionRecord: hasAwaitingResumeRecord,
-    currentSliceId: hasAwaitingResumeRecord ? existingSessionRecord.sliceId : 1,
-    existingSessionRecord
-  };
+async function recordAuthorizationCompleted(args) {
+  const eventStore = getConversationEventStore();
+  const events = await eventStore.loadCurrentHistory(args.conversationId);
+  if (events.some(
+    (event) => event.data.type === "authorization_completed" && event.data.authorizationId === args.authorizationId
+  )) {
+    return;
+  }
+  await eventStore.append(args.conversationId, [
+    {
+      data: {
+        type: "authorization_completed",
+        kind: args.kind,
+        provider: args.provider,
+        actorId: args.actorId,
+        authorizationId: args.authorizationId
+      },
+      createdAtMs: Date.now()
+    }
+  ]);
 }
-async function persistRunningSessionRecord(args) {
-  if (args.messages.length === 0 || !isContinuablePiBoundary(args.messages)) {
-    return false;
+async function loadTurnRoute(args) {
+  const event = await getConversationEventStore().loadByIdempotencyKey(
+    args.conversationId,
+    `turn:${args.turnId}:routed`
+  );
+  if (!event) {
+    return void 0;
   }
-  try {
-    const latestSessionRecord = await getAgentTurnSessionRecord(
-      args.conversationId,
-      args.sessionId
-    );
-    await upsertAgentTurnSessionRecord({
-      ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
-      conversationId: args.conversationId,
-      cumulativeDurationMs: latestSessionRecord?.cumulativeDurationMs,
-      cumulativeUsage: latestSessionRecord?.cumulativeUsage,
-      ...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.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
-      } : {}
-    });
-    return true;
-  } catch (recordError) {
-    logSessionRecordError(
-      recordError,
-      "agent_turn_running_session_record_failed",
-      args,
-      {
-        "app.ai.resume_slice_id": args.sliceId
+  if (event.data.type !== "turn_routed" || event.data.turnId !== args.turnId) {
+    throw new Error(`Turn route key for "${args.turnId}" has invalid data`);
+  }
+  return event.data;
+}
+async function recordTurnRoute(args) {
+  await getConversationEventStore().append(args.conversationId, [
+    {
+      idempotencyKey: `turn:${args.turnId}:routed`,
+      createdAtMs: Date.now(),
+      data: {
+        type: "turn_routed",
+        turnId: args.turnId,
+        modelProfile: args.modelProfile,
+        modelId: args.modelId,
+        reasoningLevel: args.reasoningLevel,
+        ...args.confidence !== void 0 ? { confidence: args.confidence } : {},
+        source: args.source
+      }
+    }
+  ]);
+}
+async function recordToolExecutionStarted(args) {
+  await getConversationEventStore().append(args.conversationId, [
+    {
+      data: {
+        type: "tool_execution_started",
+        toolCallId: args.toolCallId,
+        toolName: args.toolName
       },
-      "Failed to persist running turn session record"
+      createdAtMs: args.createdAtMs ?? Date.now()
+    }
+  ]);
+}
+
+// src/chat/state/turn-id.ts
+function buildDeterministicTurnId(messageId) {
+  const sanitized = messageId.replace(/[^a-zA-Z0-9_-]/g, "_");
+  return `turn_${sanitized}`;
+}
+function buildDeterministicAssistantMessageId(turnId) {
+  return `${turnId}:assistant:1`;
+}
+
+// src/chat/runtime/turn.ts
+var ConversationTurnBoundaryError = class extends Error {
+  eventId;
+  failureCode;
+  constructor(args) {
+    super(
+      args.cause instanceof Error ? args.cause.message : String(args.cause),
+      {
+        cause: args.cause
+      }
     );
-    return false;
+    this.name = "ConversationTurnBoundaryError";
+    this.eventId = args.eventId;
+    this.failureCode = args.failureCode;
   }
+};
+function getConversationTurnBoundaryError(error) {
+  return error instanceof ConversationTurnBoundaryError ? error : void 0;
 }
-async function persistCompletedSessionRecord(args) {
-  let latestSessionRecord;
-  await persistWithRetry(async () => {
-    latestSessionRecord = await getAgentTurnSessionRecord(
-      args.conversationId,
-      args.sessionId
-    );
-  });
-  const sliceId = args.sliceId ?? latestSessionRecord?.sliceId;
-  if (sliceId === void 0) {
-    throw new Error(
-      "Completed session record requires a slice id from the caller or the latest stored record"
-    );
+var CooperativeTurnYieldError = class extends Error {
+  code = "cooperative_turn_yield";
+  constructor(message = "Agent turn yielded at a safe boundary") {
+    super(message);
+    this.name = "CooperativeTurnYieldError";
   }
-  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
-    ),
-    ...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 ? {
-      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
-    } : {}
-  };
-  await persistWithRetry(async () => {
-    await upsertAgentTurnSessionRecord(target);
-  });
+};
+function isCooperativeTurnYieldError(error) {
+  return error instanceof CooperativeTurnYieldError;
 }
-async function completeDeliveredTurn(args) {
-  await persistCompletedSessionRecord({
-    channelName: args.channelName,
-    conversationId: args.conversationId,
-    currentDurationMs: args.durationMs,
-    currentUsage: args.usage,
-    destination: args.destination,
-    destinationVisibility: args.destinationVisibility,
-    dispatchId: args.dispatchId,
-    dispatchOutcome: args.dispatchOutcome,
-    errorMessage: args.errorMessage,
-    resultMessageId: args.resultMessageId,
-    source: args.source,
-    sessionId: args.sessionId,
-    sliceId: args.sliceId,
-    allMessages: args.messages,
-    loadedSkillNames: args.loadedSkillNames,
-    modelId: args.modelId,
-    actor: args.actor,
-    reasoningLevel: args.reasoningLevel,
-    surface: args.surface,
-    turnStartMessageIndex: args.turnStartMessageIndex
-  });
+var TurnInputCommitLostError = class extends Error {
+  code = "turn_input_commit_lost";
+  constructor(message = "Turn input commit lost its durable owner") {
+    super(message);
+    this.name = "TurnInputCommitLostError";
+  }
+};
+function isTurnInputCommitLostError(error) {
+  return error instanceof TurnInputCommitLostError;
 }
-async function persistAuthPauseSessionRecord(args) {
-  const nextSliceId = args.currentSliceId + 1;
-  try {
-    const latestSessionRecord = await getAgentTurnSessionRecord(
-      args.conversationId,
-      args.sessionId
-    );
-    const piMessages = resumableBoundary(
-      args.messages,
-      latestSessionRecord?.piMessages
-    );
-    if (piMessages.length > 0 && !isContinuablePiBoundary(piMessages)) {
-      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
-      ),
-      ...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: 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: "auth",
-      resumedFromSliceId: args.currentSliceId,
-      errorMessage: args.errorMessage,
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
-    });
-  } catch (recordError) {
-    logSessionRecordError(
-      recordError,
-      "agent_turn_auth_resume_session_record_failed",
-      args,
-      {
-        "app.ai.resume_from_slice_id": args.currentSliceId,
-        "app.ai.resume_next_slice_id": nextSliceId
-      },
-      "Failed to persist auth session record before retry"
-    );
+var TurnInputDeferredError = class extends Error {
+  code = "turn_input_deferred";
+  constructor(message = "Turn input is deferred until the active resume ends") {
+    super(message);
+    this.name = "TurnInputDeferredError";
   }
-  return void 0;
+};
+function isTurnInputDeferredError(error) {
+  return error instanceof TurnInputDeferredError;
 }
-async function persistContinuationSessionRecord(args) {
-  const nextSliceId = args.currentSliceId + 1;
-  try {
-    const latestSessionRecord = await getAgentTurnSessionRecord(
-      args.conversationId,
-      args.sessionId
-    );
-    const piMessages = resumableBoundary(
-      args.messages,
-      latestSessionRecord?.piMessages
-    );
-    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
-      return void 0;
-    }
-    const cumulativeDurationMs = addDurationMs(
-      latestSessionRecord?.cumulativeDurationMs,
-      args.currentDurationMs
-    );
-    const cumulativeUsage = addAgentTurnUsage(
-      latestSessionRecord?.cumulativeUsage,
-      args.currentUsage
-    );
-    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
-        } : {},
-        ...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,
-        errorMessage: new TurnSliceLimitExceededError(
-          botConfig.maxSlicesPerTurn
-        ).message,
-        ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-        ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
-      });
-    }
-    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 } : {},
-      ...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,
-      errorMessage: args.errorMessage,
-      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
-      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
-    });
-  } catch (recordError) {
-    logSessionRecordError(
-      recordError,
-      "agent_continue_session_record_failed",
-      args,
-      {
-        "app.ai.resume_from_slice_id": args.currentSliceId,
-        "app.ai.resume_next_slice_id": nextSliceId
-      },
-      "Failed to persist session record before scheduling agent continuation"
-    );
-    return void 0;
+function startActiveTurn(args) {
+  args.conversation.processing.activeTurnId = args.nextTurnId;
+  args.updateConversationStats(args.conversation);
+}
+function clearActiveTurn(conversation, sessionId) {
+  if (!sessionId || conversation.processing.activeTurnId === sessionId) {
+    conversation.processing.activeTurnId = void 0;
   }
 }
-async function persistYieldSessionRecord(args) {
-  try {
-    const piMessages = [...args.messages];
-    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
-      return void 0;
+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);
+  args.conversation.processing.lastCompletedAtMs = args.nowMs;
+  args.markConversationMessage(args.conversation, args.userMessageId, {
+    replied: false,
+    skippedReason: "reply failed"
+  });
+  args.updateConversationStats(args.conversation);
+}
+
+// src/chat/no-reply.ts
+var NO_REPLY_MARKER = "[[NO_REPLY]]";
+function isNoReplyMarker(text) {
+  return text.trim() === NO_REPLY_MARKER;
+}
+function containsNoReplyMarker(text) {
+  return text.includes(NO_REPLY_MARKER);
+}
+
+// src/chat/services/assistant-reply.ts
+var THINKING_XML_BLOCK_PATTERN = /[ \t]*<thinking\b[^>]*>[\s\S]*?<\/thinking>[ \t]*(?:\r?\n)?/gi;
+var FENCED_CODE_BLOCK_PATTERN = /```[\s\S]*?```/g;
+function sanitizeAssistantText(text) {
+  let result = "";
+  let cursor = 0;
+  for (const match of text.matchAll(FENCED_CODE_BLOCK_PATTERN)) {
+    const start = match.index;
+    if (start === void 0) continue;
+    result += text.slice(cursor, start).replace(THINKING_XML_BLOCK_PATTERN, "");
+    result += match[0];
+    cursor = start + match[0].length;
+  }
+  return (result + text.slice(cursor).replace(THINKING_XML_BLOCK_PATTERN, "")).trim();
+}
+function decideReply(message) {
+  if (message.content.some((part) => part.type === "toolCall")) {
+    return { kind: "suppress" };
+  }
+  const text = sanitizeAssistantText(extractAssistantText(message));
+  if (!text) return { kind: "empty" };
+  if (isNoReplyMarker(text) || containsNoReplyMarker(text)) {
+    return { kind: "suppress" };
+  }
+  return { kind: "deliver", text };
+}
+function getAssistantReplyText(message) {
+  const decision = decideReply(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);
+      }
     }
-    const latestSessionRecord = await getAgentTurnSessionRecord(
-      args.conversationId,
-      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
-      ),
-      ...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",
-      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 } : {}
-    });
-  } catch (recordError) {
-    logSessionRecordError(
-      recordError,
-      "agent_turn_yield_session_record_failed",
-      args,
-      {
-        "app.ai.resume_slice_id": args.currentSliceId
-      },
-      "Failed to persist cooperative yield session record"
-    );
-    return void 0;
   }
+  throw lastError;
 }
 
-// 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: {}
-    }
+// src/chat/state/turn-session.ts
+import { THREAD_STATE_TTL_MS } from "chat";
+import {
+  actorSchema,
+  destinationSchema,
+  sourceSchema
+} from "@sentry/junior-plugin-api";
+import { z as z2 } from "zod";
+
+// src/chat/state/turn-session-keys.ts
+var AGENT_TURN_SESSION_PREFIX = "junior:agent_turn_session";
+function agentTurnSessionKey(conversationId, sessionId) {
+  return `${AGENT_TURN_SESSION_PREFIX}:${conversationId}:${sessionId}`;
+}
+function agentTurnSessionConversationIndexKey(conversationId) {
+  return `${AGENT_TURN_SESSION_PREFIX}:conversation:${conversationId}:index`;
+}
+
+// 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 agentTurnSessionStatusSchema = z2.enum([
+  "running",
+  "awaiting_resume",
+  "completed",
+  "failed",
+  "abandoned"
+]);
+var agentTurnSurfaceSchema = z2.enum([
+  "slack",
+  "api",
+  "scheduler",
+  "internal"
+]);
+var agentTurnResumeReasonSchema = z2.enum([
+  "timeout",
+  "auth",
+  "yield",
+  "retry"
+]);
+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(),
+  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(),
+  actor: actorSchema.optional(),
+  resumeReason: agentTurnResumeReasonSchema.optional(),
+  resumedFromSliceId: z2.number().int().nonnegative().optional(),
+  sessionId: z2.string().min(1),
+  sliceId: z2.number().int().nonnegative(),
+  startedAtMs: nonNegativeNumberSchema,
+  state: agentTurnSessionStatusSchema,
+  surface: agentTurnSurfaceSchema.optional(),
+  traceId: z2.string().optional(),
+  updatedAtMs: nonNegativeNumberSchema
+}).strict();
+var storedAgentTurnSessionRecordSchema = agentTurnSessionSummarySchema.extend({
+  actors: z2.array(actorSchema).optional(),
+  committedSeq: seqCursorSchema,
+  historyVersion: z2.number().int().nonnegative().optional(),
+  errorMessage: z2.string().optional(),
+  turnStartSeq: seqCursorSchema.optional(),
+  runtimeContext: z2.array(piMessageSchema).optional()
+}).strict();
+function conversationExecutionFromSummary(summary) {
+  const status = summary.state === "completed" || summary.state === "abandoned" ? "idle" : summary.state;
+  return {
+    status,
+    runId: summary.sessionId,
+    updatedAtMs: summary.updatedAtMs
   };
 }
-function coercePendingAuthState(value) {
-  if (!isRecord(value)) {
-    return void 0;
-  }
-  const kind = value.kind;
-  const provider = toOptionalString(value.provider);
-  const actorId = toOptionalString(value.actorId);
-  const authSessionId = toOptionalString(value.authSessionId);
-  const scope = toOptionalString(value.scope);
-  const sessionId = toOptionalString(value.sessionId);
-  const linkSentAtMs = toOptionalNumber(value.linkSentAtMs);
-  if (kind !== "mcp" && kind !== "plugin" || !provider || !actorId || kind === "mcp" && !authSessionId || !sessionId || typeof linkSentAtMs !== "number") {
-    return void 0;
-  }
-  const base = {
-    provider,
-    actorId,
-    ...scope ? { scope } : {},
-    sessionId,
-    linkSentAtMs
-  };
-  return kind === "mcp" ? { ...base, authSessionId, kind } : { ...base, kind };
+function sessionLogActor(actor) {
+  return actor?.platform === "slack" ? toStoredSlackActor(actor) : void 0;
 }
-function coerceThreadConversationState(value) {
-  if (!isRecord(value)) {
-    return defaultConversationState();
-  }
-  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 = {};
-  for (const [fileId, value2] of Object.entries(rawVisionByFileId)) {
-    if (typeof fileId !== "string" || fileId.trim().length === 0) continue;
-    if (!isRecord(value2)) continue;
-    const summary = toOptionalString(value2.summary);
-    const analyzedAtMs = toOptionalNumber(value2.analyzedAtMs);
-    if (!summary || !analyzedAtMs) continue;
-    byFileId[fileId] = {
+function parseAgentTurnSessionRecord(value) {
+  return storedAgentTurnSessionRecordSchema.parse(value);
+}
+function parseAgentTurnSessionSummary(value) {
+  return agentTurnSessionSummarySchema.parse(value);
+}
+async function appendAgentTurnSessionSummary(summary, ttlMs) {
+  const stateAdapter = getStateAdapter();
+  await Promise.all([
+    stateAdapter.appendToList(AGENT_TURN_SESSION_INDEX_KEY, summary, {
+      maxLength: AGENT_TURN_SESSION_INDEX_MAX_LENGTH,
+      ttlMs
+    }),
+    stateAdapter.appendToList(
+      agentTurnSessionConversationIndexKey(summary.conversationId),
       summary,
-      analyzedAtMs
-    };
-  }
-  return {
-    schemaVersion: 1,
-    messages,
-    compactions,
-    backfill,
-    processing,
-    stats,
-    vision: {
-      backfillCompletedAtMs: toOptionalNumber(rawVision.backfillCompletedAtMs),
-      byFileId
-    }
-  };
+      { ttlMs }
+    )
+  ]);
 }
-function buildConversationStatePatch(conversation) {
-  const {
-    compactions: _compactions,
-    messages: _messages,
-    ...scratch
-  } = conversation;
+async function recordConversationActivityMetadata(args) {
+  const conversationStore = args.conversationStore ?? getConversationStore();
+  const source = args.summary.destination?.platform === "local" ? "local" : args.summary.surface;
+  await conversationStore.recordActivity({
+    activityAtMs: args.summary.updatedAtMs,
+    channelName: args.summary.channelName,
+    conversationId: args.summary.conversationId,
+    destination: args.summary.destination,
+    nowMs: args.nowMs,
+    actor: sessionLogActor(args.summary.actor),
+    source,
+    visibility: args.destinationVisibility
+  });
+  await conversationStore.recordExecution({
+    channelName: args.summary.channelName,
+    conversationId: args.summary.conversationId,
+    createdAtMs: args.summary.startedAtMs,
+    destination: args.summary.destination,
+    execution: conversationExecutionFromSummary(args.summary),
+    lastActivityAtMs: args.summary.updatedAtMs,
+    metrics: {
+      durationMs: args.summary.cumulativeDurationMs,
+      ...args.summary.cumulativeUsage ? { usage: args.summary.cumulativeUsage } : {}
+    },
+    actor: sessionLogActor(args.summary.actor),
+    source,
+    updatedAtMs: args.nowMs,
+    visibility: args.destinationVisibility
+  });
+}
+function materializeAgentTurnSessionRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true) {
+  const piMessages = restoreVolatileContext && (stored.state === "running" || stored.state === "awaiting_resume") ? restoreRuntimeContext(piProjection.messages, stored.runtimeContext) : piProjection.messages;
   return {
-    conversation: {
-      ...scratch,
-      schemaVersion: 1,
-      stats: {
-        ...conversation.stats,
-        totalMessageCount: conversation.messages.length,
-        updatedAtMs: Date.now()
-      }
-    }
+    version: stored.version,
+    ...stored.channelName ? { channelName: stored.channelName } : {},
+    conversationId: stored.conversationId,
+    sessionId: stored.sessionId,
+    sliceId: stored.sliceId,
+    state: stored.state,
+    startedAtMs: stored.startedAtMs,
+    lastProgressAtMs: stored.lastProgressAtMs,
+    updatedAtMs: stored.updatedAtMs,
+    piMessages,
+    piMessageProvenance: piProjection.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 } : {}
   };
 }
-
-// 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 restoreRuntimeContext(messages, runtimeContext) {
+  if (!runtimeContext || runtimeContext.length === 0) return messages;
+  const restored = [...messages];
+  const unmatchedRuntimeContext = [];
+  for (const runtimeMessage of runtimeContext) {
+    const runtime = runtimeMessage;
+    const targetIndex = restored.findIndex((message) => {
+      const candidate = message;
+      return candidate.role === "user" && candidate.timestamp === runtime.timestamp;
+    });
+    if (targetIndex < 0) {
+      unmatchedRuntimeContext.push(runtimeMessage);
+      continue;
+    }
+    const target = restored[targetIndex];
+    restored[targetIndex] = {
+      ...restored[targetIndex],
+      content: [
+        ...Array.isArray(runtime.content) ? runtime.content : [],
+        ...Array.isArray(target.content) ? target.content : []
+      ]
+    };
+  }
+  return [...unmatchedRuntimeContext, ...restored];
 }
-function estimateTextTokens(text) {
-  return Math.ceil(text.length / 4);
+async function getStoredAgentTurnSessionRecord(conversationId, sessionId) {
+  const stateAdapter = getStateAdapter();
+  await stateAdapter.connect();
+  const value = await stateAdapter.get(
+    agentTurnSessionKey(conversationId, sessionId)
+  );
+  return value == null ? void 0 : parseAgentTurnSessionRecord(value);
 }
-function calculateContextCompactionTriggerTokens(model) {
-  const contextWindow = positiveInteger(
-    model.contextWindow,
-    FALLBACK_CONTEXT_WINDOW_TOKENS
+async function materializeStoredAgentTurnSessionRecord(conversationId, sessionId, followCurrentReplacement) {
+  const parsed = await getStoredAgentTurnSessionRecord(
+    conversationId,
+    sessionId
+  );
+  if (!parsed) {
+    return void 0;
+  }
+  const pinnedProjection = await loadTurnProjection({
+    conversationId,
+    committedSeq: parsed.committedSeq,
+    // Unfinished records include the current-epoch tail so parked input
+    // appended after the last safe boundary stays model-visible on resume.
+    includeTail: parsed.state === "running" || parsed.state === "awaiting_resume"
+  });
+  if (!pinnedProjection) {
+    return void 0;
+  }
+  const currentHistory = await getConversationEventStore().loadCurrentHistory(conversationId);
+  const currentHistoryVersion = currentHistory.at(-1)?.historyVersion ?? parsed.historyVersion ?? 0;
+  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;
+  return materializeAgentTurnSessionRecord(
+    parsed,
+    piProjection,
+    turnStartMessageIndex,
+    !followsReplacement && (parsed.historyVersion === void 0 || parsed.historyVersion === currentHistoryVersion)
   );
-  return Math.max(1, Math.floor(contextWindow * COMPACTION_TRIGGER_RATIO));
 }
-function calculateContextInputLimitTokens(model) {
-  const contextWindow = positiveInteger(
-    model.contextWindow,
-    FALLBACK_CONTEXT_WINDOW_TOKENS
+async function getAgentTurnSessionRecord(conversationId, sessionId) {
+  return await materializeStoredAgentTurnSessionRecord(
+    conversationId,
+    sessionId,
+    false
   );
-  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
+async function getAgentTurnSessionRecordForResume(conversationId, sessionId) {
+  return await materializeStoredAgentTurnSessionRecord(
+    conversationId,
+    sessionId,
+    true
   );
+}
+function buildStoredRecord(args) {
+  const nowMs = Date.now();
   return {
-    contextWindow: Math.min(
-      botConfig.contextWindowTokens,
-      advertisedContextWindow
-    )
+    version: (args.previousVersion ?? 0) + 1,
+    ...args.channelName ? { channelName: args.channelName } : {},
+    conversationId: args.conversationId,
+    sessionId: args.sessionId,
+    sliceId: args.sliceId,
+    state: args.state,
+    startedAtMs: args.startedAtMs ?? nowMs,
+    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 } : {}
   };
 }
-function getAgentContextCompactionTriggerTokens(modelId) {
-  return calculateContextCompactionTriggerTokens(
-    getModelContextBudget(modelId)
+async function setStoredRecord(args) {
+  const stateAdapter = getStateAdapter();
+  await stateAdapter.connect();
+  await recordConversationActivityMetadata({
+    conversationStore: args.conversationStore,
+    destinationVisibility: args.destinationVisibility,
+    nowMs: Date.now(),
+    summary: args.record
+  });
+  await stateAdapter.set(
+    agentTurnSessionKey(args.record.conversationId, args.record.sessionId),
+    args.record,
+    args.ttlMs
   );
-}
-function getAgentContextInputLimitTokens(modelId) {
-  return calculateContextInputLimitTokens(getModelContextBudget(modelId));
-}
-function getConversationContextCompactionTriggerTokens() {
-  return calculateContextCompactionTriggerTokens(
-    getModelContextBudget(botConfig.fastModelId)
+  const {
+    actors: _actors,
+    committedSeq: _committedSeq,
+    historyVersion: _historyVersion,
+    errorMessage: _errorMessage,
+    turnStartSeq: _turnStartSeq,
+    runtimeContext: _runtimeContext,
+    ...summary
+  } = args.record;
+  await appendAgentTurnSessionSummary(summary, args.ttlMs);
+  return materializeAgentTurnSessionRecord(
+    args.record,
+    {
+      messages: [...args.piMessages],
+      provenance: [...args.piMessageProvenance]
+    },
+    args.turnStartMessageIndex
   );
 }
-
-// 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 "";
+async function updateAgentTurnSessionState(args) {
+  const parsed = await getStoredAgentTurnSessionRecord(
+    args.existing.conversationId,
+    args.existing.sessionId
+  );
+  if (!parsed || parsed.version !== args.existing.version) {
+    return void 0;
   }
-  const summaries = imageFileIds.map((fileId) => byFileId[fileId]?.summary?.trim()).filter((summary) => Boolean(summary));
-  if (summaries.length === 0) {
-    return "";
+  return await setStoredRecord({
+    piMessages: args.existing.piMessages,
+    piMessageProvenance: args.existing.piMessageProvenance,
+    ttlMs: AGENT_TURN_SESSION_TTL_MS,
+    ...args.existing.turnStartMessageIndex !== void 0 ? { 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 } : {}
+    })
+  });
+}
+async function upsertAgentTurnSessionRecord(args) {
+  const existingRecord = await getStoredAgentTurnSessionRecord(
+    args.conversationId,
+    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`
+    );
   }
-  return ` [image context: ${summaries.join(" | ")}]`;
+  const ttlMs = Math.max(1, args.ttlMs ?? AGENT_TURN_SESSION_TTL_MS);
+  const instructionActor = args.actor ?? existingRecord?.actor;
+  const commit = await commitMessages({
+    conversationId: args.conversationId,
+    messages: args.piMessages,
+    ...instructionActor ? { newMessageProvenance: instructionProvenanceFor(instructionActor) } : {},
+    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
+    ...args.turnContexts && args.turnContexts.length > 0 ? {
+      turnContext: {
+        contexts: args.turnContexts,
+        turnId: args.sessionId
+      }
+    } : {}
+  });
+  const durableTurnStartMessageIndex = args.turnStartMessageIndex === void 0 ? void 0 : stripRuntimeTurnContext(
+    args.piMessages.slice(0, args.turnStartMessageIndex)
+  ).length;
+  const runtimeContext = retainRuntimeTurnContext(args.piMessages);
+  const retainedRuntimeContext = runtimeContext.length > 0 ? runtimeContext : existingRecord?.historyVersion === commit.historyVersion ? existingRecord.runtimeContext : void 0;
+  const turnStartSeq = durableTurnStartMessageIndex === void 0 ? existingRecord?.turnStartSeq : durableTurnStartMessageIndex <= 0 ? -1 : commit.messageSeqs[durableTurnStartMessageIndex - 1] ?? commit.committedSeq;
+  const turnStartMessageIndex = durableTurnStartMessageIndex ?? (turnStartSeq === void 0 ? void 0 : commit.messageSeqs.filter((seq) => seq <= turnStartSeq).length);
+  return await setStoredRecord({
+    conversationStore: args.conversationStore,
+    destinationVisibility: args.destinationVisibility,
+    piMessages: commit.messages,
+    piMessageProvenance: commit.provenance,
+    ttlMs,
+    ...turnStartMessageIndex !== void 0 ? { 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 } : {}
+    })
+  });
 }
-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"}`
+async function recordAgentTurnSessionSummary(args) {
+  const stored = await getStoredAgentTurnSessionRecord(
+    args.conversationId,
+    args.sessionId
+  );
+  const priorSummary = (await listAgentTurnSessionSummariesForConversation(args.conversationId)).find((summary2) => summary2.sessionId === args.sessionId);
+  const existing = stored ?? priorSummary;
+  const existingDispatchId = existing?.dispatchId;
+  const existingDispatchOutcome = priorSummary?.dispatchOutcome ?? stored?.dispatchOutcome;
+  const existingResultMessageId = priorSummary?.resultMessageId ?? stored?.resultMessageId;
+  if (existingDispatchId && args.dispatchId && existingDispatchId !== args.dispatchId) {
+    throw new Error(
+      `Turn session ${args.sessionId} dispatchId cannot be changed`
     );
   }
-  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);
+  const nowMs = Date.now();
+  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,
+    startedAtMs: existing?.startedAtMs ?? args.startedAtMs ?? nowMs,
+    lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
+    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 } : {}
+  };
+  await recordConversationActivityMetadata({
+    conversationStore: args.conversationStore,
+    destinationVisibility: args.destinationVisibility,
+    nowMs,
+    summary
+  });
+  await appendAgentTurnSessionSummary(summary, ttlMs);
 }
-function authorDisplayField(value, userId) {
-  if (!value || value === userId || SLACK_USER_ID_DISPLAY_PATTERN.test(value)) {
-    return void 0;
+async function readAgentTurnSessionSummariesFromIndex(key, stateAdapter) {
+  await stateAdapter.connect();
+  const values = await stateAdapter.getList(key);
+  const summaries = /* @__PURE__ */ new Map();
+  for (const value of [...values].reverse()) {
+    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)
+      });
+      continue;
+    }
+    const summaryKey = `${summary.conversationId}:${summary.sessionId}`;
+    if (!summaries.has(summaryKey)) {
+      summaries.set(summaryKey, summary);
+    }
   }
-  return value;
-}
-function updateConversationStats(conversation) {
-  const contextText = buildConversationContext(conversation);
-  conversation.stats.estimatedContextTokens = estimateTextTokens(
-    contextText ?? ""
+  return [...summaries.values()].sort(
+    (left, right) => right.updatedAtMs - left.updatedAtMs
   );
-  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;
+async function listAgentTurnSessionSummariesForConversation(conversationId) {
+  const stateAdapter = getStateAdapter();
+  const summaries = await listBoundedAgentTurnSessionSummariesForConversation(conversationId);
+  if (summaries.length > 0) {
+    return summaries;
   }
-  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;
+  return (await readAgentTurnSessionSummariesFromIndex(
+    AGENT_TURN_SESSION_INDEX_KEY,
+    stateAdapter
+  )).filter((summary) => summary.conversationId === conversationId);
 }
-function turnHasReply(conversation, turnId) {
-  const assistantPrefix = `${turnId}:assistant:`;
-  return conversation.messages.some(
-    (message) => message.role === "assistant" && message.id.startsWith(assistantPrefix)
+async function listBoundedAgentTurnSessionSummariesForConversation(conversationId) {
+  return readAgentTurnSessionSummariesFromIndex(
+    agentTurnSessionConversationIndexKey(conversationId),
+    getStateAdapter()
   );
 }
-function markConversationMessage(conversation, messageId, patch) {
-  if (!messageId) return;
-  const messageIndex = conversation.messages.findIndex(
-    (entry) => entry.id === messageId
+async function abandonAgentTurnSessionRecord(args) {
+  const existing = await getAgentTurnSessionRecord(
+    args.conversationId,
+    args.sessionId
   );
-  if (messageIndex < 0) return;
-  const current = conversation.messages[messageIndex];
-  conversation.messages[messageIndex] = {
-    ...current,
-    meta: {
-      ...current.meta ?? {},
-      ...patch
-    }
-  };
-  updateConversationStats(conversation);
+  if (!existing || existing.state === "completed" || existing.state === "failed" || existing.state === "abandoned") {
+    return void 0;
+  }
+  return await updateAgentTurnSessionState({
+    existing,
+    state: "abandoned",
+    errorMessage: args.errorMessage ?? existing.errorMessage
+  });
 }
-function buildConversationContext(conversation, options = {}) {
-  const messages = conversation.messages.filter(
-    (entry) => entry.id !== options.excludeMessageId
+async function failAgentTurnSessionRecord(args) {
+  const existing = await getAgentTurnSessionRecord(
+    args.conversationId,
+    args.sessionId
   );
-  if (messages.length === 0 && conversation.compactions.length === 0) {
+  if (!existing || existing.state === "completed" || existing.state === "failed" || existing.state === "abandoned" || existing.version !== args.expectedVersion) {
     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>");
+  return await updateAgentTurnSessionState({
+    existing,
+    state: "failed",
+    errorMessage: args.errorMessage ?? existing.errorMessage
+  });
+}
+
+// src/chat/services/turn-limit.ts
+var TurnSliceLimitExceededError = class extends Error {
+  constructor(maxSlices) {
+    super(`Agent turn exceeded execution limit (${maxSlices} slices)`);
+    this.name = "TurnSliceLimitExceededError";
   }
-  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>"
-      );
+};
+function buildTurnLimitResponse(eventId) {
+  return `I couldn't finish this request because this turn reached its execution limit. Please try again with a smaller or more specific request. Reference: \`event_id=${eventId}\`.`;
+}
+
+// src/chat/services/turn-session-record.ts
+function logSessionRecordError(error, eventName, args, attributes) {
+  logException(error, eventName, {
+    "app.ai.resume_conversation_id": args.conversationId,
+    "app.ai.resume_session_id": args.sessionId,
+    ...attributes
+  });
+}
+function addDurationMs(prior, current) {
+  const total = [prior, current].reduce((sum, value) => {
+    if (typeof value !== "number" || !Number.isFinite(value)) {
+      return sum;
     }
-    lines.push("</thread-transcript>");
-  }
-  return lines.join("\n");
+    return (sum ?? 0) + Math.max(0, Math.floor(value));
+  }, void 0);
+  return total;
 }
-function pruneCompactions(compactions) {
-  if (compactions.length <= CONTEXT_MAX_COMPACTIONS) {
-    return compactions;
+function resumableBoundary(messages, fallbackMessages) {
+  const current = trimTrailingAssistantMessages(messages);
+  if (current.length > 0 && isContinuablePiBoundary(current)) {
+    return current;
   }
-  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 trimTrailingAssistantMessages(fallbackMessages ?? []);
+}
+async function loadTurnSessionRecord(ctx) {
+  const existingSessionRecord = await getAgentTurnSessionRecordForResume(
+    ctx.conversationId,
+    ctx.sessionId
+  );
+  const hasAwaitingResumeRecord = Boolean(
+    existingSessionRecord && existingSessionRecord.state === "awaiting_resume"
+  );
+  return {
+    resumedFromSessionRecord: hasAwaitingResumeRecord,
+    currentSliceId: hasAwaitingResumeRecord ? existingSessionRecord.sliceId : 1,
+    existingSessionRecord
   };
-  return [compacted, ...compactions.slice(overflowCount)];
 }
-async function summarizeConversationChunk(messages, conversation, context, deps) {
-  const transcript = messages.map((message) => renderConversationMessageLine(message, conversation)).join("\n");
+async function persistRunningSessionRecord(args) {
+  if (args.messages.length === 0 || !isContinuablePiBoundary(args.messages)) {
+    return false;
+  }
   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 latestSessionRecord = await getAgentTurnSessionRecord(
+      args.conversationId,
+      args.sessionId
+    );
+    await upsertAgentTurnSessionRecord({
+      ...args.channelName ?? latestSessionRecord?.channelName ? { channelName: args.channelName ?? latestSessionRecord?.channelName } : {},
+      conversationId: args.conversationId,
+      cumulativeDurationMs: latestSessionRecord?.cumulativeDurationMs,
+      cumulativeUsage: latestSessionRecord?.cumulativeUsage,
+      ...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.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
+      } : {}
     });
-    const summary = result.text.trim();
-    if (summary.length > 0) {
-      return summary.slice(0, 3500);
-    }
-  } catch (error) {
-    logWarn(
-      "conversation_compaction_summary_failed",
-      {
-        messageConversationId: context.threadId,
-        userId: context.actorId,
-        destinationName: context.channelId,
-        runId: context.runId,
-        assistantUserName: botConfig.userName,
-        modelId: botConfig.fastModelId
-      },
+    return true;
+  } catch (recordError) {
+    logSessionRecordError(
+      recordError,
+      "agent.turn.running_session_record.failed",
+      args,
       {
-        "exception.message": error instanceof Error ? error.message : String(error),
-        "app.compaction_messages_covered": messages.length
-      },
-      "Compaction summarization failed; using fallback summary"
+        "app.ai.resume_slice_id": args.sliceId
+      }
     );
+    return false;
   }
-  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
-    }
+async function persistCompletedSessionRecord(args) {
+  let latestSessionRecord;
+  await persistWithRetry(async () => {
+    latestSessionRecord = await getAgentTurnSessionRecord(
+      args.conversationId,
+      args.sessionId
+    );
+  });
+  const sliceId = args.sliceId ?? latestSessionRecord?.sliceId;
+  if (sliceId === void 0) {
+    throw new Error(
+      "Completed session record requires a slice id from the caller or the latest stored record"
+    );
+  }
+  const modelId = 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
+    ),
+    ...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 ? {
+      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
+    } : {}
+  };
+  await persistWithRetry(async () => {
+    await upsertAgentTurnSessionRecord(target);
   });
-  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;
+async function completeDeliveredTurn(args) {
+  await persistCompletedSessionRecord({
+    channelName: args.channelName,
+    conversationId: args.conversationId,
+    currentDurationMs: args.durationMs,
+    currentUsage: args.usage,
+    destination: args.destination,
+    destinationVisibility: args.destinationVisibility,
+    dispatchId: args.dispatchId,
+    dispatchOutcome: args.dispatchOutcome,
+    errorMessage: args.errorMessage,
+    resultMessageId: args.resultMessageId,
+    source: args.source,
+    sessionId: args.sessionId,
+    sliceId: args.sliceId,
+    allMessages: args.messages,
+    loadedSkillNames: args.loadedSkillNames,
+    modelId: args.modelId,
+    actor: args.actor,
+    reasoningLevel: args.reasoningLevel,
+    surface: args.surface,
+    turnStartMessageIndex: args.turnStartMessageIndex
+  });
+}
+async function persistAuthPauseSessionRecord(args) {
+  const nextSliceId = args.currentSliceId + 1;
+  try {
+    const latestSessionRecord = await getAgentTurnSessionRecord(
+      args.conversationId,
+      args.sessionId
+    );
+    const piMessages = resumableBoundary(
+      args.messages,
+      latestSessionRecord?.piMessages
+    );
+    if (piMessages.length > 0 && !isContinuablePiBoundary(piMessages)) {
+      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
+      ),
+      ...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: 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: "auth",
+      resumedFromSliceId: args.currentSliceId,
+      errorMessage: args.errorMessage,
+      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
+      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+    });
+  } catch (recordError) {
+    logSessionRecordError(
+      recordError,
+      "agent.turn.auth_resume_session_record.failed",
+      args,
+      {
+        "app.ai.resume_from_slice_id": args.currentSliceId,
+        "app.ai.resume_next_slice_id": nextSliceId
+      }
+    );
   }
-  return firstMessage;
+  return void 0;
 }
-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
+async function persistContinuationSessionRecord(args) {
+  const nextSliceId = args.currentSliceId + 1;
+  try {
+    const latestSessionRecord = await getAgentTurnSessionRecord(
+      args.conversationId,
+      args.sessionId
     );
-    if (compactCount <= 0) {
-      break;
-    }
-    const compactedChunk = conversation.messages.slice(0, compactCount);
-    const summary = await summarizeConversationChunk(
-      compactedChunk,
-      conversation,
-      context,
-      deps
+    const piMessages = resumableBoundary(
+      args.messages,
+      latestSessionRecord?.piMessages
     );
-    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;
+    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
+      return void 0;
     }
-  }
-}
-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 isDeepStrictEqual3 } from "util";
-
-// src/chat/conversations/message-summaries.ts
-import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
-function projectConversationMessageSummaries(events) {
-  for (let index = events.length - 1; index >= 0; index -= 1) {
-    const data = events[index]?.data;
-    if (data?.type === "messages_summarized") {
-      return data.compactions;
+    const cumulativeDurationMs = addDurationMs(
+      latestSessionRecord?.cumulativeDurationMs,
+      args.currentDurationMs
+    );
+    const cumulativeUsage = addAgentTurnUsage(
+      latestSessionRecord?.cumulativeUsage,
+      args.currentUsage
+    );
+    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
+        } : {},
+        ...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,
+        errorMessage: new TurnSliceLimitExceededError(
+          botConfig.maxSlicesPerTurn
+        ).message,
+        ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
+        ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+      });
     }
+    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 } : {},
+      ...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,
+      errorMessage: args.errorMessage,
+      ...args.actor ?? latestSessionRecord?.actor ? { actor: args.actor ?? latestSessionRecord?.actor } : {},
+      ...getActiveTraceId() ?? latestSessionRecord?.traceId ? { traceId: getActiveTraceId() ?? latestSessionRecord?.traceId } : {}
+    });
+  } catch (recordError) {
+    logSessionRecordError(
+      recordError,
+      "agent.continue.session_record.failed",
+      args,
+      {
+        "app.ai.resume_from_slice_id": args.currentSliceId,
+        "app.ai.resume_next_slice_id": nextSliceId
+      }
+    );
+    return void 0;
   }
-  return [];
 }
-async function persistConversationMessageSummaries(args) {
-  const eventStore = getConversationEventStore();
-  const history = await eventStore.loadMessageHistory(args.conversationId);
-  const existing = history.compaction ? projectConversationMessageSummaries([history.compaction]) : [];
-  if (isDeepStrictEqual2(existing, args.conversation.compactions)) {
-    return;
-  }
-  const liveMessageIds = new Set(
-    args.conversation.messages.map((message) => message.id)
-  );
-  const historyFromSeq = history.events.find(
-    (event) => event.data.type === "message" && liveMessageIds.has(event.data.messageId)
-  )?.seq;
-  const nextHistoryFromSeq = historyFromSeq ?? Math.max(history.historyFromSeq, (history.events.at(-1)?.seq ?? -1) + 1);
-  await eventStore.append(args.conversationId, [
-    {
-      data: {
-        type: "messages_summarized",
-        historyFromSeq: nextHistoryFromSeq,
-        compactions: args.conversation.compactions
-      },
-      createdAtMs: args.conversation.compactions.at(-1)?.createdAtMs ?? Date.now()
+async function persistYieldSessionRecord(args) {
+  try {
+    const piMessages = [...args.messages];
+    if (piMessages.length === 0 || !isContinuablePiBoundary(piMessages)) {
+      return void 0;
     }
-  ]);
-}
-
-// src/chat/conversations/message-projection.ts
-function isMessageEvent(event) {
-  return event.data.type === "message" || event.data.type === "message_updated" || event.data.type === "message_handled";
-}
-function splitMeta(meta) {
-  const rest = { ...meta ?? {} };
-  const author = rest.author;
-  delete rest.author;
-  return {
-    ...author ? { author } : {},
-    ...Object.keys(rest).length > 0 ? { meta: rest } : {}
-  };
-}
-function missingBaselineError(event) {
-  return new Error(
-    `Message event ${event.data.type} at seq ${event.seq} references ${event.data.messageId} before message`
-  );
-}
-function projectConversationMessages(history) {
-  const byId = /* @__PURE__ */ new Map();
-  for (const event of history.events) {
-    if (!isMessageEvent(event)) continue;
-    const data = event.data;
-    const current = byId.get(data.messageId);
-    if (data.type === "message" || data.type === "message_updated") {
-      const message = {
-        id: data.messageId,
-        role: data.role,
-        text: data.text,
-        createdAtMs: event.createdAtMs,
-        ...splitMeta(data.meta)
-      };
-      if (data.type === "message" && current)
-        throw new Error(
-          `Duplicate message event for ${data.messageId} at seq ${event.seq}`
-        );
-      if (data.type === "message_updated" && !current) {
-        if (history.historyFromSeq > 0) continue;
-        throw missingBaselineError(event);
+    const latestSessionRecord = await getAgentTurnSessionRecord(
+      args.conversationId,
+      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
+      ),
+      ...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",
+      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 } : {}
+    });
+  } catch (recordError) {
+    logSessionRecordError(
+      recordError,
+      "agent.turn.yield_session_record.failed",
+      args,
+      {
+        "app.ai.resume_slice_id": args.currentSliceId
       }
-      byId.set(data.messageId, {
-        message: {
-          ...message,
-          createdAtMs: current?.message.createdAtMs ?? message.createdAtMs
-        },
-        ...current?.repliedAtMs === void 0 ? {} : { repliedAtMs: current.repliedAtMs }
-      });
-      continue;
-    }
-    if (!current) {
-      if (history.historyFromSeq > 0) continue;
-      throw missingBaselineError(event);
-    }
-    current.repliedAtMs ??= event.createdAtMs;
+    );
+    return void 0;
   }
-  return [...byId.values()].map(({ message, repliedAtMs }) => {
-    if (repliedAtMs === void 0) return message;
-    return {
-      ...message,
-      meta: { ...message.meta ?? {}, replied: true }
-    };
-  });
 }
 
-// src/chat/conversations/messages.ts
-function toStoredConversationMessage(message) {
-  const meta = {};
-  if (message.author) meta.author = message.author;
-  const { replied, ...restMeta } = message.meta ?? {};
-  Object.assign(meta, restMeta);
-  if (replied === false) meta.replied = false;
+// src/chat/state/conversation.ts
+function defaultConversationState() {
+  const nowMs = Date.now();
   return {
-    messageId: message.id,
-    role: message.role,
-    text: message.text,
-    ...Object.keys(meta).length > 0 ? { meta } : {},
-    createdAtMs: message.createdAtMs
+    schemaVersion: 1,
+    messages: [],
+    compactions: [],
+    backfill: {},
+    processing: {},
+    stats: {
+      estimatedContextTokens: 0,
+      totalMessageCount: 0,
+      compactedMessageCount: 0,
+      updatedAtMs: nowMs
+    },
+    vision: {
+      byFileId: {}
+    }
   };
 }
-function canonicalJson(value) {
-  if (Array.isArray(value)) return value.map(canonicalJson);
-  if (!value || typeof value !== "object") return value;
-  return Object.fromEntries(
-    Object.entries(value).filter(([, item]) => item !== void 0).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => [key, canonicalJson(item)])
-  );
-}
-function messageStateKey(message) {
-  return createHash("sha256").update(JSON.stringify(canonicalJson(message))).digest("hex").slice(0, 32);
+function coercePendingAuthState(value) {
+  if (!isRecord(value)) {
+    return void 0;
+  }
+  const kind = value.kind;
+  const provider = toOptionalString(value.provider);
+  const actorId = toOptionalString(value.actorId);
+  const authSessionId = toOptionalString(value.authSessionId);
+  const scope = toOptionalString(value.scope);
+  const sessionId = toOptionalString(value.sessionId);
+  const linkSentAtMs = toOptionalNumber(value.linkSentAtMs);
+  if (kind !== "mcp" && kind !== "plugin" || !provider || !actorId || kind === "mcp" && !authSessionId || !sessionId || typeof linkSentAtMs !== "number") {
+    return void 0;
+  }
+  const base = {
+    provider,
+    actorId,
+    ...scope ? { scope } : {},
+    sessionId,
+    linkSentAtMs
+  };
+  return kind === "mcp" ? { ...base, authSessionId, kind } : { ...base, kind };
 }
-async function hydrateConversationMessages(args) {
-  if (!args.conversationId) {
-    args.conversation.messages = [];
-    return;
+function coerceThreadConversationState(value) {
+  if (!isRecord(value)) {
+    return defaultConversationState();
   }
-  const history = await getConversationEventStore().loadMessageHistory(
-    args.conversationId
-  );
-  args.conversation.compactions = history.compaction ? projectConversationMessageSummaries([history.compaction]) : [];
-  args.conversation.messages = projectConversationMessages(history);
-  updateConversationStats(args.conversation);
+  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 = {};
+  for (const [fileId, value2] of Object.entries(rawVisionByFileId)) {
+    if (typeof fileId !== "string" || fileId.trim().length === 0) continue;
+    if (!isRecord(value2)) continue;
+    const summary = toOptionalString(value2.summary);
+    const analyzedAtMs = toOptionalNumber(value2.analyzedAtMs);
+    if (!summary || !analyzedAtMs) continue;
+    byFileId[fileId] = {
+      summary,
+      analyzedAtMs
+    };
+  }
+  return {
+    schemaVersion: 1,
+    messages,
+    compactions,
+    backfill,
+    processing,
+    stats,
+    vision: {
+      backfillCompletedAtMs: toOptionalNumber(rawVision.backfillCompletedAtMs),
+      byFileId
+    }
+  };
 }
-async function persistConversationMessages(args) {
-  if (!args.conversationId || args.conversation.messages.length === 0) return;
-  const history = await getConversationEventStore().loadMessageHistory(
-    args.conversationId
-  );
-  const existingMessages = new Map(
-    projectConversationMessages(history).map((message) => [
-      message.id,
-      message
-    ])
-  );
-  const handledAtMs = args.repliedAtMs ?? Date.now();
-  const events = args.conversation.messages.flatMap((message) => {
-    const stored = toStoredConversationMessage(message);
-    const existing = existingMessages.get(stored.messageId);
-    const changed = existing !== void 0 && !isDeepStrictEqual3(toStoredConversationMessage(existing), stored);
-    const messageEvent = existing ? changed ? [
-      {
-        idempotencyKey: `message:${stored.messageId}:update:${messageStateKey(stored)}`,
-        createdAtMs: handledAtMs,
-        data: {
-          type: "message_updated",
-          messageId: stored.messageId,
-          role: stored.role,
-          text: stored.text,
-          ...stored.authorIdentityId ? { authorIdentityId: stored.authorIdentityId } : {},
-          ...stored.meta ? { meta: stored.meta } : {}
-        }
-      }
-    ] : [] : [
-      {
-        idempotencyKey: `message:${stored.messageId}`,
-        createdAtMs: stored.createdAtMs,
-        data: {
-          type: "message",
-          messageId: stored.messageId,
-          role: stored.role,
-          text: stored.text,
-          ...stored.authorIdentityId ? { authorIdentityId: stored.authorIdentityId } : {},
-          ...stored.meta ? { meta: stored.meta } : {}
-        }
+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()
       }
-    ];
-    return [
-      ...messageEvent,
-      ...message.meta?.replied === true ? [
-        {
-          idempotencyKey: `message:${stored.messageId}:handled`,
-          createdAtMs: handledAtMs,
-          data: {
-            type: "message_handled",
-            messageId: stored.messageId
-          }
-        }
-      ] : []
-    ];
-  });
-  await getConversationEventStore().append(args.conversationId, events);
+    }
+  };
 }
 
 // src/chat/state/artifacts.ts
@@ -2793,11 +2832,29 @@ export {
   stripRuntimeTurnContext,
   historyItemFromPiMessage,
   piMessageFromHistoryItem,
+  persistConversationMessageSummaries,
+  estimateTextTokens,
+  getAgentContextCompactionTriggerTokens,
+  getAgentContextInputLimitTokens,
+  normalizeConversationText,
+  updateConversationStats,
+  upsertConversationMessage,
+  recordDeliveredAssistantMessage,
+  turnHasReply,
+  markConversationMessage,
+  buildConversationContext,
+  getThreadTitleSourceMessage,
+  createConversationMemoryService,
+  isHumanConversationMessage,
+  getConversationMessageSlackTs,
+  hydrateConversationMessages,
+  persistConversationMessages,
   loadProjection,
   loadConversationProjection,
   openConversationProjection,
   loadConnectedMcpProviders,
   commitMessages,
+  commitAcceptedReply,
   recordMcpProviderConnected,
   recordAuthorizationRequested,
   recordAuthorizationCompleted,
@@ -2818,6 +2875,12 @@ export {
   markTurnClosed,
   markTurnCompleted,
   markTurnFailed,
+  NO_REPLY_MARKER,
+  isNoReplyMarker,
+  containsNoReplyMarker,
+  sanitizeAssistantText,
+  decideReply,
+  getAssistantReplyText,
   getAgentTurnSessionRecord,
   getAgentTurnSessionRecordForResume,
   recordAgentTurnSessionSummary,
@@ -2841,23 +2904,6 @@ export {
   abandonReplacedPendingAuth,
   isPendingAuthLatestRequest,
   coerceThreadConversationState,
-  persistConversationMessageSummaries,
-  estimateTextTokens,
-  getAgentContextCompactionTriggerTokens,
-  getAgentContextInputLimitTokens,
-  normalizeConversationText,
-  updateConversationStats,
-  upsertConversationMessage,
-  recordDeliveredAssistantMessage,
-  turnHasReply,
-  markConversationMessage,
-  buildConversationContext,
-  getThreadTitleSourceMessage,
-  createConversationMemoryService,
-  isHumanConversationMessage,
-  getConversationMessageSlackTs,
-  hydrateConversationMessages,
-  persistConversationMessages,
   coerceThreadArtifactsState,
   mergeArtifactsState,
   getPersistedSandboxState,