openfox 1.6.77 → 1.6.78

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

@@ -2,16 +2,16 @@ import {
   maybeAutoCompactContext,
   performManualContextCompaction,
   resolveCompactionStatsIdentity
-} from "./chunk-EBQYRNNU.js";
+} from "./chunk-GLVNO4DS.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-AN3U2AD5.js.map

package/dist/{chat-handler-K2RDXBO6.js → chat-handler-AIBOSHAQ.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-NWXLRRDD.js";
+import "./chunk-GLVNO4DS.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-AN3U2AD5.js");
     await maybeAutoCompactContext({
       sessionManager,
       sessionId,
@@ -172,4 +172,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-K2RDXBO6.js.map
+//# sourceMappingURL=chat-handler-AIBOSHAQ.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-DKKDNJT7.js}

@@ -2,7 +2,7 @@ import {
   createVerifierNudgeConfig,
   runBuilderTurn,
   runChatTurn
-} from "./chunk-6SYNGMU4.js";
+} from "./chunk-NWXLRRDD.js";
 import {
   TurnMetrics,
   agentExists,
@@ -37,7 +37,7 @@ import {
   setSkillEnabled,
   skillExists,
   spawnShellProcess
-} from "./chunk-EBQYRNNU.js";
+} from "./chunk-GLVNO4DS.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.78";
 
 // 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-6DXPHBUV.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-6DXPHBUV.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-AIBOSHAQ.js");
+    const { cancelQuestionsForSession, cancelPathConfirmationsForSession } = await import("./tools-6DXPHBUV.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-PV446N55.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-DKKDNJT7.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-EBQYRNNU.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-UVN6AKIO.js";
+} from "./chunk-RJRG2VER.js";
+import {
+  buildContextMessagesFromEventHistory,
+  foldContextState,
+  handleMessageDelta,
+  handleMessageThinking,
+  handleToolCall,
+  handleToolResult,
+  stripOrphanedToolCalls
+} from "./chunk-TS5XFQ2D.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
@@ -553,25 +561,6 @@ function computeAggregatedStats(input) {
 }
 
 // src/server/chat/stream-pure.ts
-function toStreamMessages(messages) {
-  return messages.map((m) => ({
-    role: m.role,
-    content: m.content,
-    ...m.thinkingContent ? { thinkingContent: m.thinkingContent } : {},
-    ...m.toolCalls?.length ? { toolCalls: m.toolCalls.map((tc) => ({ id: tc.id, name: tc.name, arguments: tc.arguments })) } : {},
-    ...m.toolCallId ? { toolCallId: m.toolCallId } : {},
-    ...m.attachments?.length ? { attachments: m.attachments } : {}
-  }));
-}
-function createAssistantMessage(content, thinkingContent, toolCalls) {
-  return {
-    role: "assistant",
-    content,
-    source: "history",
-    ...thinkingContent ? { thinkingContent } : {},
-    ...toolCalls.length > 0 ? { toolCalls } : {}
-  };
-}
 function createEmptyStreamResult(aborted, xmlFormatError, modelParams) {
   return {
     content: "",
@@ -2830,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(
@@ -2950,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();
@@ -2996,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(
@@ -3008,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);
@@ -3284,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(
@@ -3298,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,
@@ -3315,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);
@@ -3346,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;
@@ -3356,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,
@@ -3376,14 +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: toStreamMessages(customMessages),
+      messages: assembledRequest.messages,
       tools: toolRegistry.definitions,
       toolChoice: "auto",
       signal,
@@ -3406,9 +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(createAssistantMessage(result.content, result.thinkingContent, result.toolCalls));
     session = sessionManager.requireSession(sessionId);
     if (result.toolCalls.length === 0) {
       if (nudgeConfig) {
@@ -3428,7 +3509,6 @@ async function executeSubAgent(options) {
               subAgentId,
               subAgentType
             });
-            customMessages = [...customMessages, { role: "user", content: nudgeContent, source: "runtime" }];
             continue;
           }
           const stalledMsgId = crypto.randomUUID();
@@ -3458,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");
@@ -3510,7 +3589,6 @@ async function executeSubAgent(options) {
       }
       break;
     }
-    customMessages = [...customMessages, ...batchResult.toolMessages];
     session = sessionManager.requireSession(sessionId);
     if (nudgeConfig) {
       consecutiveEmptyStops = 0;
@@ -3597,7 +3675,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-QJ5K5IJP.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-6DXPHBUV.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4581,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);
@@ -4630,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);
@@ -4789,4 +4864,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-EBQYRNNU.js.map
+//# sourceMappingURL=chunk-GLVNO4DS.js.map