openfox 1.6.79 → 1.6.81

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

@@ -2,17 +2,17 @@ import {
   maybeAutoCompactContext,
   performManualContextCompaction,
   resolveCompactionStatsIdentity
-} from "./chunk-UCZSBKG7.js";
+} from "./chunk-42TLGPX4.js";
 import "./chunk-OXI26S7U.js";
 import "./chunk-CMQCO27Y.js";
 import "./chunk-DL6ZILAF.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
 import "./chunk-CUDAT6SS.js";
-import "./chunk-RJRG2VER.js";
+import "./chunk-LHKXWUEK.js";
 import "./chunk-KIOUKC3Z.js";
 import "./chunk-TS5XFQ2D.js";
-import "./chunk-STYHKCG7.js";
+import "./chunk-UF6D2IPO.js";
 import "./chunk-BJYPTN5S.js";
 import "./chunk-NDJ6FKSP.js";
 import "./chunk-CQGTEGKL.js";
@@ -24,4 +24,4 @@ export {
   performManualContextCompaction,
   resolveCompactionStatsIdentity
 };
-//# sourceMappingURL=auto-compaction-KTA6H4HP.js.map
+//# sourceMappingURL=auto-compaction-JSO3ZWSE.js.map

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

@@ -5,11 +5,11 @@ import {
   generateSessionName,
   getSessionMessageCount,
   needsNameGenerationCheck
-} from "./chunk-2IZMUXMP.js";
+} from "./chunk-A5W6JUYZ.js";
 import {
   runChatTurn
-} from "./chunk-BG7QCFGG.js";
-import "./chunk-UCZSBKG7.js";
+} from "./chunk-SJHWJAJA.js";
+import "./chunk-42TLGPX4.js";
 import "./chunk-OXI26S7U.js";
 import "./chunk-CMQCO27Y.js";
 import "./chunk-DL6ZILAF.js";
@@ -18,14 +18,14 @@ import "./chunk-VRGRAQDG.js";
 import "./chunk-CUDAT6SS.js";
 import {
   getEventStore
-} from "./chunk-RJRG2VER.js";
+} from "./chunk-LHKXWUEK.js";
 import "./chunk-KIOUKC3Z.js";
 import "./chunk-TS5XFQ2D.js";
 import {
   createChatMessageMessage,
   createPhaseChangedMessage,
   createSessionRunningMessage
-} from "./chunk-STYHKCG7.js";
+} from "./chunk-UF6D2IPO.js";
 import "./chunk-BJYPTN5S.js";
 import "./chunk-NDJ6FKSP.js";
 import "./chunk-CQGTEGKL.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-KTA6H4HP.js");
+    const { maybeAutoCompactContext } = await import("./auto-compaction-JSO3ZWSE.js");
     await maybeAutoCompactContext({
       sessionManager,
       sessionId,
@@ -113,8 +113,11 @@ async function startChatSession(sessionId, content, deps, options) {
     if (activeAgents.get(sessionId) === controller) {
       activeAgents.delete(sessionId);
     }
-    sessionManager.setRunning(sessionId, false);
-    broadcastForSession(sessionId, createSessionRunningMessage(false));
+    try {
+      sessionManager.setRunning(sessionId, false);
+      broadcastForSession(sessionId, createSessionRunningMessage(false));
+    } catch {
+    }
     finalizeTurnCompletion(sessionId, sessionManager, broadcastForSession);
     throw error;
   }
@@ -172,4 +175,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-EKAO6CIB.js.map
+//# sourceMappingURL=chat-handler-RN662HKM.js.map

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

@@ -2,7 +2,7 @@ import {
   createVerifierNudgeConfig,
   runBuilderTurn,
   runChatTurn
-} from "./chunk-BG7QCFGG.js";
+} from "./chunk-SJHWJAJA.js";
 import {
   TurnMetrics,
   agentExists,
@@ -37,7 +37,7 @@ import {
   setSkillEnabled,
   skillExists,
   spawnShellProcess
-} from "./chunk-UCZSBKG7.js";
+} from "./chunk-42TLGPX4.js";
 import {
   getProject
 } from "./chunk-CMQCO27Y.js";
@@ -87,7 +87,7 @@ import {
   updateSessionProvider,
   updateSessionRunning,
   updateSessionSummary
-} from "./chunk-RJRG2VER.js";
+} from "./chunk-LHKXWUEK.js";
 import {
   initDatabase
 } from "./chunk-KIOUKC3Z.js";
