feat(agent): make MCP tool call timeout configurable

agent/component/agent_with_tools.py

@@ -69,6 +69,7 @@ def __init__(self):
         self.max_rounds = 5
         self.description = ""
         self.custom_header = {}
+        self.tool_timeout = 10
 
 
 class Agent(LLM, ToolBase):
@@ -111,7 +112,9 @@ def __init__(self, canvas, id, param: LLMParam):
                 self.tool_meta.append(mcp_tool_metadata_to_openai_tool(meta, function_name=indexed_name))
                 self.tools[indexed_name] = MCPToolBinding(tool_call_session, tnm)
         self.callback = partial(self._canvas.tool_use_callback, id)
-        self.toolcall_session = LLMToolPluginCallSession(self.tools, self.callback)
+        self.toolcall_session = LLMToolPluginCallSession(
+            self.tools, self.callback, default_timeout=float(self._param.tool_timeout or 10)
+        )
         if self.tool_meta:
             self.chat_mdl.bind_tools(self.toolcall_session, self.tool_meta)
 

agent/tools/base.py

@@ -48,14 +48,16 @@ class ToolMeta(TypedDict):
 
 
 class LLMToolPluginCallSession(ToolCallSession):
-    def __init__(self, tools_map: dict[str, object], callback: partial):
+    def __init__(self, tools_map: dict[str, object], callback: partial, default_timeout: float = 10):
         self.tools_map = tools_map
         self.callback = callback
+        self.default_timeout = default_timeout
 
-    def tool_call(self, name: str, arguments: dict[str, Any], timeout: float | int = 10) -> Any:
+    def tool_call(self, name: str, arguments: dict[str, Any], timeout: float | int | None = None) -> Any:
         return asyncio.run(self.tool_call_async(name, arguments, request_timeout=timeout))
 
-    async def tool_call_async(self, name: str, arguments: dict[str, Any], request_timeout: float | int = 10) -> Any:
+    async def tool_call_async(self, name: str, arguments: dict[str, Any], request_timeout: float | int | None = None) -> Any:
+        request_timeout = self.default_timeout if request_timeout is None else request_timeout
         assert name in self.tools_map, f"LLM tool {name} does not exist"
         logging.info(f"[ToolCall] invoke name={name} arguments={str(arguments)[:200]}")
         if not isinstance(arguments, Mapping):

test/unit_test/agent/tools/test_llm_tool_plugin_session.py

@@ -0,0 +1,64 @@
+#
+#  Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+"""Verify that LLMToolPluginCallSession applies its configurable default timeout to MCP tool calls."""
+
+import asyncio
+import time
+from functools import partial
+
+from agent.tools.base import LLMToolPluginCallSession
+from common.mcp_tool_call_conn import MCPToolBinding
+
+
+class _BlockingSession:
+    """Fake MCP session that waits until the caller-provided timeout elapses, mimicking MCPToolCallSession."""
+
+    def tool_call(self, name: str, arguments: dict, timeout: float = 10) -> str:
+        deadline = time.monotonic() + timeout
+        while time.monotonic() < deadline:
+            time.sleep(0.005)
+        return "done"
+
+
+def _noop_callback(*args, **kwargs):
+    pass
+
+
+def _make_session(default_timeout):
+    return LLMToolPluginCallSession(
+        {"transcribe_0": MCPToolBinding(_BlockingSession(), "transcribe")},
+        partial(_noop_callback),
+        default_timeout=default_timeout,
+    )
+
+
+def test_default_timeout_is_applied_to_mcp_tool_call():
+    session = _make_session(default_timeout=0.1)
+    start = time.monotonic()
+    result = asyncio.run(session.tool_call_async("transcribe_0", {}))
+    elapsed = time.monotonic() - start
+    assert result == "done"
+    # Without the session default the 10s tool_call default would run far longer.
+    assert elapsed < 1.0
+
+
+def test_explicit_request_timeout_overrides_default():
+    session = _make_session(default_timeout=0.5)
+    start = time.monotonic()
+    result = asyncio.run(session.tool_call_async("transcribe_0", {}, request_timeout=0.05))
+    elapsed = time.monotonic() - start
+    assert result == "done"
+    assert elapsed < 0.3

web/src/locales/en.ts

@@ -2602,6 +2602,9 @@ Best for: Documents with flowing, contextually connected content — such as boo
       maxRounds: 'Max reflection rounds',
       delayAfterError: 'Delay after error',
       maxRetries: 'Max retry rounds',
