openfox 1.6.13 → 1.6.15

package/dist/{ask-JQQNGB5K.js → ask-3RK5YJZE.js}

@@ -6,7 +6,7 @@ import {
   cancelQuestionsForSession,
   hasPendingQuestion,
   provideAnswer
-} from "./chunk-5LDTVERY.js";
+} from "./chunk-22CTURMH.js";
 export {
   AskUserInterrupt,
   askUserTool,
@@ -16,4 +16,4 @@ export {
   hasPendingQuestion,
   provideAnswer
 };
-//# sourceMappingURL=ask-JQQNGB5K.js.map
+//# sourceMappingURL=ask-3RK5YJZE.js.map

package/dist/{auto-compaction-QPFQEWJG.js → auto-compaction-JZIM73ZY.js}

@@ -2,14 +2,14 @@ import {
   maybeAutoCompactContext,
   performManualContextCompaction,
   resolveCompactionStatsIdentity
-} from "./chunk-POJO7A5H.js";
+} from "./chunk-3WHZ47PY.js";
 import "./chunk-NBU6KIOD.js";
 import "./chunk-574HZVLE.js";
-import "./chunk-XFXOSPYH.js";
-import "./chunk-ZRDRYL6W.js";
-import "./chunk-WQ4W5H6A.js";
+import "./chunk-55N6FAAZ.js";
+import "./chunk-6L3X7T4K.js";
+import "./chunk-2KP34IDL.js";
 import "./chunk-NJWPSSRW.js";
-import "./chunk-5LDTVERY.js";
+import "./chunk-22CTURMH.js";
 import "./chunk-7IOZFJBW.js";
 import "./chunk-XKFPU2FA.js";
 import "./chunk-3EHGGBWE.js";
@@ -22,4 +22,4 @@ export {
   performManualContextCompaction,
   resolveCompactionStatsIdentity
 };
-//# sourceMappingURL=auto-compaction-QPFQEWJG.js.map
+//# sourceMappingURL=auto-compaction-JZIM73ZY.js.map

package/dist/{chat-handler-FDHHTHS3.js → chat-handler-F2A2IMQB.js}

@@ -1,30 +1,30 @@
 import {
+  buildRunChatTurnParams,
+  finalizeTurnCompletion,
+  getSessionMessageCount
+} from "./chunk-SN7OBEVL.js";
+import {
+  applyGeneratedSessionName,
   generateSessionName,
-  needsNameGeneration
-} from "./chunk-QDEKU5RL.js";
+  needsNameGenerationCheck
+} from "./chunk-F54ZJN4X.js";
 import {
   runChatTurn
-} from "./chunk-LMIBGLOB.js";
-import "./chunk-POJO7A5H.js";
+} from "./chunk-YM6VHAPM.js";
+import "./chunk-3WHZ47PY.js";
 import "./chunk-NBU6KIOD.js";
 import "./chunk-574HZVLE.js";
-import "./chunk-XFXOSPYH.js";
-import {
-  getEventStore,
-  updateSessionMetadata
-} from "./chunk-ZRDRYL6W.js";
+import "./chunk-55N6FAAZ.js";
 import {
-  buildMessagesFromStoredEvents,
-  foldPendingConfirmations
-} from "./chunk-WQ4W5H6A.js";
+  getEventStore
+} from "./chunk-6L3X7T4K.js";
+import "./chunk-2KP34IDL.js";
 import {
   createChatMessageMessage,
-  createContextStateMessage,
   createPhaseChangedMessage,
-  createSessionRunningMessage,
-  createSessionStateMessage
+  createSessionRunningMessage
 } from "./chunk-NJWPSSRW.js";
-import "./chunk-5LDTVERY.js";
+import "./chunk-22CTURMH.js";
 import "./chunk-7IOZFJBW.js";
 import "./chunk-XKFPU2FA.js";
 import "./chunk-3EHGGBWE.js";