@@ -108,7 +108,7 @@ import {
   parseClientMessage,
   serializeServerMessage,
   storedEventToServerMessage
-} from "./chunk-STYHKCG7.js";
+} from "./chunk-UF6D2IPO.js";
 import {
   EventEmitter,
   provideAnswer
@@ -2287,17 +2287,6 @@ function resolveStatsIdentity(llmClient, getActiveProvider) {
     model
   };
 }
-function buildSessionState(sessionManager, sessionId) {
-  const session = sessionManager.getSession(sessionId);
-  if (!session) {
-    return { session: null, messages: [], pendingConfirmations: [] };
-  }
-  const eventStore = getEventStore();
-  const events = eventStore.getEvents(sessionId);
-  const messages = events.length > 0 ? buildMessagesFromStoredEvents(events) : [];
-  const pendingConfirmations = foldPendingConfirmations(events);
-  return { session, messages, pendingConfirmations };
-}
 function addUserMessageAndBroadcast(sessionManager, sessionId, message, broadcastFn) {
   const userMessage = sessionManager.addMessage(sessionId, {
     role: "user",
@@ -2342,6 +2331,7 @@ function processQueueAndRestartTurn(sessionManager, sessionId, drainFn, queueMod
   return true;
 }
 var activeAgents = /* @__PURE__ */ new Map();
+var MAX_SEND_QUEUE_SIZE = 1e3;
 function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvider, sessionManager, providerManager) {
   const wss = new WebSocketServer({ server: httpServer });
   const clients = /* @__PURE__ */ new Map();
@@ -2408,6 +2398,37 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
       }
     }
   };
+  function enqueueSend(client, data, seq) {
+    if (client.sendQueue.length >= MAX_SEND_QUEUE_SIZE) {
+      logger.warn("WebSocket send queue full, dropping message", {
+        queueSize: client.sendQueue.length,
+        sessionId: client.activeSessionId
+      });
+      return;
+    }
+    client.sendQueue.push({ data, seq });
+    processSendQueue(client);
+  }
+  function processSendQueue(client) {
+    if (client.isSending || client.sendQueue.length === 0) {
+      return;
+    }
+    client.isSending = true;
+    const item = client.sendQueue.shift();
+    if (client.ws.readyState === WebSocket2.OPEN) {
+      client.ws.send(item.data, (err) => {
+        if (err) {
+          logger.debug("WebSocket send error", { error: err });
+        }
+        client.isSending = false;
+        client.lastSentSeq = item.seq;
+        processSendQueue(client);
+      });
+    } else {
+      client.isSending = false;
+      processSendQueue(client);
+    }
+  }
   const llmForSession = (sessionId) => getSessionLLMClient?.(sessionId) ?? getLLMClient();
   const statsForSession = (sessionId) => getSessionStatsIdentity?.(sessionId) ?? resolveStatsIdentity(getLLMClient(), getActiveProvider);
   function cleanupAfterTurn(sessionId, controller, sendFn, setRunningOnEarlyReturn) {
@@ -2464,47 +2485,12 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
       cleanupAfterTurn(sessionId, controller, broadcastForSession, false);
     });
   }
-  sessionManager.subscribe((event) => {
-    const sessionId = "sessionId" in event ? event.sessionId : "session" in event ? event.session.id : null;
-    if (!sessionId) return;
-    for (const [ws, client] of clients) {
-      if (ws.readyState !== WebSocket2.OPEN) continue;
-      if (event.type === "session_created") {
-        const session = sessionManager.getSession(sessionId);
-        if (session) {
-          const { messages, pendingConfirmations } = buildSessionState(sessionManager, sessionId);
-          ws.send(
-            serializeServerMessage({
-              ...createSessionStateMessage(session, messages, pendingConfirmations),
-              sessionId
-            })
-          );
-        }
-        continue;
-      }
-      if (isSubscribedToSession(client, sessionId)) {
-        if (event.type === "session_updated") {
-          const { session, messages, pendingConfirmations } = buildSessionState(sessionManager, sessionId);
-          if (session) {
-            ws.send(
-              serializeServerMessage({
-                ...createSessionStateMessage(session, messages, pendingConfirmations),
-                sessionId
-              })
-            );
-          }
-        }
-        if (event.type === "running_changed") {
-          ws.send(serializeServerMessage({ ...createSessionRunningMessage(event.isRunning), sessionId }));
-        }
-      }
-    }
-  });
   const broadcastAll = (msg) => {
     const serialized = serializeServerMessage(msg);
-    for (const [clientWs] of clients) {
+    for (const [clientWs, client] of clients) {
       if (clientWs.readyState === WebSocket2.OPEN) {
-        clientWs.send(serialized);
+        const seq = client.lastSentSeq + 1;
+        enqueueSend(client, serialized, seq);
       }
     }
   };
@@ -2532,7 +2518,8 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
     for (const [clientWs, client] of clients) {
       if (client.activeSessionId === sessionId) {
         if (clientWs.readyState === WebSocket2.OPEN) {
-          clientWs.send(serializeServerMessage(msg));
+          const seq = client.lastSentSeq + 1;
+          enqueueSend(client, serializeServerMessage(msg), seq);
         }
       }
     }
@@ -2550,7 +2537,14 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
       }
     }
     logger.debug("WebSocket client connected");
