Agent Zero AI framework
Refactor extensions to async/sync API
frdelab9fc4ee7f3d
diff --git a/agent.py b/agent.pyindex efcbec1c7..c037a8c24 100644--- a/agent.py+++ b/agent.py@@ -30,7 +30,7 @@ from helpers.dirty_json import DirtyJsonfrom helpers.defer import DeferredTaskfrom typing import Callablefrom helpers.localization import Localization-from helpers.extension import call_extensions, extensible+from helpers import extensionfrom helpers.errors import RepairableException, InterventionException, HandledExceptionclass AgentContextType(Enum):@@ -46,7 +46,7 @@ class AgentContext:_counter: int = 0_notification_manager = None- @extensible+ @extension.extensibledef __init__(self,config: "AgentConfig",@@ -152,7 +152,7 @@ class AgentContext:return cls._notification_manager@staticmethod- @extensible+ @extension.extensibledef remove(id: str):with AgentContext._contexts_lock:context = AgentContext._contexts.pop(id, None)@@ -176,7 +176,7 @@ class AgentContext:# recursive is not used now, prepared for context hierarchyself.output_data[key] = value- # @extensible+ @extension.extensibledef output(self):return {"id": self.id,@@ -220,12 +220,12 @@ class AgentContext:)return items- @extensible+ @extension.extensibledef kill_process(self):if self.task:self.task.kill()- @extensible+ @extension.extensibledef reset(self):self.kill_process()self.log.reset()@@ -233,21 +233,21 @@ class AgentContext:self.streaming_agent = Noneself.paused = False- @extensible+ @extension.extensibledef nudge(self):self.kill_process()self.paused = Falseself.task = self.communicate(UserMessage(self.agent0.read_prompt("fw.msg_nudge.md")))return self.task- @extensible+ @extension.extensibledef get_agent(self):return self.streaming_agent or self.agent0def is_running(self) -> bool:return (self.task and self.task.is_alive()) or False- @extensible+ @extension.extensibledef communicate(self, msg: "UserMessage", broadcast_level: int = 1):self.paused = False # unpause if paused@@ -267,7 +267,7 @@ class AgentContext:return self.task- @extensible+ @extension.extensibledef run_task(self, func: Callable[..., Coroutine[Any, Any, Any]], *args: Any, **kwargs: Any):@@ -279,7 +279,7 @@ class AgentContext:return self.task# this wrapper ensures that superior agents are called back if the chat was loaded from file and original callstack is gone- @extensible+ @extension.extensibleasync def _process_chain(self, agent: "Agent", msg: "UserMessage|str", user=True):try:msg_template = (@@ -295,13 +295,13 @@ class AgentContext:response = await self._process_chain(superior, response, False) # type: ignore# call end of process extensions- await self.get_agent().call_extensions("process_chain_end", data={})+ await extension.call_extensions_async("process_chain_end", agent=self.get_agent(), data={})return responseexcept Exception as e:await self.handle_exception("process_chain", e)- @extensible+ @extension.extensibleasync def handle_exception(self, location: str, exception: Exception):if exception:raise exception # exception handling is done by extensions@@ -358,7 +358,7 @@ class Agent:DATA_NAME_SUBORDINATE = "_subordinate"DATA_NAME_CTX_WINDOW = "ctx_window"- @extensible+ @extension.extensibledef __init__(self, number: int, config: AgentConfig, context: AgentContext | None = None):@@ -378,16 +378,18 @@ class Agent:self.intervention: UserMessage | None = Noneself.data: dict[str, Any] = {} # free data object all the tools can use- asyncio.run(self.call_extensions("agent_init"))+ extension.call_extensions_sync("agent_init", self)- @extensible+ @extension.extensibleasync def monologue(self):while True:try:# loop data dictionary to pass to extensionsself.loop_data = LoopData(user_message=self.last_user_message)# call monologue_start extensions- await self.call_extensions("monologue_start", loop_data=self.loop_data)+ await extension.call_extensions_async(+ "monologue_start", self, loop_data=self.loop_data+ )printer = PrintStyle(italic=True, font_color="#b3ffd9", padding=False)@@ -399,8 +401,8 @@ class Agent:self.loop_data.params_temporary = {} # clear temporary params# call message_loop_start extensions- await self.call_extensions(- "message_loop_start", loop_data=self.loop_data+ await extension.call_extensions_async(+ "message_loop_start", self, loop_data=self.loop_data)await self.handle_intervention()@@ -409,8 +411,8 @@ class Agent:prompt = await self.prepare_prompt(loop_data=self.loop_data)# call before_main_llm_call extensions- await self.call_extensions(- "before_main_llm_call", loop_data=self.loop_data+ await extension.call_extensions_async(+ "before_main_llm_call", self, loop_data=self.loop_data)await self.handle_intervention()@@ -421,8 +423,9 @@ class Agent:printer.print("Reasoning: ") # start of reasoning# Pass chunk and full data to extensions for processingstream_data = {"chunk": chunk, "full": full}- await self.call_extensions(+ await extension.call_extensions_async("reasoning_stream_chunk",+ self,loop_data=self.loop_data,stream_data=stream_data,)@@ -439,8 +442,9 @@ class Agent:printer.print("Response: ") # start of response# Pass chunk and full data to extensions for processingstream_data = {"chunk": chunk, "full": full}- await self.call_extensions(+ await extension.call_extensions_async("response_stream_chunk",+ self,loop_data=self.loop_data,stream_data=stream_data,)@@ -459,13 +463,13 @@ class Agent:await self.handle_intervention(agent_response)# Notify extensions to finalize their stream filters- await self.call_extensions(- "reasoning_stream_end", loop_data=self.loop_data+ await extension.call_extensions_async(+ "reasoning_stream_end", self, loop_data=self.loop_data)await self.handle_intervention(agent_response)- await self.call_extensions(- "response_stream_end", loop_data=self.loop_data+ await extension.call_extensions_async(+ "response_stream_end", self, loop_data=self.loop_data)await self.handle_intervention(agent_response)@@ -498,8 +502,8 @@ class Agent:finally:# call message_loop_end extensionsif self.context.task and self.context.task.is_alive(): # don't call extensions post mortem- await self.call_extensions(- "message_loop_end", loop_data=self.loop_data+ await extension.call_extensions_async(+ "message_loop_end", self, loop_data=self.loop_data)@@ -511,21 +515,27 @@ class Agent:self.context.streaming_agent = None # unset current streamer# call monologue_end extensionsif self.context.task and self.context.task.is_alive(): # don't call extensions post mortem- await self.call_extensions("monologue_end", loop_data=self.loop_data) # type: ignore+ await extension.call_extensions_async(+ "monologue_end", self, loop_data=self.loop_data+ ) # type: ignore- @extensible+ @extension.extensibleasync def prepare_prompt(self, loop_data: LoopData) -> list[BaseMessage]:self.context.log.set_progress("Building prompt")# call extensions before setting prompts- await self.call_extensions("message_loop_prompts_before", loop_data=loop_data)+ await extension.call_extensions_async(+ "message_loop_prompts_before", self, loop_data=loop_data+ )# set system prompt and message historyloop_data.system = await self.get_system_prompt(self.loop_data)loop_data.history_output = self.history.output()# and allow extensions to edit them- await self.call_extensions("message_loop_prompts_after", loop_data=loop_data)+ await extension.call_extensions_async(+ "message_loop_prompts_after", self, loop_data=loop_data+ )# concatenate system promptsystem_text = "\n\n".join(loop_data.system)@@ -565,7 +575,7 @@ class Agent:return full_prompt- @extensible+ @extension.extensibleasync def handle_exception(self, location: str, exception: Exception):if exception:raise exception # exception handling is done by extensions@@ -605,15 +615,15 @@ class Agent:# raise HandledException(exception) # Re-raise the exception to kill the loop- @extensible+ @extension.extensibleasync def get_system_prompt(self, loop_data: LoopData) -> list[str]:system_prompt: list[str] = []- await self.call_extensions(- "system_prompt", system_prompt=system_prompt, loop_data=loop_data+ await extension.call_extensions_async(+ "system_prompt", self, system_prompt=system_prompt, loop_data=loop_data)return system_prompt- @extensible+ @extension.extensibledef parse_prompt(self, _prompt_file: str, **kwargs):dirs = subagents.get_paths(self, "prompts")@@ -622,7 +632,7 @@ class Agent:)return prompt- @extensible+ @extension.extensibledef read_prompt(self, file: str, **kwargs) -> str:dirs = subagents.get_paths(self, "prompts")@@ -637,21 +647,21 @@ class Agent:def set_data(self, field: str, value):self.data[field] = value- @extensible+ @extension.extensibledef hist_add_message(self, ai: bool, content: history.MessageContent, tokens: int = 0):self.last_message = datetime.now(timezone.utc)# Allow extensions to process content before adding to historycontent_data = {"content": content}- asyncio.run(- self.call_extensions("hist_add_before", content_data=content_data, ai=ai)+ extension.call_extensions_sync(+ "hist_add_before", self, content_data=content_data, ai=ai)return self.history.add_message(ai=ai, content=content_data["content"], tokens=tokens)- @extensible+ @extension.extensibledef hist_add_user_message(self, message: UserMessage, intervention: bool = False):self.history.new_topic() # user message starts a new topic in history@@ -680,25 +690,25 @@ class Agent:self.last_user_message = msgreturn msg- @extensible+ @extension.extensibledef hist_add_ai_response(self, message: str):self.loop_data.last_response = messagecontent = self.parse_prompt("fw.ai_response.md", message=message)return self.hist_add_message(True, content=content)- @extensible+ @extension.extensibledef hist_add_warning(self, message: history.MessageContent):content = self.parse_prompt("fw.warning.md", message=message)return self.hist_add_message(False, content=content)- @extensible+ @extension.extensibledef hist_add_tool_result(self, tool_name: str, tool_result: str, **kwargs):data = {"tool_name": tool_name,"tool_result": tool_result,**kwargs,}- asyncio.run(self.call_extensions("hist_add_tool_result", data=data))+ extension.call_extensions_sync("hist_add_tool_result", self, data=data)return self.hist_add_message(False, content=data)def concat_messages(@@ -706,7 +716,7 @@ class Agent:): # TODO add param for message range, topic, historyreturn self.history.output_text(human_label="user", ai_label="assistant")- @extensible+ @extension.extensibledef get_chat_model(self):return models.get_chat_model(self.config.chat_model.provider,@@ -715,7 +725,7 @@ class Agent:**self.config.chat_model.build_kwargs(),)- @extensible+ @extension.extensibledef get_utility_model(self):return models.get_chat_model(self.config.utility_model.provider,@@ -724,7 +734,7 @@ class Agent:**self.config.utility_model.build_kwargs(),)- @extensible+ @extension.extensibledef get_browser_model(self):return models.get_browser_model(self.config.browser_model.provider,@@ -733,7 +743,7 @@ class Agent:**self.config.browser_model.build_kwargs(),)- @extensible+ @extension.extensibledef get_embedding_model(self):return models.get_embedding_model(self.config.embeddings_model.provider,@@ -742,7 +752,7 @@ class Agent:**self.config.embeddings_model.build_kwargs(),)- @extensible+ @extension.extensibleasync def call_utility_model(self,system: str,@@ -760,7 +770,9 @@ class Agent:"callback": callback,"background": background,}- await self.call_extensions("util_model_call_before", call_data=call_data)+ await extension.call_extensions_async(+ "util_model_call_before", self, call_data=call_data+ )# propagate stream to callback if setasync def stream_callback(chunk: str, total: str):@@ -778,7 +790,7 @@ class Agent:return response- @extensible+ @extension.extensibleasync def call_chat_model(self,messages: list[BaseMessage],@@ -805,7 +817,7 @@ class Agent:return response, reasoning- @extensible+ @extension.extensibleasync def rate_limiter_callback(self, message: str, key: str, total: int, limit: int):@@ -813,7 +825,7 @@ class Agent:self.context.log.set_progress(message, True)return False- @extensible+ @extension.extensibleasync def handle_intervention(self, progress: str = ""):await self.wait_if_paused()if (@@ -838,7 +850,7 @@ class Agent:while self.context.paused:await asyncio.sleep(0.1)- @extensible+ @extension.extensibleasync def process_tools(self, msg: str):# search for tool usage requests in agent messagetool_request = extract_tools.json_parse_dirty(msg)@@ -894,8 +906,9 @@ class Agent:await self.handle_intervention()# Allow extensions to preprocess tool arguments- await self.call_extensions(+ await extension.call_extensions_async("tool_execute_before",+ self,tool_args=tool_args or {},tool_name=tool_name,)@@ -904,8 +917,11 @@ class Agent:await self.handle_intervention()# Allow extensions to postprocess tool response- await self.call_extensions(- "tool_execute_after", response=response, tool_name=tool_name+ await extension.call_extensions_async(+ "tool_execute_after",+ self,+ response=response,+ tool_name=tool_name,)await tool.after_execution(response)@@ -935,8 +951,9 @@ class Agent:async def handle_reasoning_stream(self, stream: str):await self.handle_intervention()- await self.call_extensions(+ await extension.call_extensions_async("reasoning_stream",+ self,loop_data=self.loop_data,text=stream,)@@ -948,8 +965,9 @@ class Agent:return # no reason to tryresponse = DirtyJson.parse_string(stream)if isinstance(response, dict):- await self.call_extensions(+ await extension.call_extensions_async("response_stream",+ self,loop_data=self.loop_data,text=stream,parsed=response,@@ -958,7 +976,7 @@ class Agent:except Exception as e:pass- @extensible+ @extension.extensibledef get_tool(self,name: str,@@ -992,9 +1010,4 @@ class Agent:message=message,loop_data=loop_data,**kwargs,- )-- async def call_extensions(self, extension_point: str, **kwargs) -> Any:- return await call_extensions(- extension_point=extension_point, agent=self, **kwargs- )+ )\ No newline at end of filediff --git a/api/banners.py b/api/banners.pyindex f20a752e9..58c2f19c3 100644--- a/api/banners.py+++ b/api/banners.py@@ -1,5 +1,5 @@from helpers.api import ApiHandler, Request, Response-from helpers.extension import call_extensions+from helpers.extension import call_extensions_asyncclass GetBanners(ApiHandler):@@ -13,7 +13,7 @@ class GetBanners(ApiHandler):frontend_context = input.get("context", {})# Banners array passed by reference - extensions append directly to it- await call_extensions("banners", agent=None, banners=banners, frontend_context=frontend_context)+ await call_extensions_async("banners", agent=None, banners=banners, frontend_context=frontend_context)return {"banners": banners}diff --git a/api/message.py b/api/message.pyindex 5aff05b77..7eaef1d57 100644--- a/api/message.py+++ b/api/message.py@@ -58,7 +58,7 @@ class Message(ApiHandler):# call extension point, alow it to modify datadata = { "message": message, "attachment_paths": attachment_paths }- await extension.call_extensions("user_message_ui", agent=context.get_agent(), data=data)+ await extension.call_extensions_async("user_message_ui", agent=context.get_agent(), data=data)message = data.get("message", "")attachment_paths = data.get("attachment_paths", [])diff --git a/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py b/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.pyindex 3f111337d..f35016570 100644--- a/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py+++ b/extensions/python/agent_Agent_handle_exception_end/_50_handle_repairable_exception.py@@ -3,10 +3,9 @@ from helpers.extension import Extensionfrom agent import LoopDatafrom helpers.localization import Localizationfrom helpers.errors import RepairableException-from helpers import errors+from helpers import errors, extensionfrom helpers.print_style import PrintStyle-class HandleRepairableException(Extension):async def execute(self, data: dict = {}, **kwargs):if not self.agent:@@ -17,7 +16,7 @@ class HandleRepairableException(Extension):if isinstance(data["exception"], RepairableException):msg = {"message": errors.format_error(data["exception"])}- await self.agent.call_extensions("error_format", msg=msg)+ await extension.call_extensions_async("error_format", agent=self.agent, msg=msg)self.agent.hist_add_warning(msg["message"])PrintStyle(font_color="red", padding=True).print(msg["message"])self.agent.context.log.log(type="warning", content=msg["message"])diff --git a/extensions/python/agent_init/_10_initial_message.py b/extensions/python/agent_init/_10_initial_message.pyindex 30c735030..557f8701a 100644--- a/extensions/python/agent_init/_10_initial_message.py+++ b/extensions/python/agent_init/_10_initial_message.py@@ -5,7 +5,7 @@ from helpers.extension import Extensionclass InitialMessage(Extension):- async def execute(self, **kwargs):+ def execute(self, **kwargs):"""Add an initial greeting message when first user message is processed.Called only once per session via _process_chain method.diff --git a/extensions/python/agent_init/_15_load_profile_settings.py b/extensions/python/agent_init/_15_load_profile_settings.pyindex 4fe17bb39..9270fb049 100644--- a/extensions/python/agent_init/_15_load_profile_settings.py+++ b/extensions/python/agent_init/_15_load_profile_settings.py@@ -5,7 +5,7 @@ from helpers.extension import Extensionclass LoadProfileSettings(Extension):- async def execute(self, **kwargs) -> None:+ def execute(self, **kwargs) -> None:if not self.agent or not self.agent.config.profile:returndiff --git a/extensions/python/hist_add_before/_10_mask_content.py b/extensions/python/hist_add_before/_10_mask_content.pyindex e57a8c60f..5b09e14c5 100644--- a/extensions/python/hist_add_before/_10_mask_content.py+++ b/extensions/python/hist_add_before/_10_mask_content.py@@ -4,7 +4,7 @@ from helpers.secrets import get_secrets_managerclass MaskHistoryContent(Extension):- async def execute(self, **kwargs):+ def execute(self, **kwargs):if not self.agent:returndiff --git a/extensions/python/hist_add_tool_result/_90_save_tool_call_file.py b/extensions/python/hist_add_tool_result/_90_save_tool_call_file.pyindex a00232bc0..21d6ea0ee 100644--- a/extensions/python/hist_add_tool_result/_90_save_tool_call_file.py+++ b/extensions/python/hist_add_tool_result/_90_save_tool_call_file.py@@ -6,7 +6,7 @@ import os, reLEN_MIN = 500class SaveToolCallFile(Extension):- async def execute(self, data: dict[str, Any] | None = None, **kwargs):+ def execute(self, data: dict[str, Any] | None = None, **kwargs):if not self.agent:returndiff --git a/helpers/extension.py b/helpers/extension.pyindex bb379b108..6a88ab6a3 100644--- a/helpers/extension.py+++ b/helpers/extension.py@@ -1,10 +1,9 @@from abc import abstractmethod-from typing import Any+from typing import Any, Awaitable, Type, castfrom helpers import extract_tools, filesfrom helpers import cache, plugins, subagentsfrom typing import TYPE_CHECKINGfrom functools import wraps-import asyncioimport inspectif TYPE_CHECKING:@@ -15,7 +14,7 @@ DEFAULT_EXTENSIONS_FOLDER = "python/extensions"USER_EXTENSIONS_FOLDER = "usr/extensions"_CACHE_AREA = "extension_folder_classes(extensions)(plugins)"-cache.toggle_area(_CACHE_AREA, True) # cache off for now+cache.toggle_area(_CACHE_AREA, False) # cache off for nowclass _Unset:@@ -35,62 +34,54 @@ def extensible(func):- ``{func.__module__}_{func.__qualname__}_end`` with `.` replaced by `_`When the wrapped function is called, the decorator builds a mutable ``data``- payload and passes it to both extension points via ``call_extensions``:+ payload and passes it to both extension points:- - ``data["args"]``: the original positional arguments tuple- - ``data["kwargs"]``: the original keyword arguments dict- - ``data["result"]``: initialized to an internal sentinel; extensions may- set this to short-circuit the wrapped function+ - ``data["args"]``: positional args (extensions may replace/mutate)+ - ``data["kwargs"]``: keyword args (extensions may replace/mutate)+ - ``data["result"]``: initialized to an internal sentinel; extensions may set+ this to short-circuit the wrapped function- ``data["exception"]``: initialized to an internal sentinel; extensions mayset this to a ``BaseException`` instance to force-raise+ Sync functions call ``call_extensions_sync``. Async functions call+ ``call_extensions_async``.+Behavior:- - ``-start`` extensions run first and may mutate ``data["args"]`` /- ``data["kwargs"]``, set ``data["result"]`` to skip calling ``func``, or set- ``data["exception"]`` to abort by raising.- - If ``data["result"]`` is still unset, the decorator calls ``func`` (awaiting- it if it is async) and stores either the return value into ``data["result"]``- or the raised error into ``data["exception"]``.- - ``-end`` extensions run last and may further transform the outcome by- rewriting ``data["result"]`` or replacing/clearing ``data["exception"]``.+ - ``-start`` extensions run first and may mutate inputs or set+ ``data["result"]`` / ``data["exception"]``.+ - If ``data["result"]`` is still unset, the decorator calls the wrapped+ function using the possibly modified ``data["args"]`` / ``data["kwargs"]``.+ - ``-end`` extensions run last and may rewrite ``data["result"]`` or replace /+ clear ``data["exception"]``.Finally, if ``data["exception"]`` contains an exception it is raised;otherwise ``data["result"]`` is returned."""- @wraps(func)- async def _inner_async(*args, **kwargs):+ def _get_agent(args, kwargs):from agent import Agent- # prepare extension points data+ candidate = kwargs.get("agent")+ if isinstance(candidate, Agent) and bool(getattr(candidate, "__dict__", None)):+ return candidate++ for a in args:+ if isinstance(a, Agent) and bool(getattr(a, "__dict__", None)):+ return a++ return None++ def _prepare_inputs(args, kwargs):module_name = getattr(func, "__module__", "").replace(".", "_")qual_name = getattr(func, "__qualname__", "").replace(".", "_")-- # skip if extension point cannot be determinedif not module_name or not qual_name:- return await func(*args, **kwargs)+ return Nonestart_point = f"{module_name}_{qual_name}_start"end_point = f"{module_name}_{qual_name}_end"+ agent = _get_agent(args, kwargs)- def _get_agent() -> "Agent|None":- candidate = kwargs.get("agent")- if isinstance(candidate, Agent) and bool(- getattr(candidate, "__dict__", None)- ):- return candidate-- for a in args:- if isinstance(a, Agent) and bool(getattr(a, "__dict__", None)):- return a-- return None-- # try to find agent instance for better extension determination- agent = _get_agent()-- # build extension data object - func input/outputdata = {"args": args,"kwargs": kwargs,@@ -98,44 +89,78 @@ def extensible(func):"exception": None,}- # call start extensions, these can modify inputs, produce output or exception- await call_extensions(start_point, agent=agent, data=data)+ return start_point, end_point, agent, data- # if there is an explicit exception set, raise it+ def _process_result(data):exc = data.get("exception")if isinstance(exc, BaseException):raise exc- # if there is no result set, call the original function- if data.get("result") is _UNSET:+ return data.get("result")++ def _call_original(data):+ call_args = data.get("args")+ call_kwargs = data.get("kwargs")++ if not isinstance(call_args, tuple):+ call_args = (call_args,)+ if not isinstance(call_kwargs, dict):+ call_kwargs = {}++ try:+ data["result"] = func(*call_args, **call_kwargs)+ except Exception as e:+ data["exception"] = e+ return _UNSET++ async def _run_async(*args, **kwargs):+ prepared = _prepare_inputs(args, kwargs)+ if prepared is None:+ return await func(*args, **kwargs)++ start_point, end_point, agent, data = prepared++ # call pre-extensions+ await call_extensions_async(start_point, agent=agent, data=data)++ # call the original if pre-extensions don't return a result+ if (result := _process_result(data)) is _UNSET:+ _call_original(data)try:- if inspect.iscoroutinefunction(func):- data["result"] = await func(*args, **kwargs)- else:- data["result"] = func(*args, **kwargs)+ data["result"] = await data["result"]except Exception as e:data["exception"] = e- # call end extensions, these can modify outputs or exception- await call_extensions(end_point, agent=agent, data=data)+ # call post-extensions+ await call_extensions_async(end_point, agent=agent, data=data)- # if there's an exception, raise it- exc = data.get("exception")- if isinstance(exc, BaseException):- raise exc+ result = _process_result(data)+ return None if result is _UNSET else result- # if there's a result, return it- result = data.get("result")+ def _run_sync(*args, **kwargs):+ prepared = _prepare_inputs(args, kwargs)+ if prepared is None:+ return func(*args, **kwargs)++ start_point, end_point, agent, data = prepared++ # call pre-extensions+ call_extensions_sync(start_point, agent=agent, data=data)++ # call the original if pre-extensions don't return a result+ if (result := _process_result(data)) is _UNSET:+ _call_original(data)++ # call post-extensions+ call_extensions_sync(end_point, agent=agent, data=data)++ result = _process_result(data)return None if result is _UNSET else resultif inspect.iscoroutinefunction(func):- return _inner_async-- @wraps(func)- def _inner_sync(*args, **kwargs):- return asyncio.run(_inner_async(*args, **kwargs))+ return wraps(func)(_run_async)- return _inner_sync+ return wraps(func)(_run_sync)class Extension:@@ -145,37 +170,34 @@ class Extension:self.kwargs = kwargs@abstractmethod- async def execute(self, **kwargs) -> Any:+ def execute(self, **kwargs) -> None | Awaitable[None]:pass-async def call_extensions(+async def call_extensions_async(extension_point: str, agent: "Agent|None" = None, **kwargs-) -> Any:- # search for extension folders in all agent's paths- paths = subagents.get_paths(agent, "extensions/python", extension_point)+):+ # fetch classes for this extension point and agent+ classes = _get_extension_classes(extension_point, agent=agent, **kwargs)- # # Add plugin backend extension paths (plugins/*/extensions/python/{extension_point})- # plugin_paths = plugins.get_enabled_plugin_paths(- # agent, "extensions", "python", extension_point- # )- # paths.extend(p for p in plugin_paths if p not in paths)+ # execute unique extensions+ for cls in classes:+ result = cls(agent=agent).execute(**kwargs)+ if isinstance(result, Awaitable):+ await result- all_exts = [cls for path in paths for cls in _get_extensions(path)]- # merge: first ocurrence of file name is the override- unique = {}- for cls in all_exts:- file = _get_file_from_module(cls.__module__)- if file not in unique:- unique[file] = cls- classes = sorted(- unique.values(), key=lambda cls: _get_file_from_module(cls.__module__)- )+def call_extensions_sync(extension_point: str, agent: "Agent|None" = None, **kwargs):+ # fetch classes for this extension point and agent+ classes = _get_extension_classes(extension_point, agent=agent, **kwargs)# execute unique extensionsfor cls in classes:- await cls(agent=agent).execute(**kwargs)+ result = cls(agent=agent).execute(**kwargs)+ if isinstance(result, Awaitable):+ raise ValueError(+ f"Extension {cls.__name__} returned awaitable in sync mode"+ )def get_webui_extensions(@@ -205,6 +227,26 @@ def get_webui_extensions(return entries+def _get_extension_classes(+ extension_point: str, agent: "Agent|None" = None, **kwargs+) -> list[Type[Extension]]:+ # search for extension folders in all agent's paths+ paths = subagents.get_paths(agent, "extensions/python", extension_point)++ all_exts = [cls for path in paths for cls in _get_extensions(path)]++ # merge: first ocurrence of file name is the override+ unique = {}+ for cls in all_exts:+ file = _get_file_from_module(cls.__module__)+ if file not in unique:+ unique[file] = cls+ classes = sorted(+ unique.values(), key=lambda cls: _get_file_from_module(cls.__module__)+ )+ return classes++def _get_file_from_module(module_name: str) -> str:return module_name.split(".")[-1]diff --git a/helpers/settings.py b/helpers/settings.pyindex 8eab0731f..4b77322cc 100644--- a/helpers/settings.py+++ b/helpers/settings.py@@ -600,10 +600,10 @@ def _apply_settings(previous: Settings | None):or _settings["embed_model_provider"] != previous["embed_model_provider"]or _settings["embed_model_kwargs"] != previous["embed_model_kwargs"]):- from helpers.extension import call_extensions+ from helpers.extension import call_extensions_asyncdefer.DeferredTask().start_task(- call_extensions, "embedding_model_changed"+ call_extensions_async, "embedding_model_changed")# update mcp settings if necessarydiff --git a/plugins/text_editor/tools/text_editor.py b/plugins/text_editor/tools/text_editor.pyindex fd5cb2d5e..529bd001e 100644--- a/plugins/text_editor/tools/text_editor.py+++ b/plugins/text_editor/tools/text_editor.py@@ -1,5 +1,5 @@from helpers.tool import Tool, Response-from helpers.extension import call_extensions+from helpers.extension import call_extensions_asyncfrom helpers import plugins, runtimefrom plugins.text_editor.helpers.file_ops import (FileInfo,@@ -63,7 +63,7 @@ class TextEditor(Tool):"content": result["content"],"warnings": result["warnings"],}- await call_extensions(+ await call_extensions_async("text_editor_read_after", agent=self.agent, data=ext_data)@@ -87,7 +87,7 @@ class TextEditor(Tool):# Extension pointext_data = {"path": path, "content": content}- await call_extensions(+ await call_extensions_async("text_editor_write_before", agent=self.agent, data=ext_data)@@ -99,7 +99,7 @@ class TextEditor(Tool):return self._error("write", path, result["error"])# Extension point- await call_extensions(+ await call_extensions_async("text_editor_write_after", agent=self.agent,data={"path": path, "total_lines": result["total_lines"]},)@@ -148,7 +148,7 @@ class TextEditor(Tool):# Extension pointext_data = {"path": expanded, "edits": parsed}- await call_extensions(+ await call_extensions_async("text_editor_patch_before", agent=self.agent, data=ext_data)@@ -160,7 +160,7 @@ class TextEditor(Tool):return self._error("patch", path, str(exc))# Extension point- await call_extensions(+ await call_extensions_async("text_editor_patch_after", agent=self.agent,data={"path": expanded, "total_lines": total_lines},)diff --git a/run_ui.py b/run_ui.pyindex deb597085..e9b98dfb1 100644--- a/run_ui.py+++ b/run_ui.py@@ -15,7 +15,7 @@ from helpers import files, git, mcp_server, fasta2a_server, settings as settingsfrom helpers.files import get_abs_pathfrom helpers import runtime, dotenv, processfrom helpers.websocket import WebSocketHandler, validate_ws_origin-from helpers.api import register_api_route, requires_auth+from helpers.api import register_api_route, requires_auth, csrf_protectfrom helpers.print_style import PrintStylefrom helpers import loginimport socketio # type: ignore[import-untyped]diff --git a/webui/js/api.js b/webui/js/api.jsindex 89f549aef..4eb6ee219 100644--- a/webui/js/api.js+++ b/webui/js/api.js@@ -126,10 +126,10 @@ const CSRF_SLOW_WARN_MS = 1500;export function getRuntimeId() {if (runtimeIdCache) return runtimeIdCache;const injected =- window.runtimeInfo &&- typeof window.runtimeInfo.id === "string" &&- window.runtimeInfo.id.length > 0- ? window.runtimeInfo.id+ globalThis.runtimeInfo &&+ typeof globalThis.runtimeInfo.id === "string" &&+ globalThis.runtimeInfo.id.length > 0+ ? globalThis.runtimeInfo.id: null;return injected;}@@ -167,6 +167,7 @@ export async function getCsrfToken() {});}+ /** @type {RequestInit} */const fetchOptions = { credentials: "same-origin" };if (controller) {fetchOptions.signal = controller.signal;@@ -177,7 +178,7 @@ export async function getCsrfToken() {? await Promise.race([fetchPromise, timeoutPromise]): await fetchPromise;} catch (error) {- if (error && error.name === "AbortError") {+ if (error && error["name"] === "AbortError") {throw new Error("CSRF token request timed out");}throw error;@@ -204,10 +205,10 @@ export async function getCsrfToken() {runtimeIdCache = runtimeId;}const injectedRuntimeId =- window.runtimeInfo &&- typeof window.runtimeInfo.id === "string" &&- window.runtimeInfo.id.length > 0- ? window.runtimeInfo.id+ globalThis.runtimeInfo &&+ typeof globalThis.runtimeInfo.id === "string" &&+ globalThis.runtimeInfo.id.length > 0+ ? globalThis.runtimeInfo.id: null;const cookieRuntimeId = runtimeId || injectedRuntimeId;if (cookieRuntimeId) {@@ -216,7 +217,7 @@ export async function getCsrfToken() {console.warn("CSRF runtime id missing; skipping cookie name binding.");}const elapsedMs = Date.now() - startedAt;- if (elapsedMs > CSRF_SLOW_WARN_MS && window.runtimeInfo?.isDevelopment) {+ if (elapsedMs > CSRF_SLOW_WARN_MS && globalThis.runtimeInfo?.isDevelopment) {console.warn(`CSRF token request took ${elapsedMs}ms`);}return csrfToken;diff --git a/webui/js/confirmClick.js b/webui/js/confirmClick.jsindex 76c0aa392..ff557523b 100644--- a/webui/js/confirmClick.js+++ b/webui/js/confirmClick.js@@ -68,7 +68,7 @@ function resetButton(button, state) {// Register Alpine magic helperexport function registerAlpineMagic() {if (globalThis.Alpine) {- Alpine.magic('confirmClick', () => confirmClick);+ globalThis.Alpine.magic('confirmClick', () => confirmClick);}}