openfox 2.0.75 → 2.0.77

package/dist/{chunk-J3VQBVGO.js → chunk-VMYDUZWI.js}

@@ -9,7 +9,7 @@ import {
   loadAllAgentsDefault,
   processEventsForConversation,
   runTopLevelAgentLoop
-} from "./chunk-6ZMGWDOD.js";
+} from "./chunk-YDV7RIQ6.js";
 import {
   TurnMetrics,
   buildAgentReminder,
@@ -17,16 +17,16 @@ import {
   buildTopLevelSystemPrompt,
   createChatDoneEvent,
   createMessageStartEvent
-} from "./chunk-XWBNYU2L.js";
+} from "./chunk-XNCHOD2X.js";
 import {
   PathAccessDeniedError
-} from "./chunk-KEVRZWL3.js";
+} from "./chunk-46RORSKU.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-YFFP4DR4.js";
+} from "./chunk-NGJ5XJ7D.js";
 import {
   buildSnapshotFromSessionState
 } from "./chunk-DJASQ2ZB.js";
@@ -66,7 +66,7 @@ function resolveAgentDef(sessionManager, sessionId) {
 }
 async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-RZ464GUJ.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-T7S45DOQ.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   const allAgents = await loadAllAgentsDefault();
@@ -79,7 +79,7 @@ async function buildCachedPrompt(sessionManager, sessionId, agentDef) {
 async function computeSessionHash(sessionManager, sessionId) {
   const { instructionContent, skills } = await loadSessionContext(sessionManager, sessionId);
   const agentDef = await resolveAgentDef(sessionManager, sessionId);
-  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-RZ464GUJ.js");
+  const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-T7S45DOQ.js");
   const tools = getToolRegistryForAgent2(agentDef).definitions;
   const toolFingerprint = getToolFingerprint(tools);
   return computeDynamicContextHash(instructionContent, skills, toolFingerprint);
@@ -97,7 +97,7 @@ async function applyDynamicContext(sessionManager, sessionId) {
 
 // src/server/chat/orchestrator.ts
 async function buildRetryPatterns() {
-  const { getSetting, SETTINGS_KEYS } = await import("./settings-PFXRYXZU.js");
+  const { getSetting, SETTINGS_KEYS } = await import("./settings-7XDMSPIC.js");
   const raw = getSetting(SETTINGS_KEYS.RETRY_PATTERNS);
   if (!raw) {
     const oldXmlProtection = getSetting("llm.disableXmlProtection");
@@ -359,4 +359,4 @@ export {
   runChatTurn,
   runAgentTurn
 };
-//# sourceMappingURL=chunk-J3VQBVGO.js.map
+//# sourceMappingURL=chunk-VMYDUZWI.js.map

package/dist/{chunk-UN26GIQG.js → chunk-VPFUXGMM.js}

@@ -8,6 +8,10 @@ function buildUpdatedServerConfig(patch, existing, persistedCfg) {
   const mergedEnv = patch.env !== void 0 ? patch.env : transportChanged ? void 0 : existing.config.env;
   const mergedUrl = patch.url !== void 0 ? patch.url : transportChanged ? void 0 : existing.config.url;
   const mergedHeaders = patch.headers !== void 0 ? patch.headers : transportChanged ? void 0 : existing.config.headers;
+  const mergedTimeout = patch.timeout !== void 0 ? patch.timeout : existing.config.timeout;
+  if (patch.timeout !== void 0 && (typeof patch.timeout !== "number" || patch.timeout <= 0)) {
+    return { serverCfg: {}, error: "timeout must be a positive number" };
+  }
   if (resolvedTransport === "http" && !mergedUrl) {
     return { serverCfg: {}, error: "url is required for http transport" };
   }
@@ -21,6 +25,7 @@ function buildUpdatedServerConfig(patch, existing, persistedCfg) {
     ...mergedEnv && Object.keys(mergedEnv).length > 0 ? { env: mergedEnv } : {},
     ...mergedUrl ? { url: mergedUrl } : {},
     ...mergedHeaders && Object.keys(mergedHeaders).length > 0 ? { headers: mergedHeaders } : {},
+    ...mergedTimeout !== void 0 ? { timeout: mergedTimeout } : {},
     ...persistedCfg?.disabledTools && persistedCfg.disabledTools.length > 0 ? { disabledTools: persistedCfg.disabledTools } : {},
     ...persistedCfg?.cachedTools && persistedCfg.cachedTools.length > 0 ? { cachedTools: persistedCfg.cachedTools } : {}
   };
@@ -51,4 +56,4 @@ export {
   buildUpdatedServerConfig,
   applyMcpServerUpdate
 };
-//# sourceMappingURL=chunk-UN26GIQG.js.map
+//# sourceMappingURL=chunk-VPFUXGMM.js.map

package/dist/{chunk-6XOA2WPU.js → chunk-WL2WEJAK.js}

@@ -13,7 +13,7 @@ import {
   getThinking,
   mapFinishReason,
   parseToolArguments
-} from "./chunk-EZK7CGJ7.js";
+} from "./chunk-RMXPVQP4.js";
 import {
   LLMError,
   OpenAIHttpClient
@@ -94,7 +94,10 @@ function createLLMClient(config, initialBackend = "unknown") {
         const content = message.content ?? "";
         const thinkingContent = getThinking(message, thinkingField) ?? "";
         const toolCalls = message.tool_calls?.map((tc) => {
-          const { arguments: args, parseError } = parseToolArguments(tc.function.arguments, { id: tc.id, name: tc.function.name });
+          const { arguments: args, parseError } = parseToolArguments(tc.function.arguments, {
+            id: tc.id,
+            name: tc.function.name
+          });
           return { id: tc.id, name: tc.function.name, arguments: args, ...parseError ? { parseError } : {} };
         });
         return {
@@ -265,4 +268,4 @@ function createLLMClient(config, initialBackend = "unknown") {
 export {
   createLLMClient
 };
-//# sourceMappingURL=chunk-6XOA2WPU.js.map
+//# sourceMappingURL=chunk-WL2WEJAK.js.map

package/dist/{chunk-XWBNYU2L.js → chunk-XNCHOD2X.js}

@@ -1,6 +1,6 @@
 import {
   getPlatformShell
-} from "./chunk-S7O77CVO.js";
+} from "./chunk-4QHDQP2N.js";
 import {
   streamWithSegments
 } from "./chunk-J2GP3J3X.js";
@@ -12,7 +12,7 @@ import {
 } from "./chunk-YHEQTVFV.js";
 import {
   buildModelParams
-} from "./chunk-EZK7CGJ7.js";
+} from "./chunk-RMXPVQP4.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
@@ -419,13 +419,14 @@ async function* streamLLMPure(options) {
           const fullName = toolNames.get(value.index);
           if (!seenToolIndices.has(value.index) && fullName) {
             seenToolIndices.add(value.index);
+            const displayName = options.subAgentAliases?.has(fullName) ? "call_sub_agent" : fullName;
             const accumulatedArgs = toolArgs.get(value.index);
             yield {
               type: "tool.preparing",
               data: {
                 messageId,
                 index: value.index,
-                name: fullName,
+                name: displayName,
                 ...accumulatedArgs ? { arguments: accumulatedArgs } : {}
               }
             };
@@ -678,4 +679,4 @@ export {
   createChatDoneEvent,
   consumeStreamGenerator
 };
-//# sourceMappingURL=chunk-XWBNYU2L.js.map
+//# sourceMappingURL=chunk-XNCHOD2X.js.map

package/dist/{chunk-6ZMGWDOD.js → chunk-YDV7RIQ6.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-NWO6GRYE.js";
 import {
   applyMcpServerUpdate
-} from "./chunk-UN26GIQG.js";
+} from "./chunk-VPFUXGMM.js";
 import {
   getGitBranch,
   listWorkspaces
@@ -24,13 +24,13 @@ import {
   createToolCallEvent,
   createToolResultEvent,
   streamLLMPure
-} from "./chunk-XWBNYU2L.js";
+} from "./chunk-XNCHOD2X.js";
 import {
   startInspectProxy
-} from "./chunk-E5LLEO3C.js";
+} from "./chunk-DH3SSBZN.js";
 import {
   getProject
-} from "./chunk-UV3EMWL4.js";
+} from "./chunk-LXFLRM7M.js";
 import {
   checkAborted,
   createProcess,
@@ -41,13 +41,13 @@ import {
   spawnShellProcess,
   startProcessCommand,
   stopProcess
-} from "./chunk-LTFB2WWE.js";
+} from "./chunk-OBQPXUXI.js";
 import {
   SETTINGS_KEYS,
   deleteSetting,
   getSetting,
   setSetting
-} from "./chunk-QNKXZH3Z.js";
+} from "./chunk-YMFCFMMB.js";
 import {
   getMaxPerSession,
   getSessionProcessCount,
@@ -58,13 +58,13 @@ import {
   extractAbsolutePathsFromCommand,
   extractSensitivePathsFromCommand,
   requestPathAccess
-} from "./chunk-KEVRZWL3.js";
+} from "./chunk-46RORSKU.js";
 import {
   getCurrentContextWindowId,
   getCurrentWindowMessageOptions,
   getEventStore,
   getRuntimeConfig
-} from "./chunk-YFFP4DR4.js";
+} from "./chunk-NGJ5XJ7D.js";
 import {
   buildContextMessagesFromEventHistory,
   foldContextState,
@@ -86,18 +86,22 @@ import {
 } from "./chunk-V4IE7HJY.js";
 import {
   OUTPUT_LIMITS,
+  cacheSet,
+  contentHash,
+  decodeDataUrl,
+  extractPdfContent,
   extractPdfText,
   formatPdfErrorMessage,
   isPdfBuffer,
   processPdfContent
-} from "./chunk-EZK7CGJ7.js";
+} from "./chunk-RMXPVQP4.js";
 import {
   logger
 } from "./chunk-K44MW7JJ.js";
 import {
   loadGlobalConfig,
   saveGlobalConfig
-} from "./chunk-WGAAQASA.js";
+} from "./chunk-YFVSSMA3.js";
 import {
   getGlobalConfigDir
 } from "./chunk-CQGTEGKL.js";
@@ -2107,6 +2111,21 @@ function createToolProgressHandler(append, messageId, callId, _sessionId) {
 // src/server/chat/execute-tools.ts
 import stripAnsi2 from "strip-ansi";
 var INTERRUPTED_ERROR = "Tool execution was interrupted by user";
+function extractSubAgentPrompt(args) {
+  return args["prompt"] || args["query"] || args["task"] || "";
+}
+async function transformSubAgentAliases(toolCalls, toolRegistry) {
+  const hasCallSubAgent = toolRegistry.tools.some((t) => t.name === "call_sub_agent");
+  if (!hasCallSubAgent) return;
+  const agents = await loadAllAgentsDefault();
+  for (const tc of toolCalls) {
+    const agentDef = findAgentById(tc.name, agents);
+    if (!agentDef?.metadata.subagent) continue;
+    const prompt = extractSubAgentPrompt(tc.arguments);
+    tc.name = "call_sub_agent";
+    tc.arguments = { subAgentType: agentDef.metadata.id, prompt };
+  }
+}
 function createInterruptedResult(startTime) {
   return {
     success: false,
@@ -2123,6 +2142,7 @@ async function executeTools(assistantMsgId, toolCalls, ctx, append) {
   if (ctx.signal?.aborted) {
     throw new Error("Aborted");
   }
+  await transformSubAgentAliases(toolCalls, ctx.toolRegistry);
   for (const toolCall of toolCalls) {
     append(createToolCallEvent(assistantMsgId, toolCall));
   }
@@ -2428,6 +2448,8 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
       const requestedMaxTokens = modelSettings.maxTokens ?? 16384;
       modelSettings = { ...modelSettings, maxTokens: Math.min(requestedMaxTokens, availableForOutput) };
     }
+    const allAgents = await loadAllAgentsDefault();
+    const subAgentAliases = new Set(getSubAgents(allAgents).map((a) => a.metadata.id));
     const streamGen = streamLLMPure({
       messageId: assistantMsgId,
       systemPrompt: assembledRequest.systemPrompt,
@@ -2436,6 +2458,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
       tools: assembledRequest.tools,
       toolChoice: "auto",
       signal,
+      subAgentAliases,
       ...config.retryPatterns ? { retryPatterns: config.retryPatterns } : {},
       ...modelSettings && { modelSettings }
     });
@@ -2494,7 +2517,7 @@ ${CONTINUE_PROMPT}` : CONTINUE_PROMPT;
     sessionManager.setCurrentContextSize(sessionId, result.usage.promptTokens, config.subAgentMetadata?.subAgentId);
     if (!compacting) {
       const contextState2 = sessionManager.getContextState(sessionId);
-      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-AERNYEMP.js");
+      const { shouldCompact, appendCompactionPrompt } = await import("./compactor-BJXFE5PL.js");
       if (shouldCompact(contextState2.currentTokens, contextState2.maxTokens, runtimeConfig.context.compactionThreshold)) {
         appendCompactionPrompt(sessionId, append);
         compacting = true;
@@ -2851,10 +2874,9 @@ async function describeImageFromDataUrl(dataUrl, visionModel, options) {
 }
 
 // src/server/context/image-processor.ts
-import { createHash as createHash2 } from "crypto";
 async function loadVisionModelFromGlobalConfig() {
   try {
-    const { loadGlobalConfig: loadGlobalConfig2, getVisionFallback } = await import("./config-EUMVEFHU.js");
+    const { loadGlobalConfig: loadGlobalConfig2, getVisionFallback } = await import("./config-MD74ETY5.js");
     const runtimeConfig = getRuntimeConfig();
     const mode = runtimeConfig.mode ?? "production";
     const globalConfig = await loadGlobalConfig2(mode);
@@ -2872,12 +2894,12 @@ async function loadVisionModelFromGlobalConfig() {
   return void 0;
 }
 var descriptionCache = /* @__PURE__ */ new Map();
-function contentHash(data) {
-  return createHash2("sha256").update(data).digest("hex").slice(0, 16);
-}
 function isImageAttachment(att) {
   return att.mimeType.startsWith("image/");
 }
+function isPdfAttachment(att) {
+  return att.mimeType === "application/pdf";
+}
 function hasImageMetadata(result) {
   const meta = result.metadata;
   if (!meta) return false;
@@ -2885,46 +2907,17 @@ function hasImageMetadata(result) {
   const mimeType = meta["mimeType"];
   return typeof dataUrl === "string" && typeof mimeType === "string" && mimeType.startsWith("image/");
 }
-async function describeAttachment(att, messageId, options, descriptions) {
-  const cacheKey = contentHash(att.data);
-  if (descriptionCache.has(cacheKey)) {
-    const cached = descriptionCache.get(cacheKey);
-    descriptions.set(att.id, cached);
-    return cached;
-  }
-  if (options.visionModel) {
-    const startData = {
-      messageId,
-      attachmentId: att.id
-    };
-    if (att.filename !== void 0) {
-      startData.filename = att.filename;
-    }
-    options.onEvent?.({ type: "vision_fallback.start", data: startData });
-    const description = await describeImageFromDataUrl(att.data, options.visionModel, {
-      context: att.filename ? `File: ${att.filename}` : void 0,
-      signal: options.signal
-    });
-    descriptionCache.set(cacheKey, description);
-    descriptions.set(att.id, description);
-    options.onEvent?.({ type: "vision_fallback.done", data: { messageId, attachmentId: att.id, description } });
-    return description;
-  }
-  const placeholder = `[Image: ${att.filename || "image"}]`;
-  descriptions.set(att.id, placeholder);
-  return placeholder;
-}
-async function describeToolResultImage(dataUrl, filename, toolCallId, messageId, options, descriptions) {
+async function describeImageDataUrl(dataUrl, attachmentId, messageId, options, descriptions, filename) {
   const cacheKey = contentHash(dataUrl);
   if (descriptionCache.has(cacheKey)) {
     const cached = descriptionCache.get(cacheKey);
-    descriptions.set(toolCallId, cached);
+    descriptions.set(attachmentId, cached);
     return cached;
   }
   if (options.visionModel) {
     const startData = {
       messageId,
-      attachmentId: toolCallId
+      attachmentId
     };
     if (filename !== void 0) {
       startData.filename = filename;
@@ -2934,18 +2927,61 @@ async function describeToolResultImage(dataUrl, filename, toolCallId, messageId,
       context: filename ? `File: ${filename}` : void 0,
       signal: options.signal
     });
-    descriptionCache.set(cacheKey, description);
-    descriptions.set(toolCallId, description);
-    options.onEvent?.({
-      type: "vision_fallback.done",
-      data: { messageId, attachmentId: toolCallId, description }
-    });
+    cacheSet(descriptionCache, cacheKey, description);
+    descriptions.set(attachmentId, description);
+    options.onEvent?.({ type: "vision_fallback.done", data: { messageId, attachmentId, description } });
     return description;
   }
-  const placeholder = `[Image: ${filename || "image"}]`;
-  descriptions.set(toolCallId, placeholder);
+  const placeholder = filename ? `[Image: ${filename}]` : "[Image]";
+  descriptions.set(attachmentId, placeholder);
   return placeholder;
 }
+async function describeAttachment(att, messageId, options, descriptions) {
+  return describeImageDataUrl(att.data, att.id, messageId, options, descriptions, att.filename);
+}
+async function describePdfAttachment(att, messageId, options, descriptions) {
+  const hasVision = !!options.visionModel;
+  const cacheKey = `pdf:${hasVision}:${contentHash(att.data)}`;
+  const filenameLabel = att.filename || "document.pdf";
+  if (descriptionCache.has(cacheKey)) {
+    const cached = descriptionCache.get(cacheKey);
+    const output2 = `[PDF: ${filenameLabel}]${cached}`;
+    descriptions.set(att.id, output2);
+    return output2;
+  }
+  const buffer = decodeDataUrl(att.data);
+  if (!buffer) {
+    const fallback = `[PDF: ${filenameLabel}] (could not decode)`;
+    cacheSet(descriptionCache, cacheKey, fallback);
+    descriptions.set(att.id, fallback);
+    return fallback;
+  }
+  let blocks;
+  try {
+    const result = await extractPdfContent(buffer);
+    blocks = result.blocks;
+  } catch {
+    const errorText = `[PDF: ${filenameLabel}] (could not extract content)`;
+    descriptions.set(att.id, errorText);
+    return errorText;
+  }
+  let body = "";
+  let imageIndex = 0;
+  for (const block of blocks) {
+    if (block.type === "text" && block.content) {
+      body += "\n\n" + block.content;
+    } else if (block.type === "image" && block.dataUrl) {
+      const imgAttachmentId = `${att.id}/image-${imageIndex}`;
+      const description = await describeImageDataUrl(block.dataUrl, imgAttachmentId, messageId, options, descriptions);
+      body += "\n\n" + description;
+      imageIndex++;
+    }
+  }
+  const output = `[PDF: ${filenameLabel}]${body}`;
+  cacheSet(descriptionCache, cacheKey, body);
+  descriptions.set(att.id, output);
+  return output;
+}
 async function processContextImages(events, options) {
   if (options.modelSupportsVision) {
     return { events, descriptions: /* @__PURE__ */ new Map() };
@@ -2956,9 +2992,8 @@ async function processContextImages(events, options) {
     if (event.type === "message.start") {
       const data = event.data;
       if (!data.attachments || data.attachments.length === 0) continue;
-      const imageAtts = data.attachments.filter(isImageAttachment);
-      if (imageAtts.length === 0) continue;
       let enriched = false;
+      const imageAtts = data.attachments.filter(isImageAttachment);
       for (const att of imageAtts) {
         if (att.description) {
           descriptions.set(att.id, att.description);
@@ -2968,6 +3003,16 @@ async function processContextImages(events, options) {
         att.description = description;
         enriched = true;
       }
+      const pdfAtts = data.attachments.filter(isPdfAttachment);
+      for (const att of pdfAtts) {
+        if (att.pdfContent) {
+          descriptions.set(att.id, att.pdfContent);
+          continue;
+        }
+        const pdfContent = await describePdfAttachment(att, data.messageId, options, descriptions);
+        att.pdfContent = pdfContent;
+        enriched = true;
+      }
       if (enriched && options.persistEvent) {
         options.persistEvent(event.sessionId, event.seq, data);
       }
@@ -2982,13 +3027,13 @@ async function processContextImages(events, options) {
       }
       const dataUrl = meta["dataUrl"];
       const path = meta["path"];
-      const description = await describeToolResultImage(
+      const description = await describeImageDataUrl(
         dataUrl,
-        path,
         data.toolCallId,
         data.messageId,
         options,
-        descriptions
+        descriptions,
+        path
       );
       meta["description"] = description;
       if (options.persistEvent) {
@@ -3000,16 +3045,24 @@ async function processContextImages(events, options) {
       let enriched = false;
       for (const message of snapshot.messages) {
         if (message.role === "user" && message.attachments && message.attachments.length > 0) {
-          const imageAtts = message.attachments.filter(isImageAttachment);
-          if (imageAtts.length === 0) continue;
-          for (const att of imageAtts) {
-            if (att.description) {
-              descriptions.set(att.id, att.description);
-              continue;
+          for (const att of message.attachments) {
+            if (isImageAttachment(att)) {
+              if (att.description) {
+                descriptions.set(att.id, att.description);
+                continue;
+              }
+              const description = await describeAttachment(att, message.id, options, descriptions);
+              att.description = description;
+              enriched = true;
+            } else if (isPdfAttachment(att)) {
+              if (att.pdfContent) {
+                descriptions.set(att.id, att.pdfContent);
+                continue;
+              }
+              const pdfContent = await describePdfAttachment(att, message.id, options, descriptions);
+              att.pdfContent = pdfContent;
+              enriched = true;
             }
-            const description = await describeAttachment(att, message.id, options, descriptions);
-            att.description = description;
-            enriched = true;
           }
         }
         if (message.role === "assistant" && message.toolCalls) {
@@ -3022,13 +3075,13 @@ async function processContextImages(events, options) {
             }
             const dataUrl = meta["dataUrl"];
             const path = meta["path"];
-            const description = await describeToolResultImage(
+            const description = await describeImageDataUrl(
               dataUrl,
-              path,
               toolCall.id,
               message.id,
               options,
-              descriptions
+              descriptions,
+              path
             );
             meta["description"] = description;
             enriched = true;
@@ -3399,7 +3452,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-RZ464GUJ.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-T7S45DOQ.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -4369,6 +4422,10 @@ var mcpConfigTool = createTool(
           enabled: {
             type: "boolean",
             description: "Whether the tool should be enabled (required for: toggle-tool)"
+          },
+          timeout: {
+            type: "number",
+            description: "Timeout in seconds for MCP tool calls (optional)"
           }
         },
         required: ["action"]
@@ -4398,7 +4455,7 @@ var mcpConfigTool = createTool(
       mcpNotifyChanged?.(sessionId);
     }
     async function rebuildTools() {
-      const { setMcpTools: setMcpTools2 } = await import("./tools-RZ464GUJ.js");
+      const { setMcpTools: setMcpTools2 } = await import("./tools-T7S45DOQ.js");
       const mcpTools = createMcpTools(mcpManagerForTools);
       setMcpTools2(mcpTools);
     }
@@ -4435,13 +4492,17 @@ var mcpConfigTool = createTool(
       } else if (!args.command) {
         return helpers.error("command is required for stdio transport");
       }
+      if (args.timeout !== void 0 && (typeof args.timeout !== "number" || args.timeout <= 0)) {
+        return helpers.error("timeout must be a positive number");
+      }
       const serverCfg = {
         transport: args.transport ?? "stdio",
         ...args.command ? { command: args.command } : {},
         ...args.args && args.args.length > 0 ? { args: args.args } : {},
         ...args.env && Object.keys(args.env).length > 0 ? { env: args.env } : {},
         ...args.url ? { url: args.url } : {},
-        ...args.headers && Object.keys(args.headers).length > 0 ? { headers: args.headers } : {}
+        ...args.headers && Object.keys(args.headers).length > 0 ? { headers: args.headers } : {},
+        ...args.timeout !== void 0 ? { timeout: args.timeout } : {}
       };
       await persistAndRebuild((mcpServers) => {
         mcpServers[args.name] = serverCfg;
@@ -4466,7 +4527,8 @@ var mcpConfigTool = createTool(
         ...args.args !== void 0 ? { args: args.args } : {},
         ...args.env !== void 0 ? { env: args.env } : {},
         ...args.url !== void 0 ? { url: args.url } : {},
-        ...args.headers !== void 0 ? { headers: args.headers } : {}
+        ...args.headers !== void 0 ? { headers: args.headers } : {},
+        ...args.timeout !== void 0 ? { timeout: args.timeout } : {}
       };
       const { error: updateError } = await applyMcpServerUpdate({
         name: args.name,
@@ -4484,7 +4546,9 @@ var mcpConfigTool = createTool(
       notifyContextChanged(context.sessionId);
       const server = mcpManagerForTools.getServer(args.name);
       const toolCount = server?.tools.length ?? 0;
-      return helpers.success(`Updated MCP server "${args.name}" (${toolCount} tools discovered). ${APPLY_PROMPT_MESSAGE}`);
+      return helpers.success(
+        `Updated MCP server "${args.name}" (${toolCount} tools discovered). ${APPLY_PROMPT_MESSAGE}`
+      );
     }
     if (args.action === "remove") {
       if (!args.name) return helpers.error("Missing required field: name");
@@ -4828,39 +4892,11 @@ function validateToolAction(toolName, action, permissions) {
   }
   return void 0;
 }
-function extractSubAgentPrompt(args) {
-  return args["prompt"] || args["query"] || args["task"] || "";
-}
 function createRegistryFromTools(tools, allowedTools, toolPermissions, agentId, isSubAgent) {
   const toolMap = /* @__PURE__ */ new Map();
   for (const tool of tools) {
     toolMap.set(tool.name, tool);
   }
-  async function trySubAgentAlias(name, args, context) {
-    if (!toolMap.has("call_sub_agent")) {
-      return null;
-    }
-    try {
-      const agents = await loadAllAgentsDefault();
-      const agentDef = findAgentById(name, agents);
-      if (!agentDef?.metadata.subagent) {
-        return null;
-      }
-      const prompt = extractSubAgentPrompt(args);
-      logger.info("Sub-agent alias transformation", {
-        from: name,
-        to: "call_sub_agent",
-        subAgentType: name
-      });
-      return callSubAgentTool.execute({ subAgentType: name, prompt }, context);
-    } catch (err) {
-      logger.warn("Sub-agent alias resolution failed", {
-        tool: name,
-        error: err instanceof Error ? err.message : String(err)
-      });
-      return null;
-    }
-  }
   return {
     tools,
     definitions: tools.map((t) => t.definition),
@@ -4936,8 +4972,6 @@ function createRegistryFromTools(tools, allowedTools, toolPermissions, agentId,
           };
         }
       }
-      const aliasResult = await trySubAgentAlias(name, args, context);
-      if (aliasResult) return aliasResult;
       return {
         success: false,
         error: `Unknown tool: ${name}. Available tools: ${tools.map((t) => t.name).join(", ")}`,
@@ -5074,4 +5108,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-6ZMGWDOD.js.map
+//# sourceMappingURL=chunk-YDV7RIQ6.js.map

package/dist/{chunk-WGAAQASA.js → chunk-YFVSSMA3.js}

@@ -104,7 +104,8 @@ var mcpServerSchema = z.object({
   url: z.string().optional(),
   headers: z.record(z.string(), z.string()).optional(),
   disabledTools: z.array(z.string()).optional(),
-  cachedTools: z.array(cachedToolSchema).optional()
+  cachedTools: z.array(cachedToolSchema).optional(),
+  timeout: z.number().positive().optional()
 });
 var llmConfigSchema = z.object({
   timeout: z.number().optional(),
@@ -313,4 +314,4 @@ export {
   removeProvider,
   activateProvider
 };
-//# sourceMappingURL=chunk-WGAAQASA.js.map
+//# sourceMappingURL=chunk-YFVSSMA3.js.map

package/dist/{chunk-QNKXZH3Z.js → chunk-YMFCFMMB.js}

@@ -1,6 +1,6 @@
 import {
   getDatabase
-} from "./chunk-I4RWK2L2.js";
+} from "./chunk-7QXRQ5ZL.js";
 
 // src/server/db/settings.ts
 var SETTINGS_KEYS = {
@@ -101,4 +101,4 @@ export {
   deleteSetting,
   getAllSettings
 };
-//# sourceMappingURL=chunk-QNKXZH3Z.js.map
+//# sourceMappingURL=chunk-YMFCFMMB.js.map