-    clients.set(ws, { ws, activeSessionId: null, globalSubscription: null });
+    clients.set(ws, {
+      ws,
+      activeSessionId: null,
+      globalSubscription: null,
+      sendQueue: [],
+      isSending: false,
+      lastSentSeq: 0
+    });
     const eventStore = getEventStore();
     const { iterator: globalIterator, unsubscribe: globalUnsubscribe } = eventStore.subscribeAll();
     clients.get(ws).globalSubscription = globalUnsubscribe;
@@ -2560,7 +2554,12 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
           if (ws.readyState !== WebSocket2.OPEN) break;
           const serverMsg = storedEventToServerMessage(storedEvent);
           if (serverMsg) {
-            ws.send(serializeServerMessage({ ...serverMsg, seq: storedEvent.seq, sessionId: storedEvent.sessionId }));
+            const client = clients.get(ws);
+            enqueueSend(
+              client,
+              serializeServerMessage({ ...serverMsg, seq: storedEvent.seq, sessionId: storedEvent.sessionId }),
+              storedEvent.seq
+            );
           }
         }
       } catch (error) {
@@ -2570,7 +2569,13 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
     ws.on("message", async (data) => {
       const message = parseClientMessage(data.toString());
       if (!message) {
-        ws.send(serializeServerMessage(createErrorMessage("INVALID_MESSAGE", "Invalid message format")));
+        const client2 = clients.get(ws);
+        const seq = client2.lastSentSeq + 1;
+        enqueueSend(
+          client2,
+          serializeServerMessage(createErrorMessage("INVALID_MESSAGE", "Invalid message format")),
+          seq
+        );
         return;
       }
       if (message.type.startsWith("terminal.")) {
@@ -2593,14 +2598,19 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
           llmForSession,
           statsForSession,
           startTurnWithCompletionChain,
-          cleanupAfterTurn
+          cleanupAfterTurn,
+          enqueueSend
         );
       } catch (error) {
         logger.error("Error handling client message", { error, type: message.type });
-        ws.send(
+        const client2 = clients.get(ws);
+        const seq = client2.lastSentSeq + 1;
+        enqueueSend(
+          client2,
           serializeServerMessage(
             createErrorMessage("INTERNAL_ERROR", error instanceof Error ? error.message : "Unknown error", message.id)
-          )
+          ),
+          seq
         );
       }
     });
@@ -2611,6 +2621,10 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
         client.globalSubscription();
       }
       unsubscribeAllFromTerminal(ws);
