openfox 2.0.49 → 2.0.51

package/dist/{chat-handler-PLRNAAXW.js → chat-handler-K7M5ZPLO.js}

@@ -2,11 +2,11 @@ import {
   buildRunChatTurnParams,
   finalizeTurnCompletion,
   generateSessionNameForSession
-} from "./chunk-U62IKLKM.js";
+} from "./chunk-7OJTTOZ7.js";
 import {
   runChatTurn
-} from "./chunk-PTIF5OEJ.js";
-import "./chunk-GTY27MWS.js";
+} from "./chunk-4Y7WWB55.js";
+import "./chunk-AE5Q2JXO.js";
 import "./chunk-LBGHZLLH.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
@@ -22,8 +22,8 @@ import "./chunk-YQ3SOPBI.js";
 import "./chunk-55RWNJBT.js";
 import {
   getEventStore
-} from "./chunk-LB3E24TN.js";
-import "./chunk-EHYFYQXY.js";
+} from "./chunk-AIJE3RYH.js";
+import "./chunk-TMUBLQFC.js";
 import "./chunk-ZPIZLTWU.js";
 import "./chunk-J2GP3J3X.js";
 import "./chunk-Z4FMBCJO.js";
@@ -154,4 +154,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-PLRNAAXW.js.map
+//# sourceMappingURL=chat-handler-K7M5ZPLO.js.map

package/dist/{chunk-PTIF5OEJ.js → chunk-4Y7WWB55.js}

@@ -12,7 +12,7 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-GTY27MWS.js";
+} from "./chunk-AE5Q2JXO.js";
 import {
   TurnMetrics,
   WORKFLOW_KICKOFF_PROMPT,
@@ -26,10 +26,10 @@ import {
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -324,4 +324,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-PTIF5OEJ.js.map
+//# sourceMappingURL=chunk-4Y7WWB55.js.map

package/dist/{chunk-U62IKLKM.js → chunk-7OJTTOZ7.js}

@@ -9,11 +9,11 @@ import {
   getEventStore,
   getRuntimeConfig,
   updateSessionMetadata
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -180,4 +180,4 @@ export {
   buildRunChatTurnParams,
   generateSessionNameForSession
 };
-//# sourceMappingURL=chunk-U62IKLKM.js.map
+//# sourceMappingURL=chunk-7OJTTOZ7.js.map

package/dist/{chunk-GTY27MWS.js → chunk-AE5Q2JXO.js}

@@ -55,7 +55,7 @@ import {
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -63,8 +63,9 @@ import {
   handleMessageThinking,
   handleToolCall,
   handleToolResult,
+  reorderToolMessages,
   stripOrphanedToolCalls
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -2608,7 +2609,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens);
     if (!compacting) {
       const contextState2 = sessionManager.getContextState(sessionId);
-      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-VIN5YWQF.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-7OGA6OYM.js");
       if (shouldCompact(contextState2.currentTokens, contextState2.maxTokens, runtimeConfig.context.compactionThreshold)) {
         appendCompactionPrompt(sessionId, append);
         compacting = true;
@@ -3235,6 +3236,7 @@ function buildSubAgentContextMessages(events, scope) {
     }
   }
   stripOrphanedToolCalls(messages, fulfilledToolCallIds);
+  reorderToolMessages(messages);
   return messages.map(
     ({ id: _id, subAgentId: _sa, subAgentType: _st, contextWindowId: _cw, isCompactionSummary: _ics, ...rest }) => {
       const ctx = {
@@ -3479,7 +3481,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-CSRQDWRI.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-AALOAXXT.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4295,7 +4297,7 @@ function resolveAgentDef2(sessionManager, sessionId) {
 }
 async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-CSRQDWRI.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-AALOAXXT.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   const allAgents = await loadAllAgentsDefault();
@@ -4308,7 +4310,7 @@ async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
 async function computeSessionHash(sessionManager, sessionId) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
   const agentDef = await resolveAgentDef2(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-CSRQDWRI.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-AALOAXXT.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   return computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -4415,7 +4417,7 @@ var mcpConfigTool = createTool(
       await saveGlobalConfig(mcpConfigMode, { ...globalConfig, mcpServers: updated });
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-CSRQDWRI.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-AALOAXXT.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -5085,4 +5087,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-GTY27MWS.js.map
+//# sourceMappingURL=chunk-AE5Q2JXO.js.map

package/dist/{chunk-LB3E24TN.js → chunk-AIJE3RYH.js}

@@ -5,7 +5,7 @@ import {
   foldContextState,
   foldSessionState,
   spreadOptionalMessageFields
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import {
   getDatabase
 } from "./chunk-ZPIZLTWU.js";
@@ -1434,4 +1434,4 @@ export {
   truncateSessionMessages,
   getRecentUserPromptsForSession
 };
-//# sourceMappingURL=chunk-LB3E24TN.js.map
+//# sourceMappingURL=chunk-AIJE3RYH.js.map

package/dist/{chunk-2DKFKTLY.js → chunk-KFO535IO.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-55RWNJBT.js";
 import {
   getCurrentWindowMessageOptions
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 
 // src/server/context/compactor.ts
 function appendCompactionPrompt(sessionId, append) {
@@ -31,4 +31,4 @@ export {
   shouldCompact,
   getCompactionTarget
 };
-//# sourceMappingURL=chunk-2DKFKTLY.js.map
+//# sourceMappingURL=chunk-KFO535IO.js.map

package/dist/{chunk-Z3TD43AO.js → chunk-KS25ZHG3.js}

@@ -21,7 +21,7 @@ import {
   tokenFromPassword,
   verifyPassword,
   workflowExists
-} from "./chunk-CZPX6AVB.js";
+} from "./chunk-PSFMSGCC.js";
 import {
   agentExists,
   createToolRegistry,
@@ -61,7 +61,7 @@ import {
   setMcpTools,
   setNotifyMcpServersChanged,
   skillExists
-} from "./chunk-GTY27MWS.js";
+} from "./chunk-AE5Q2JXO.js";
 import {
   getPathSeparator,
   isAbsolutePath
@@ -109,7 +109,7 @@ import {
   updateSessionMetadata,
   updateSessionProvider,
   updateSessionRunning
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   initDatabase
 } from "./chunk-ZPIZLTWU.js";
@@ -3849,7 +3849,7 @@ import { Router as Router7 } from "express";
 import { spawn as spawn2 } from "child_process";
 
 // src/constants.ts
-var VERSION = "2.0.49";
+var VERSION = "2.0.51";
 
 // src/server/routes/auto-update.ts
 var updateInProgress = false;
@@ -4046,7 +4046,7 @@ async function createServerHandle(config4) {
       setMcpTools(mcpTools);
       logger.info("MCP tools registered", { count: mcpTools.length });
     }
-    const { signalMcpReady } = await import("./server-7XS77JZD.js");
+    const { signalMcpReady } = await import("./server-UB2YTFXP.js");
     signalMcpReady();
   });
   const app = express();
@@ -4204,7 +4204,7 @@ async function createServerHandle(config4) {
     res.json({ project });
   });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-S4EOKSYA.js");
+    const { getRecentUserPromptsForSession } = await import("./events-52XADT6Y.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -4237,9 +4237,9 @@ async function createServerHandle(config4) {
     res.status(201).json({ session });
   });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-S4EOKSYA.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-H5C6HS7O.js");
-    const { getPendingQuestionsForSession } = await import("./tools-CSRQDWRI.js");
+    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
+    const { getPendingQuestionsForSession } = await import("./tools-AALOAXXT.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
@@ -4258,8 +4258,8 @@ async function createServerHandle(config4) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-PLRNAAXW.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-CSRQDWRI.js");
+    const { stopSessionExecution } = await import("./chat-handler-K7M5ZPLO.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-AALOAXXT.js");
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
@@ -4278,8 +4278,8 @@ async function createServerHandle(config4) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-S4EOKSYA.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-H5C6HS7O.js");
+    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -4292,11 +4292,6 @@ async function createServerHandle(config4) {
     const provider = providerManager.getProviders().find((p) => p.id === providerId);
     const resolvedModel = model ?? provider?.models?.[0]?.id ?? "auto";
     sessionManager.setSessionProvider(sessionId, providerId, resolvedModel);
-    const { loadGlobalConfig, saveGlobalConfig, setDefaultModelSelection } = await import("./config-G5GNT4UT.js");
-    const globalConfig = await loadGlobalConfig(config4.mode ?? "production");
-    const updatedConfig = setDefaultModelSelection(globalConfig, providerId, resolvedModel);
-    await saveGlobalConfig(config4.mode ?? "production", updatedConfig);
-    config4.defaultModelSelection = updatedConfig.defaultModelSelection;
     const contextState = sessionManager.getContextState(sessionId);
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
@@ -4304,6 +4299,26 @@ async function createServerHandle(config4) {
     const updatedSession = sessionManager.getSession(sessionId);
     res.json({ session: updatedSession, messages, contextState });
   });
+  app.post("/api/default-model", async (req, res) => {
+    const { providerId, model } = req.body;
+    if (!providerId || !model) {
+      return res.status(400).json({ error: "providerId and model are required" });
+    }
+    const provider = providerManager.getProviders().find((p) => p.id === providerId);
+    if (!provider) {
+      return res.status(404).json({ error: "Provider not found" });
+    }
+    const result = await providerManager.setDefaultModelSelection(providerId, model);
+    if (!result.success) {
+      return res.status(500).json({ error: result.error ?? "Failed to set default model" });
+    }
+    const { loadGlobalConfig, saveGlobalConfig, setDefaultModelSelection } = await import("./config-G5GNT4UT.js");
+    const globalConfig = await loadGlobalConfig(config4.mode ?? "production");
+    const updatedConfig = setDefaultModelSelection(globalConfig, providerId, model);
+    await saveGlobalConfig(config4.mode ?? "production", updatedConfig);
+    config4.defaultModelSelection = updatedConfig.defaultModelSelection;
+    res.json({ success: true, defaultModelSelection: config4.defaultModelSelection });
+  });
   app.put("/api/sessions/:id/criteria", async (req, res) => {
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
@@ -4341,8 +4356,8 @@ async function createServerHandle(config4) {
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-S4EOKSYA.js");
-    const { buildMessagesFromStoredEvents } = await import("./folding-H5C6HS7O.js");
+    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
+    const { buildMessagesFromStoredEvents } = await import("./folding-2BGFLV5J.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
     if (!session) {
@@ -4398,15 +4413,15 @@ async function createServerHandle(config4) {
     if (!callId || approved === void 0) {
       return res.status(400).json({ error: "callId and approved are required" });
     }
-    const { providePathConfirmation } = await import("./tools-CSRQDWRI.js");
+    const { providePathConfirmation } = await import("./tools-AALOAXXT.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-S4EOKSYA.js");
-    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-H5C6HS7O.js");
+    const { getEventStore: getEventStore2 } = await import("./events-52XADT6Y.js");
+    const { buildMessagesFromStoredEvents, foldPendingConfirmations } = await import("./folding-2BGFLV5J.js");
     const { createSessionStateMessage } = await import("./protocol-CTNE3ANP.js");
-    const { getPendingQuestionsForSession } = await import("./tools-CSRQDWRI.js");
+    const { getPendingQuestionsForSession } = await import("./tools-AALOAXXT.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents(events);
@@ -4427,7 +4442,7 @@ async function createServerHandle(config4) {
     if (!skip && typeof answer !== "string") {
       return res.status(400).json({ error: "answer is required when not skipping" });
     }
-    const { provideAnswer } = await import("./tools-CSRQDWRI.js");
+    const { provideAnswer } = await import("./tools-AALOAXXT.js");
     const found = provideAnswer(callId, answer ?? "", skip ?? false);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
@@ -4463,7 +4478,7 @@ async function createServerHandle(config4) {
     if (sessionManager.isWarmedUp(sessionId)) {
       return res.json({ success: false, reason: "already_warmed" });
     }
-    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-YOAWKIB2.js");
+    const { runAgentTurn, TurnMetrics } = await import("./orchestrator-5BXIY2F7.js");
     runAgentTurn(
       {
         sessionManager,
@@ -4506,15 +4521,15 @@ async function createServerHandle(config4) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-PLRNAAXW.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-CSRQDWRI.js");
+    const { stopSessionExecution } = await import("./chat-handler-K7M5ZPLO.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-AALOAXXT.js");
     const queuedMessages = sessionManager.getQueueState(sessionId);
     sessionManager.clearMessageQueue(sessionId);
     stopSessionExecution(sessionId, sessionManager);
     abortSession(sessionId);
     cancelQuestionsForSession(sessionId, "Session stopped by user");
     cancelPathConfirmationsForSession(sessionId, "Session stopped by user");
-    const eventStore = (await import("./events-S4EOKSYA.js")).getEventStore();
+    const eventStore = (await import("./events-52XADT6Y.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true, queuedMessages });
   });
@@ -4528,7 +4543,7 @@ async function createServerHandle(config4) {
     if (typeof messageIndex !== "number" || messageIndex < 0) {
       return res.status(400).json({ error: "messageIndex must be a non-negative number" });
     }
-    const { truncateSessionMessages } = await import("./events-S4EOKSYA.js");
+    const { truncateSessionMessages } = await import("./events-52XADT6Y.js");
     truncateSessionMessages(sessionId, messageIndex);
     res.json({ success: true });
   });
@@ -4546,7 +4561,7 @@ async function createServerHandle(config4) {
     if (!msg) {
       return res.status(400).json({ error: "Message not found at this index" });
     }
-    const { truncateSessionMessages } = await import("./events-S4EOKSYA.js");
+    const { truncateSessionMessages } = await import("./events-52XADT6Y.js");
     truncateSessionMessages(sessionId, messageIndex - 1);
     sessionManager.queueMessage(sessionId, "asap", msg.content, msg.attachments, msg.messageKind);
     res.json({ success: true });
@@ -5003,7 +5018,7 @@ async function createServerHandle(config4) {
   });
   async function rebuildMcpTools() {
     const { createMcpTools: createMcpTools2 } = await import("./tool-adapter-MOGEI6TP.js");
-    const { setMcpTools: setMcpTools2 } = await import("./tools-CSRQDWRI.js");
+    const { setMcpTools: setMcpTools2 } = await import("./tools-AALOAXXT.js");
     const mcpTools = createMcpTools2(mcpManager);
     setMcpTools2(mcpTools);
   }
@@ -5311,7 +5326,7 @@ async function createServerHandle(config4) {
     const state = sessionManager.getContextState(sessionId);
     wssExports.broadcastForSession(sessionId, createContextStateMessage(state));
   });
-  const { QueueProcessor } = await import("./processor-U35UWS3W.js");
+  const { QueueProcessor } = await import("./processor-L4XHWQUH.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -5386,4 +5401,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-Z3TD43AO.js.map
+//# sourceMappingURL=chunk-KS25ZHG3.js.map

package/dist/{chunk-CZPX6AVB.js → chunk-PSFMSGCC.js}

@@ -2,7 +2,7 @@ import {
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-PTIF5OEJ.js";
+} from "./chunk-4Y7WWB55.js";
 import {
   applyDynamicContext,
   checkAborted,
@@ -16,7 +16,7 @@ import {
   loadAllAgentsDefault,
   saveItemToDir,
   spawnShellProcess
-} from "./chunk-GTY27MWS.js";
+} from "./chunk-AE5Q2JXO.js";
 import {
   getPlatformShell,
   onProcessEvent
@@ -40,7 +40,7 @@ import {
 } from "./chunk-EU3WWTFH.js";
 import {
   appendCompactionPrompt
-} from "./chunk-2DKFKTLY.js";
+} from "./chunk-KFO535IO.js";
 import {
   TurnMetrics,
   createMessageStartEvent
@@ -49,7 +49,7 @@ import {
   getCurrentContextWindowId,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   createLLMClient
 } from "./chunk-H5AC62SN.js";
@@ -1815,12 +1815,20 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         return;
       }
       send({ type: "ack", payload: {}, id: message.id });
+      const controller = new AbortController();
+      const existingController = activeAgents.get(sessionId);
+      if (existingController) {
+        logger.warn("Aborting existing agent before compaction", { sessionId });
+        existingController.abort();
+      }
+      activeAgents.set(sessionId, controller);
       appendCompactionPrompt(sessionId, (event) => getEventStore().append(sessionId, event));
       runChatTurn({
         sessionManager,
         sessionId,
         llmClient: llmForSession(sessionId),
         statsIdentity: statsForSession(sessionId),
+        signal: controller.signal,
         onMessage: (msg) => _broadcastForSession(sessionId, msg),
         initialCompacting: true
       }).then(() => {
@@ -1838,8 +1846,17 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         );
       }).finally(() => {
         try {
+          if (activeAgents.get(sessionId) === controller) {
+            activeAgents.delete(sessionId);
+          }
+          if (abortedSessions.has(sessionId)) {
+            abortedSessions.delete(sessionId);
+            sessionManager.clearMessageQueue(sessionId);
+          }
           sessionManager.setRunning(sessionId, false);
           sendForSession(sessionId, createSessionRunningMessage(false));
+          const contextState = sessionManager.getContextState(sessionId);
+          sendForSession(sessionId, createContextStateMessage(contextState));
         } catch {
         }
       });
@@ -2074,4 +2091,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-CZPX6AVB.js.map
+//# sourceMappingURL=chunk-PSFMSGCC.js.map

package/dist/{chunk-EHYFYQXY.js → chunk-TMUBLQFC.js}

@@ -360,6 +360,7 @@ function buildContextMessagesFromStoredEvents(events, windowId, options) {
     }
   }
   stripOrphanedToolCalls(messages, fulfilledToolCallIds);
+  reorderToolMessages(messages);
   return messages.map(({ id: _id, ...message }) => message);
 }
 function handleMessageThinking(messageMap, data) {
@@ -423,6 +424,38 @@ function stripOrphanedToolCalls(messages, fulfilledToolCallIds) {
     }
   }
 }
+function reorderToolMessages(messages) {
+  let i = 0;
+  while (i < messages.length) {
+    const msg = messages[i];
+    if (msg.role === "assistant" && msg.toolCalls && msg.toolCalls.length > 1) {
+      const orderMap = /* @__PURE__ */ new Map();
+      msg.toolCalls.forEach((tc, idx) => orderMap.set(tc.id, idx));
+      const toolStart = i + 1;
+      let toolEnd = toolStart;
+      while (toolEnd < messages.length && messages[toolEnd].role === "tool") {
+        toolEnd++;
+      }
+      if (toolEnd - toolStart > 1) {
+        const toolSlice = messages.slice(toolStart, toolEnd);
+        const allKnown = toolSlice.every((m) => m.toolCallId && orderMap.has(m.toolCallId));
+        if (allKnown) {
+          toolSlice.sort((a, b) => {
+            const aOrder = orderMap.get(a.toolCallId);
+            const bOrder = orderMap.get(b.toolCallId);
+            return aOrder - bOrder;
+          });
+          for (let j = 0; j < toolSlice.length; j++) {
+            messages[toolStart + j] = toolSlice[j];
+          }
+        }
+      }
+      i = toolEnd;
+    } else {
+      i++;
+    }
+  }
+}
 function buildContextMessagesFromEventHistory(events, windowId, options) {
   const snapshotEvent = [...events].reverse().find((event) => event.type === "turn.snapshot");
   if (!snapshotEvent) {
@@ -816,6 +849,7 @@ export {
   handleToolCall,
   handleToolResult,
   stripOrphanedToolCalls,
+  reorderToolMessages,
   buildContextMessagesFromEventHistory,
   foldTurnEventsToSnapshotMessages,
   foldTurnEventsToSnapshotMessagesFromInitial,
@@ -833,4 +867,4 @@ export {
   buildSnapshot,
   buildSnapshotFromSessionState
 };
-//# sourceMappingURL=chunk-EHYFYQXY.js.map
+//# sourceMappingURL=chunk-TMUBLQFC.js.map

package/dist/{chunk-JMQJIU64.js → chunk-ZUADUO54.js}

@@ -208,7 +208,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-USAKHQQN.js");
+      const { runServe } = await import("./serve-4D5N2R35.js");
       const serveOptions = { mode };
       if (values.port) serveOptions.port = parseInt(values.port);
       if (values["no-browser"] === true) serveOptions.openBrowser = false;
@@ -220,4 +220,4 @@ async function runCli(options) {
 export {
   runCli
 };
-//# sourceMappingURL=chunk-JMQJIU64.js.map
+//# sourceMappingURL=chunk-ZUADUO54.js.map

package/dist/cli/dev.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-JMQJIU64.js";
+} from "../chunk-ZUADUO54.js";
 import "../chunk-XY3LESVZ.js";
 import {
   logger

package/dist/cli/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-JMQJIU64.js";
+} from "../chunk-ZUADUO54.js";
 import "../chunk-XY3LESVZ.js";
 import {
   logger

package/dist/{compactor-VIN5YWQF.js → compactor-7OGA6OYM.js}

@@ -2,10 +2,10 @@ import {
   appendCompactionPrompt,
   getCompactionTarget,
   shouldCompact
-} from "./chunk-2DKFKTLY.js";
+} from "./chunk-KFO535IO.js";
 import "./chunk-55RWNJBT.js";
-import "./chunk-LB3E24TN.js";
-import "./chunk-EHYFYQXY.js";
+import "./chunk-AIJE3RYH.js";
+import "./chunk-TMUBLQFC.js";
 import "./chunk-ZPIZLTWU.js";
 import "./chunk-J2GP3J3X.js";
 import "./chunk-Z4FMBCJO.js";
@@ -18,4 +18,4 @@ export {
   getCompactionTarget,
   shouldCompact
 };
-//# sourceMappingURL=compactor-VIN5YWQF.js.map
+//# sourceMappingURL=compactor-7OGA6OYM.js.map

package/dist/{events-S4EOKSYA.js → events-52XADT6Y.js}

@@ -38,7 +38,7 @@ import {
   isStoredEvent,
   isTurnEvent,
   truncateSessionMessages
-} from "./chunk-LB3E24TN.js";
+} from "./chunk-AIJE3RYH.js";
 import {
   buildContextMessagesFromEventHistory,
   buildContextMessagesFromMessages,
@@ -55,7 +55,7 @@ import {
   foldTodos,
   foldTurnEventsToSnapshotMessages,
   getMessagesForWindow
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import "./chunk-ZPIZLTWU.js";
 import "./chunk-K44MW7JJ.js";
 import "./chunk-5WRI5ZAA.js";
@@ -115,4 +115,4 @@ export {
   isTurnEvent,
   truncateSessionMessages
 };
-//# sourceMappingURL=events-S4EOKSYA.js.map
+//# sourceMappingURL=events-52XADT6Y.js.map

package/dist/{folding-H5C6HS7O.js → folding-2BGFLV5J.js}

@@ -21,9 +21,10 @@ import {
   handleMessageThinking,
   handleToolCall,
   handleToolResult,
+  reorderToolMessages,
   spreadOptionalMessageFields,
   stripOrphanedToolCalls
-} from "./chunk-EHYFYQXY.js";
+} from "./chunk-TMUBLQFC.js";
 import "./chunk-5WRI5ZAA.js";
 export {
   buildContextMessagesFromEventHistory,
@@ -48,7 +49,8 @@ export {
   handleMessageThinking,
   handleToolCall,
   handleToolResult,
+  reorderToolMessages,
   spreadOptionalMessageFields,
   stripOrphanedToolCalls
 };
-//# sourceMappingURL=folding-H5C6HS7O.js.map
+//# sourceMappingURL=folding-2BGFLV5J.js.map