@@ -61,7 +61,7 @@ async function startChatSession(sessionId, content, deps, options) {
   sessionManager.setRunning(sessionId, true);
   broadcastForSession(sessionId, createSessionRunningMessage(true));
   try {
-    const { maybeAutoCompactContext } = await import("./auto-compaction-QPFQEWJG.js");
+    const { maybeAutoCompactContext } = await import("./auto-compaction-JZIM73ZY.js");
     await maybeAutoCompactContext({
       sessionManager,
       sessionId,
@@ -82,13 +82,7 @@ async function startChatSession(sessionId, content, deps, options) {
     broadcastForSession(sessionId, createChatMessageMessage(userMessage));
     const messageCount = getSessionMessageCount(sessionId);
     const currentSession = sessionManager.getSession(sessionId);
-    logger.debug("Session name generation check", {
-      sessionId,
-      title: currentSession?.metadata.title,
-      messageCount,
-      needsGeneration: currentSession ? needsNameGeneration(currentSession.metadata.title, messageCount) : false
-    });
-    if (currentSession && needsNameGeneration(currentSession.metadata.title, messageCount)) {
+    if (currentSession && needsNameGenerationCheck(sessionId, currentSession.metadata.title, messageCount)) {
       generateSessionName({
         userMessage: content,
         llmClient,
@@ -101,18 +95,11 @@ async function startChatSession(sessionId, content, deps, options) {
           error: result.error
         });
         if (result.success && result.name) {
-          updateSessionMetadata(sessionId, { title: result.name });
-          eventStore.append(sessionId, {
-            type: "session.name_generated",
-            data: { name: result.name }
+          applyGeneratedSessionName(sessionId, result.name, {
+            sessionManager,
+            eventStore,
+            broadcastForSession
           });
-          const updatedSession = sessionManager.getSession(sessionId);
-          if (updatedSession) {
-            const events = eventStore.getEvents(sessionId);
-            const messages = buildMessagesFromStoredEvents(events);
-            const pendingConfirmations = foldPendingConfirmations(events);
-            broadcastForSession(sessionId, createSessionStateMessage(updatedSession, messages, pendingConfirmations));
-          }
         }
       }).catch((error) => {
         logger.error("Session name generation failed", {
@@ -128,35 +115,20 @@ async function startChatSession(sessionId, content, deps, options) {
     }
     sessionManager.setRunning(sessionId, false);
     broadcastForSession(sessionId, createSessionRunningMessage(false));
-    const contextState = sessionManager.getContextState(sessionId);
-    broadcastForSession(sessionId, createContextStateMessage(contextState));
+    finalizeTurnCompletion(sessionId, sessionManager, broadcastForSession);
     throw error;
   }
 }
-function getSessionMessageCount(sessionId) {
-  const eventStore = getEventStore();
-  const events = eventStore.getEvents(sessionId);
-  let count = 0;
-  for (const event of events) {
-    if (event.type === "message.start") {
-      const data = event.data;
-      if (data.role === "user") {
-        count++;
-      }
-    }
-  }
-  return count;
-}
 function startTurnWithCompletionChain(sessionId, controller, deps) {
   const { sessionManager, llmClient, statsIdentity, broadcastForSession } = deps;
-  runChatTurn({
+  runChatTurn(buildRunChatTurnParams({
     sessionManager,
     sessionId,
     llmClient,
     statsIdentity,
     signal: controller.signal,
     onMessage: (msg) => broadcastForSession(sessionId, msg)
-  }).catch((error) => {
+  })).catch((error) => {
     if (error instanceof Error && error.message === "Aborted") {
       return;
     }
@@ -183,9 +155,7 @@ function startTurnWithCompletionChain(sessionId, controller, deps) {
       return;
     }
     sessionManager.clearMessageQueue(sessionId);
-    sessionManager.setRunning(sessionId, false);
-    const contextState = sessionManager.getContextState(sessionId);
-    broadcastForSession(sessionId, createContextStateMessage(contextState));
+    finalizeTurnCompletion(sessionId, sessionManager, broadcastForSession);
   });
 }
 function stopSessionExecution(sessionId, sessionManager) {
@@ -200,4 +170,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-FDHHTHS3.js.map
+//# sourceMappingURL=chat-handler-F2A2IMQB.js.map

package/dist/{chunk-5LDTVERY.js → chunk-22CTURMH.js}

@@ -76,8 +76,6 @@ var AskUserInterrupt = class extends Error {
     this.question = question;
     this.name = "AskUserInterrupt";
   }
-  callId;
-  question;
 };
 function provideAnswer(callId, answer) {
   const pending = pendingQuestions.get(callId);
@@ -127,4 +125,4 @@ export {
   hasPendingQuestion,
   awaitAnswer
 };
-//# sourceMappingURL=chunk-5LDTVERY.js.map
+//# sourceMappingURL=chunk-22CTURMH.js.map

package/dist/{chunk-WQ4W5H6A.js → chunk-2KP34IDL.js}

@@ -1,151 +1,91 @@
-// src/server/events/folding.ts
-function cloneMessage(message) {
+// src/server/events/apply-events.ts
+function extractMessageOptionalFields(data) {
   return {
-    ...message,
-    ...message.attachments ? { attachments: [...message.attachments] } : {},
-    ...message.toolCalls ? {
-      toolCalls: message.toolCalls.map((toolCall) => ({
-        ...toolCall,
-        ...toolCall.streamingOutput ? { streamingOutput: [...toolCall.streamingOutput] } : {},
-        ...toolCall.result ? { result: { ...toolCall.result } } : {}
-      }))
-    } : {},
-    ...message.segments ? { segments: [...message.segments] } : {},
-    ...message.preparingToolCalls ? { preparingToolCalls: [...message.preparingToolCalls] } : {}
+    ...data.tokenCount !== void 0 && { tokenCount: data.tokenCount },
+    ...data.contextWindowId !== void 0 && { contextWindowId: data.contextWindowId },
+    ...data.subAgentId !== void 0 && { subAgentId: data.subAgentId },
+    ...data.subAgentType !== void 0 && { subAgentType: data.subAgentType },
+    ...data.isSystemGenerated !== void 0 && { isSystemGenerated: data.isSystemGenerated },
+    ...data.messageKind !== void 0 && { messageKind: data.messageKind },
+    ...data.isCompactionSummary !== void 0 && { isCompactionSummary: data.isCompactionSummary },
+    ...data.attachments !== void 0 && { attachments: data.attachments },
+    ...data.metadata !== void 0 && { metadata: data.metadata }
   };
 }
-function snapshotMessageToMessage(message) {
-  return cloneMessage({
-    id: message.id,
-    role: message.role,
-    content: message.content,
-    timestamp: new Date(message.timestamp).toISOString(),
-    ...message.tokenCount !== void 0 && { tokenCount: message.tokenCount },
-    ...message.isStreaming !== void 0 && { isStreaming: message.isStreaming },
-    ...message.contextWindowId !== void 0 && { contextWindowId: message.contextWindowId },
-    ...message.subAgentId !== void 0 && { subAgentId: message.subAgentId },
-    ...message.subAgentType !== void 0 && { subAgentType: message.subAgentType },
-    ...message.isSystemGenerated !== void 0 && { isSystemGenerated: message.isSystemGenerated },
-    ...message.messageKind !== void 0 && { messageKind: message.messageKind },
-    ...message.isCompactionSummary !== void 0 && { isCompactionSummary: message.isCompactionSummary },
-    ...message.attachments !== void 0 && { attachments: message.attachments },
-    ...message.thinkingContent !== void 0 && { thinkingContent: message.thinkingContent },
-    ...message.toolCalls !== void 0 && { toolCalls: message.toolCalls },
-    ...message.segments !== void 0 && { segments: message.segments },
-    ...message.stats !== void 0 && { stats: message.stats },
-    ...message.partial !== void 0 && { partial: message.partial },
-    ...message.promptContext !== void 0 && { promptContext: message.promptContext },
-    ...message.metadata !== void 0 && { metadata: message.metadata }
-  });
-}
-function shouldIncludeContextMessage(message, windowId, options) {
-  const includeVerifier = options?.includeVerifier ?? true;
-  return message.role !== "system" && (windowId === void 0 || message.contextWindowId === windowId) && (includeVerifier || message.subAgentType !== "verifier") && !message.subAgentId;
+function attachToolCallToMessage(msg, toolCall) {
+  const existing = msg.toolCalls ?? [];
+  const newTc = { ...toolCall };
+  msg.toolCalls = [...existing, newTc];
 }
-function appendSnapshotMessageContext(result, message) {
-  const contextMsg = {
-    role: message.role,
-    content: message.content
-  };
-  if (message.toolCalls && message.toolCalls.length > 0) {
-    contextMsg.toolCalls = message.toolCalls.map((toolCall) => ({
-      id: toolCall.id,
-      name: toolCall.name,
-      arguments: toolCall.arguments
-    }));
-  }
-  if (message.attachments !== void 0) {
-    contextMsg.attachments = message.attachments;
-  }
-  result.push(contextMsg);
-  if (!message.toolCalls) {
-    return;
-  }
-  for (const toolCall of message.toolCalls) {
-    if (!toolCall.result) {
-      continue;
+function attachToolResultToMessage(msg, toolCallId, result) {
+  if (msg.toolCalls) {
+    const toolCall = msg.toolCalls.find((tc) => tc.id === toolCallId);
+    if (toolCall) {
+      toolCall.result = result;
     }
-    result.push({
-      role: "tool",
-      content: toolCall.result.success ? toolCall.result.output ?? "Success" : toolCall.result.output ? `${toolCall.result.output}
-
-Error: ${toolCall.result.error}` : `Error: ${toolCall.result.error}`,
-      toolCallId: toolCall.id
-    });
   }
 }
-function applyStoredMessageEvents(initialMessages, events) {
-  const messages = new Map(initialMessages.map((message) => [message.id, cloneMessage(message)]));
+function updateMessageDelta(msg, content) {
+  msg.content += content;
+}
+function updateMessageThinking(msg, content) {
+  msg.thinkingContent = (msg.thinkingContent ?? "") + content;
+}
+function updateMessageDone(msg, data) {
+  msg.isStreaming = false;
+  if (data.stats) msg.stats = data.stats;
+  if (data.segments) msg.segments = data.segments;
+  if (data.partial) msg.partial = true;
+  if (data.promptContext) msg.promptContext = data.promptContext;
+  if (data.tokenCount !== void 0) msg.tokenCount = data.tokenCount;
+}
+function applyEvents(initialMessages, events, options) {
+  const messages = new Map(initialMessages.map((message) => [message.id, deepCloneMessage(message)]));
   for (const event of events) {
     switch (event.type) {
       case "message.start": {
         const data = event.data;
         const isUserOrSystem = data.role === "user" || data.role === "system";
+        const timestamp = options.timestampAsNumber ? typeof event.timestamp === "number" ? event.timestamp : Date.now() : new Date(event.timestamp).toISOString();
         messages.set(data.messageId, {
           id: data.messageId,
           role: data.role,
           content: data.content ?? "",
-          timestamp: new Date(event.timestamp).toISOString(),
-          tokenCount: data.tokenCount ?? 0,
+          timestamp,
           isStreaming: !isUserOrSystem,
-          ...data.contextWindowId !== void 0 && { contextWindowId: data.contextWindowId },
-          ...data.subAgentId !== void 0 && { subAgentId: data.subAgentId },
-          ...data.subAgentType !== void 0 && { subAgentType: data.subAgentType },
-          ...data.isSystemGenerated !== void 0 && { isSystemGenerated: data.isSystemGenerated },
-          ...data.messageKind !== void 0 && { messageKind: data.messageKind },
-          ...data.isCompactionSummary !== void 0 && { isCompactionSummary: data.isCompactionSummary },
-          ...data.attachments !== void 0 && { attachments: data.attachments },
-          ...data.metadata !== void 0 && { metadata: data.metadata }
+          tokenCount: data.tokenCount ?? 0,
+          ...extractMessageOptionalFields(data)
         });
         break;
       }
       case "message.delta": {
         const data = event.data;
         const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.content += data.content;
-        }
+        if (msg) updateMessageDelta(msg, data.content);
         break;
       }
       case "message.thinking": {
         const data = event.data;
         const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.thinkingContent = (msg.thinkingContent ?? "") + data.content;
-        }
+        if (msg) updateMessageThinking(msg, data.content);
         break;
       }
       case "message.done": {
         const data = event.data;
         const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.isStreaming = false;
-          if (data.stats) msg.stats = data.stats;
-          if (data.segments) msg.segments = data.segments;
-          if (data.partial) msg.partial = data.partial;
-          if (data.promptContext) msg.promptContext = data.promptContext;
-          if (data.tokenCount !== void 0) msg.tokenCount = data.tokenCount;
-        }
+        if (msg) updateMessageDone(msg, data);
         break;
       }
       case "tool.call": {
         const data = event.data;
         const msg = messages.get(data.messageId);
-        if (msg) {
-          const existingToolCalls = msg.toolCalls ?? [];
-          msg.toolCalls = [...existingToolCalls, data.toolCall];
-        }
+        if (msg) attachToolCallToMessage(msg, data.toolCall);
         break;
       }
       case "tool.result": {
         const data = event.data;
         const msg = messages.get(data.messageId);
-        if (msg?.toolCalls) {
-          const toolCall = msg.toolCalls.find((tc) => tc.id === data.toolCallId);
-          if (toolCall) {
-            toolCall.result = data.result;
-          }
-        }
+        if (msg) attachToolResultToMessage(msg, data.toolCallId, data.result);
         break;
       }
       case "session.initialized":
@@ -169,7 +109,48 @@ function applyStoredMessageEvents(initialMessages, events) {
   }
   return Array.from(messages.values());
 }
-function cloneSnapshotMessage(message) {
+function deepCloneMessage(msg) {
+  const cloned = { ...msg };
+  const obj = cloned;
+  if (obj["toolCalls"]) {
+    obj["toolCalls"] = obj["toolCalls"].map((tc) => ({ ...tc, ...tc.result ? { result: { ...tc.result } } : {} }));
+  }
+  if (obj["segments"]) {
+    obj["segments"] = [...obj["segments"]];
+  }
+  if (obj["attachments"]) {
+    obj["attachments"] = [...obj["attachments"]];
+  }
+  return cloned;
+}
+
+// src/server/events/optimize-storage.ts
+function stripPromptContextMessages(messages) {
+  let lastAssistantIdx = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    if (msg.role === "assistant" && msg.promptContext) {
+      lastAssistantIdx = i;
+      break;
+    }
+  }
+  let changed = false;
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const pc = msg.promptContext;
+    if (pc && pc.messages && pc.messages.length > 0 && i !== lastAssistantIdx) {
+      pc.messages = [];
+      changed = true;
+    }
+  }
+  return changed;
+}
+
+// src/server/events/folding.ts
+import stripAnsi from "strip-ansi";
+function cloneMessage(message) {
   return {
     ...message,
     ...message.attachments ? { attachments: [...message.attachments] } : {},
@@ -180,86 +161,81 @@ function cloneSnapshotMessage(message) {
         ...toolCall.result ? { result: { ...toolCall.result } } : {}
       }))
     } : {},
-    ...message.segments ? { segments: [...message.segments] } : {}
+    ...message.segments ? { segments: [...message.segments] } : {},
+    ...message.preparingToolCalls ? { preparingToolCalls: [...message.preparingToolCalls] } : {}
   };
 }
-function applyTurnEventsToSnapshotMessages(initialMessages, events) {
-  const messages = new Map(initialMessages.map((message) => [message.id, cloneSnapshotMessage(message)]));
-  for (const event of events) {
-    switch (event.type) {
-      case "message.start": {
-        const data = event.data;
-        const msg = {
-          id: data.messageId,
-          role: data.role,
-          content: data.content ?? "",
-          timestamp: typeof event.timestamp === "number" ? event.timestamp : Date.now(),
-          isStreaming: true
-        };
-        if (data.tokenCount !== void 0) msg.tokenCount = data.tokenCount;
-        if (data.contextWindowId !== void 0) msg.contextWindowId = data.contextWindowId;
-        if (data.subAgentId !== void 0) msg.subAgentId = data.subAgentId;
-        if (data.subAgentType !== void 0) msg.subAgentType = data.subAgentType;
-        if (data.isSystemGenerated !== void 0) msg.isSystemGenerated = data.isSystemGenerated;
-        if (data.messageKind !== void 0) msg.messageKind = data.messageKind;
-        if (data.isCompactionSummary !== void 0) msg.isCompactionSummary = data.isCompactionSummary;
-        if (data.attachments !== void 0) msg.attachments = data.attachments;
-        if (data.metadata !== void 0) msg.metadata = data.metadata;
-        messages.set(data.messageId, msg);
-        break;
-      }
-      case "message.delta": {
-        const data = event.data;
-        const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.content += data.content;
-        }
-        break;
-      }
-      case "message.thinking": {
-        const data = event.data;
-        const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.thinkingContent = (msg.thinkingContent ?? "") + data.content;
-        }
-        break;
-      }
-      case "message.done": {
-        const data = event.data;
-        const msg = messages.get(data.messageId);
-        if (msg) {
-          msg.isStreaming = false;
-          if (data.stats) msg.stats = data.stats;
-          if (data.segments) msg.segments = data.segments;
-          if (data.partial) msg.partial = data.partial;
-          if (data.promptContext) msg.promptContext = data.promptContext;
-          if (data.tokenCount !== void 0) msg.tokenCount = data.tokenCount;
-        }
-        break;
-      }
-      case "tool.call": {
-        const data = event.data;
-        const msg = messages.get(data.messageId);
-        if (msg) {
-          const toolCalls = msg.toolCalls ?? [];
-          msg.toolCalls = [...toolCalls, data.toolCall];
-        }
-        break;
-      }
-      case "tool.result": {
-        const data = event.data;
-        const msg = messages.get(data.messageId);
-        if (msg?.toolCalls) {
-          const toolCall = msg.toolCalls.find((tc) => tc.id === data.toolCallId);
-          if (toolCall) {
-            toolCall.result = data.result;
-          }
-        }
-        break;
-      }
+function spreadOptionalMessageFields(message) {
+  return {
+    ...message.thinkingContent !== void 0 && { thinkingContent: message.thinkingContent },
+    ...message.toolCalls !== void 0 && { toolCalls: message.toolCalls },
+    ...message.segments !== void 0 && { segments: message.segments },
+    ...message.stats !== void 0 && { stats: message.stats },
+    ...message.tokenCount !== void 0 && { tokenCount: message.tokenCount },
+    ...message.isStreaming !== void 0 && { isStreaming: message.isStreaming },
+    ...message.partial !== void 0 && { partial: message.partial },
+    ...message.subAgentId !== void 0 && { subAgentId: message.subAgentId },
+    ...message.subAgentType !== void 0 && { subAgentType: message.subAgentType },
+    ...message.isSystemGenerated !== void 0 && { isSystemGenerated: message.isSystemGenerated },
+    ...message.messageKind !== void 0 && { messageKind: message.messageKind },
+    ...message.contextWindowId !== void 0 && { contextWindowId: message.contextWindowId },
+    ...message.isCompactionSummary !== void 0 && { isCompactionSummary: message.isCompactionSummary },
+    ...message.promptContext !== void 0 && { promptContext: message.promptContext },
+    ...message.attachments !== void 0 && { attachments: message.attachments },
+    ...message.metadata !== void 0 && { metadata: message.metadata }
+  };
+}
+function snapshotMessageToMessage(message) {
+  return cloneMessage({
+    id: message.id,
+    role: message.role,
+    content: message.content,
+    timestamp: new Date(message.timestamp).toISOString(),
+    ...spreadOptionalMessageFields(message)
+  });
+}
+function shouldIncludeContextMessage(message, windowId, options) {
+  const includeVerifier = options?.includeVerifier ?? true;
+  return message.role !== "system" && (windowId === void 0 || message.contextWindowId === windowId) && (includeVerifier || message.subAgentType !== "verifier") && !message.subAgentId;
+}
+function appendSnapshotMessageContext(result, message) {
+  const contextMsg = {
+    role: message.role,
+    content: message.content
+  };
+  if (message.toolCalls && message.toolCalls.length > 0) {
+    contextMsg.toolCalls = message.toolCalls.map((toolCall) => ({
+      id: toolCall.id,
+      name: toolCall.name,
+      arguments: toolCall.arguments
+    }));
+  }
+  if (message.attachments !== void 0) {
+    contextMsg.attachments = message.attachments;
+  }
+  result.push(contextMsg);
+  if (!message.toolCalls) {
+    return;
+  }
+  for (const toolCall of message.toolCalls) {
+    if (!toolCall.result) {
+      continue;
     }
+    result.push({
+      role: "tool",
+      content: stripAnsi(toolCall.result.success ? toolCall.result.output ?? "Success" : toolCall.result.output ? `${toolCall.result.output}
+
+Error: ${toolCall.result.error}` : `Error: ${toolCall.result.error}`),
+      toolCallId: toolCall.id
+    });
   }
-  return Array.from(messages.values());
+}
+function applyStoredMessageEvents(initialMessages, events) {
+  return applyEvents(initialMessages, events, { timestampAsNumber: false });
+}
+function applyTurnEventsToSnapshotMessages(initialMessages, events) {
+  const messages = applyEvents(initialMessages, events, { timestampAsNumber: true });
+  return messages.map((msg) => ({ ...msg, isStreaming: msg.isStreaming ?? true }));
 }
 function buildMessagesFromStoredEvents(events) {
   const snapshotEvent = [...events].reverse().find((event) => event.type === "turn.snapshot");
@@ -315,9 +291,9 @@ function buildContextMessagesFromStoredEvents(events, windowId, options) {
           const msg = {
             id: `tool-${data.toolCallId}`,
             role: "tool",
-            content: data.result.success ? data.result.output ?? "Success" : data.result.output ? `${data.result.output}
+            content: stripAnsi(data.result.success ? data.result.output ?? "Success" : data.result.output ? `${data.result.output}
 
-Error: ${data.result.error}` : `Error: ${data.result.error}`,
+Error: ${data.result.error}` : `Error: ${data.result.error}`),
             toolCallId: data.toolCallId
           };
           if (imageMeta?.dataUrl && imageMeta?.mimeType?.startsWith("image/")) {
@@ -585,26 +561,6 @@ function buildSnapshot(foldedState, latestSeq, snapshotAt = Date.now()) {
     snapshotAt
   };
 }
-function stripPromptContextMessages(messages) {
-  let lastAssistantIdx = -1;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (!msg) continue;
-    if (msg.role === "assistant" && msg.promptContext) {
-      lastAssistantIdx = i;
-      break;
-    }
-  }
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    if (!msg) continue;
-    const pc = msg.promptContext;
-    if (pc && i !== lastAssistantIdx) {
-      const { messages: _msgs, ...rest } = pc;
-      msg.promptContext = { ...rest, messages: [] };
-    }
-  }
-}
 function buildSnapshotFromSessionState(input) {
   const { session, events, latestSeq, snapshotAt = Date.now(), maxTokens = 2e5 } = input;
   let initialWindowId = "";
@@ -660,6 +616,8 @@ function buildContextMessagesFromMessages(messages, windowId) {
 }
 
 export {
+  stripPromptContextMessages,
+  spreadOptionalMessageFields,
   buildMessagesFromStoredEvents,
   buildContextMessagesFromStoredEvents,
   buildContextMessagesFromEventHistory,
@@ -677,4 +635,4 @@ export {
   getMessagesForWindow,
   buildContextMessagesFromMessages
 };
-//# sourceMappingURL=chunk-WQ4W5H6A.js.map
+//# sourceMappingURL=chunk-2KP34IDL.js.map