+      if (client) {
+        client.sendQueue = [];
+        client.isSending = false;
+      }
       clients.delete(ws);
     });
     ws.on("error", (error) => {
@@ -2632,10 +2646,11 @@ function createWebSocketServer(httpServer, config, getLLMClient, getActiveProvid
     broadcastForSession
   };
 }
-async function handleClientMessage(ws, client, message, _getLLMClient, _getActiveProvider, sessionManager, _broadcastForSession, _providerManager, _getSessionLLMClient, _getSessionStatsIdentity, llmForSession, statsForSession, _startTurnWithCompletionChain, cleanupAfterTurn) {
+async function handleClientMessage(ws, client, message, _getLLMClient, _getActiveProvider, sessionManager, _broadcastForSession, _providerManager, _getSessionLLMClient, _getSessionStatsIdentity, llmForSession, statsForSession, _startTurnWithCompletionChain, cleanupAfterTurn, enqueueSendFn) {
   const send = (msg) => {
     if (ws.readyState === WebSocket2.OPEN) {
-      ws.send(serializeServerMessage(msg));
+      const seq = client.lastSentSeq + 1;
+      enqueueSendFn(client, serializeServerMessage(msg), seq);
     }
   };
   const sendForSession = (sessionId, msg) => {
@@ -5242,7 +5257,7 @@ function createTerminalRoutes() {
 }
 
 // src/constants.ts
-var VERSION = "1.6.79";
+var VERSION = "1.6.81";
 
 // src/server/index.ts
 var __dirname2 = dirname5(fileURLToPath4(import.meta.url));
@@ -5370,9 +5385,49 @@ async function createServerHandle(config) {
     if (!name || !workdir) {
       return res.status(400).json({ error: "name and workdir are required" });
     }
-    const { createDirectoryWithGit } = await import("./project-creator-VD7MLOWE.js");
-    const project = await createDirectoryWithGit(name, workdir);
-    res.status(201).json({ project });
+    const { createDirectoryWithGit } = await import("./project-creator-GPOIXKX4.js");
+    try {
+      const project = await createDirectoryWithGit(name, workdir);
+      res.status(201).json({ project });
+    } catch (err) {
+      const eaccError = err;
+      return res.status(403).json({
+        error: eaccError.message || "Unknown error",
+        code: eaccError.code || "UNKNOWN",
+        path: workdir
+      });
+    }
+  });
+  app.post("/api/projects/check-permissions", async (req, res) => {
+    const { path: targetPath } = req.body;
+    if (!targetPath) {
+      return res.status(400).json({ error: "path is required" });
+    }
+    const { checkPermissions } = await import("./permissions-Z2IIV2V7.js");
+    const result = await checkPermissions(targetPath);
+    if (result.success) {
+      res.json(result);
+    } else {
+      const status = result.status ?? 500;
+      res.status(status).json({ error: result.error });
+    }
+  });
+  app.post("/api/projects/fix-permissions", async (req, res) => {
+    const { path: targetPath, action } = req.body;
+    if (!targetPath) {
+      return res.status(400).json({ error: "path is required" });
+    }
+    if (!["group", "ownership", "join_group", "join_group_and_group"].includes(action)) {
+      return res.status(400).json({ error: 'action must be "group", "ownership", "join_group", or "join_group_and_group"' });
+    }
+    const { fixPermissions } = await import("./permissions-Z2IIV2V7.js");
+    const result = await fixPermissions(targetPath, action);
+    if (result.success) {
+      res.json(result);
+    } else {
+      const status = result.status ?? 500;
+      res.status(status).json(result);
+    }
   });
   app.get("/api/projects/:id", async (req, res) => {
     const { getProject: getProject2 } = await import("./projects-XLMSDFTQ.js");
@@ -5404,7 +5459,7 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.get("/api/sessions", async (req, res) => {
-    const { getRecentUserPromptsForSession } = await import("./events-ND5GZBT2.js");
+    const { getRecentUserPromptsForSession } = await import("./events-QDUOJQML.js");
     const projectId = req.query["projectId"];
     const limit = Math.min(parseInt(req.query["limit"]) || 20, 100);
     const offset = parseInt(req.query["offset"]) || 0;
@@ -5437,7 +5492,7 @@ async function createServerHandle(config) {
     res.status(201).json({ session });
   });
   app.get("/api/sessions/:id", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-QDUOJQML.js");
     const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const session = sessionManager.getSession(req.params.id);
     if (!session) {
@@ -5468,7 +5523,7 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.post("/api/sessions/:id/provider", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-QDUOJQML.js");
     const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
@@ -5506,7 +5561,7 @@ async function createServerHandle(config) {
     res.json({ success: true });
   });
   app.put("/api/sessions/:id/mode", async (req, res) => {
-    const { getEventStore: getEventStore2 } = await import("./events-ND5GZBT2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-QDUOJQML.js");
     const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2 } = await import("./folding-XIKR6AFM.js");
     const sessionId = req.params.id;
     const session = sessionManager.getSession(sessionId);
@@ -5559,14 +5614,14 @@ 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-W6OPDFQV.js");
+    const { providePathConfirmation } = await import("./tools-Y3S6BHBZ.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-ND5GZBT2.js");
+    const { getEventStore: getEventStore2 } = await import("./events-QDUOJQML.js");
     const { buildMessagesFromStoredEvents: buildMessagesFromStoredEvents2, foldPendingConfirmations: foldPendingConfirmations2 } = await import("./folding-XIKR6AFM.js");
-    const { createSessionStateMessage: createSessionStateMessage2 } = await import("./protocol-4CTV7OZC.js");
+    const { createSessionStateMessage: createSessionStateMessage2 } = await import("./protocol-IXFNYZEX.js");
     const eventStore = getEventStore2();
     const events = eventStore.getEvents(sessionId);
     const messages = buildMessagesFromStoredEvents2(events);
@@ -5583,7 +5638,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-W6OPDFQV.js");
+    const { provideAnswer: provideAnswer2 } = await import("./tools-Y3S6BHBZ.js");
     const found = provideAnswer2(callId, answer);
     if (!found) {
       return res.status(404).json({ error: "No pending question with that ID" });
@@ -5619,14 +5674,14 @@ async function createServerHandle(config) {
     if (!session) {
       return res.status(404).json({ error: "Session not found" });
     }
-    const { stopSessionExecution } = await import("./chat-handler-EKAO6CIB.js");
-    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-W6OPDFQV.js");
+    const { stopSessionExecution } = await import("./chat-handler-RN662HKM.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-Y3S6BHBZ.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-ND5GZBT2.js")).getEventStore();
+    const eventStore = (await import("./events-QDUOJQML.js")).getEventStore();
     eventStore.append(sessionId, { type: "running.changed", data: { isRunning: false } });
     res.json({ success: true });
   });
@@ -5640,7 +5695,7 @@ async function createServerHandle(config) {
     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");
+    const { truncateSessionMessages } = await import("./events-QDUOJQML.js");
     truncateSessionMessages(sessionId, messageIndex);
     res.json({ success: true });
   });
@@ -6108,7 +6163,7 @@ async function createServerHandle(config) {
     providerManager
   );
   const wss = wssExports.wss;
-  const { QueueProcessor } = await import("./processor-O35Q3EZT.js");
+  const { QueueProcessor } = await import("./processor-3A32D5MI.js");
   const queueProcessor = new QueueProcessor({
     sessionManager,
     providerManager,
@@ -6183,4 +6238,4 @@ export {
   createServerHandle,
   createServer
 };
-//# sourceMappingURL=chunk-3JU4NOQD.js.map
+//# sourceMappingURL=chunk-2MHHSLNY.js.map

package/dist/{chunk-UCZSBKG7.js → chunk-42TLGPX4.js}

@@ -32,7 +32,7 @@ import {
 import {
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-RJRG2VER.js";
+} from "./chunk-LHKXWUEK.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -50,7 +50,7 @@ import {
   createChatToolOutputMessage,
   createChatVisionFallbackMessage,
   createQueueStateMessage
-} from "./chunk-STYHKCG7.js";
+} from "./chunk-UF6D2IPO.js";
 import {
   AskUserInterrupt,
   askUserTool
@@ -2946,12 +2946,17 @@ async function executeToolBatch(assistantMsgId, toolCalls, ctx) {
   let criteriaChanged = false;
   let returnValueContent;
   let returnValueResult;
-  let session = ctx.sessionManager.requireSession(ctx.sessionId);
+  const session = ctx.sessionManager.requireSession(ctx.sessionId);
+  if (ctx.signal?.aborted) {
+    throw new Error("Aborted");
+  }
   for (const toolCall of toolCalls) {
+    eventStore.append(ctx.sessionId, createToolCallEvent(assistantMsgId, toolCall));
+  }
+  const executeTool = async (toolCall, index) => {
     if (ctx.signal?.aborted) {
       throw new Error("Aborted");
     }
-    eventStore.append(ctx.sessionId, createToolCallEvent(assistantMsgId, toolCall));
     if (toolCall.parseError) {
       const toolResult2 = {
         success: false,
@@ -2960,14 +2965,14 @@ async function executeToolBatch(assistantMsgId, toolCalls, ctx) {
         truncated: false
       };
       ctx.turnMetrics.addToolTime(toolResult2.durationMs);
-      eventStore.append(ctx.sessionId, createToolResultEvent(assistantMsgId, toolCall.id, toolResult2));
-      toolMessages.push({
-        role: "tool",
+      const event = createToolResultEvent(assistantMsgId, toolCall.id, toolResult2);
+      return {
+        toolCall,
+        toolResult: toolResult2,
         content: `Error: ${toolResult2.error}`,
-        source: "history",
-        toolCallId: toolCall.id
-      });
-      continue;
+        index,
+        event
+      };
     }
     const onProgress = ctx.onMessage ? createToolProgressHandler(assistantMsgId, toolCall.id, ctx.onMessage) : void 0;
     const toolContext = {
@@ -3018,28 +3023,40 @@ async function executeToolBatch(assistantMsgId, toolCalls, ctx) {
       }
     }
     ctx.turnMetrics.addToolTime(toolResult.durationMs);
-    eventStore.append(ctx.sessionId, createToolResultEvent(assistantMsgId, toolCall.id, toolResult));
     ctx.onToolExecuted?.(toolCall, toolResult);
     if (toolCall.name === "return_value" && !toolCall.parseError) {
       returnValueContent = toolCall.arguments["content"];
       returnValueResult = toolCall.arguments["result"];
     }
-    toolMessages.push({
-      role: "tool",
-      content: stripAnsi(
-        toolResult.success ? toolResult.output ?? "Success" : toolResult.output ? `${toolResult.output}
+    const content = stripAnsi(
+      toolResult.success ? toolResult.output ?? "Success" : toolResult.output ? `${toolResult.output}
 
 Error: ${toolResult.error}` : `Error: ${toolResult.error}`
-      ),
+    );
+    return {
+      toolCall,
+      toolResult,
+      content,
+      index,
+      event: createToolResultEvent(assistantMsgId, toolCall.id, toolResult)
+    };
+  };
+  const executionPromises = toolCalls.map((toolCall, index) => executeTool(toolCall, index));
+  const results = await Promise.all(executionPromises);
+  results.sort((a, b) => a.index - b.index);
+  for (const result of results) {
+    eventStore.append(ctx.sessionId, result.event);
+    toolMessages.push({
+      role: "tool",
+      content: result.content,
       source: "history",
-      toolCallId: toolCall.id
+      toolCallId: result.toolCall.id
     });
-    const updatedSession = ctx.sessionManager.requireSession(ctx.sessionId);
-    if (JSON.stringify(updatedSession.criteria) !== JSON.stringify(session.criteria)) {
-      eventStore.append(ctx.sessionId, { type: "criteria.set", data: { criteria: updatedSession.criteria } });
-      session = updatedSession;
-      criteriaChanged = true;
-    }
+  }
+  const updatedSession = ctx.sessionManager.requireSession(ctx.sessionId);
+  if (JSON.stringify(updatedSession.criteria) !== JSON.stringify(session.criteria)) {
+    eventStore.append(ctx.sessionId, { type: "criteria.set", data: { criteria: updatedSession.criteria } });
+    criteriaChanged = true;
   }
   return { toolMessages, criteriaChanged, returnValueContent, returnValueResult };
 }
@@ -3684,7 +3701,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-W6OPDFQV.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-Y3S6BHBZ.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4873,4 +4890,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-UCZSBKG7.js.map
+//# sourceMappingURL=chunk-42TLGPX4.js.map

package/dist/{chunk-HOD7GVQ5.js → chunk-6FOC2GAY.js}

@@ -190,7 +190,7 @@ async function runCli(options) {
       if (!configExists) {
         await runNetworkSetup(mode);
       }
-      const { runServe } = await import("./serve-55GF3KJW.js");
+      const { runServe } = await import("./serve-D4NO4GJF.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-HOD7GVQ5.js.map
+//# sourceMappingURL=chunk-6FOC2GAY.js.map

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

@@ -1,7 +1,7 @@
 import {
   getEventStore,
   updateSessionMetadata
-} from "./chunk-RJRG2VER.js";
+} from "./chunk-LHKXWUEK.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
@@ -9,7 +9,7 @@ import {
 import {
   createContextStateMessage,
   createSessionStateMessage
-} from "./chunk-STYHKCG7.js";
+} from "./chunk-UF6D2IPO.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -143,4 +143,4 @@ export {
   needsNameGenerationCheck,
   applyGeneratedSessionName
 };
-//# sourceMappingURL=chunk-2IZMUXMP.js.map
+//# sourceMappingURL=chunk-A5W6JUYZ.js.map