openfox 1.6.77 → 1.6.79

package/dist/{auto-compaction-GOHNI2R2.js → auto-compaction-KTA6H4HP.js}

@@ -2,16 +2,16 @@ import {
   maybeAutoCompactContext,
   performManualContextCompaction,
   resolveCompactionStatsIdentity
-} from "./chunk-EBQYRNNU.js";
+} from "./chunk-UCZSBKG7.js";
 import "./chunk-OXI26S7U.js";
 import "./chunk-CMQCO27Y.js";
-import "./chunk-XKIEDGQF.js";
+import "./chunk-DL6ZILAF.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
 import "./chunk-CUDAT6SS.js";
-import "./chunk-UVN6AKIO.js";
+import "./chunk-RJRG2VER.js";
 import "./chunk-KIOUKC3Z.js";
-import "./chunk-BBC46FN4.js";
+import "./chunk-TS5XFQ2D.js";
 import "./chunk-STYHKCG7.js";
 import "./chunk-BJYPTN5S.js";
 import "./chunk-NDJ6FKSP.js";
@@ -24,4 +24,4 @@ export {
   performManualContextCompaction,
   resolveCompactionStatsIdentity
 };
-//# sourceMappingURL=auto-compaction-GOHNI2R2.js.map
+//# sourceMappingURL=auto-compaction-KTA6H4HP.js.map

package/dist/{chat-handler-K2RDXBO6.js → chat-handler-EKAO6CIB.js}

@@ -5,22 +5,22 @@ import {
   generateSessionName,
   getSessionMessageCount,
   needsNameGenerationCheck
-} from "./chunk-I7JVS7V5.js";
+} from "./chunk-2IZMUXMP.js";
 import {
   runChatTurn
-} from "./chunk-6SYNGMU4.js";
-import "./chunk-EBQYRNNU.js";
+} from "./chunk-BG7QCFGG.js";
+import "./chunk-UCZSBKG7.js";
 import "./chunk-OXI26S7U.js";
 import "./chunk-CMQCO27Y.js";
-import "./chunk-XKIEDGQF.js";
+import "./chunk-DL6ZILAF.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
 import "./chunk-CUDAT6SS.js";
 import {
   getEventStore
-} from "./chunk-UVN6AKIO.js";
+} from "./chunk-RJRG2VER.js";
 import "./chunk-KIOUKC3Z.js";
-import "./chunk-BBC46FN4.js";
+import "./chunk-TS5XFQ2D.js";
 import {
   createChatMessageMessage,
   createPhaseChangedMessage,
@@ -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-GOHNI2R2.js");
+    const { maybeAutoCompactContext } = await import("./auto-compaction-KTA6H4HP.js");
     await maybeAutoCompactContext({
       sessionManager,
       sessionId,
@@ -172,4 +172,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-K2RDXBO6.js.map
+//# sourceMappingURL=chat-handler-EKAO6CIB.js.map

package/dist/{chunk-I7JVS7V5.js → chunk-2IZMUXMP.js}

@@ -1,11 +1,11 @@
 import {
   getEventStore,
   updateSessionMetadata
-} from "./chunk-UVN6AKIO.js";
+} from "./chunk-RJRG2VER.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-BBC46FN4.js";
+} from "./chunk-TS5XFQ2D.js";
 import {
   createContextStateMessage,
   createSessionStateMessage
@@ -143,4 +143,4 @@ export {
   needsNameGenerationCheck,
   applyGeneratedSessionName
 };
-//# sourceMappingURL=chunk-I7JVS7V5.js.map
+//# sourceMappingURL=chunk-2IZMUXMP.js.map

package/dist/{chunk-XSUQDB6R.js → chunk-3JU4NOQD.js}

@@ -2,7 +2,7 @@ import {
   createVerifierNudgeConfig,
   runBuilderTurn,
   runChatTurn
-} from "./chunk-6SYNGMU4.js";
+} from "./chunk-BG7QCFGG.js";
 import {
   TurnMetrics,
   agentExists,
@@ -37,7 +37,7 @@ import {
   setSkillEnabled,
   skillExists,
   spawnShellProcess
-} from "./chunk-EBQYRNNU.js";
+} from "./chunk-UCZSBKG7.js";
 import {
   getProject
 } from "./chunk-CMQCO27Y.js";
@@ -87,14 +87,14 @@ import {
   updateSessionProvider,
   updateSessionRunning,
   updateSessionSummary
-} from "./chunk-UVN6AKIO.js";
+} from "./chunk-RJRG2VER.js";
 import {
   initDatabase
 } from "./chunk-KIOUKC3Z.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-BBC46FN4.js";
+} from "./chunk-TS5XFQ2D.js";
 import {
   createChatErrorMessage,
   createChatMessageMessage,
@@ -5242,7 +5242,7 @@ function createTerminalRoutes() {
 }
 
 // src/constants.ts
-var VERSION = "1.6.77";
+var VERSION = "1.6.79";
 
 // src/server/index.ts
 var __dirname2 = dirname5(fileURLToPath4(import.meta.url));
@@ -5404,7 +5404,7 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-5RIXWI5Y.js");
+    const { getRecentUserPromptsForSession } = await import("./events-ND5GZBT2.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -5437,8 +5437,8 @@ async function createServerHandle(config) {
     res.status(201).json({ session });
   });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5RIXWI5Y.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-JNOUTI5Z.js");
+    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
@@ -5468,8 +5468,8 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5RIXWI5Y.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-JNOUTI5Z.js");
+    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -5506,8 +5506,8 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-5RIXWI5Y.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-JNOUTI5Z.js");
+    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -5559,13 +5559,13 @@ async function createServerHandle(config) {
     if (!callId || approved === void 0) {
       return res.status(400).json({ error: "callId and approved are required" });
     }
-    const { providePathConfirmation } = await import("./tools-QJ5K5IJP.js");
+    const { providePathConfirmation } = await import("./tools-W6OPDFQV.js");
     const result = providePathConfirmation(callId, approved, alwaysAllow);
     if (!result.found) {
       return res.status(404).json({ error: "No pending path confirmation with that ID" });
     }
-    const { getEventStore: getEventStore2 } = await import("./events-5RIXWI5Y.js");
-    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2, foldPendingConfirmations: foldPendingConfirmations2 } = await import("./folding-JNOUTI5Z.js");
+    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2, foldPendingConfirmations: foldPendingConfirmations2 } = await import("./folding-XIKR6AFM.js");
     const { createSessionStateMessage: createSessionStateMessage2 } = await import("./protocol-4CTV7OZC.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
@@ -5583,7 +5583,7 @@ async function createServerHandle(config) {
     if (!callId || !answer) {
       return res.status(400).json({ error: "callId and answer are required" });
     }
-    const { provideAnswer: provideAnswer2 } = await import("./tools-QJ5K5IJP.js");
+    const { provideAnswer: provideAnswer2 } = await import("./tools-W6OPDFQV.js");
     const found = provideAnswer2(callId, answer);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
@@ -5619,17 +5619,31 @@ async function createServerHandle(config) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-K2RDXBO6.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-QJ5K5IJP.js");
+    const { stopSessionExecution } = await import("./chat-handler-EKAO6CIB.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-W6OPDFQV.js");
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
     cancelQuestionsForSession(sessionId, "Session stopped by user");
     cancelPathConfirmationsForSession(sessionId, "Session stopped by user");
     sessionManager.clearMessageQueue(sessionId);
-    const eventStore = (await import("./events-5RIXWI5Y.js")).getEventStore();
+    const eventStore = (await import("./events-ND5GZBT2.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true });
   });
+  app.post("/api/sessions/:id/truncate", async (req, res) => {
+    const sessionId = req.params.id;
+    const session = sessionManager.getSession(sessionId);
+    if (!session) {
+      return res.status(404).json({ error: "Session not found" });
+    }
+    const { messageIndex } = req.body;
+    if (typeof messageIndex !== "number" || messageIndex < 0) {
+      return res.status(400).json({ error: "messageIndex must be a non-negative number" });
+    }
+    const { truncateSessionMessages } = await import("./events-ND5GZBT2.js");
+    truncateSessionMessages(sessionId, messageIndex);
+    res.json({ success: true });
+  });
   app.post("/api/sessions/:id/chat", async (req, res) => {
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
@@ -6094,7 +6108,7 @@ async function createServerHandle(config) {
     providerManager
   );
   const wss = wssExports.wss;
-  const { QueueProcessor } = await import("./processor-MZ3QIUED.js");
+  const { QueueProcessor } = await import("./processor-O35Q3EZT.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -6132,7 +6146,7 @@ async function createServerHandle(config) {
       logger.info("Shutting down...");
       void (async () => {
         await devServerManager.stopAll();
-        const { stopAllInspectProxies } = await import("./inspect-proxy-Y75AXMRX.js");
+        const { stopAllInspectProxies } = await import("./inspect-proxy-42ZXL2R5.js");
         stopAllInspectProxies();
         const { cleanupAllProcesses } = await import("./store-OQ45KONN.js");
         cleanupAllProcesses();
@@ -6169,4 +6183,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-XSUQDB6R.js.map
+//# sourceMappingURL=chunk-3JU4NOQD.js.map

package/dist/{chunk-6SYNGMU4.js → chunk-BG7QCFGG.js}

@@ -13,14 +13,14 @@ import {
   getToolRegistryForAgent,
   loadAllAgentsDefault,
   runTopLevelAgentLoop
-} from "./chunk-EBQYRNNU.js";
+} from "./chunk-UCZSBKG7.js";
 import {
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-UVN6AKIO.js";
+} from "./chunk-RJRG2VER.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-BBC46FN4.js";
+} from "./chunk-TS5XFQ2D.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -327,4 +327,4 @@ export {
   runBuilderTurn,
   runVerifierTurn
 };
-//# sourceMappingURL=chunk-6SYNGMU4.js.map
+//# sourceMappingURL=chunk-BG7QCFGG.js.map

package/dist/{chunk-XKIEDGQF.js → chunk-DL6ZILAF.js}

@@ -155,7 +155,6 @@ ${annotation || "(none)"}`;
         client.on("error", () => targetSocket.destroy());
         targetSocket.write(clientHead);
         targetSocket.pipe(client);
-        client.pipe(targetSocket);
         return;
       }
       targetSocket = net.connect(targetPort, targetHost);
@@ -294,4 +293,4 @@ export {
   startInspectProxy,
   stopAllInspectProxies
 };
-//# sourceMappingURL=chunk-XKIEDGQF.js.map
+//# sourceMappingURL=chunk-DL6ZILAF.js.map

package/dist/{chunk-OJBFC6ER.js → chunk-HOD7GVQ5.js}

@@ -155,7 +155,7 @@ async function runCli(options) {
       break;
     }
     case "service": {
-      const { runServiceCommand } = await import("./service-D6LC3CAM.js");
+      const { runServiceCommand } = await import("./service-TU4XSXYJ.js");
       const [, subcommand] = positionals;
       if (subcommand === "--help" || subcommand === "-h" || values.help) {
         runServiceCommand(mode, void 0);
@@ -190,7 +190,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-FTTLGRAO.js");
+      const { runServe } = await import("./serve-55GF3KJW.js");
       const serveOptions = { mode };
       if (values.port) serveOptions.port = parseInt(values.port);
       if (values["no-browser"] === true) serveOptions.openBrowser = false;
@@ -202,4 +202,4 @@ async function runCli(options) {
 export {
   runCli
 };
-//# sourceMappingURL=chunk-OJBFC6ER.js.map
+//# sourceMappingURL=chunk-HOD7GVQ5.js.map

package/dist/{chunk-UVN6AKIO.js → chunk-RJRG2VER.js}

@@ -9,7 +9,7 @@ import {
   foldSessionState,
   spreadOptionalMessageFields,
   stripPromptContextMessages
-} from "./chunk-BBC46FN4.js";
+} from "./chunk-TS5XFQ2D.js";
 import {
   getRuntimeConfig
 } from "./chunk-B5AP3RSV.js";
@@ -316,6 +316,19 @@ var EventStore = class {
     const result = this.db.prepare(`DELETE FROM events WHERE session_id = ? AND seq <= ?`).run(sessionId, upToSeq);
     return result.changes;
   }
+  /**
+   * Delete all events after a given sequence number (exclusive).
+   * Retains session.initialized (seq 1) and any events at/below fromSeq.
+   * Used when truncating session history.
+   *
+   * @param sessionId - The session ID
+   * @param fromSeq - Events with seq > fromSeq will be deleted
+   * @returns The number of events deleted
+   */
+  deleteEventsAfterSeq(sessionId, fromSeq) {
+    const result = this.db.prepare(`DELETE FROM events WHERE session_id = ? AND seq > ?`).run(sessionId, fromSeq);
+    return result.changes;
+  }
   /**
    * Clean up old events, keeping only:
    * - session.initialized event (seq 1)
@@ -1089,6 +1102,23 @@ function emitTurnSnapshot(sessionId, snapshot) {
     data: snapshot
   });
 }
+function truncateSessionMessages(sessionId, messageIndex) {
+  const eventStore = getEventStore();
+  const snapshotEvent = eventStore.getLatestSnapshot(sessionId);
+  if (!snapshotEvent) return;
+  const snapshot = snapshotEvent.data;
+  const messages = snapshot.messages;
+  const lastKept = messageIndex + 1;
+  if (lastKept < 1 || lastKept >= messages.length) return;
+  snapshot.messages = messages.slice(0, lastKept);
+  eventStore.deleteEventsAfterSeq(sessionId, snapshotEvent.seq);
+  eventStore.append(sessionId, {
+    type: "turn.snapshot",
+    data: snapshot
+  });
+  const removed = messages.length - messageIndex;
+  updateSessionMessageCount(sessionId, -removed);
+}
 function compactContext(sessionId, summary, beforeTokens) {
   const state = getSessionState(sessionId);
   if (!state) {
@@ -1218,7 +1248,8 @@ export {
   emitChatError,
   emitFormatRetry,
   emitTurnSnapshot,
+  truncateSessionMessages,
   compactContext,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-UVN6AKIO.js.map
+//# sourceMappingURL=chunk-RJRG2VER.js.map

package/dist/{chunk-BBC46FN4.js → chunk-TS5XFQ2D.js}

@@ -38,6 +38,9 @@ function updateMessageDone(msg, data) {
   if (data.partial) msg.partial = true;
   if (data.promptContext) msg.promptContext = data.promptContext;
   if (data.tokenCount !== void 0) msg.tokenCount = data.tokenCount;
+  if ("preparingToolCalls" in msg) {
+    msg.preparingToolCalls = [];
+  }
 }
 function applyEvents(initialMessages, events, options) {
   const messages = new Map(initialMessages.map((message) => [message.id, deepCloneMessage(message)]));
@@ -247,7 +250,7 @@ function cloneMessage(message) {
       }))
     } : {},
     ...message.segments ? { segments: [...message.segments] } : {},
-    ...message.preparingToolCalls ? { preparingToolCalls: [...message.preparingToolCalls] } : {}
+    ...message.preparingToolCalls && message.preparingToolCalls.length > 0 ? { preparingToolCalls: [...message.preparingToolCalls] } : {}
   };
 }
 function spreadOptionalMessageFields(message) {
@@ -267,6 +270,7 @@ function spreadOptionalMessageFields(message) {
     ...message.isCompactionSummary !== void 0 && { isCompactionSummary: message.isCompactionSummary },
     ...message.promptContext !== void 0 && { promptContext: message.promptContext },
     ...message.attachments !== void 0 && { attachments: message.attachments },
+    ...message.preparingToolCalls !== void 0 && message.preparingToolCalls.length > 0 && { preparingToolCalls: message.preparingToolCalls },
     ...message.metadata !== void 0 && { metadata: message.metadata }
   };
 }
@@ -292,11 +296,14 @@ function appendSnapshotMessageContext(result, message) {
     contextMsg.thinkingContent = message.thinkingContent;
   }
   if (message.toolCalls && message.toolCalls.length > 0) {
-    contextMsg.toolCalls = message.toolCalls.map((toolCall) => ({
-      id: toolCall.id,
-      name: toolCall.name,
-      arguments: toolCall.arguments
-    }));
+    const fulfilledToolCalls = message.toolCalls.filter((tc) => tc.result);
+    if (fulfilledToolCalls.length > 0) {
+      contextMsg.toolCalls = fulfilledToolCalls.map((toolCall) => ({
+        id: toolCall.id,
+        name: toolCall.name,
+        arguments: toolCall.arguments
+      }));
+    }
   }
   if (message.attachments !== void 0) {
     contextMsg.attachments = message.attachments;
@@ -346,6 +353,7 @@ function buildContextMessagesFromStoredEvents(events, windowId, options) {
   const includeVerifier = options?.includeVerifier ?? true;
   const messages = [];
   const messageMap = /* @__PURE__ */ new Map();
+  const fulfilledToolCallIds = /* @__PURE__ */ new Set();
   for (const event of events) {
     switch (event.type) {
       case "message.start": {
@@ -363,62 +371,89 @@ function buildContextMessagesFromStoredEvents(events, windowId, options) {
         break;
       }
       case "message.thinking": {
-        const data = event.data;
-        const msg = messageMap.get(data.messageId);
-        if (msg) {
-          msg.thinkingContent = (msg.thinkingContent ?? "") + data.content;
-        }
+        handleMessageThinking(messageMap, event.data);
         break;
       }
       case "message.delta": {
-        const data = event.data;
-        const msg = messageMap.get(data.messageId);
-        if (msg) {
-          msg.content += data.content;
-        }
+        handleMessageDelta(messageMap, event.data);
         break;
       }
       case "tool.call": {
-        const data = event.data;
-        const msg = messageMap.get(data.messageId);
-        if (msg) {
-          if (!msg.toolCalls) msg.toolCalls = [];
-          msg.toolCalls.push(data.toolCall);
-        }
+        handleToolCall(messageMap, event.data);
         break;
       }
       case "tool.result": {
-        const data = event.data;
-        if (messageMap.has(data.messageId)) {
-          const imageMeta = data.result.metadata;
-          const msg = {
-            id: `tool-${data.toolCallId}`,
-            role: "tool",
-            content: stripAnsi(
-              data.result.success ? data.result.output ?? "Success" : data.result.output ? `${data.result.output}
+        handleToolResult(
+          messages,
+          messageMap,
+          fulfilledToolCallIds,
+          event.data
+        );
+        break;
+      }
+    }
+  }
+  stripOrphanedToolCalls(messages, fulfilledToolCallIds);
+  return messages.map(({ id: _id, ...message }) => message);
+}
+function handleMessageThinking(messageMap, data) {
+  const msg = messageMap.get(data.messageId);
+  if (msg) {
+    msg.thinkingContent = (msg.thinkingContent ?? "") + data.content;
+  }
+}
+function handleMessageDelta(messageMap, data) {
+  const msg = messageMap.get(data.messageId);
+  if (msg) {
+    msg.content += data.content;
+  }
+}
+function handleToolCall(messageMap, data) {
+  const msg = messageMap.get(data.messageId);
+  if (msg) {
+    if (!msg.toolCalls) msg.toolCalls = [];
+    msg.toolCalls.push(data.toolCall);
+  }
+}
+function handleToolResult(messages, messageMap, fulfilled, data) {
+  fulfilled.add(data.toolCallId);
+  if (messageMap.has(data.messageId)) {
+    const imageMeta = data.result.metadata;
+    const toolMsg = {
+      id: `tool-${data.toolCallId}`,
+      role: "tool",
+      content: stripAnsi(
+        data.result.success ? data.result.output ?? "Success" : data.result.output ? `${data.result.output}
 
 Error: ${data.result.error}` : `Error: ${data.result.error}`
-            ),
-            toolCallId: data.toolCallId
-          };
-          if (imageMeta?.dataUrl && imageMeta?.mimeType?.startsWith("image/")) {
-            msg.attachments = [
-              {
-                id: crypto.randomUUID(),
-                filename: imageMeta.path ?? "image",
-                mimeType: imageMeta.mimeType,
-                size: imageMeta.size ?? 0,
-                data: imageMeta.dataUrl
-              }
-            ];
-          }
-          messages.push(msg);
+      ),
+      toolCallId: data.toolCallId
+    };
+    if (imageMeta?.dataUrl && imageMeta?.mimeType?.startsWith("image/")) {
+      toolMsg.attachments = [
+        {
+          id: crypto.randomUUID(),
+          filename: imageMeta.path ?? "image",
+          mimeType: imageMeta.mimeType,
+          size: imageMeta.size ?? 0,
+          data: imageMeta.dataUrl
         }
-        break;
+      ];
+    }
+    messages.push(toolMsg);
+  }
+}
+function stripOrphanedToolCalls(messages, fulfilledToolCallIds) {
+  for (const msg of messages) {
+    if (msg.role === "assistant" && msg.toolCalls) {
+      const fulfilled = msg.toolCalls.filter((tc) => fulfilledToolCallIds.has(tc.id));
+      if (fulfilled.length === 0) {
+        delete msg.toolCalls;
+      } else {
+        msg.toolCalls = fulfilled;
       }
     }
   }
-  return messages.map(({ id: _id, ...message }) => message);
 }
 function buildContextMessagesFromEventHistory(events, windowId, options) {
   const snapshotEvent = [...events].reverse().find((event) => event.type === "turn.snapshot");
@@ -824,6 +859,11 @@ export {
   spreadOptionalMessageFields,
   buildMessagesFromStoredEvents,
   buildContextMessagesFromStoredEvents,
+  handleMessageThinking,
+  handleMessageDelta,
+  handleToolCall,
+  handleToolResult,
+  stripOrphanedToolCalls,
   buildContextMessagesFromEventHistory,
   foldTurnEventsToSnapshotMessages,
   foldTurnEventsToSnapshotMessagesFromInitial,
@@ -840,4 +880,4 @@ export {
   getMessagesForWindow,
   buildContextMessagesFromMessages
 };
-//# sourceMappingURL=chunk-BBC46FN4.js.map
+//# sourceMappingURL=chunk-TS5XFQ2D.js.map