openfox 2.0.31 → 2.0.32

package/dist/{chat-handler-Q62GBC4Z.js → chat-handler-NXK4SYGA.js}

@@ -2,11 +2,11 @@ import {
   buildRunChatTurnParams,
   finalizeTurnCompletion,
   generateSessionNameForSession
-} from "./chunk-UHWRWFLE.js";
+} from "./chunk-BGCDJYNU.js";
 import {
   runChatTurn
-} from "./chunk-ZRKYDC4O.js";
-import "./chunk-JCOLS2ZM.js";
+} from "./chunk-7CCRQRQ4.js";
+import "./chunk-BXUFIMHG.js";
 import "./chunk-DL6ZILAF.js";
 import "./chunk-PBGOZMVY.js";
 import "./chunk-VRGRAQDG.js";
@@ -17,14 +17,14 @@ import {
   createSessionRunningMessage
 } from "./chunk-F4PMNP7S.js";
 import "./chunk-EU3WWTFH.js";
-import "./chunk-M2YRM64Q.js";
-import "./chunk-O4TED6AJ.js";
-import "./chunk-SS3F2VYF.js";
+import "./chunk-JNSSFTVD.js";
+import "./chunk-YQ3SOPBI.js";
+import "./chunk-OSMUHB5F.js";
 import {
   getEventStore
-} from "./chunk-M7M2VH45.js";
+} from "./chunk-WTDCC4IP.js";
 import "./chunk-6PLAWCHQ.js";
-import "./chunk-FBGWG4N6.js";
+import "./chunk-ZPIZLTWU.js";
 import "./chunk-J2GP3J3X.js";
 import "./chunk-Z4FMBCJO.js";
 import "./chunk-ZJ4FP6RS.js";
@@ -145,4 +145,4 @@ export {
   startChatSession,
   stopSessionExecution
 };
-//# sourceMappingURL=chat-handler-Q62GBC4Z.js.map
+//# sourceMappingURL=chat-handler-NXK4SYGA.js.map

package/dist/{chunk-ZRKYDC4O.js → chunk-7CCRQRQ4.js}

@@ -1,20 +1,18 @@
 import {
   PathAccessDeniedError,
-  assembleAgentRequest,
+  buildCachedPrompt,
   computeDynamicContextHash,
   createAssemblyResult,
-  createToolRegistry,
   findAgentById,
   getAllInstructions,
   getConversationMessages,
   getEnabledSkillMetadata,
-  getSubAgents,
   getToolFingerprint,
   getToolRegistryForAgent,
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-JCOLS2ZM.js";
+} from "./chunk-BXUFIMHG.js";
 import {
   TurnMetrics,
   WORKFLOW_KICKOFF_PROMPT,
@@ -22,13 +20,13 @@ import {
   buildAgentSmallReminder,
   createChatDoneEvent,
   createMessageStartEvent
-} from "./chunk-SS3F2VYF.js";
+} from "./chunk-OSMUHB5F.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-M7M2VH45.js";
+} from "./chunk-WTDCC4IP.js";
 import {
   buildSnapshotFromSessionState
 } from "./chunk-6PLAWCHQ.js";
