From 319ad4857cac10227a660330c5611b4f7d526e63 Mon Sep 17 00:00:00 2001
From: matdev83 <211248003+matdev83@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:03:18 +0100
Subject: [PATCH] Use contextvars for tool renderer overrides

---
 src/core/services/tool_text_renderer.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/core/services/tool_text_renderer.py b/src/core/services/tool_text_renderer.py
index 4245dd0dc..7a5a13f5d 100644
--- a/src/core/services/tool_text_renderer.py
+++ b/src/core/services/tool_text_renderer.py
@@ -5,6 +5,7 @@
 import logging
 from abc import ABC, abstractmethod
 from collections.abc import Callable
+from contextvars import ContextVar, Token
 from typing import Any
 
 from src.core.domain.chat import ToolCall
@@ -279,31 +280,34 @@ def reset_renderer_registry() -> None:
 
 
 # Context manager to temporarily override the renderer for a block of code
-_override: str | None = None
+_renderer_override: ContextVar[str | None] = ContextVar(
+    "tool_text_renderer_override", default=None
+)
 
 
 class OverrideRenderer:
-    def __init__(self, renderer_name: str):
+    def __init__(self, renderer_name: str) -> None:
         self.renderer_name = renderer_name
-        self.original_override = _override
+        self._token: Token[str | None] | None = None
 
     def __enter__(self) -> None:
-        global _override
-        _override = self.renderer_name
+        self._token = _renderer_override.set(self.renderer_name)
 
     def __exit__(self, exc_type: Any, _: Any, traceback: Any) -> None:
-        global _override
-        _override = self.original_override
+        if self._token is not None:
+            _renderer_override.reset(self._token)
+            self._token = None
 
 
 def render_tool_call(tool_call: ToolCall) -> str | None:
     """Render a tool call using the currently active renderer."""
-    renderer_name = _override or _renderer_registry.default_renderer
+    override = _renderer_override.get()
+    renderer_name = override or _renderer_registry.default_renderer
     renderer = get_renderer(renderer_name)
     text = renderer.render(tool_call)
     if text:
         return text
-    if (_override or "").strip().lower() in {"", "none"}:
+    if (override or "").strip().lower() in {"", "none"}:
         return None
     fallback_name = _renderer_registry.fallback_renderer
     if fallback_name and fallback_name != renderer_name: