Your lightweight open-source personal agent.
Python agent-frameworkai-agentai-agentschatbotchatopsdiscord-botllm-agentsllmslocal-llmmcpmodel-context-protocolmulti-agentopenai-compatibleopenclawpersonal-ai-assistantpythonself-hostedtelegram-bot-ai-assistantwebuiworkflow-automation
refactor(agent): compose image tools in application runtimes (#6172)
chengyongru105b7722037b
diff --git a/nanobot/agent/context.py b/nanobot/agent/context.pyindex 8bfa758b9..d8ed6b3a4 100644--- a/nanobot/agent/context.py+++ b/nanobot/agent/context.py@@ -9,16 +9,9 @@ from typing import Any, Mapping, Sequence, castfrom nanobot.agent.memory import MemoryStorefrom nanobot.agent.skills import SkillsLoader-from nanobot.agent.tools import image_generation as image_generation_toolsfrom nanobot.agent.tools import mcp as mcp_toolsfrom nanobot.agent.tools import sessions as session_tools-from nanobot.agent.tools.registry import ToolRegistryfrom nanobot.apps.cli import utils as cli_app_utils-from nanobot.bus.events import (- INBOUND_META_RUNTIME_CONTROL,- RUNTIME_CONTROL_SESSION_DISCARD,- InboundMessage,-)from nanobot.runtime_context import (RUNTIME_CONTEXT_MESSAGE_META,RuntimeContextBlock,@@ -41,13 +34,6 @@ def session_extra(metadata: Mapping[str, Any] | None) -> dict[str, Any]:)-async def handle_runtime_control(state: Any, msg: InboundMessage, tools: ToolRegistry) -> bool:- if msg.metadata.get(INBOUND_META_RUNTIME_CONTROL) == RUNTIME_CONTROL_SESSION_DISCARD:- await state.discard_session(msg.session_key)- return True- return await image_generation_tools.handle_runtime_control(state, msg, tools)--@dataclass(frozen=True, slots=True)class PersistedPromptContextResolver:"""Restore prompt routing context when no inbound message is available."""diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.pyindex 48bd286c7..2b174ea92 100644--- a/nanobot/agent/loop.py+++ b/nanobot/agent/loop.py@@ -44,7 +44,13 @@ from nanobot.agent.turn_delivery import ()from nanobot.agent.turn_delivery import TurnRoute as TurnRoutefrom nanobot.agent.turn_hooks import AgentTurnHookSpec, build_agent_turn_hook-from nanobot.bus.events import INBOUND_META_USER_SHELL, InboundMessage, OutboundMessage+from nanobot.bus.events import (+ INBOUND_META_RUNTIME_CONTROL,+ INBOUND_META_USER_SHELL,+ RUNTIME_CONTROL_SESSION_DISCARD,+ InboundMessage,+ OutboundMessage,+)from nanobot.bus.outbound_events import (StreamDeltaEvent,StreamedResponseEvent,@@ -110,7 +116,6 @@ if TYPE_CHECKING:from nanobot.config.schema import (ChannelsConfig,Config,- ProviderConfig,ToolsConfig,)from nanobot.cron.service import CronService@@ -281,8 +286,6 @@ class AgentLoop:unified_session: bool = False,disabled_skills: list[str] | None = None,tools_config: ToolsConfig | None = None,- image_generation_provider_config: ProviderConfig | None = None,- image_generation_provider_configs: dict[str, ProviderConfig] | None = None,provider_snapshot_loader: Callable[..., ProviderSnapshot] | None = None,provider_signature: tuple[object, ...] | None = None,model_presets: dict[str, ModelPresetConfig] | None = None,@@ -351,12 +354,6 @@ class AgentLoop:self.tools_config = _tcself.web_config = _tc.webself.exec_config = _tc.exec- self._image_generation_provider_configs = dict(image_generation_provider_configs or {})- if (- image_generation_provider_config is not None- and "openrouter" not in self._image_generation_provider_configs- ):- self._image_generation_provider_configs["openrouter"] = image_generation_provider_configself.cron_service = cron_serviceself.local_trigger_store = local_trigger_storeself.restrict_to_workspace = restrict_to_workspace@@ -631,7 +628,6 @@ class AgentLoop:exec_session_manager=self._exec_session_manager,sessions=self.sessions,provider_snapshot_loader=provider_snapshot_loader,- image_generation_provider_configs=self._image_generation_provider_configs,timezone=self.context.timezone or "UTC",workspace_sandbox=self.workspace_scopes.sandbox_status,runtime_control=runtime_control,@@ -1367,7 +1363,8 @@ class AgentLoop:raw = command_text(msg)effective_key = self._effective_session_key(msg)- if await agent_context.handle_runtime_control(self, msg, self.tools):+ if msg.metadata.get(INBOUND_META_RUNTIME_CONTROL) == RUNTIME_CONTROL_SESSION_DISCARD:+ await self.discard_session(msg.session_key)continueif (msg.require_existing_sessiondiff --git a/nanobot/agent/tools/context.py b/nanobot/agent/tools/context.pyindex 73d6cd318..db19c443e 100644--- a/nanobot/agent/tools/context.py+++ b/nanobot/agent/tools/context.py@@ -13,7 +13,7 @@ if TYPE_CHECKING:from nanobot.agent.tools.file_state import FileStatesfrom nanobot.agent.tools.runtime_control import RuntimeControlfrom nanobot.bus.queue import MessageBus- from nanobot.config.schema import ProviderConfig, ToolsConfig+ from nanobot.config.schema import ProvidersConfig, ToolsConfigfrom nanobot.cron.service import CronServicefrom nanobot.providers.factory import ProviderSnapshotfrom nanobot.security.workspace_access import WorkspaceSandboxStatus, WorkspaceScope@@ -98,7 +98,7 @@ class ToolContext:sessions: SessionManager | None = Nonefile_state_store: FileStates | None = Noneprovider_snapshot_loader: Callable[..., ProviderSnapshot] | None = None- image_generation_provider_configs: dict[str, ProviderConfig] | None = None+ providers_config: ProvidersConfig | None = Nonetimezone: str = "UTC"workspace_sandbox: WorkspaceSandboxStatus | None = Noneruntime_control: RuntimeControl | None = Nonediff --git a/nanobot/agent/tools/image_generation.py b/nanobot/agent/tools/image_generation.pyindex de164f116..3617eb511 100644--- a/nanobot/agent/tools/image_generation.py+++ b/nanobot/agent/tools/image_generation.py@@ -2,9 +2,8 @@from __future__ import annotations-import asynciofrom pathlib import Path-from typing import TYPE_CHECKING, Any, cast+from typing import TYPE_CHECKING, Anyfrom loguru import loggerfrom pydantic import Field@@ -17,13 +16,6 @@ from nanobot.agent.tools.schema import (StringSchema,tool_parameters_schema,)-from nanobot.bus.events import (- INBOUND_META_RUNTIME_CONTROL,- RUNTIME_CONTROL_ACK,- RUNTIME_CONTROL_IMAGE_GENERATION_RELOAD,- InboundMessage,-)-from nanobot.bus.queue import MessageBusfrom nanobot.config.paths import get_media_dirfrom nanobot.config_base import Basefrom nanobot.providers.image_generation import (@@ -43,7 +35,7 @@ from nanobot.utils.helpers import detect_image_mimeif TYPE_CHECKING:from nanobot.agent.tools.context import ToolContext- from nanobot.config.schema import ProviderConfig+ from nanobot.config.schema import Config, ProviderConfigclass ImageGenerationToolConfig(Base):@@ -92,14 +84,14 @@ class ImageGenerationTool(Tool):@classmethoddef enabled(cls, ctx: ToolContext) -> bool:- return ctx.config.image_generation.enabled+ return ctx.providers_config is not None and ctx.config.image_generation.enabled@classmethoddef create(cls, ctx: ToolContext) -> Tool:return cls(workspace=ctx.workspace,config=ctx.config.image_generation,- provider_configs=ctx.image_generation_provider_configs,+ provider_configs=image_gen_provider_configs(ctx.providers_config),)def __init__(@@ -224,14 +216,38 @@ class ImageGenerationTool(Tool):return ToolResult.error(f"Error: {exc}")-async def reload_image_generation_tool(state: Any, registry: ToolRegistry) -> dict[str, Any]:- """Apply the persisted image configuration to the running agent."""+def register_image_generation_tool(+ config: Config,+ registry: ToolRegistry,+ *,+ workspace: Path,+) -> None:+ """Assemble the configured tool in the application's shared registry."""+ from nanobot.agent.tools.context import ToolContext++ ctx = ToolContext(+ config=config.tools,+ workspace=str(workspace),+ providers_config=config.providers,+ )+ if ImageGenerationTool.enabled(ctx):+ registry.register(ImageGenerationTool.create(ctx))+ else:+ registry.unregister("generate_image")+++async def reload_image_generation_tool(+ *,+ config_path: Path,+ workspace: Path,+ registry: ToolRegistry,+) -> dict[str, Any]:+ """Refresh the application's image tool from its persisted config."""try:from nanobot.config.loader import load_config, resolve_config_env_vars- config = resolve_config_env_vars(load_config())- tool_config = config.tools.image_generation- provider_configs = image_gen_provider_configs(config)+ config = resolve_config_env_vars(load_config(config_path), config_path=config_path)+ register_image_generation_tool(config, registry, workspace=workspace)except Exception as exc:logger.warning("Image generation hot reload could not read config: {}", exc)return {@@ -241,23 +257,7 @@ async def reload_image_generation_tool(state: Any, registry: ToolRegistry) -> di"error": str(exc),}- next_tool = (- ImageGenerationTool( # pyright: ignore[reportAbstractUsage]- workspace=state.workspace,- config=tool_config,- provider_configs=provider_configs,- )- if tool_config.enabled- else None- )-- state.tools_config.image_generation = tool_config- state._image_generation_provider_configs = provider_configs- if next_tool is not None:- registry.register(next_tool)- else:- registry.unregister("generate_image")-+ tool_config = config.tools.image_generationlogger.info("Image generation config reloaded: enabled={} provider={} model={}",tool_config.enabled,@@ -272,66 +272,3 @@ async def reload_image_generation_tool(state: Any, registry: ToolRegistry) -> di"model": tool_config.model,"requires_restart": False,}---async def request_image_generation_reload(- bus: MessageBus,- *,- timeout: float = 5.0,-) -> dict[str, Any]:- """Ask the running agent loop to refresh its image generation tool."""- loop = asyncio.get_running_loop()- ack: asyncio.Future[dict[str, Any]] = loop.create_future()- await bus.publish_inbound(- InboundMessage(- channel="system",- sender_id="webui-settings",- chat_id="runtime",- content=RUNTIME_CONTROL_IMAGE_GENERATION_RELOAD,- metadata={- INBOUND_META_RUNTIME_CONTROL: RUNTIME_CONTROL_IMAGE_GENERATION_RELOAD,- RUNTIME_CONTROL_ACK: ack,- },- )- )- try:- result = await asyncio.wait_for(ack, timeout=timeout)- except asyncio.TimeoutError:- return {- "ok": False,- "message": "Image generation hot reload timed out.",- "requires_restart": True,- }- if not isinstance(cast(object, result), dict):- return {- "ok": False,- "message": "Image generation hot reload returned an unexpected response.",- "requires_restart": True,- }- return result---async def handle_runtime_control(- state: Any,- msg: InboundMessage,- registry: ToolRegistry,-) -> bool:- """Handle an in-process image generation reload request."""- metadata = msg.metadata- if metadata.get(INBOUND_META_RUNTIME_CONTROL) != RUNTIME_CONTROL_IMAGE_GENERATION_RELOAD:- return False-- ack = metadata.get(RUNTIME_CONTROL_ACK)- try:- result = await reload_image_generation_tool(state, registry)- except Exception as exc:- logger.exception("Image generation hot reload failed")- result = {- "ok": False,- "message": "Image generation hot reload failed.",- "requires_restart": True,- "error": str(exc),- }- if isinstance(ack, asyncio.Future) and not ack.done():- cast(asyncio.Future[Any], ack).set_result(result)- return Truediff --git a/nanobot/agent/tools/loader.py b/nanobot/agent/tools/loader.pyindex 4fb2aaca3..4d5a26052 100644--- a/nanobot/agent/tools/loader.py+++ b/nanobot/agent/tools/loader.py@@ -90,7 +90,9 @@ class ToolLoader:return pluginsdef load(self, ctx: ToolContext, registry: ToolRegistry, *, scope: str = "core") -> list[str]:+ """Load defaults while preserving tools already supplied by the caller."""registered: list[str] = []+ supplied_names = set(registry.tool_names)builtin_names: set[str] = set()sources = [(self.discover(), False), (self._discover_plugins().values(), True)]for source, is_plugin_source in sources:@@ -104,6 +106,10 @@ class ToolLoader:tool = tool_cls.create(ctx)if is_plugin_source:tool = _LegacyErrorPrefixTool(tool)+ if tool.name in supplied_names:+ if not is_plugin_source:+ builtin_names.add(tool.name)+ continueif registry.has(tool.name):if is_plugin_source and tool.name in builtin_names:logger.warning(@@ -122,7 +128,7 @@ class ToolLoader:except Exception:logger.exception("Failed to register tool: %s", cls_label)if not is_plugin_source and "rg" in builtin_names:- replaced = builtin_names & {"grep", "find_files"}+ replaced = (builtin_names & {"grep", "find_files"}) - supplied_namesfor name in replaced:registry.unregister(name)registered = [name for name in registered if name not in replaced]diff --git a/nanobot/bus/events.py b/nanobot/bus/events.pyindex 7de154af5..8c228a92a 100644--- a/nanobot/bus/events.py+++ b/nanobot/bus/events.py@@ -16,8 +16,6 @@ OUTBOUND_META_AGENT_UI = "_agent_ui"# services. Never accept these keys verbatim from an untrusted client.INBOUND_META_RUNTIME_CONTROL = "_runtime_control"INBOUND_META_USER_SHELL = "_user_shell"-RUNTIME_CONTROL_ACK = "_ack"-RUNTIME_CONTROL_IMAGE_GENERATION_RELOAD = "image_generation_reload"RUNTIME_CONTROL_SESSION_DISCARD = "session_discard"diff --git a/nanobot/channels/manager.py b/nanobot/channels/manager.pyindex a5bb0b73f..ef489d989 100644--- a/nanobot/channels/manager.py+++ b/nanobot/channels/manager.py@@ -108,6 +108,7 @@ class ChannelManager:webui_runtime_capabilities: dict[str, Any] | None = None,webui_mcp_runtime_status: Callable[[], Mapping[str, str]] | None = None,webui_mcp_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,+ webui_image_generation_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,webui_skill_state_action: Callable[[set[str]], None] | None = None,webui_recovery_action: (Callable[[str, dict[str, Any]], Awaitable[dict[str, Any]]] | None@@ -135,6 +136,7 @@ class ChannelManager:self._webui_runtime_capabilities = dict(webui_runtime_capabilities or {})self._webui_mcp_runtime_status = webui_mcp_runtime_statusself._webui_mcp_reload = webui_mcp_reload+ self._webui_image_generation_reload = webui_image_generation_reloadself._webui_skill_state_action = webui_skill_state_actionself._webui_recovery_action = webui_recovery_actionself._webui_subagent_manager = webui_subagent_manager@@ -214,6 +216,7 @@ class ChannelManager:channel_runtime_status=self.get_status,mcp_runtime_status=self._webui_mcp_runtime_status,mcp_reload=self._webui_mcp_reload,+ image_generation_reload=self._webui_image_generation_reload,skill_state_action=self._webui_skill_state_action,recovery_action=self._webui_recovery_action,subagent_manager=self._webui_subagent_manager,diff --git a/nanobot/channels/websocket/tests/test_websocket_channel.py b/nanobot/channels/websocket/tests/test_websocket_channel.pyindex bace30a94..4d5b0c05d 100644--- a/nanobot/channels/websocket/tests/test_websocket_channel.py+++ b/nanobot/channels/websocket/tests/test_websocket_channel.py@@ -133,6 +133,7 @@ def _thread_conversation_events(body: dict[str, Any]) -> list[dict[str, Any]]:def _ch(bus: Any, **kw: Any) -> WebSocketChannel:+ image_generation_reload = kw.pop("image_generation_reload", None)cfg: dict[str, Any] = {"enabled": True,"allowFrom": ["*"],@@ -153,6 +154,7 @@ def _ch(bus: Any, **kw: Any) -> WebSocketChannel:runtime_model_name=None,runtime_surface="browser",runtime_capabilities_overrides=None,+ image_generation_reload=image_generation_reload,)return WebSocketChannel(cfg, bus, gateway=gateway)@@ -4262,12 +4264,7 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist("requires_restart": False,})- monkeypatch.setattr(- "nanobot.webui.settings_routes.request_image_generation_reload",- image_reload,- )-- channel = _ch(bus, port=port)+ channel = _ch(bus, port=port, image_generation_reload=image_reload)channel.gateway.tokens.api_tokens["tok"] = time.monotonic() + 300server_task = asyncio.create_task(channel.start())@@ -4645,29 +4642,32 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist(@pytest.mark.asyncioasync def test_image_settings_hot_reload_without_restart(- bus: MagicMock,monkeypatch: pytest.MonkeyPatch,tmp_path: Path,) -> None:+ from nanobot.agent.loop import AgentLoop+ from nanobot.agent.tools.image_generation import (+ ImageGenerationTool,+ reload_image_generation_tool,+ )+port = 29935config_path = tmp_path / "config.json"config = Config()config.providers.openrouter.api_key = "image-key"save_config(config, config_path)monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)- image_reload = AsyncMock(- return_value={- "ok": True,- "message": "Image generation settings applied.",- "requires_restart": False,- }- )- monkeypatch.setattr(- "nanobot.webui.settings_routes.request_image_generation_reload",- image_reload,- )+ runtime_bus = MessageBus()+ provider = MagicMock(aclose=AsyncMock())+ provider.get_default_model.return_value = "test-model"+ agent = AgentLoop(bus=runtime_bus, provider=provider, workspace=tmp_path)++ async def image_reload() -> dict[str, Any]:+ return await reload_image_generation_tool(+ config_path=config_path, workspace=agent.workspace, registry=agent.tools,+ )- channel = _ch(bus, port=port)+ channel = _ch(runtime_bus, port=port, image_generation_reload=image_reload)channel.gateway.tokens.api_tokens["tok"] = time.monotonic() + 300server_task = asyncio.create_task(channel.start())await asyncio.sleep(0.3)@@ -4687,19 +4687,36 @@ async def test_image_settings_hot_reload_without_restart(assert response.status_code == 200assert response.json()["requires_restart"] is Falseassert response.json()["restart_required_sections"] == []- image_reload.assert_awaited_once_with(bus)+ tool = agent.tools.get("generate_image")+ assert isinstance(tool, ImageGenerationTool)+ assert tool.config.model == "openai/gpt-image-1"+ assert tool.provider_configs["openrouter"].api_key == "image-key"+ assert agent.tools.has("read_file")+ assert runtime_bus.inbound_size == 0++ disabled = await _webui_mutate(+ webui_client,+ "settings.image_generation.update",+ {"enabled": False},+ )+ assert disabled.status_code == 200+ assert disabled.json()["requires_restart"] is False+ assert not agent.tools.has("generate_image")finally:if webui_client is not None:await webui_client.close()await channel.stop()await server_task+ await agent.aclose()@pytest.mark.asyncio[email protected]("runtime_available", [True, False])async def test_image_settings_fall_back_to_restart_when_hot_reload_fails(bus: MagicMock,monkeypatch: pytest.MonkeyPatch,tmp_path: Path,+ runtime_available: bool,) -> None:port = 29936config_path = tmp_path / "config.json"@@ -4707,18 +4724,15 @@ async def test_image_settings_fall_back_to_restart_when_hot_reload_fails(config.providers.openrouter.api_key = "image-key"save_config(config, config_path)monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)- monkeypatch.setattr(- "nanobot.webui.settings_routes.request_image_generation_reload",- AsyncMock(- return_value={- "ok": False,- "message": "Image generation hot reload timed out.",- "requires_restart": True,- }- ),+ image_reload = AsyncMock(+ return_value={+ "ok": False,+ "message": "Image generation hot reload timed out.",+ "requires_restart": True,+ })- channel = _ch(bus, port=port)+ channel = _ch(bus, port=port, image_generation_reload=image_reload if runtime_available else None)channel.gateway.tokens.api_tokens["tok"] = time.monotonic() + 300server_task = asyncio.create_task(channel.start())await asyncio.sleep(0.3)diff --git a/nanobot/cli/agent.py b/nanobot/cli/agent.pyindex d8abff9a0..09b81f28f 100644--- a/nanobot/cli/agent.py+++ b/nanobot/cli/agent.py@@ -118,6 +118,7 @@ def agent(returnfrom nanobot.agent.hooks import create_file_edit_activity_hook+ from nanobot.agent.tools.image_generation import register_image_generation_toolfrom nanobot.agent.tools.mcp import MCPProviderfrom nanobot.agent.tools.registry import ToolRegistryfrom nanobot.bus.outbound_events import (@@ -130,7 +131,6 @@ def agent(from nanobot.cli.stream import ThinkingSpinnerfrom nanobot.cron.service import CronServicefrom nanobot.providers.factory import make_provider- from nanobot.providers.image_generation import image_gen_provider_configsfrom nanobot.utils.helpers import sanitize_surrogates as _sanitize_surrogatesfrom nanobot.utils.restart import (format_restart_completed_message,@@ -163,6 +163,7 @@ def agent(cron_store_path = runtime_config.workspace_path / "cron" / "jobs.json"cron = CronService(cron_store_path)tools = ToolRegistry()+ register_image_generation_tool(runtime_config, tools, workspace=runtime_config.workspace_path)mcp_provider = MCPProvider.from_config(runtime_config, tools)_set_nanobot_logs(logs)@@ -173,7 +174,6 @@ def agent(bus,provider=provider,cron_service=cron,- image_generation_provider_configs=image_gen_provider_configs(runtime_config),hook_factories=[create_file_edit_activity_hook],tool_registry=tools,)diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.pyindex a361ffb02..02090221b 100644--- a/nanobot/cli/commands.py+++ b/nanobot/cli/commands.py@@ -369,9 +369,9 @@ def serve(console.print("[red]aiohttp is required. Install with: nanobot plugins enable api[/red]")raise typer.Exit(1)+ from nanobot.agent.tools.image_generation import register_image_generation_toolfrom nanobot.api.server import create_appfrom nanobot.bus.queue import MessageBus- from nanobot.providers.image_generation import image_gen_provider_configsfrom nanobot.session.manager import SessionManager_set_nanobot_logs(verbose)@@ -391,12 +391,12 @@ def serve(bus = MessageBus()session_manager = SessionManager(runtime_config.workspace_path)tools = ToolRegistry()+ register_image_generation_tool(runtime_config, tools, workspace=runtime_config.workspace_path)mcp_provider = MCPProvider.from_config(runtime_config, tools)try:agent_loop = AgentLoop.from_config(runtime_config, bus,session_manager=session_manager,- image_generation_provider_configs=image_gen_provider_configs(runtime_config),hook_factories=[create_file_edit_activity_hook],tool_registry=tools,)diff --git a/nanobot/cli/gateway_runtime.py b/nanobot/cli/gateway_runtime.pyindex 83a5f1ba9..15c6dd858 100644--- a/nanobot/cli/gateway_runtime.py+++ b/nanobot/cli/gateway_runtime.py@@ -15,6 +15,10 @@ from nanobot import __logo__, __version__from nanobot.agent.hook import AgentHook, AgentRunHookContextfrom nanobot.agent.hooks import create_file_edit_activity_hookfrom nanobot.agent.loop import AgentLoop+from nanobot.agent.tools.image_generation import (+ register_image_generation_tool,+ reload_image_generation_tool,+)from nanobot.agent.tools.mcp import MCPProviderfrom nanobot.agent.tools.registry import ToolRegistryfrom nanobot.cli import terminal as cli_terminal@@ -377,7 +381,6 @@ def _run_gateway(load_provider_snapshot,)from nanobot.providers.fallback_provider import FallbackProvider- from nanobot.providers.image_generation import image_gen_provider_configsfrom nanobot.session.manager import SessionManagerfrom nanobot.session.recovery import RecoveryCoordinatorfrom nanobot.session.webui_turns import (@@ -476,6 +479,7 @@ def _run_gateway()tools = ToolRegistry()+ register_image_generation_tool(config, tools, workspace=config.workspace_path)mcp_provider = MCPProvider.from_config(config, tools)recovery = RecoveryCoordinator(@@ -492,7 +496,6 @@ def _run_gateway(context_window_tokens=provider_snapshot.context_window_tokens,cron_service=cron,session_manager=session_manager,- image_generation_provider_configs=image_gen_provider_configs(config),provider_snapshot_loader=_load_gateway_provider_snapshot,preset_catalog_loader=load_model_preset_catalog,turn_delivery_factory=turn_delivery_factory,@@ -716,6 +719,13 @@ def _run_gateway(agent.context.skills.disabled_skills = set(disabled_skills)agent.subagents.disabled_skills = set(disabled_skills)+ async def _webui_image_generation_reload() -> dict[str, Any]:+ return await reload_image_generation_tool(+ config_path=Path(config_path),+ workspace=agent.workspace,+ registry=tools,+ )+# Create channel manager (forwards SessionManager so the WebSocket channel# can serve the embedded webui's REST surface).channels = ChannelManager(@@ -733,6 +743,7 @@ def _run_gateway(webui_runtime_capabilities=webui_runtime_capabilities,webui_mcp_runtime_status=mcp_provider.runtime_status,webui_mcp_reload=mcp_provider.reload,+ webui_image_generation_reload=_webui_image_generation_reload,webui_skill_state_action=_webui_skill_state_action,webui_recovery_action=recovery.handle_action,webui_subagent_manager=agent.subagents,diff --git a/nanobot/nanobot.py b/nanobot/nanobot.pyindex 3c1654cb0..7656d657c 100644--- a/nanobot/nanobot.py+++ b/nanobot/nanobot.py@@ -10,11 +10,11 @@ from typing import Anyfrom nanobot.agent.hook import AgentHook, SDKCaptureHookfrom nanobot.agent.hooks import create_file_edit_activity_hookfrom nanobot.agent.loop import AgentLoop+from nanobot.agent.tools.image_generation import register_image_generation_toolfrom nanobot.agent.tools.mcp import MCPProviderfrom nanobot.agent.tools.registry import ToolRegistryfrom nanobot.config.schema import Configfrom nanobot.providers.base import LLMUsage-from nanobot.providers.image_generation import image_gen_provider_configsfrom nanobot.sdk.clients import MemoryClient, RuntimeClient, SessionClientfrom nanobot.sdk.runtime import (build_process_direct_kwargs,@@ -132,10 +132,10 @@ class Nanobot:config.agents.defaults.model_preset = model_presettools = ToolRegistry()+ register_image_generation_tool(config, tools, workspace=config.workspace_path)mcp_provider = MCPProvider.from_config(config, tools)loop = AgentLoop.from_config(config,- image_generation_provider_configs=image_gen_provider_configs(config),hook_factories=[create_file_edit_activity_hook],tool_registry=tools,)diff --git a/nanobot/providers/image_generation.py b/nanobot/providers/image_generation.pyindex f5c607e13..921606f91 100644--- a/nanobot/providers/image_generation.py+++ b/nanobot/providers/image_generation.py@@ -15,7 +15,7 @@ from urllib.parse import urljoinimport httpxfrom loguru import logger-from nanobot.config.schema import Config, ProviderConfig+from nanobot.config.schema import ProviderConfig, ProvidersConfigfrom nanobot.providers.registry import find_by_namefrom nanobot.security.network import (PinnedDNSAsyncTransport,@@ -262,12 +262,11 @@ def image_gen_provider_names() -> tuple[str, ...]:return tuple(_IMAGE_GEN_PROVIDERS)-def image_gen_provider_configs(config: Config) -> dict[str, ProviderConfig]:- providers_cfg = config.providers+def image_gen_provider_configs(providers: ProvidersConfig | None) -> dict[str, ProviderConfig]:return {name: pcfor name in _IMAGE_GEN_PROVIDERS- if (pc := getattr(providers_cfg, name, None)) is not None+ if (pc := getattr(providers, name, None)) is not None}diff --git a/nanobot/webui/gateway_services.py b/nanobot/webui/gateway_services.pyindex a067c3863..7179671e9 100644--- a/nanobot/webui/gateway_services.py+++ b/nanobot/webui/gateway_services.py@@ -77,6 +77,7 @@ def build_gateway_services(channel_runtime_status: Callable[[], dict[str, Any]] | None = None,mcp_runtime_status: Callable[[], Mapping[str, str]] | None = None,mcp_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,+ image_generation_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,skill_state_action: Callable[[set[str]], None] | None = None,recovery_action: Callable[[str, dict[str, Any]], Awaitable[dict[str, Any]]] | None = None,subagent_manager: SubagentManager | None = None,@@ -145,6 +146,7 @@ def build_gateway_services(channel_runtime_status=channel_runtime_status,mcp_runtime_status=mcp_runtime_status,mcp_reload=mcp_reload,+ image_generation_reload=image_generation_reload,skill_state_action=skill_state_action,recovery_action=recovery_action,subagent_manager=subagent_manager,diff --git a/nanobot/webui/settings_routes.py b/nanobot/webui/settings_routes.pyindex d693acb8b..8b850ae5e 100644--- a/nanobot/webui/settings_routes.py+++ b/nanobot/webui/settings_routes.py@@ -11,7 +11,6 @@ from typing import Any, castfrom websockets.http11 import Request as WsRequestfrom websockets.http11 import Response-from nanobot.agent.tools.image_generation import request_image_generation_reloadfrom nanobot.agent.tools.mcp_oauth import MCP_OAUTH_CALLBACK_PATHfrom nanobot.api.runtime import ApiRuntime, api_runtime_pathsfrom nanobot.bus.queue import MessageBus@@ -73,6 +72,7 @@ _WEBUI_MUTATION_REQUEST_ATTR = "_nanobot_webui_mutation_request"_CHANNEL_CONNECT_ACTIONS = frozenset({"start", "poll", "cancel"})_MCP_OAUTH_CALLBACK_URL_MAX_BYTES = 8 * 1024_MCP_RELOAD_TIMEOUT_SECONDS = 15.0+_IMAGE_GENERATION_RELOAD_TIMEOUT_SECONDS = 5.0_query_first = contracts.query_first@@ -233,6 +233,7 @@ class WebUISettingsRouter:channel_runtime_status: Callable[[], dict[str, Any]] | None = None,mcp_runtime_status: Callable[[], Mapping[str, str]] | None = None,mcp_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,+ image_generation_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,mcp_oauth_redirect_uri: Callable[[WsRequest], str] | None = None,) -> None:self.settings = settings@@ -248,6 +249,7 @@ class WebUISettingsRouter:self._channel_runtime_status = channel_runtime_statusself._mcp_runtime_status = mcp_runtime_statusself._mcp_reload = mcp_reload+ self._image_generation_reload = image_generation_reloadself._mcp_oauth_redirect_uri = mcp_oauth_redirect_uriself._mcp_oauth = McpOAuthManager()self._restart_sections: set[str] = set()@@ -504,7 +506,7 @@ class WebUISettingsRouter:update_network=update_network_safety_settings,nanobot_features_action=nanobot_features_action,api_runtime=self._api_runtime,- reload_image=lambda: request_image_generation_reload(self.bus),+ reload_image=self._reload_image_generation_runtime,)def _system_operations(self) -> system_domain.SystemSettingsOperations:@@ -534,9 +536,36 @@ class WebUISettingsRouter:) -> tuple[dict[str, Any], bool]:return await self._capabilities.apply_image_runtime_change(payload,- lambda: request_image_generation_reload(self.bus),+ self._reload_image_generation_runtime,)+ async def _reload_image_generation_runtime(self) -> dict[str, Any]:+ if self._image_generation_reload is None:+ return {+ "ok": False,+ "message": "Image generation runtime reload is unavailable. Restart nanobot to apply changes.",+ "requires_restart": True,+ }+ try:+ return await asyncio.wait_for(+ self._image_generation_reload(),+ timeout=_IMAGE_GENERATION_RELOAD_TIMEOUT_SECONDS,+ )+ except asyncio.TimeoutError:+ return {+ "ok": False,+ "message": "Image generation hot reload timed out.",+ "requires_restart": True,+ }+ except Exception as exc:+ self.logger.exception("Image generation hot reload failed")+ return {+ "ok": False,+ "message": "Image generation hot reload failed.",+ "requires_restart": True,+ "error": str(exc),+ }+async def _reload_mcp_runtime(self) -> dict[str, Any]:if self._mcp_reload is None:return {diff --git a/nanobot/webui/ws_http.py b/nanobot/webui/ws_http.pyindex 01c8a90c3..09aa43b0e 100644--- a/nanobot/webui/ws_http.py+++ b/nanobot/webui/ws_http.py@@ -376,6 +376,7 @@ class GatewayHTTPHandler:channel_runtime_status: Callable[[], dict[str, Any]] | None = None,mcp_runtime_status: Callable[[], Mapping[str, str]] | None = None,mcp_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,+ image_generation_reload: Callable[[], Awaitable[dict[str, Any]]] | None = None,skill_state_action: Callable[[set[str]], None] | None = None,recovery_action: (Callable[[str, dict[str, Any]], Awaitable[dict[str, Any]]] | None@@ -434,6 +435,7 @@ class GatewayHTTPHandler:channel_runtime_status=channel_runtime_status,mcp_runtime_status=mcp_runtime_status,mcp_reload=mcp_reload,+ image_generation_reload=image_generation_reload,mcp_oauth_redirect_uri=self._mcp_oauth_redirect_uri,)diff --git a/tests/agent/test_image_generation_hot_reload.py b/tests/agent/test_image_generation_hot_reload.pyindex 48ee1a242..8b69ac06f 100644--- a/tests/agent/test_image_generation_hot_reload.py+++ b/tests/agent/test_image_generation_hot_reload.py@@ -2,29 +2,11 @@from __future__ import annotations-import asyncio-from types import SimpleNamespace-import pytest-from nanobot.agent import context as agent_context-from nanobot.agent.tools.image_generation import (- ImageGenerationTool,- reload_image_generation_tool,- request_image_generation_reload,-)+from nanobot.agent.tools.image_generation import ImageGenerationTool, reload_image_generation_toolfrom nanobot.agent.tools.registry import ToolRegistry-from nanobot.bus.queue import MessageBusfrom nanobot.config.loader import load_config, save_config-from nanobot.config.schema import ToolsConfig---def _runtime_state(tmp_path):- return SimpleNamespace(- workspace=tmp_path,- tools_config=ToolsConfig(),- _image_generation_provider_configs={},- )@pytest.mark.asyncio@@ -33,71 +15,72 @@ async def test_image_generation_reload_replaces_and_removes_live_tool(monkeypatch: pytest.MonkeyPatch,) -> None:config_path = tmp_path / "config.json"- monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)- config = load_config()+ monkeypatch.setattr("nanobot.config.loader._current_config_path", tmp_path / "other-instance.json")+ config = load_config(config_path)config.providers.openrouter.api_key = "first-key"config.tools.image_generation.enabled = Trueconfig.tools.image_generation.provider = "openrouter"config.tools.image_generation.model = "openai/first-image-model"- save_config(config)+ save_config(config, config_path)- state = _runtime_state(tmp_path)registry = ToolRegistry()- result = await reload_image_generation_tool(state, registry)+ assert registry.get_definitions() == []+ result = await reload_image_generation_tool(config_path=config_path, workspace=tmp_path, registry=registry)first_tool = registry.get("generate_image")assert result["requires_restart"] is Falseassert isinstance(first_tool, ImageGenerationTool)assert first_tool.config.model == "openai/first-image-model"assert first_tool.provider_configs["openrouter"].api_key == "first-key"+ assert [definition["function"]["name"] for definition in registry.get_definitions()] == [+ "generate_image"+ ]- config = load_config()+ config = load_config(config_path)config.providers.openrouter.api_key = "second-key"config.tools.image_generation.model = "openai/second-image-model"- save_config(config)+ save_config(config, config_path)- result = await reload_image_generation_tool(state, registry)+ result = await reload_image_generation_tool(config_path=config_path, workspace=tmp_path, registry=registry)second_tool = registry.get("generate_image")assert result["requires_restart"] is Falseassert isinstance(second_tool, ImageGenerationTool)assert second_tool is not first_toolassert second_tool.config.model == "openai/second-image-model"assert second_tool.provider_configs["openrouter"].api_key == "second-key"- assert state.tools_config.image_generation.model == "openai/second-image-model"- config = load_config()+ config = load_config(config_path)config.tools.image_generation.enabled = False- save_config(config)+ save_config(config, config_path)- result = await reload_image_generation_tool(state, registry)+ result = await reload_image_generation_tool(config_path=config_path, workspace=tmp_path, registry=registry)assert result["requires_restart"] is Falseassert not registry.has("generate_image")+ assert registry.get_definitions() == []@pytest.mark.asyncio-async def test_image_generation_reload_reaches_agent_runtime_control(+async def test_image_generation_reload_failure_preserves_live_tool(tmp_path,monkeypatch: pytest.MonkeyPatch,) -> None:config_path = tmp_path / "config.json"- monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)- config = load_config()- config.providers.openrouter.api_key = "image-key"+ config = load_config(config_path)config.tools.image_generation.enabled = True- save_config(config)-- bus = MessageBus()- state = _runtime_state(tmp_path)+ config.providers.openrouter.api_key = "working-key"+ save_config(config, config_path)registry = ToolRegistry()-- async def consume_control() -> None:- message = await bus.consume_inbound()- assert await agent_context.handle_runtime_control(state, message, registry) is True-- consumer = asyncio.create_task(consume_control())- result = await request_image_generation_reload(bus, timeout=2.0)- await consumer-- assert result["ok"] is True- assert result["requires_restart"] is False- assert registry.has("generate_image")+ await reload_image_generation_tool(config_path=config_path, workspace=tmp_path, registry=registry)+ working_tool = registry.get("generate_image")+ definitions = registry.get_definitions()++ missing_env = "NANOBOT_TEST_IMAGE_RELOAD_KEY"+ monkeypatch.delenv(missing_env, raising=False)+ config.providers.openrouter.api_key = f"${{{missing_env}}}"+ save_config(config, config_path)+ result = await reload_image_generation_tool(config_path=config_path, workspace=tmp_path, registry=registry)++ assert result["ok"] is False+ assert result["requires_restart"] is True+ assert registry.get("generate_image") is working_tool+ assert registry.get_definitions() == definitionsdiff --git a/tests/agent/test_loop_image_generation_media.py b/tests/agent/test_loop_image_generation_media.pyindex d45cff499..ad7fe1c00 100644--- a/tests/agent/test_loop_image_generation_media.py+++ b/tests/agent/test_loop_image_generation_media.py@@ -7,10 +7,12 @@ from unittest.mock import AsyncMock, MagicMockimport pytestfrom nanobot.agent.loop import AgentLoop+from nanobot.agent.tools.image_generation import register_image_generation_tool+from nanobot.agent.tools.registry import ToolRegistryfrom nanobot.bus.events import InboundMessagefrom nanobot.bus.queue import MessageBusfrom nanobot.config.loader import set_config_path-from nanobot.config.schema import ImageGenerationToolConfig, ProviderConfig, ToolsConfig+from nanobot.config.schema import Configfrom nanobot.providers.base import LLMResponse, ToolCallRequestfrom nanobot.providers.image_generation import GeneratedImageResponse@@ -58,15 +60,18 @@ async def test_generate_image_does_not_attach_media_to_final_response(LLMResponse(content="Done", finish_reason="stop"),])+ config = Config()+ config.tools.image_generation.enabled = True+ config.providers.openrouter.api_key = "sk-or-test"+ tools = ToolRegistry()+ register_image_generation_tool(config, tools, workspace=tmp_path)loop = AgentLoop(bus=MessageBus(),provider=provider,workspace=tmp_path,model="test-model",- tools_config=ToolsConfig(- image_generation=ImageGenerationToolConfig(enabled=True),- ),- image_generation_provider_config=ProviderConfig(api_key="sk-or-test"),+ tools_config=config.tools,+ tool_registry=tools,)result = await loop._process_message(diff --git a/tests/agent/test_loop_tool_context.py b/tests/agent/test_loop_tool_context.pyindex 000f160eb..1ad13abf7 100644--- a/tests/agent/test_loop_tool_context.py+++ b/tests/agent/test_loop_tool_context.py@@ -13,6 +13,7 @@ from nanobot.agent.tools.context import (current_request_context,reset_request_context,)+from nanobot.agent.tools.image_generation import ImageGenerationTool, register_image_generation_toolfrom nanobot.agent.tools.registry import ToolRegistryfrom nanobot.bus.events import InboundMessagefrom nanobot.bus.queue import MessageBus@@ -105,6 +106,28 @@ def test_loop_from_config_uses_caller_owned_registry(tmp_path: Path) -> None:assert loop.tools.has("read_file")[email protected]("provider_name", ["openrouter", "aihubmix"])+def test_loop_uses_pre_registered_image_tool(+ tmp_path: Path,+ provider_name: str,+) -> None:+ config = _config_for_loop(tmp_path)+ config.tools.image_generation.enabled = True+ config.tools.image_generation.provider = provider_name+ getattr(config.providers, provider_name).api_key = "configured-image-key"+ registry = ToolRegistry()+ register_image_generation_tool(config, registry, workspace=config.workspace_path)+ configured_tool = registry.get("generate_image")+ loop = AgentLoop.from_config(config, tool_registry=registry, provider=_provider_for_loop())++ tool = registry.get("generate_image")+ assert loop.tools is registry+ assert isinstance(tool, ImageGenerationTool)+ assert tool is configured_tool+ assert tool.provider_configs[provider_name].api_key == "configured-image-key"+ assert registry.has("read_file")++@pytest.mark.asyncioasync def test_loop_binds_request_context_for_tool_execution(tmp_path: Path) -> None:provider = MagicMock()diff --git a/tests/test_nanobot_facade.py b/tests/test_nanobot_facade.pyindex 09ead451a..135dc8b24 100644--- a/tests/test_nanobot_facade.py+++ b/tests/test_nanobot_facade.py@@ -118,6 +118,23 @@ def test_from_config_composes_configured_mcp_outside_agent_loop(tmp_path):assert bot._mcp_provider._registry is bot._loop.tools+def test_from_config_uses_instance_image_settings(tmp_path, monkeypatch):+ from nanobot.agent.tools.image_generation import ImageGenerationTool++ monkeypatch.setattr("nanobot.config.loader._current_config_path", tmp_path / "default.json")+ config_path = _write_config(+ tmp_path,+ {"tools": {"imageGeneration": {"enabled": True, "model": "instance-image-model"}}},+ )++ bot = Nanobot.from_config(config_path, workspace=tmp_path)++ tool = bot._loop.tools.get("generate_image")+ assert isinstance(tool, ImageGenerationTool)+ assert tool.config.model == "instance-image-model"+ assert tool.provider_configs["openrouter"].api_key == "sk-test-key"++def test_from_config_accepts_default_model_override(tmp_path):config_path = _write_config(tmp_path)diff --git a/tests/tools/test_tool_loader.py b/tests/tools/test_tool_loader.pyindex 99de091fb..5ae0e7da6 100644--- a/tests/tools/test_tool_loader.py+++ b/tests/tools/test_tool_loader.py@@ -59,7 +59,7 @@ def test_tool_context_has_required_fields():required = {"config", "workspace", "bus", "subagent_manager","cron_service", "exec_session_manager", "file_state_store",- "provider_snapshot_loader", "image_generation_provider_configs", "timezone",+ "provider_snapshot_loader", "providers_config", "timezone","runtime_control",}assert required <= field_names@@ -72,7 +72,7 @@ def test_tool_context_defaults():assert ctx.cron_service is Noneassert ctx.exec_session_manager is Noneassert ctx.provider_snapshot_loader is None- assert ctx.image_generation_provider_configs is None+ assert ctx.providers_config is Noneassert ctx.runtime_control is Noneassert ctx.timezone == "UTC"@@ -175,6 +175,23 @@ def test_loader_wires_shared_exec_session_manager(tmp_path):assert "write_stdin" not in definition_names+def test_loader_preserves_caller_supplied_tool(tmp_path):+ from nanobot.agent.tools.filesystem import ReadFileTool+ from nanobot.agent.tools.registry import ToolRegistry+ from nanobot.config.schema import ToolsConfig++ tool = ReadFileTool(workspace=tmp_path / "custom-root")+ registry = ToolRegistry()+ registry.register(tool)++ registered = ToolLoader(test_classes=[ReadFileTool]).load(+ ToolContext(config=ToolsConfig(), workspace=str(tmp_path)), registry,+ )++ assert registry.get("read_file") is tool+ assert "read_file" not in registered++# --- Task 4: _FsTool.create() ---@@ -344,9 +361,10 @@ def test_image_gen_tool_config_cls():def test_image_gen_tool_enabled():from nanobot.agent.tools.image_generation import ImageGenerationTool+ from nanobot.config.schema import ProvidersConfigmock_config = MagicMock()mock_config.image_generation.enabled = True- ctx = ToolContext(config=mock_config, workspace="/tmp")+ ctx = ToolContext(config=mock_config, workspace="/tmp", providers_config=ProvidersConfig())assert ImageGenerationTool.enabled(ctx) is Truemock_config.image_generation.enabled = Falseassert ImageGenerationTool.enabled(ctx) is False@@ -354,14 +372,16 @@ def test_image_gen_tool_enabled():def test_image_gen_tool_create():from nanobot.agent.tools.image_generation import ImageGenerationTool+ from nanobot.config.schema import ProviderConfig, ProvidersConfigmock_config = MagicMock()mock_config.image_generation = MagicMock()ctx = ToolContext(config=mock_config, workspace="/tmp",- image_generation_provider_configs={"openrouter": MagicMock()},+ providers_config=ProvidersConfig(openrouter=ProviderConfig(api_key="image-key")),)tool = ImageGenerationTool.create(ctx)assert isinstance(tool, ImageGenerationTool)+ assert tool.provider_configs["openrouter"].api_key == "image-key"# --- Task 7: MyToolConfig + MCP wrappers ---diff --git a/tests/webui/test_settings_routes.py b/tests/webui/test_settings_routes.pyindex 4d9d1f5e8..d30d6d588 100644--- a/tests/webui/test_settings_routes.py+++ b/tests/webui/test_settings_routes.py@@ -25,6 +25,7 @@ def _router(config_path: Path | None = None,mcp_runtime_status: Callable[[], Mapping[str, str]] | None = None,mcp_reload: Callable[[], Awaitable[dict[str, object]]] | None = None,+ image_generation_reload: Callable[[], Awaitable[dict[str, object]]] | None = None,rename_model_preset: Callable[[str, str], int] | None = None,refresh_runtime_config: Callable[[], None] | None = None,) -> WebUISettingsRouter:@@ -47,6 +48,7 @@ def _router(runtime_capabilities={},mcp_runtime_status=mcp_runtime_status,mcp_reload=mcp_reload,+ image_generation_reload=image_generation_reload,mcp_oauth_redirect_uri=lambda _request: "https://gateway.example/auth/mcp/callback",)@@ -657,7 +659,7 @@ async def test_reverting_web_reader_preserves_unrelated_restart_reason(tmp_path)@pytest.mark.parametrize("enabled", [False, True])-async def test_image_switch_round_trip_clears_restart(tmp_path, monkeypatch, enabled):+async def test_image_switch_round_trip_clears_restart(tmp_path, enabled):from nanobot.config.loader import save_configfrom nanobot.config.schema import Config@@ -666,11 +668,10 @@ async def test_image_switch_round_trip_clears_restart(tmp_path, monkeypatch, enaconfig.tools.image_generation.enabled = enabledconfig_path = tmp_path / "config.json"save_config(config, config_path)- monkeypatch.setattr(- "nanobot.webui.settings_routes.request_image_generation_reload",- AsyncMock(return_value={"ok": False, "requires_restart": True}),+ router = _router(+ config_path=config_path,+ image_generation_reload=AsyncMock(return_value={"ok": False, "requires_restart": True}),)- router = _router(config_path=config_path)router.logger.warning = MagicMock()path = "/api/settings/image-generation/update"changed = await router.dispatch(None, _mutation_request(path, {"enabled": not enabled}), path)