@@ -41,7 +39,7 @@ import {
 
 // src/server/chat/orchestrator.ts
 async function buildRetryPatterns() {
-  const { getSetting, SETTINGS_KEYS } = await import("./settings-MMEBGS53.js");
+  const { getSetting, SETTINGS_KEYS } = await import("./settings-MTGCEUS7.js");
   const raw = getSetting(SETTINGS_KEYS.RETRY_PATTERNS);
   if (!raw) {
     const oldXmlProtection = getSetting("llm.disableXmlProtection");
@@ -209,7 +207,6 @@ async function runAgentTurn(options, turnMetrics, agentId, append, callbacks) {
   const allAgents = await loadAllAgentsDefault();
   const agentDef = findAgentById(agentId, allAgents) ?? findAgentById("planner", allAgents);
   injectAgentReminder(options.sessionId, agentDef);
-  const subAgentDefs = getSubAgents(allAgents);
   const { content: instructionContent } = await getAllInstructions(
     options.sessionManager.requireSession(options.sessionId).workdir,
     options.sessionManager.requireSession(options.sessionId).projectId
@@ -228,44 +225,37 @@ async function runAgentTurn(options, turnMetrics, agentId, append, callbacks) {
       statsIdentity,
       signal: options.signal,
       onMessage: options.onMessage,
-      assembleRequest: (input) => {
+      assembleRequest: async (input) => {
         const cached = options.sessionManager.getCachedPrompt(options.sessionId);
-        const liveTools = createToolRegistry().definitions;
-        const toolFingerprint = getToolFingerprint(liveTools);
         if (cached) {
+          const toolFingerprint = getToolFingerprint(cached.tools);
           const currentHash = computeDynamicContextHash(instructionContent ?? "", skills, toolFingerprint);
           if (cached.hash !== currentHash) {
             logger.debug("assembleRequest: hash mismatch", {
               sessionId: options.sessionId,
               cachedHash: cached.hash,
               currentHash,
-              cachedTools: cached.tools.map((t) => t.function.name),
-              liveTools: liveTools.map((t) => t.function.name)
+              cachedTools: cached.tools.map((t) => t.function.name)
             });
             options.sessionManager.setDynamicContextChanged(options.sessionId, true);
-            options.sessionManager.setDebugDump(options.sessionId, {
-              cachedPrompt: cached.systemPrompt.slice(0, 5e3),
-              cachedTools: cached.tools.map((t) => t.function.name),
-              liveTools: liveTools.map((t) => t.function.name)
-            });
           }
           return createAssemblyResult({
             systemPrompt: cached.systemPrompt,
             messages: input.messages,
             injectedFiles: input.injectedFiles,
-            requestTools: cached.tools.length > 0 ? cached.tools : liveTools,
+            requestTools: cached.tools,
             toolChoice: input.toolChoice
           });
         }
-        const result = assembleAgentRequest({
-          ...input,
-          agentDef,
-          subAgentDefs,
-          modelName: options.llmClient.getModel()
+        const result = await buildCachedPrompt(options.sessionManager, options.sessionId, agentDef);
+        options.sessionManager.setCachedPrompt(options.sessionId, result.systemPrompt, result.tools, result.hash);
+        return createAssemblyResult({
+          systemPrompt: result.systemPrompt,
+          messages: input.messages,
+          injectedFiles: input.injectedFiles,
+          requestTools: result.tools,
+          toolChoice: input.toolChoice
         });
-        const hash = computeDynamicContextHash(instructionContent ?? "", skills, toolFingerprint);
-        options.sessionManager.setCachedPrompt(options.sessionId, result.systemPrompt, result.tools, hash);
-        return result;
       },
       getToolRegistry: () => getToolRegistryForAgent(agentDef),
       getConversationMessages: buildGetConversationMessages(options.sessionId, options.llmClient, append),
@@ -320,4 +310,4 @@ export {
   runAgentTurn,
   injectWorkflowKickoffIfNeeded
 };
-//# sourceMappingURL=chunk-ZRKYDC4O.js.map
+//# sourceMappingURL=chunk-7CCRQRQ4.js.map

package/dist/{chunk-UHWRWFLE.js → chunk-BGCDJYNU.js}

@@ -8,7 +8,7 @@ import {
 import {
   getEventStore,
   updateSessionMetadata
-} from "./chunk-M7M2VH45.js";
+} from "./chunk-WTDCC4IP.js";
 import {
   buildMessagesFromStoredEvents,
   foldPendingConfirmations
@@ -174,4 +174,4 @@ export {
   buildRunChatTurnParams,
   generateSessionNameForSession
 };
-//# sourceMappingURL=chunk-UHWRWFLE.js.map
+//# sourceMappingURL=chunk-BGCDJYNU.js.map

package/dist/{chunk-JCOLS2ZM.js → chunk-BXUFIMHG.js}

@@ -32,15 +32,14 @@ import {
   SETTINGS_KEYS,
   deleteSetting,
   getSetting
-} from "./chunk-M2YRM64Q.js";
+} from "./chunk-JNSSFTVD.js";
 import {
   getProject
-} from "./chunk-O4TED6AJ.js";
+} from "./chunk-YQ3SOPBI.js";
 import {
   COMPACTION_PROMPT,
   TurnMetrics,
   buildBasePrompt,
-  buildSubAgentSystemPrompt,
   buildTopLevelSystemPrompt,
   computeEffectiveTools,
   consumeStreamGenerator,
@@ -50,13 +49,13 @@ import {
   createToolCallEvent,
   createToolResultEvent,
   streamLLMPure
-} from "./chunk-SS3F2VYF.js";
+} from "./chunk-OSMUHB5F.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-M7M2VH45.js";
+} from "./chunk-WTDCC4IP.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -2490,7 +2489,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
     const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
     if (signal?.aborted) throw new Error("Aborted");
-    const assembledRequest = config.assembleRequest({
+    const assembledRequest = await config.assembleRequest({
       workdir: session.workdir,
       messages: requestMessages,
       injectedFiles,
@@ -2581,7 +2580,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens);
     if (!compacting) {
       const contextState2 = sessionManager.getContextState(sessionId);
-      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-BN5IDIVR.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-SHEOFZDB.js");
       if (shouldCompact(contextState2.currentTokens, contextState2.maxTokens, runtimeConfig.context.compactionThreshold)) {
         appendCompactionPrompt(sessionId, append);
         compacting = true;
@@ -2833,32 +2832,6 @@ function createAssemblyResult(input) {
     tools: input.requestTools
   };
 }
-function buildAssemblyInput(systemPrompt, baseInput) {
-  return createAssemblyResult({
-    systemPrompt,
-    messages: baseInput.messages,
-    injectedFiles: baseInput.injectedFiles,
-    requestTools: baseInput.requestTools ?? baseInput.promptTools,
-    toolChoice: baseInput.toolChoice ?? "auto",
-    ...baseInput.customInstructions ? { customInstructions: baseInput.customInstructions } : {},
-    ...baseInput.skills && baseInput.skills.length > 0 ? { skills: baseInput.skills } : {}
-  });
-}
-function assembleAgentRequest(input) {
-  const { agentDef, subAgentDefs, ...baseInput } = input;
-  if (agentDef.metadata.subagent) {
-    const systemPrompt2 = buildSubAgentSystemPrompt(baseInput.workdir, agentDef, baseInput.skills, baseInput.modelName);
-    return buildAssemblyInput(systemPrompt2, baseInput);
-  }
-  const systemPrompt = buildTopLevelSystemPrompt(
-    baseInput.workdir,
-    baseInput.customInstructions,
-    baseInput.skills,
-    subAgentDefs,
-    baseInput.modelName
-  );
-  return buildAssemblyInput(systemPrompt, baseInput);
-}
 
 // src/server/llm/vision-fallback.ts
 var IMAGE_PROMPT = `Describe this image in detail. Focus on:
@@ -3290,7 +3263,7 @@ async function executeSubAgent(options) {
       statsIdentity,
       signal,
       onMessage,
-      assembleRequest: (input) => createAssemblyResult({
+      assembleRequest: async (input) => createAssemblyResult({
         systemPrompt,
         messages: input.messages,
         injectedFiles: input.injectedFiles,
@@ -3386,7 +3359,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-G3KFVM2A.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-EKK2C42A.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4186,32 +4159,49 @@ function computeDynamicContextHash(instructionContent, skills, toolFingerprint)
 function getToolFingerprint(tools) {
   return tools.map((t) => `${t.function.name}:${JSON.stringify(t.function.parameters)}`).sort().join("|");
 }
-async function computeContextHash(sessionManager, sessionId) {
+async function loadSessionContext(sessionManager, sessionId) {
   const session = sessionManager.requireSession(sessionId);
   const { content: instructionContent } = await getAllInstructions(session.workdir, session.projectId);
   const runtimeConfig = getRuntimeConfig();
   const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
   const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-  const { createToolRegistry: createToolRegistry2 } = await import("./tools-G3KFVM2A.js");
-  const allTools = createToolRegistry2().definitions;
-  const toolFingerprint = getToolFingerprint(allTools);
+  return { instructionContent: instructionContent ?? "", skills };
+}
+function resolveAgentDef2(sessionManager, sessionId) {
+  return loadAllAgentsDefault().then((allAgents) => {
+    const session = sessionManager.requireSession(sessionId);
+    return findAgentById(session.mode, allAgents) ?? findAgentById("planner", allAgents);
+  });
+}
+async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
+  const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-EKK2C42A.js");
+  const tools = getToolRegistryForAgent2(agentDef).definitions;
+  const toolFingerprint = getToolFingerprint(tools);
+  const allAgents = await loadAllAgentsDefault();
+  const subAgentDefs = getSubAgents(allAgents);
+  const session = sessionManager.requireSession(sessionId);
+  const systemPrompt = buildTopLevelSystemPrompt(session.workdir, instructionContent || void 0, skills, subAgentDefs);
   const hash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
-  return { hash, instructionContent, skills, allTools };
+  return { systemPrompt, tools, hash };
+}
+async function computeSessionHash(sessionManager, sessionId) {
+  const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
+  const agentDef = await resolveAgentDef2(sessionManager, sessionId);
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-EKK2C42A.js");
+  const tools = getToolRegistryForAgent2(agentDef).definitions;
+  const toolFingerprint = getToolFingerprint(tools);
+  return computeDynamicContextHash(instructionContent, skills, toolFingerprint);
 }
 async function applyDynamicContext(sessionManager, sessionId) {
-  const { hash, instructionContent, skills, allTools } = await computeContextHash(sessionManager, sessionId);
+  const session = sessionManager.requireSession(sessionId);
   const allAgents = await loadAllAgentsDefault();
-  const subAgentDefs = getSubAgents(allAgents);
-  const systemPrompt = buildTopLevelSystemPrompt(
-    sessionManager.requireSession(sessionId).workdir,
-    instructionContent || void 0,
-    skills,
-    subAgentDefs
-  );
-  sessionManager.setCachedPrompt(sessionId, systemPrompt, allTools, hash);
+  const agentDef = findAgentById(session.mode, allAgents) ?? findAgentById("planner", allAgents);
+  const { systemPrompt, tools, hash } = await buildCachedPrompt(sessionManager, sessionId, agentDef);
+  sessionManager.setCachedPrompt(sessionId, systemPrompt, tools, hash);
   sessionManager.setDynamicContextChanged(sessionId, false);
   sessionManager.clearDebugDump(sessionId);
-  logger.debug("applyDynamicContext done", { sessionId, hash, toolCount: allTools.length });
+  logger.debug("applyDynamicContext done", { sessionId, hash, toolCount: tools.length });
 }
 
 // src/server/tools/mcp-config.ts
@@ -4305,7 +4295,7 @@ var mcpConfigTool = createTool(
       await saveGlobalConfig(mcpConfigMode, { ...globalConfig, mcpServers: updated });
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-G3KFVM2A.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-EKK2C42A.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -4666,7 +4656,6 @@ export {
   getDefaultAgentIds,
   isDefaultAgent,
   findAgentById,
-  getSubAgents,
   getTopLevelAgents,
   agentExists,
   saveAgent,
@@ -4688,7 +4677,6 @@ export {
   deleteProjectSkill,
   runTopLevelAgentLoop,
   createAssemblyResult,
-  assembleAgentRequest,
   getConversationMessages,
   processEventsForConversation,
   executeSubAgent,
@@ -4696,6 +4684,8 @@ export {
   stepDoneTool,
   computeDynamicContextHash,
   getToolFingerprint,
+  buildCachedPrompt,
+  computeSessionHash,
   applyDynamicContext,
   setMcpManagerForTools,
   setMcpConfigMode,
@@ -4709,4 +4699,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-JCOLS2ZM.js.map
+//# sourceMappingURL=chunk-BXUFIMHG.js.map

package/dist/{chunk-EQUVYCW5.js → chunk-E4EUSGI7.js}

@@ -2,24 +2,21 @@ import {
   injectWorkflowKickoffIfNeeded,
   runAgentTurn,
   runChatTurn
-} from "./chunk-ZRKYDC4O.js";
+} from "./chunk-7CCRQRQ4.js";
 import {
   applyDynamicContext,
   checkAborted,
-  computeDynamicContextHash,
+  computeSessionHash,
   deleteItemFromDir,
   devServerManager,
   executeSubAgent,
   findAgentById,
-  getAllInstructions,
-  getEnabledSkillMetadata,
-  getToolFingerprint,
   getToolRegistryForAgent,
   jsonSerializer,
   loadAllAgentsDefault,
   saveItemToDir,
   spawnShellProcess
-} from "./chunk-JCOLS2ZM.js";
+} from "./chunk-BXUFIMHG.js";
 import {
   getPlatformShell,
   onProcessEvent
@@ -43,16 +40,16 @@ import {
 } from "./chunk-EU3WWTFH.js";
 import {
   appendCompactionPrompt
-} from "./chunk-SSWRM5BT.js";
+} from "./chunk-ZMONCXGW.js";
 import {
   TurnMetrics,
   createMessageStartEvent
-} from "./chunk-SS3F2VYF.js";
+} from "./chunk-OSMUHB5F.js";
 import {
   getCurrentContextWindowId,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-M7M2VH45.js";
+} from "./chunk-WTDCC4IP.js";
 import {
   createLLMClient
 } from "./chunk-QYP6MOB5.js";
@@ -1773,14 +1770,7 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         (async () => {
           try {
             await mcpReadyPromise;
-            const { content: instructionContent } = await getAllInstructions(session.workdir, session.projectId);
-            const runtimeConfig = getRuntimeConfig();
-            const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
-            const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-            const { createToolRegistry } = await import("./tools-G3KFVM2A.js");
-            const allTools = createToolRegistry().definitions;
-            const toolFingerprint = getToolFingerprint(allTools);
-            const currentHash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
+            const currentHash = await computeSessionHash(sessionManager, session.id);
             if (currentHash !== cachedHash) {
               sessionManager.setDynamicContextChanged(session.id, true);
               sendContextState();
@@ -1842,26 +1832,17 @@ async function handleClientMessage(ws, client, message, _getLLMClient, _getActiv
         return;
       }
       const sessionId = client.activeSessionId;
-      const session = sessionManager.requireSession(sessionId);
       (async () => {
         try {
           await mcpReadyPromise;
-          const { content: instructionContent } = await getAllInstructions(session.workdir, session.projectId);
-          const runtimeConfig = getRuntimeConfig();
-          const configDir = getGlobalConfigDir(runtimeConfig.mode ?? "production");
-          const skills = await getEnabledSkillMetadata(configDir, runtimeConfig.workdir);
-          const { createToolRegistry } = await import("./tools-G3KFVM2A.js");
-          const allTools = createToolRegistry().definitions;
-          const toolFingerprint = getToolFingerprint(allTools);
-          const currentHash = computeDynamicContextHash(instructionContent, skills, toolFingerprint);
+          const currentHash = await computeSessionHash(sessionManager, sessionId);
           const cachedHash = sessionManager.getCachedPrompt(sessionId)?.hash;
           if (cachedHash) {
             if (currentHash !== cachedHash) {
               logger.debug("checkDynamic: hash mismatch", {
                 sessionId,
                 cachedHash,
-                currentHash,
-                toolCount: allTools.length
+                currentHash
               });
               if (!sessionManager.getDynamicContextChanged(sessionId)) {
                 sessionManager.setDynamicContextChanged(sessionId, true);
@@ -2071,4 +2052,4 @@ export {
   signalMcpReady,
   createWebSocketServer
 };
-//# sourceMappingURL=chunk-EQUVYCW5.js.map
+//# sourceMappingURL=chunk-E4EUSGI7.js.map

package/dist/{chunk-M2YRM64Q.js → chunk-JNSSFTVD.js}

@@ -1,6 +1,6 @@
 import {
   getDatabase
-} from "./chunk-FBGWG4N6.js";
+} from "./chunk-ZPIZLTWU.js";
 
 // src/server/db/settings.ts
 var SETTINGS_KEYS = {
@@ -90,4 +90,4 @@ export {
   deleteSetting,
   getAllSettings
 };
-//# sourceMappingURL=chunk-M2YRM64Q.js.map
+//# sourceMappingURL=chunk-JNSSFTVD.js.map