openfox 1.6.76 → 1.6.78

package/dist/{chunk-H5EICXF3.js → chunk-GLVNO4DS.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-CMQCO27Y.js";
 import {
   startInspectProxy
-} from "./chunk-XKIEDGQF.js";
+} from "./chunk-DL6ZILAF.js";
 import {
   createProcess,
   getPlatformShell,
@@ -30,10 +30,18 @@ import {
   streamWithSegments
 } from "./chunk-CUDAT6SS.js";
 import {
-  getContextMessages,
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-5ZD3GZTK.js";
+} from "./chunk-RJRG2VER.js";
+import {
+  buildContextMessagesFromEventHistory,
+  foldContextState,
+  handleMessageDelta,
+  handleMessageThinking,
+  handleToolCall,
+  handleToolResult,
+  stripOrphanedToolCalls
+} from "./chunk-TS5XFQ2D.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
@@ -672,13 +680,15 @@ async function* streamLLMPure(options) {
               }
             };
           } else if (seenToolIndices.has(value.index) && value.arguments) {
-            const accumulatedArgs = toolArgs.get(value.index);
             const name = toolNames.get(value.index);
-            if (accumulatedArgs && name) {
-              yield {
-                type: "tool.preparing",
-                data: { messageId, index: value.index, name, arguments: accumulatedArgs }
-              };
+            if (name === "run_command" || name === "return_value") {
+              const accumulatedArgs = toolArgs.get(value.index);
+              if (accumulatedArgs) {
+                yield {
+                  type: "tool.preparing",
+                  data: { messageId, index: value.index, name, arguments: accumulatedArgs }
+                };
+              }
             }
           }
           if (fullName === "return_value" && value.arguments) {
@@ -1434,9 +1444,20 @@ function extractDangerousPatterns(command) {
   }
   return dangerous;
 }
-var GIT_NO_VERIFY_PATTERN = /\bgit\s+\w+\s+.*(?:--no-verify|-n)/;
 function extractGitNoVerify(command) {
-  return GIT_NO_VERIFY_PATTERN.test(command);
+  const parts = command.split(/\s+/);
+  for (let i = 0; i < parts.length - 1; i++) {
+    if (parts[i] === "git") {
+      const sub = parts[i + 1];
+      if (sub && !sub.startsWith("-")) {
+        const args = parts.slice(i + 2);
+        if (args.includes("--no-verify") || args.includes("-n")) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
 }
 async function requestPathAccess(paths, workdir, sessionId, callId, tool, onEvent, dangerLevel, command) {
   const emitPendingEvent = (confirmationPaths, confirmationReason) => {
@@ -2798,6 +2819,111 @@ async function deleteSkill(configDir, skillId) {
 
 // src/server/chat/agent-loop.ts
 import stripAnsi from "strip-ansi";
+
+// src/server/chat/conversation-history.ts
+function buildContextMessages(events, scope) {
+  if (scope.type === "toplevel") {
+    return buildTopLevelContextMessages(events, scope);
+  }
+  return buildSubAgentContextMessages(events, scope);
+}
+function buildTopLevelContextMessages(events, scope) {
+  const includeVerifier = scope.includeVerifier ?? true;
+  const currentWindowId = foldContextState(events, "").currentContextWindowId;
+  if (!currentWindowId) return [];
+  return buildContextMessagesFromEventHistory(events, currentWindowId, { includeVerifier });
+}
+function buildSubAgentContextMessages(events, scope) {
+  const { subAgentId } = scope;
+  const messages = [];
+  const messageMap = /* @__PURE__ */ new Map();
+  const fulfilledToolCallIds = /* @__PURE__ */ new Set();
+  let compactionSummaryIndex = -1;
+  for (let i = events.length - 1; i >= 0; i--) {
+    const event = events[i];
+    if (event.type === "context.compacted") {
+      const data = event.data;
+      if (data.subAgentId === subAgentId) {
+        compactionSummaryIndex = i;
+        break;
+      }
+    }
+  }
+  const startIdx = compactionSummaryIndex >= 0 ? compactionSummaryIndex : 0;
+  for (let i = startIdx; i < events.length; i++) {
+    const event = events[i];
+    switch (event.type) {
+      case "message.start": {
+        const data = event.data;
+        if (data.subAgentId !== subAgentId) break;
+        if (data.role === "system") break;
+        if (data.messageKind === "context-reset") break;
+        const message = {
+          id: data.messageId,
+          role: data.role,
+          content: data.content ?? "",
+          ...data.subAgentId ? { subAgentId: data.subAgentId } : {},
+          ...data.subAgentType ? { subAgentType: data.subAgentType } : {},
+          ...data.contextWindowId ? { contextWindowId: data.contextWindowId } : {},
+          ...data.isCompactionSummary ? { isCompactionSummary: data.isCompactionSummary } : {},
+          ...data.attachments !== void 0 ? { attachments: data.attachments } : {}
+        };
+        messageMap.set(data.messageId, message);
+        messages.push(message);
+        break;
+      }
+      case "message.thinking": {
+        const evt = event.data;
+        handleMessageThinking(messageMap, evt);
+        break;
+      }
+      case "message.delta": {
+        const evt = event.data;
+        handleMessageDelta(messageMap, evt);
+        break;
+      }
+      case "tool.call": {
+        const evt = event.data;
+        handleToolCall(messageMap, evt);
+        break;
+      }
+      case "tool.result": {
+        const evt = event.data;
+        handleToolResult(messages, messageMap, fulfilledToolCallIds, evt);
+        break;
+      }
+      case "context.compacted": {
+        const data = event.data;
+        if (data.subAgentId === subAgentId && i === compactionSummaryIndex) {
+        }
+        break;
+      }
+    }
+  }
+  stripOrphanedToolCalls(messages, fulfilledToolCallIds);
+  return messages.map(
+    ({ id: _id, subAgentId: _sa, subAgentType: _st, contextWindowId: _cw, isCompactionSummary: _ics, ...rest }) => {
+      const ctx = {
+        role: rest.role,
+        content: rest.content,
+        ...rest.thinkingContent ? { thinkingContent: rest.thinkingContent } : {},
+        ...rest.toolCalls ? { toolCalls: rest.toolCalls } : {},
+        ...rest.toolCallId ? { toolCallId: rest.toolCallId } : {},
+        ...rest.attachments ? { attachments: rest.attachments } : {}
+      };
+      return ctx;
+    }
+  );
+}
+function getConversationMessages(scope) {
+  const eventStore = getEventStore();
+  const events = eventStore.getEvents(scope.sessionId);
+  if (events.length === 0) return [];
+  const contextMessages = buildContextMessages(events, scope);
+  return minimalMessagesToRequestContextMessages(contextMessages, "history");
+}
+
+// src/server/chat/agent-loop.ts
 function emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, promptContext, eventStore) {
   const stats = turnMetrics.buildStats(statsIdentity, mode);
   eventStore.append(
@@ -2918,24 +3044,7 @@ Error: ${toolResult.error}` : `Error: ${toolResult.error}`
   return { toolMessages, criteriaChanged, returnValueContent, returnValueResult };
 }
 var MAX_FORMAT_RETRIES = 10;
-var FORMAT_CORRECTION_PROMPT2 = `IMPORTANT: You MUST use the JSON function calling API. Do NOT output XML tags like <tool_call>, <function=>, or <parameter=>. Your previous attempt was stopped because you used the wrong format. Use the proper tool_calls format.`;
-function toRequestContextMessages(messages) {
-  return messages.map((message) => ({
-    role: message.role,
-    content: message.content,
-    source: "history",
-    ...message.thinkingContent ? { thinkingContent: message.thinkingContent } : {},
-    ...message.toolCalls ? {
-      toolCalls: message.toolCalls.map((toolCall) => ({
-        id: toolCall.id,
-        name: toolCall.name,
-        arguments: toolCall.arguments
-      }))
-    } : {},
-    ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
-    ...message.attachments ? { attachments: message.attachments } : {}
-  }));
-}
+var FORMAT_CORRECTION_PROMPT2 = `IMPORTANT: You MUST use the JSON function calling API. Do NOT output XML tags like <function=>, <parameter=>, or <invoke=>. Your previous attempt was stopped because you used the wrong format. Use the proper tool_calls format.`;
 async function runTopLevelAgentLoop(config, turnMetrics) {
   const { mode, sessionManager, sessionId, llmClient, signal, onMessage, statsIdentity } = config;
   const eventStore = getEventStore();
@@ -2964,7 +3073,7 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
     }));
     const toolRegistry = config.getToolRegistry();
     const currentWindowMessageOptions = getCurrentWindowMessageOptions(sessionId);
-    const requestMessages = toRequestContextMessages(getContextMessages(sessionId));
+    const requestMessages = getConversationMessages({ type: "toplevel", sessionId });
     if (formatRetryCount > 0) {
       const correctionMsgId = crypto.randomUUID();
       eventStore.append(
@@ -2976,7 +3085,7 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
         })
       );
       eventStore.append(sessionId, createFormatRetryEvent(formatRetryCount, MAX_FORMAT_RETRIES));
-      requestMessages.push({ role: "user", content: FORMAT_CORRECTION_PROMPT2, source: "runtime" });
+      requestMessages.push({ role: "user", content: FORMAT_CORRECTION_PROMPT2, source: "history" });
     }
     const configDir = getGlobalConfigDir(getRuntimeConfig().mode ?? "production");
     const skills = await getEnabledSkillMetadata(configDir);
@@ -3252,7 +3361,6 @@ async function executeSubAgent(options) {
   const subAgentId = crypto.randomUUID();
   let session = sessionManager.requireSession(sessionId);
   const currentWindowMessageOptions = getCurrentWindowMessageOptions2(sessionId);
-  const contextMessages = [{ role: "user", content: prompt, source: "runtime" }];
   logger.debug("Sub-agent starting", { subAgentType, subAgentId, sessionId });
   const resetMsgId = crypto.randomUUID();
   eventStore.append(
@@ -3266,12 +3374,30 @@ async function executeSubAgent(options) {
     })
   );
   eventStore.append(sessionId, { type: "message.done", data: { messageId: resetMsgId } });
-  for (const msg of contextMessages) {
-    const msgId = crypto.randomUUID();
-    eventStore.append(
-      sessionId,
-      createMessageStartEvent(msgId, "user", msg.content, {
-        ...currentWindowMessageOptions ?? {},
+  const promptMsgId = crypto.randomUUID();
+  eventStore.append(
+    sessionId,
+    createMessageStartEvent(promptMsgId, "user", prompt, {
+      ...currentWindowMessageOptions ?? {},
+      isSystemGenerated: true,
+      messageKind: "auto-prompt",
+      subAgentId,
+      subAgentType,
+      metadata: {
+        type: "subagent",
+        name: agentDef.metadata.name,
+        color: agentDef.metadata.color ?? "#6b7280"
+      }
+    })
+  );
+  eventStore.append(sessionId, { type: "message.done", data: { messageId: promptMsgId } });
+  if (onMessage) {
+    onMessage(
+      createChatMessageMessage({
+        id: promptMsgId,
+        role: "user",
+        content: prompt,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         isSystemGenerated: true,
         messageKind: "auto-prompt",
         subAgentId,
@@ -3283,28 +3409,8 @@ async function executeSubAgent(options) {
         }
       })
     );
-    eventStore.append(sessionId, { type: "message.done", data: { messageId: msgId } });
-    if (onMessage) {
-      onMessage(
-        createChatMessageMessage({
-          id: msgId,
-          role: "user",
-          content: msg.content,
-          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-          isSystemGenerated: true,
-          messageKind: "auto-prompt",
-          subAgentId,
-          subAgentType,
-          metadata: {
-            type: "subagent",
-            name: agentDef.metadata.name,
-            color: agentDef.metadata.color ?? "#6b7280"
-          }
-        })
-      );
-    }
   }
-  const { files } = await getAllInstructions(session.workdir, session.projectId);
+  const { content: instructionContent, files } = await getAllInstructions(session.workdir, session.projectId);
   const injectedFiles = toInjectedFiles(files);
   const configDir = getGlobalConfigDir(getRuntimeConfig().mode ?? "production");
   const skills = await getEnabledSkillMetadata(configDir);
@@ -3314,7 +3420,7 @@ async function executeSubAgent(options) {
     skills.length > 0 ? skills : void 0,
     llmClient.getModel()
   );
-  let customMessages = [...contextMessages];
+  const subAgentScope = { type: "subagent", sessionId, subAgentId, subAgentType };
   let consecutiveEmptyStops = 0;
   let finalContent;
   let returnValueContent = null;
@@ -3324,13 +3430,7 @@ async function executeSubAgent(options) {
     if (signal?.aborted) {
       throw new Error("Aborted");
     }
-    await maybeAutoCompactContext({
-      sessionManager,
-      sessionId,
-      llmClient,
-      statsIdentity: resolveCompactionStatsIdentity(llmClient),
-      ...signal ? { signal } : {}
-    });
+    const requestMessages = getConversationMessages(subAgentScope);
     const assistantMsgId = crypto.randomUUID();
     eventStore.append(
       sessionId,
@@ -3344,19 +3444,29 @@ async function executeSubAgent(options) {
       systemPrompt,
       injectedFiles,
       prompt,
-      customMessages,
+      requestMessages,
       toolRegistry.definitions
     );
+    const assembledRequest = assembleAgentRequest({
+      agentDef,
+      subAgentDefs: [],
+      workdir: session.workdir,
+      messages: requestMessages,
+      injectedFiles,
+      promptTools: toolRegistry.definitions,
+      requestTools: toolRegistry.definitions,
+      toolChoice: "auto",
+      disableThinking: true,
+      ...instructionContent ? { customInstructions: instructionContent } : {},
+      ...skills.length > 0 ? { skills } : {},
+      modelName: llmClient.getModel()
+    });
+    const effectiveSystemPrompt = assembledRequest.systemPrompt + RETURN_VALUE_INSTRUCTION;
     const streamGen = streamLLMPure({
       messageId: assistantMsgId,
-      systemPrompt: systemPrompt + RETURN_VALUE_INSTRUCTION,
+      systemPrompt: effectiveSystemPrompt,
       llmClient,
-      messages: customMessages.map((m) => ({
-        role: m.role,
-        content: m.content,
-        ...m.toolCalls ? { toolCalls: m.toolCalls.map((tc) => ({ id: tc.id, name: tc.name, arguments: tc.arguments })) } : {},
-        ...m.toolCallId ? { toolCallId: m.toolCallId } : {}
-      })),
+      messages: assembledRequest.messages,
       tools: toolRegistry.definitions,
       toolChoice: "auto",
       signal,
@@ -3379,14 +3489,7 @@ async function executeSubAgent(options) {
       throw new Error("Aborted");
     }
     turnMetrics.addLLMCall(result.timing, result.usage.promptTokens, result.usage.completionTokens, result.modelParams);
-    sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens, subAgentId);
     finalContent = result.content;
-    customMessages.push({
-      role: "assistant",
-      content: result.content,
-      source: "history",
-      ...result.toolCalls.length > 0 && { toolCalls: result.toolCalls }
-    });
     session = sessionManager.requireSession(sessionId);
     if (result.toolCalls.length === 0) {
       if (nudgeConfig) {
@@ -3406,7 +3509,6 @@ async function executeSubAgent(options) {
               subAgentId,
               subAgentType
             });
-            customMessages = [...customMessages, { role: "user", content: nudgeContent, source: "runtime" }];
             continue;
           }
           const stalledMsgId = crypto.randomUUID();
@@ -3436,7 +3538,6 @@ async function executeSubAgent(options) {
           subAgentId,
           subAgentType
         });
-        customMessages = [...customMessages, { role: "user", content: RETURN_VALUE_NUDGE, source: "runtime" }];
         continue;
       }
       const stats = turnMetrics.buildStats(statsIdentity, "verifier");
@@ -3488,7 +3589,6 @@ async function executeSubAgent(options) {
       }
       break;
     }
-    customMessages = [...customMessages, ...batchResult.toolMessages];
     session = sessionManager.requireSession(sessionId);
     if (nudgeConfig) {
       consecutiveEmptyStops = 0;
@@ -3575,7 +3675,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-BHYHS3RY.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-6DXPHBUV.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4559,9 +4659,6 @@ function getCurrentWindowMessageOptions3(sessionId) {
   const contextWindowId = getCurrentContextWindowId(sessionId);
   return contextWindowId ? { contextWindowId } : void 0;
 }
-function toRequestContextMessages2(messages) {
-  return minimalMessagesToRequestContextMessages(messages, "history");
-}
 async function maybeAutoCompactContext(options) {
   const config = getRuntimeConfig();
   const contextState = options.sessionManager.getContextState(options.sessionId);
@@ -4608,7 +4705,7 @@ async function performContextCompaction(options) {
   const session = sessionManager.requireSession(sessionId);
   const { content: instructions, files } = await getAllInstructions(session.workdir, session.projectId);
   const injectedFiles = toInjectedFiles(files);
-  const requestMessages = toRequestContextMessages2(getContextMessages(sessionId));
+  const requestMessages = getConversationMessages({ type: "toplevel", sessionId });
   const config = getRuntimeConfig();
   const allAgents = await loadAllAgentsDefault();
   const plannerDef = findAgentById("planner", allAgents);
@@ -4767,4 +4864,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-H5EICXF3.js.map
+//# sourceMappingURL=chunk-GLVNO4DS.js.map

package/dist/{chunk-NHJ2GVCF.js → chunk-NWXLRRDD.js}

@@ -13,14 +13,14 @@ import {
   getToolRegistryForAgent,
   loadAllAgentsDefault,
   runTopLevelAgentLoop
-} from "./chunk-H5EICXF3.js";
+} from "./chunk-GLVNO4DS.js";
 import {
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-5ZD3GZTK.js";
+} from "./chunk-RJRG2VER.js";
 import {
   buildSnapshotFromSessionState
-} from "./chunk-VAMTEAYI.js";
+} from "./chunk-TS5XFQ2D.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -327,4 +327,4 @@ export {
   runBuilderTurn,
   runVerifierTurn
 };
-//# sourceMappingURL=chunk-NHJ2GVCF.js.map
+//# sourceMappingURL=chunk-NWXLRRDD.js.map

package/dist/{chunk-5ZD3GZTK.js → chunk-RJRG2VER.js}

@@ -9,7 +9,7 @@ import {
   foldSessionState,
   spreadOptionalMessageFields,
   stripPromptContextMessages
-} from "./chunk-VAMTEAYI.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-5ZD3GZTK.js.map
+//# sourceMappingURL=chunk-RJRG2VER.js.map