From 3f1bf8c0e8ba31d65c5a56041e4a9f89e87aa65e Mon Sep 17 00:00:00 2001
From: tanaka takashi <isazaka@gmail.com>
Date: Sat, 27 Jun 2026 02:47:14 +0900
Subject: MCP toolsの名称による実行制限処理の削除。
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ollama_web/llm.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/ollama_web/llm.py')

diff --git a/src/ollama_web/llm.py b/src/ollama_web/llm.py
index 11e93d2..693cfa2 100644
--- a/src/ollama_web/llm.py
+++ b/src/ollama_web/llm.py
@@ -10,8 +10,9 @@ from typing import Any, cast
 import ollama
 from ollama import Message
 
+
 from .config import settings
-from .mcp import is_dangerous_mcp_tool, redact_secrets
+from .mcp import redact_secrets
 from .tools.registry import ToolRegistry, default_registry
 
 # Maximum successive tool-call rounds before we force a final answer.
@@ -38,14 +39,7 @@ def _safe_tool_result(result: str) -> str:
     return str(redacted)
 
 
-def _execute_tool_with_policy(
-    reg: ToolRegistry,
-    name: str,
-    args: Any,
-) -> str:
-    if is_dangerous_mcp_tool(name):
-        return json.dumps({"error": "MCP tool requires explicit approval"}, ensure_ascii=False)
-    return reg.execute(name, args if isinstance(args, dict) else json.dumps(args))
+
 
 
 def get_client(host: str | None = None) -> ollama.Client:
@@ -265,8 +259,9 @@ def chat_with_tools(
         for call in calls:
             name = call.get("name", "")
             args = call.get("arguments", {})
+
             yield {"type": "tool_start", "name": name, "arguments": _safe_tool_arguments(args)}
-            result = _execute_tool_with_policy(reg, name, args)
+            result = reg.execute(name, args if isinstance(args, dict) else json.dumps(args))
             result = _safe_tool_result(_trim_tool_result(result, settings.max_tool_result_chars))
             yield {"type": "tool_end", "name": name, "result": result}
             tool_results.append((name, result))
@@ -443,10 +438,11 @@ def stream_chat_with_tools(
         for call in tool_calls:
             name = call.get("name", "")
             args = call.get("arguments", {})
+
             yield {"type": "tool_start", "name": name, "arguments": _safe_tool_arguments(args)}
             t1 = time.time()
             try:
-                result = _execute_tool_with_policy(reg, name, args)
+                result = reg.execute(name, args if isinstance(args, dict) else json.dumps(args))
             except Exception as exc:  # noqa: BLE001
                 logger.warning("tool %s execution failed in %.2fs: %s", name, time.time() - t1, exc)
                 result = f"Tool execution failed: {exc}"
-- 
cgit v1.2.3