+      toolTimeout: 'Tool timeout',
+      toolTimeoutTip:
+        'Timeout in seconds for a single tool call (including MCP tools). Increase it for long-running tools.',
       maxSteps: 'Max steps',
       headless: 'Headless',
       enableDefaultExtensions: 'Enable default extensions',

web/src/locales/ru.ts

@@ -1599,6 +1599,9 @@ export default {
       maxRounds: 'Максимальное количество раундов рефлексии',
       delayAfterError: 'Задержка после ошибки',
       maxRetries: 'Максимальное количество попыток повтора',
+      toolTimeout: 'Таймаут вызова инструмента',
+      toolTimeoutTip:
+        'Таймаут в секундах для одного вызова инструмента (включая MCP). Увеличьте для длительно выполняющихся инструментов.',
       advancedSettings: 'Расширенные настройки',
       addTools: 'Добавить инструменты',
       sysPromptDefaultValue: `

web/src/locales/zh.ts

@@ -2247,6 +2247,9 @@ NER：使用 spaCy NER 和基于规则的关键词提取来抽取实体和关系
       maxRounds: '最大反思轮数',
       delayAfterError: '错误后延迟',
       maxRetries: '最大重试轮数',
+      toolTimeout: '工具调用超时',
+      toolTimeoutTip:
+        '单次工具调用（含 MCP 工具）的超时秒数。长时间运行的工具请调大该值。',
       maxSteps: '最大步数',
       headless: '无头模式',
       enableDefaultExtensions: '启用默认扩展',

web/src/pages/agent/constant/index.tsx

@@ -491,6 +491,7 @@ export const initialAgentValues = {
   exception_default_value: '',
   tools: [],
   mcp: [],
+  tool_timeout: 10,
   cite: true,
   showStructuredOutput: false,
   outputs: {

web/src/pages/agent/form/agent-form/index.tsx

@@ -19,6 +19,7 @@ import { Input, NumberInput } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Separator } from '@/components/ui/separator';
 import { Switch } from '@/components/ui/switch';
+import NumberInputStepper from '@/components/originui/number-input';
 import { useFindLlmByUuid } from '@/hooks/use-llm-request';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { get } from 'lodash';
@@ -49,6 +50,7 @@ import {
   useHandleShowStructuredOutput,
   useShowStructuredOutputDialog,
 } from './use-show-structured-output-dialog';
+import { useGetAgentMCPIds } from './use-get-tools';
 import { useValues } from './use-values';
 import { useWatchFormChange } from './use-watch-change';
 
@@ -74,6 +76,7 @@ const FormSchema = z.object({
   exception_method: z.string().optional(),
   exception_goto: z.array(z.string()).optional(),
   exception_default_value: z.string().optional(),
+  tool_timeout: z.coerce.number().optional(),
   ...LargeModelFilterFormSchema,
   cite: z.boolean().optional(),
   showStructuredOutput: z.boolean().optional(),
@@ -118,6 +121,8 @@ function AgentForm({ node }: INextOperatorForm) {
     name: 'exception_method',
   });
 
+  const { mcpIds } = useGetAgentMCPIds();
+
   const showStructuredOutput = useWatch({
     control: form.control,
     name: 'showStructuredOutput',
@@ -248,6 +253,29 @@ function AgentForm({ node }: INextOperatorForm) {
                   </FormItem>
                 )}
               />
+              {mcpIds.length > 0 && (
+                <FormField
+                  control={form.control}
+                  name={`tool_timeout`}
+                  render={({ field }) => (
+                    <FormItem className="flex-1">
+                      <FormLabel tooltip={t('flow.toolTimeoutTip')}>
+                        {t('flow.toolTimeout')}
+                      </FormLabel>
+                      <FormControl>
+                        <div className="flex gap-2 items-center">
+                          <NumberInputStepper
+                            value={field.value}
+                            onChange={field.onChange}
+                            min={1}
+                          />{' '}
+                          {t('flow.seconds')}
+                        </div>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+              )}
               {hasSubAgentOrTool(edges, node?.id) && (
                 <FormField
                   control={form.control}

web/src/pages/agent/form/agent-form/use-values.ts

@@ -33,6 +33,7 @@ export function useValues(node?: RAGFlowNodeType) {
 
     return {
       ...omitToolsAndMcp(formData),
+      tool_timeout: get(formData, 'tool_timeout', 10),
       prompts: get(formData, 'prompts.0.content', ''),
     };
   }, [defaultValues, node?.data?.form]);