diff --git a/README.md b/README.md index d4e5db46..b5e4b02c 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,7 @@ nanobot agent - Want different LLM providers, web search, MCP, security settings, or more config options? See [Configuration](./docs/configuration.md) +- Want to run locally? Use [Atomic Chat](./docs/configuration.md#atomic-chat-local), [vLLM](./docs/configuration.md#vllm-local-openai-compatible), [Ollama](./docs/configuration.md#ollama-local), and [others](./docs/configuration.md#local-providers). - Want to run nanobot in chat apps like Telegram, Discord, WeChat or Feishu? See [Chat Apps](./docs/chat-apps.md) - Want Docker or Linux service deployment? See [Deployment](./docs/deployment.md) @@ -329,4 +330,4 @@ This project was started by [Xubin Ren](https://github.com/re-bin) as a personal

Thanks for visiting ✨ nanobot!

Views -

\ No newline at end of file +

diff --git a/docs/configuration.md b/docs/configuration.md index b5d74f7c..fed07ff2 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -152,6 +152,7 @@ ANTHROPIC_API_KEY="$(bw get password api/anthropic)" nanobot agent | `zhipu` | LLM (Zhipu GLM) | [open.bigmodel.cn](https://open.bigmodel.cn) | | `mimo` | LLM (MiMo) | [platform.xiaomimimo.com](https://platform.xiaomimimo.com) | | `longcat` | LLM (LongCat) | [longcat.chat](https://longcat.chat/platform/docs/zh/) | +| `ant_ling` | LLM (Ant Ling / 蚂蚁百灵) | [developer.ant-ling.com](https://developer.ant-ling.com/en/docs/api-reference/openai/) | | `ollama` | LLM (local, Ollama) | — | | `lm_studio` | LLM (local, LM Studio) | — | | `atomic_chat` | LLM (local, [Atomic Chat](https://atomic.chat/)) | — | @@ -444,6 +445,34 @@ Official model names include `LongCat-Flash-Chat`, `LongCat-Flash-Thinking`, +
+Ant Ling (OpenAI-compatible) + +Ant Ling is available through nanobot's built-in OpenAI-compatible provider flow. +The default API base points to `https://api.ant-ling.com/v1`, so you usually +only need to set `apiKey`. + +```json +{ + "providers": { + "antLing": { + "apiKey": "${ANT_LING_API_KEY}" + } + }, + "agents": { + "defaults": { + "provider": "ant_ling", + "model": "Ling-2.6-flash" + } + } +} +``` + +Official OpenAI-compatible model names include `Ling-2.6-1T`, +`Ling-2.6-flash`, `Ling-2.5-1T`, `Ling-1T`, `Ring-2.5-1T`, and `Ring-1T`. + +
+
Custom Provider (Any OpenAI-compatible API) @@ -512,6 +541,8 @@ Some OpenAI-compatible gateways expose request-body extensions such as vLLM guid
+ +
Ollama (local) @@ -577,12 +608,19 @@ ollama run llama3.2
+
Atomic Chat (local) -[Atomic Chat](https://atomic.chat/) is a local-first desktop app that exposes an **OpenAI-compatible** HTTP API (default `http://localhost:1337/v1`). Start Atomic Chat and enable the local API server, then point nanobot at it. +[Atomic Chat](https://atomic.chat/) is a local-first desktop app that exposes an **OpenAI-compatible** HTTP API (default `http://localhost:1337/v1`). Use it when you want to run nanobot against a model on your own machine instead of a hosted API provider. -**1. Add to config** (partial — merge into `~/.nanobot/config.json`): +**1. Start Atomic Chat** + +- Install [Atomic Chat](https://atomic.chat/) on your machine. +- Open Atomic Chat, download a model, and keep the app running. The local API is enabled by default. +- Copy the model ID exposed by the local API. For example, the model ID for `Qwen 3 32B` might be `qwen3-32b`. + +**2. Add to config** (partial — merge into `~/.nanobot/config.json`): ```json { @@ -595,13 +633,13 @@ ollama run llama3.2 "agents": { "defaults": { "provider": "atomic_chat", - "model": "your-model-id-from-atomic-chat" + "model": "qwen3-32b" } } } ``` -> **Note:** Set `apiKey` to `null` if your Atomic Chat server does not require a key. If it does, set `apiKey` (or the `ATOMIC_CHAT_API_KEY` environment variable) to the value Atomic Chat expects. The `model` string must match the model id Atomic Chat exposes on its OpenAI-compatible endpoint. +> **Note:** Replace `qwen3-32b` with the model ID from Atomic Chat. Set `apiKey` to `null` if your Atomic Chat server does not require a key. If it does, set `apiKey` (or the `ATOMIC_CHAT_API_KEY` environment variable) to the value Atomic Chat expects. > `provider: "auto"` also works when `providers.atomic_chat.apiBase` is configured, but setting `"provider": "atomic_chat"` is the clearest option. @@ -682,6 +720,7 @@ docker run -d \ > See the [official OVMS docs](https://docs.openvino.ai/2026/model-server/ovms_docs_llm_quickstart.html) for more details.
+
vLLM (local / OpenAI-compatible) diff --git a/docs/image-generation.md b/docs/image-generation.md index 5c63fddf..6ca04929 100644 --- a/docs/image-generation.md +++ b/docs/image-generation.md @@ -6,8 +6,6 @@ The feature is disabled by default. Enable it in `~/.nanobot/config.json`, confi ## Quick Setup -OpenRouter example: - ```json { "providers": { @@ -19,34 +17,13 @@ OpenRouter example: "imageGeneration": { "enabled": true, "provider": "openrouter", - "model": "openai/gpt-5.4-image-2", - "defaultAspectRatio": "1:1", - "defaultImageSize": "1K" + "model": "openai/gpt-5.4-image-2" } } } ``` -AIHubMix example: - -```json -{ - "providers": { - "aihubmix": { - "apiKey": "${AIHUBMIX_API_KEY}" - } - }, - "tools": { - "imageGeneration": { - "enabled": true, - "provider": "aihubmix", - "model": "gpt-image-2-free", - "defaultAspectRatio": "1:1", - "defaultImageSize": "1K" - } - } -} -``` +See [Provider Notes](#provider-notes) for AIHubMix, MiniMax, and Gemini configuration examples. > [!TIP] > Prefer environment variables for API keys. nanobot resolves `${VAR_NAME}` values from the environment at startup. @@ -69,7 +46,7 @@ The WebUI hides provider storage details from the user. The agent sees the saved | Option | Type | Default | Description | |--------|------|---------|-------------| | `tools.imageGeneration.enabled` | boolean | `false` | Register the `generate_image` tool | -| `tools.imageGeneration.provider` | string | `"openrouter"` | Image provider name. Currently `openrouter` and `aihubmix` are supported | +| `tools.imageGeneration.provider` | string | `"openrouter"` | Image provider name. Supported values: `openrouter`, `aihubmix`, `minimax`, `gemini` | | `tools.imageGeneration.model` | string | `"openai/gpt-5.4-image-2"` | Provider model name | | `tools.imageGeneration.defaultAspectRatio` | string | `"1:1"` | Default ratio when the prompt/tool call does not specify one | | `tools.imageGeneration.defaultImageSize` | string | `"1K"` | Default size hint, for example `1K`, `2K`, `4K`, or `1024x1024` | @@ -139,6 +116,58 @@ Configure: `quality: low` is optional. It can make free image models faster and less likely to time out, but it is not required for correctness. +### MiniMax + +MiniMax `image-01` supports text-to-image and reference-image (subject reference) edits. Supported aspect ratios are `1:1`, `16:9`, `4:3`, `3:2`, `2:3`, `3:4`, `9:16`, and `21:9`. + +```json +{ + "providers": { + "minimax": { + "apiKey": "${MINIMAX_API_KEY}" + } + }, + "tools": { + "imageGeneration": { + "enabled": true, + "provider": "minimax", + "model": "image-01", + "defaultAspectRatio": "1:1" + } + } +} +``` + +### Gemini + +nanobot supports two Gemini image generation model families via Google's Generative Language API: + +| Model | Endpoint | Reference images | +|-------|----------|-----------------| +| `imagen-4.0-generate-001` | `:predict` | Not supported by this integration | +| `gemini-2.5-flash-image` | `:generateContent` | Supported | + +For reference-image edits, use a Gemini Flash image model: + +```json +{ + "providers": { + "gemini": { + "apiKey": "${GEMINI_API_KEY}" + } + }, + "tools": { + "imageGeneration": { + "enabled": true, + "provider": "gemini", + "model": "gemini-2.5-flash-image" + } + } +} +``` + +Imagen 4 supports the aspect ratios `1:1`, `9:16`, `16:9`, `3:4`, and `4:3`. Unsupported ratios are ignored and the model uses its default. The `defaultImageSize` setting has no effect on Gemini models; sizing is controlled by `defaultAspectRatio` only. Reference images passed with an Imagen model are ignored (with a warning logged). + ## Artifacts Generated images are stored under the active nanobot instance's media directory: @@ -193,7 +222,7 @@ Use the reference image. Keep the same robot and composition, change the palette |---------|-------| | `generate_image` is not available | Set `tools.imageGeneration.enabled` to `true` and restart the gateway | | Missing API key error | Configure `providers..apiKey`; if using `${VAR_NAME}`, confirm the environment variable is visible to the gateway process | -| `unsupported image generation provider` | Use `openrouter` or `aihubmix` | +| `unsupported image generation provider` | Use `openrouter`, `aihubmix`, `minimax`, or `gemini` | | AIHubMix says `Incorrect model ID` | Use `model: "gpt-image-2-free"`; nanobot expands it to the required `openai/gpt-image-2-free` model path internally | | Generation times out | Try a smaller/default image size, set AIHubMix `extraBody.quality` to `"low"`, or retry later | | Reference image rejected | Reference image paths must be inside the workspace or nanobot media directory and must be valid image files | diff --git a/nanobot/agent/loop.py b/nanobot/agent/loop.py index c1f52117..abc6449d 100644 --- a/nanobot/agent/loop.py +++ b/nanobot/agent/loop.py @@ -36,19 +36,17 @@ from nanobot.session.goal_state import ( runner_wall_llm_timeout_s, ) from nanobot.session.manager import Session, SessionManager -from nanobot.utils.artifacts import generated_image_paths_from_messages +from nanobot.session.webui_turns import ( + WebuiTurnCoordinator, + build_bus_progress_callback, + mark_webui_session, +) from nanobot.utils.document import extract_documents from nanobot.utils.helpers import image_placeholder_text from nanobot.utils.helpers import truncate_text as truncate_text_fn from nanobot.utils.image_generation_intent import image_generation_prompt from nanobot.utils.llm_runtime import LLMRuntime from nanobot.utils.runtime import EMPTY_FINAL_RESPONSE_MESSAGE -from nanobot.utils.session_attachments import merge_turn_media_into_last_assistant -from nanobot.utils.webui_turn_helpers import ( - WebuiTurnCoordinator, - build_bus_progress_callback, - mark_webui_session, -) if TYPE_CHECKING: from nanobot.config.schema import ( @@ -103,7 +101,6 @@ class TurnContext: save_skip: int = 0 outbound: OutboundMessage | None = None - generated_media: list[str] = field(default_factory=list) on_progress: Callable[..., Awaitable[None]] | None = None on_stream: Callable[[str], Awaitable[None]] | None = None @@ -1194,7 +1191,6 @@ class AgentLoop: all_msgs: list[dict[str, Any]], stop_reason: str, had_injections: bool, - generated_media: list[str], on_stream: Callable[[str], Awaitable[None]] | None, *, turn_latency_ms: int | None = None, @@ -1218,7 +1214,6 @@ class AgentLoop: channel=msg.channel, chat_id=msg.chat_id, content=final_content, - media=generated_media, metadata=meta, ) @@ -1348,11 +1343,6 @@ class AgentLoop: ctx.final_content = EMPTY_FINAL_RESPONSE_MESSAGE ctx.save_skip = 1 + len(ctx.history) + (1 if ctx.user_persisted_early else 0) - skip_msgs = ctx.all_messages[ctx.save_skip:] - ctx.generated_media = generated_image_paths_from_messages(skip_msgs) - mt = self.tools.get("message") - extra = getattr(mt, "turn_delivered_media_paths", lambda: [])() if mt else [] - merge_turn_media_into_last_assistant(ctx.all_messages, ctx.generated_media, extra) ctx.turn_latency_ms = max(0, int((time.time() - ctx.turn_wall_started_at) * 1000)) self._save_turn( @@ -1380,7 +1370,6 @@ class AgentLoop: ctx.all_messages, ctx.stop_reason, ctx.had_injections, - ctx.generated_media, ctx.on_stream, turn_latency_ms=ctx.turn_latency_ms, ) diff --git a/nanobot/agent/runner.py b/nanobot/agent/runner.py index 776885ec..0b0164fd 100644 --- a/nanobot/agent/runner.py +++ b/nanobot/agent/runner.py @@ -20,6 +20,7 @@ from nanobot.utils.file_edit_events import ( build_file_edit_error_event, build_file_edit_start_event, prepare_file_edit_tracker, + StreamingFileEditTracker, ) from nanobot.utils.helpers import ( IncrementalThinkExtractor, @@ -629,6 +630,24 @@ class AgentRunner: ) progress_state: dict[str, bool] | None = None + live_file_edits: StreamingFileEditTracker | None = None + + if ( + spec.progress_callback is not None + and on_progress_accepts_file_edit_events(spec.progress_callback) + ): + async def _emit_live_file_edits(events: list[dict[str, Any]]) -> None: + await invoke_file_edit_progress(spec.progress_callback, events) + + live_file_edits = StreamingFileEditTracker( + workspace=spec.workspace, + tools=spec.tools, + emit=_emit_live_file_edits, + ) + + async def _tool_call_delta(delta: dict[str, Any]) -> None: + if live_file_edits is not None: + await live_file_edits.update(delta) if wants_streaming: async def _stream(delta: str) -> None: @@ -646,6 +665,7 @@ class AgentRunner: **kwargs, on_content_delta=_stream, on_thinking_delta=_thinking, + on_tool_call_delta=_tool_call_delta if live_file_edits is not None else None, ) elif wants_progress_streaming: stream_buf = "" @@ -675,6 +695,7 @@ class AgentRunner: coro = self.provider.chat_stream_with_retry( **kwargs, on_content_delta=_stream_progress, + on_tool_call_delta=_tool_call_delta if live_file_edits is not None else None, ) else: coro = self.provider.chat_with_retry(**kwargs) @@ -689,6 +710,14 @@ class AgentRunner: await coro if outer_timeout_s is None else await asyncio.wait_for(coro, timeout=outer_timeout_s) ) + if live_file_edits is not None: + await live_file_edits.flush() + if response.should_execute_tools: + live_file_edits.apply_final_call_ids(response.tool_calls) + await live_file_edits.error_unmatched( + response.tool_calls if response.should_execute_tools else [], + "Tool call did not complete.", + ) except asyncio.TimeoutError: if outer_timeout_s is None: return LLMResponse( @@ -907,7 +936,10 @@ class AgentRunner: if file_edit_tracker is not None and progress_callback is not None: await invoke_file_edit_progress( progress_callback, - [build_file_edit_end_event(file_edit_tracker)], + [build_file_edit_end_event( + file_edit_tracker, + params if isinstance(params, dict) else None, + )], ) detail = "" if result is None else str(result) diff --git a/nanobot/agent/tools/image_generation.py b/nanobot/agent/tools/image_generation.py index f9d4056d..f2f599de 100644 --- a/nanobot/agent/tools/image_generation.py +++ b/nanobot/agent/tools/image_generation.py @@ -17,9 +17,9 @@ from nanobot.agent.tools.schema import ( from nanobot.config.paths import get_media_dir from nanobot.config.schema import Base from nanobot.providers.image_generation import ( - AIHubMixImageGenerationClient, ImageGenerationError, - OpenRouterImageGenerationClient, + ImageGenerationProvider, + get_image_gen_provider, ) from nanobot.utils.artifacts import ( ArtifactError, @@ -117,27 +117,24 @@ class ImageGenerationTool(Tool): def _provider_config(self) -> ProviderConfig | None: return self.provider_configs.get(self.config.provider) - def _provider_client(self) -> OpenRouterImageGenerationClient | AIHubMixImageGenerationClient | None: + def _provider_client(self) -> ImageGenerationProvider | None: provider = self._provider_config() + cls = get_image_gen_provider(self.config.provider) + if cls is None: + return None kwargs = { "api_key": provider.api_key if provider else None, "api_base": provider.api_base if provider else None, "extra_headers": provider.extra_headers if provider else None, "extra_body": provider.extra_body if provider else None, } - if self.config.provider == "openrouter": - return OpenRouterImageGenerationClient(**kwargs) - if self.config.provider == "aihubmix": - return AIHubMixImageGenerationClient(**kwargs) - return None + return cls(**kwargs) def _missing_api_key_error(self) -> str: - provider = self.config.provider - if provider == "openrouter": - return "Error: OpenRouter API key is not configured. Set providers.openrouter.apiKey." - if provider == "aihubmix": - return "Error: AIHubMix API key is not configured. Set providers.aihubmix.apiKey." - return f"Error: {provider} API key is not configured." + cls = get_image_gen_provider(self.config.provider) + if cls and cls.missing_key_message: + return f"Error: {cls.missing_key_message}" + return f"Error: {self.config.provider} API key is not configured." def _resolve_reference_image(self, value: str) -> str: raw_path = Path(value).expanduser() diff --git a/nanobot/agent/tools/message.py b/nanobot/agent/tools/message.py index 725e824e..63b45c38 100644 --- a/nanobot/agent/tools/message.py +++ b/nanobot/agent/tools/message.py @@ -31,8 +31,8 @@ from nanobot.config.paths import get_workspace_path media=ArraySchema( StringSchema(""), description=( - "Optional list of existing file paths to attach for proactive or cross-channel delivery. " - "Do not use this to resend generate_image outputs in the current chat." + "Optional list of existing file paths to attach. " + "Use artifact paths returned by generate_image here when delivering generated images." ), ), buttons=ArraySchema( @@ -140,8 +140,8 @@ class MessageTool(Tool, ContextAware): "Do not use this for the normal reply in the current chat: answer naturally instead. " "If channel/chat_id would target the current runtime conversation, do not call this tool " "unless the user explicitly asked you to proactively send an existing file attachment. " - "When generate_image creates images in the current chat, the final assistant reply " - "automatically attaches them; do not call message just to announce or resend them. " + "When generate_image creates images in the current chat, use the message tool " + "with the artifact paths in the media parameter to deliver the images to the user. " "For proactive attachment delivery, use the 'media' parameter with file paths. " "Do NOT use read_file to send files — that only reads content for your own analysis." ) diff --git a/nanobot/channels/websocket.py b/nanobot/channels/websocket.py index 0202bd33..11818ea9 100644 --- a/nanobot/channels/websocket.py +++ b/nanobot/channels/websocket.py @@ -37,15 +37,27 @@ from nanobot.command.builtin import builtin_command_palette from nanobot.config.paths import get_media_dir from nanobot.config.schema import Base from nanobot.session.goal_state import goal_state_ws_blob +from nanobot.session.webui_turns import websocket_turn_wall_started_at from nanobot.utils.helpers import safe_filename from nanobot.utils.media_decode import ( FileSizeExceeded, save_base64_data_url, ) from nanobot.utils.subagent_channel_display import scrub_subagent_messages_for_channel -from nanobot.utils.webui_thread_disk import delete_webui_thread -from nanobot.utils.webui_transcript import append_transcript_object, build_webui_thread_response -from nanobot.utils.webui_turn_helpers import websocket_turn_wall_started_at +from nanobot.webui.settings_api import ( + WebUISettingsError, + settings_payload, + update_agent_settings, + update_image_generation_settings, + update_provider_settings, + update_web_search_settings, +) +from nanobot.webui.sidebar_state import ( + read_webui_sidebar_state, + write_webui_sidebar_state, +) +from nanobot.webui.thread_disk import delete_webui_thread +from nanobot.webui.transcript import append_transcript_object, build_webui_thread_response if TYPE_CHECKING: from nanobot.session.manager import SessionManager @@ -222,47 +234,6 @@ def _query_first(query: dict[str, list[str]], key: str) -> str | None: return values[0] if values else None -def _mask_secret_hint(secret: str | None) -> str | None: - if not secret: - return None - if len(secret) <= 8: - return "••••" - return f"{secret[:4]}••••{secret[-4:]}" - - -def _provider_requires_api_key(spec: Any) -> bool: - if spec.backend == "azure_openai": - return True - if spec.is_local or spec.is_direct: - return False - return True - - -def _provider_configured_for_settings(spec: Any, provider_config: Any) -> bool: - if _provider_requires_api_key(spec): - return bool(provider_config.api_key) - return bool( - provider_config.api_key - or provider_config.api_base - or getattr(provider_config, "region", None) - or getattr(provider_config, "profile", None) - ) - - -_WEB_SEARCH_PROVIDER_OPTIONS: tuple[dict[str, str], ...] = ( - {"name": "duckduckgo", "label": "DuckDuckGo", "credential": "none"}, - {"name": "brave", "label": "Brave Search", "credential": "api_key"}, - {"name": "tavily", "label": "Tavily", "credential": "api_key"}, - {"name": "searxng", "label": "SearXNG", "credential": "base_url"}, - {"name": "jina", "label": "Jina", "credential": "api_key"}, - {"name": "kagi", "label": "Kagi", "credential": "api_key"}, - {"name": "olostep", "label": "Olostep", "credential": "api_key"}, -) -_WEB_SEARCH_PROVIDER_BY_NAME = { - provider["name"]: provider for provider in _WEB_SEARCH_PROVIDER_OPTIONS -} - - def _parse_inbound_payload(raw: str) -> str | None: """Parse a client frame into text; return None for empty or unrecognized content.""" text = raw.strip() @@ -501,6 +472,7 @@ class WebSocketChannel(BaseChannel): static_dist_path.resolve() if static_dist_path is not None else None ) self._runtime_model_name = runtime_model_name + self._settings_restart_sections: set[str] = set() # Process-local secret used to HMAC-sign media URLs. The signed URL is # the capability — anyone who holds a valid URL can fetch that one # file, nothing else. The secret regenerates on restart so links @@ -663,6 +635,12 @@ class WebSocketChannel(BaseChannel): if got == "/api/commands": return self._handle_commands(request) + if got == "/api/webui/sidebar-state": + return self._handle_webui_sidebar_state(request) + + if got == "/api/webui/sidebar-state/update": + return self._handle_webui_sidebar_state_update(request) + if got == "/api/settings/update": return self._handle_settings_update(request) @@ -672,6 +650,9 @@ class WebSocketChannel(BaseChannel): if got == "/api/settings/web-search/update": return self._handle_settings_web_search_update(request) + if got == "/api/settings/image-generation/update": + return self._handle_settings_image_generation_update(request) + m = re.match(r"^/api/sessions/([^/]+)/messages$", got) if m: return self._handle_session_messages(request, m.group(1)) @@ -783,221 +764,115 @@ class WebSocketChannel(BaseChannel): sessions = self._session_manager.list_sessions() # Sidebar/chat listing for WS-backed sessions only — CLI / Slack / etc. # keys are not intended for resume over this HTTP surface. - cleaned = [ - {k: v for k, v in s.items() if k != "path"} - for s in sessions - if isinstance(s.get("key"), str) and s["key"].startswith("websocket:") - ] - return _http_json_response({"sessions": cleaned}) - - def _settings_payload(self, *, requires_restart: bool = False) -> dict[str, Any]: - from nanobot.config.loader import get_config_path, load_config - from nanobot.providers.registry import PROVIDERS, find_by_name - - config = load_config() - defaults = config.agents.defaults - provider_name = config.get_provider_name(defaults.model) or defaults.provider - provider = config.get_provider(defaults.model) - selected_provider = provider_name - if defaults.provider != "auto": - spec = find_by_name(defaults.provider) - selected_provider = spec.name if spec else provider_name - providers = [] - for spec in PROVIDERS: - provider_config = getattr(config.providers, spec.name, None) - if provider_config is None or spec.is_oauth: + cleaned = [] + for s in sessions: + key = s.get("key") + if not (isinstance(key, str) and key.startswith("websocket:")): continue - providers.append( - { - "name": spec.name, - "label": spec.label, - "configured": _provider_configured_for_settings(spec, provider_config), - "api_key_required": _provider_requires_api_key(spec), - "api_key_hint": _mask_secret_hint(provider_config.api_key), - "api_base": provider_config.api_base, - "default_api_base": spec.default_api_base or None, - } - ) - search_config = config.tools.web.search - search_provider = ( - search_config.provider - if search_config.provider in _WEB_SEARCH_PROVIDER_BY_NAME - else "duckduckgo" - ) - return { - "agent": { - "model": defaults.model, - "provider": selected_provider, - "resolved_provider": provider_name, - "has_api_key": bool(provider and provider.api_key), - }, - "providers": providers, - "web_search": { - "provider": search_provider, - "api_key_hint": _mask_secret_hint(search_config.api_key), - "base_url": search_config.base_url or None, - "providers": list(_WEB_SEARCH_PROVIDER_OPTIONS), - }, - "runtime": { - "config_path": str(get_config_path().expanduser()), - }, - "requires_restart": requires_restart, - } + row = {k: v for k, v in s.items() if k != "path"} + chat_id = key.split(":", 1)[1] + started_at = websocket_turn_wall_started_at(chat_id) + if started_at is not None: + row["run_started_at"] = started_at + cleaned.append(row) + return _http_json_response({"sessions": cleaned}) def _handle_settings(self, request: WsRequest) -> Response: if not self._check_api_token(request): return _http_error(401, "Unauthorized") - return _http_json_response(self._settings_payload()) + return _http_json_response(self._with_settings_restart_state(settings_payload())) + + def _with_settings_restart_state( + self, + payload: dict[str, Any], + *, + section: str | None = None, + ) -> dict[str, Any]: + """Keep restart-required state alive for this gateway process.""" + if section and payload.get("requires_restart"): + self._settings_restart_sections.add(section) + if self._settings_restart_sections: + payload = dict(payload) + payload["requires_restart"] = True + payload["restart_required_sections"] = sorted(self._settings_restart_sections) + else: + payload = dict(payload) + payload["restart_required_sections"] = [] + return payload def _handle_commands(self, request: WsRequest) -> Response: if not self._check_api_token(request): return _http_error(401, "Unauthorized") return _http_json_response({"commands": builtin_command_palette()}) + def _handle_webui_sidebar_state(self, request: WsRequest) -> Response: + if not self._check_api_token(request): + return _http_error(401, "Unauthorized") + return _http_json_response(read_webui_sidebar_state()) + + def _handle_webui_sidebar_state_update(self, request: WsRequest) -> Response: + if not self._check_api_token(request): + return _http_error(401, "Unauthorized") + query = _parse_query(request.path) + raw_state = _query_first(query, "state") + if raw_state is None: + return _http_error(400, "missing state") + try: + decoded = json.loads(raw_state) + except json.JSONDecodeError: + return _http_error(400, "state must be JSON") + if not isinstance(decoded, dict): + return _http_error(400, "state must be an object") + try: + state = write_webui_sidebar_state(decoded) + except ValueError as e: + return _http_error(400, str(e)) + except OSError: + self.logger.exception("failed to write webui sidebar state") + return _http_error(500, "failed to write sidebar state") + return _http_json_response(state) + def _handle_settings_update(self, request: WsRequest) -> Response: if not self._check_api_token(request): return _http_error(401, "Unauthorized") - from nanobot.config.loader import load_config, save_config - from nanobot.providers.registry import find_by_name - query = _parse_query(request.path) - config = load_config() - defaults = config.agents.defaults - changed = False - - model = _query_first(query, "model") - if model is not None: - model = model.strip() - if not model: - return _http_error(400, "model is required") - if defaults.model != model: - defaults.model = model - changed = True - - provider = _query_first(query, "provider") - if provider is not None: - provider = provider.strip() - if not provider: - return _http_error(400, "provider is required") - if find_by_name(provider) is None: - return _http_error(400, "unknown provider") - provider_config = getattr(config.providers, provider, None) - spec = find_by_name(provider) - if ( - provider_config is None - or spec is None - or not _provider_configured_for_settings(spec, provider_config) - ): - return _http_error(400, "provider is not configured") - if defaults.provider != provider: - defaults.provider = provider - changed = True - - if changed: - save_config(config) - # LLM provider/model changes are hot-reloaded by AgentLoop before each - # new turn via the provider snapshot loader, so a restart is unnecessary. - return _http_json_response(self._settings_payload(requires_restart=False)) + try: + payload = update_agent_settings(query) + except WebUISettingsError as e: + return _http_error(e.status, e.message) + return _http_json_response( + self._with_settings_restart_state(payload, section="runtime") + ) def _handle_settings_provider_update(self, request: WsRequest) -> Response: if not self._check_api_token(request): return _http_error(401, "Unauthorized") - from nanobot.config.loader import load_config, save_config - from nanobot.providers.registry import find_by_name - query = _parse_query(request.path) - provider_name = (_query_first(query, "provider") or "").strip() - if not provider_name: - return _http_error(400, "provider is required") - spec = find_by_name(provider_name) - if spec is None or spec.is_oauth: - return _http_error(400, "unknown provider") - - config = load_config() - provider_config = getattr(config.providers, spec.name, None) - if provider_config is None: - return _http_error(400, "unknown provider") - - changed = False - if "api_key" in query or "apiKey" in query: - api_key = _query_first(query, "api_key") - if api_key is None: - api_key = _query_first(query, "apiKey") - api_key = (api_key or "").strip() or None - if provider_config.api_key != api_key: - provider_config.api_key = api_key - changed = True - - if "api_base" in query or "apiBase" in query: - api_base = _query_first(query, "api_base") - if api_base is None: - api_base = _query_first(query, "apiBase") - api_base = (api_base or "").strip() or None - if provider_config.api_base != api_base: - provider_config.api_base = api_base - changed = True - - if changed: - save_config(config) - # API key/base changes are picked up by the next provider snapshot refresh. - return _http_json_response(self._settings_payload(requires_restart=False)) + try: + payload = update_provider_settings(query) + except WebUISettingsError as e: + return _http_error(e.status, e.message) + return _http_json_response(self._with_settings_restart_state(payload, section="image")) def _handle_settings_web_search_update(self, request: WsRequest) -> Response: if not self._check_api_token(request): return _http_error(401, "Unauthorized") - from nanobot.config.loader import load_config, save_config - query = _parse_query(request.path) - provider_name = (_query_first(query, "provider") or "").strip().lower() - provider_option = _WEB_SEARCH_PROVIDER_BY_NAME.get(provider_name) - if provider_option is None: - return _http_error(400, "unknown web search provider") + try: + payload = update_web_search_settings(query) + except WebUISettingsError as e: + return _http_error(e.status, e.message) + return _http_json_response(self._with_settings_restart_state(payload, section="web")) - config = load_config() - search_config = config.tools.web.search - previous_provider = search_config.provider - changed = False - - def set_value(attr: str, value: str | None) -> None: - nonlocal changed - if getattr(search_config, attr) != value: - setattr(search_config, attr, value) - changed = True - - if search_config.provider != provider_name: - search_config.provider = provider_name - changed = True - - credential = provider_option["credential"] - if credential == "none": - set_value("api_key", "") - set_value("base_url", "") - elif credential == "base_url": - base_url = _query_first(query, "base_url") - if base_url is None: - base_url = _query_first(query, "baseUrl") - base_url = base_url.strip() if base_url is not None else None - if not base_url and previous_provider == provider_name and search_config.base_url: - base_url = search_config.base_url - if not base_url: - return _http_error(400, "base_url is required") - set_value("base_url", base_url) - set_value("api_key", "") - else: - api_key = _query_first(query, "api_key") - if api_key is None: - api_key = _query_first(query, "apiKey") - api_key = api_key.strip() if api_key is not None else None - if not api_key and previous_provider == provider_name and search_config.api_key: - api_key = search_config.api_key - if not api_key: - return _http_error(400, "api_key is required") - set_value("api_key", api_key) - set_value("base_url", "") - - if changed: - save_config(config) - return _http_json_response(self._settings_payload(requires_restart=False)) + def _handle_settings_image_generation_update(self, request: WsRequest) -> Response: + if not self._check_api_token(request): + return _http_error(401, "Unauthorized") + query = _parse_query(request.path) + try: + payload = update_image_generation_settings(query) + except WebUISettingsError as e: + return _http_error(e.status, e.message) + return _http_json_response(self._with_settings_restart_state(payload, section="image")) @staticmethod def _is_websocket_channel_session_key(key: str) -> bool: diff --git a/nanobot/cli/commands.py b/nanobot/cli/commands.py index 69420543..f7bf043a 100644 --- a/nanobot/cli/commands.py +++ b/nanobot/cli/commands.py @@ -620,6 +620,7 @@ def serve( from nanobot.api.server import create_app from nanobot.bus.queue import MessageBus + from nanobot.providers.image_generation import image_gen_provider_configs from nanobot.session.manager import SessionManager if verbose: @@ -639,10 +640,7 @@ def serve( agent_loop = AgentLoop.from_config( runtime_config, bus, session_manager=session_manager, - image_generation_provider_configs={ - "openrouter": runtime_config.providers.openrouter, - "aihubmix": runtime_config.providers.aihubmix, - }, + image_generation_provider_configs=image_gen_provider_configs(runtime_config), ) except ValueError as exc: console.print(f"[red]Error: {exc}[/red]") @@ -722,6 +720,7 @@ def _run_gateway( from nanobot.cron.types import CronJob from nanobot.heartbeat.service import HeartbeatService from nanobot.providers.factory import build_provider_snapshot, load_provider_snapshot + from nanobot.providers.image_generation import image_gen_provider_configs from nanobot.session.manager import SessionManager port = port if port is not None else config.gateway.port @@ -752,10 +751,7 @@ def _run_gateway( context_window_tokens=provider_snapshot.context_window_tokens, cron_service=cron, session_manager=session_manager, - image_generation_provider_configs={ - "openrouter": config.providers.openrouter, - "aihubmix": config.providers.aihubmix, - }, + image_generation_provider_configs=image_gen_provider_configs(config), provider_snapshot_loader=load_provider_snapshot, runtime_model_publisher=lambda model, preset: publish_runtime_model_update( bus, @@ -1122,6 +1118,7 @@ def agent( from nanobot.bus.queue import MessageBus from nanobot.cron.service import CronService + from nanobot.providers.image_generation import image_gen_provider_configs config = _load_runtime_config(config, workspace) sync_workspace_templates(config.workspace_path) @@ -1145,6 +1142,7 @@ def agent( agent_loop = AgentLoop.from_config( config, bus, cron_service=cron, + image_generation_provider_configs=image_gen_provider_configs(config), ) except ValueError as exc: console.print(f"[red]Error: {exc}[/red]") diff --git a/nanobot/config/schema.py b/nanobot/config/schema.py index 96f9014a..6ccabea3 100644 --- a/nanobot/config/schema.py +++ b/nanobot/config/schema.py @@ -207,6 +207,7 @@ class ProvidersConfig(Base): stepfun: ProviderConfig = Field(default_factory=ProviderConfig) # Step Fun (阶跃星辰) xiaomi_mimo: ProviderConfig = Field(default_factory=ProviderConfig) # Xiaomi MIMO (小米) longcat: ProviderConfig = Field(default_factory=ProviderConfig) # LongCat + ant_ling: ProviderConfig = Field(default_factory=ProviderConfig) # Ant Ling aihubmix: ProviderConfig = Field(default_factory=ProviderConfig) # AiHubMix API gateway siliconflow: ProviderConfig = Field(default_factory=ProviderConfig) # SiliconFlow (硅基流动) volcengine: ProviderConfig = Field(default_factory=ProviderConfig) # VolcEngine (火山引擎) diff --git a/nanobot/nanobot.py b/nanobot/nanobot.py index bfedb761..95185ba4 100644 --- a/nanobot/nanobot.py +++ b/nanobot/nanobot.py @@ -8,6 +8,7 @@ from typing import Any from nanobot.agent.hook import AgentHook, SDKCaptureHook from nanobot.agent.loop import AgentLoop +from nanobot.providers.image_generation import image_gen_provider_configs @dataclass(slots=True) @@ -63,10 +64,7 @@ class Nanobot: loop = AgentLoop.from_config( config, - image_generation_provider_configs={ - "openrouter": config.providers.openrouter, - "aihubmix": config.providers.aihubmix, - }, + image_generation_provider_configs=image_gen_provider_configs(config), ) return cls(loop) diff --git a/nanobot/providers/anthropic_provider.py b/nanobot/providers/anthropic_provider.py index b667853a..31f2bc2f 100644 --- a/nanobot/providers/anthropic_provider.py +++ b/nanobot/providers/anthropic_provider.py @@ -590,6 +590,7 @@ class AnthropicProvider(LLMProvider): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: kwargs = self._build_kwargs( messages, tools, model, max_tokens, temperature, @@ -598,11 +599,12 @@ class AnthropicProvider(LLMProvider): idle_timeout_s = int(os.environ.get("NANOBOT_STREAM_IDLE_TIMEOUT_S", "90")) try: async with self._client.messages.stream(**kwargs) as stream: - if on_content_delta or on_thinking_delta: + if on_content_delta or on_thinking_delta or on_tool_call_delta: # Idle timeout must track *any* SSE chunk (thinking_delta, # tool JSON deltas, etc.), not only text_stream tokens. # Otherwise extended thinking can stall text_stream for minutes # while the connection is healthy (e.g. MiniMax Anthropic). + tool_blocks: dict[int, dict[str, str]] = {} while True: try: chunk = await asyncio.wait_for( @@ -611,7 +613,22 @@ class AnthropicProvider(LLMProvider): ) except StopAsyncIteration: break - if ( + if chunk.type == "content_block_start": + block = getattr(chunk, "content_block", None) + if getattr(block, "type", None) == "tool_use": + index = int(getattr(chunk, "index", 0) or 0) + state = { + "call_id": str(getattr(block, "id", "") or ""), + "name": str(getattr(block, "name", "") or ""), + } + tool_blocks[index] = state + if on_tool_call_delta: + await on_tool_call_delta({ + "index": index, + **state, + "arguments_delta": "", + }) + elif ( chunk.type == "content_block_delta" and getattr(chunk.delta, "type", None) == "thinking_delta" ): @@ -625,6 +642,20 @@ class AnthropicProvider(LLMProvider): text = getattr(chunk.delta, "text", None) or "" if text and on_content_delta: await on_content_delta(text) + elif ( + chunk.type == "content_block_delta" + and getattr(chunk.delta, "type", None) == "input_json_delta" + ): + partial = getattr(chunk.delta, "partial_json", None) or "" + if partial and on_tool_call_delta: + index = int(getattr(chunk, "index", 0) or 0) + state = tool_blocks.get(index, {}) + await on_tool_call_delta({ + "index": index, + "call_id": state.get("call_id", ""), + "name": state.get("name", ""), + "arguments_delta": partial, + }) response = await asyncio.wait_for( stream.get_final_message(), timeout=idle_timeout_s, diff --git a/nanobot/providers/azure_openai_provider.py b/nanobot/providers/azure_openai_provider.py index 918a11ce..24a65cdf 100644 --- a/nanobot/providers/azure_openai_provider.py +++ b/nanobot/providers/azure_openai_provider.py @@ -158,6 +158,7 @@ class AzureOpenAIProvider(LLMProvider): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: _ = on_thinking_delta body = self._build_body( @@ -169,7 +170,7 @@ class AzureOpenAIProvider(LLMProvider): try: stream = await self._client.responses.create(**body) content, tool_calls, finish_reason, usage, reasoning_content = ( - await consume_sdk_stream(stream, on_content_delta) + await consume_sdk_stream(stream, on_content_delta, on_tool_call_delta) ) return LLMResponse( content=content or None, diff --git a/nanobot/providers/base.py b/nanobot/providers/base.py index 98f048db..87697650 100644 --- a/nanobot/providers/base.py +++ b/nanobot/providers/base.py @@ -70,11 +70,11 @@ class LLMResponse: @property def should_execute_tools(self) -> bool: - """Tools execute only when has_tool_calls AND finish_reason is ``tool_calls`` / ``stop``. + """Tools execute only when has_tool_calls AND finish_reason is a tool-capable stop. Blocks gateway-injected calls under ``refusal`` / ``content_filter`` / ``error`` (#3220).""" if not self.has_tool_calls: return False - return self.finish_reason in ("tool_calls", "stop") + return self.finish_reason in ("tool_calls", "function_call", "stop") @dataclass(frozen=True) @@ -501,6 +501,7 @@ class LLMProvider(ABC): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: """Stream a chat completion, calling *on_content_delta* for each text chunk. @@ -514,7 +515,7 @@ class LLMProvider(ABC): full content as a single delta. Providers that support native streaming should override this method. """ - _ = on_thinking_delta + _ = on_thinking_delta, on_tool_call_delta response = await self.chat( messages=messages, tools=tools, model=model, max_tokens=max_tokens, temperature=temperature, @@ -544,6 +545,7 @@ class LLMProvider(ABC): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, retry_mode: str = "standard", on_retry_wait: Callable[[str], Awaitable[None]] | None = None, ) -> LLMResponse: @@ -561,6 +563,7 @@ class LLMProvider(ABC): reasoning_effort=reasoning_effort, tool_choice=tool_choice, on_content_delta=on_content_delta, on_thinking_delta=on_thinking_delta, + on_tool_call_delta=on_tool_call_delta, ) return await self._run_with_retry( self._safe_chat_stream, diff --git a/nanobot/providers/bedrock_provider.py b/nanobot/providers/bedrock_provider.py index b3f4ea57..ff74badb 100644 --- a/nanobot/providers/bedrock_provider.py +++ b/nanobot/providers/bedrock_provider.py @@ -704,8 +704,9 @@ class BedrockProvider(LLMProvider): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: - _ = on_thinking_delta + _ = on_thinking_delta, on_tool_call_delta idle_timeout_s = int(os.environ.get("NANOBOT_STREAM_IDLE_TIMEOUT_S", "90")) content_parts: list[str] = [] reasoning_parts: list[str] = [] diff --git a/nanobot/providers/github_copilot_provider.py b/nanobot/providers/github_copilot_provider.py index fdba99eb..bec7c11e 100644 --- a/nanobot/providers/github_copilot_provider.py +++ b/nanobot/providers/github_copilot_provider.py @@ -243,6 +243,7 @@ class GitHubCopilotProvider(OpenAICompatProvider): tool_choice: str | dict[str, object] | None = None, on_content_delta: Callable[[str], None] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, object]], Awaitable[None]] | None = None, ): await self._refresh_client_api_key() return await super().chat_stream( @@ -255,4 +256,5 @@ class GitHubCopilotProvider(OpenAICompatProvider): tool_choice=tool_choice, on_content_delta=on_content_delta, on_thinking_delta=on_thinking_delta, + on_tool_call_delta=on_tool_call_delta, ) diff --git a/nanobot/providers/image_generation.py b/nanobot/providers/image_generation.py index d1e7a1b2..08e57cba 100644 --- a/nanobot/providers/image_generation.py +++ b/nanobot/providers/image_generation.py @@ -3,11 +3,14 @@ from __future__ import annotations import base64 +import binascii +from abc import ABC, abstractmethod from dataclasses import dataclass from pathlib import Path from typing import Any import httpx +from loguru import logger from nanobot.providers.registry import find_by_name from nanobot.utils.helpers import detect_image_mime @@ -26,6 +29,8 @@ _AIHUBMIX_ASPECT_RATIO_SIZES = { "4:3": "1536x1024", "16:9": "1536x1024", } +_GEMINI_DEFAULT_TIMEOUT_S = 120.0 +_GEMINI_IMAGEN_ASPECT_RATIOS = {"1:1", "9:16", "16:9", "3:4", "4:3"} class ImageGenerationError(RuntimeError): @@ -41,28 +46,38 @@ class GeneratedImageResponse: raw: dict[str, Any] -def _provider_base_url(provider: str, api_base: str | None, fallback: str) -> str: - if api_base: - return api_base.rstrip("/") - spec = find_by_name(provider) - if spec and spec.default_api_base: - return spec.default_api_base.rstrip("/") - return fallback - - -def image_path_to_data_url(path: str | Path) -> str: - """Convert a local image path to an image data URL.""" +def _read_image_b64(path: str | Path) -> tuple[str, str]: + """Return ``(mime, base64)`` for the image at ``path``.""" p = Path(path).expanduser() raw = p.read_bytes() mime = detect_image_mime(raw) if mime is None: raise ImageGenerationError(f"unsupported reference image: {p}") - encoded = base64.b64encode(raw).decode("ascii") + return mime, base64.b64encode(raw).decode("ascii") + + +def image_path_to_data_url(path: str | Path) -> str: + """Convert a local image path to an image data URL.""" + mime, encoded = _read_image_b64(path) return f"data:{mime};base64,{encoded}" -def _b64_png_data_url(value: str) -> str: - return f"data:image/png;base64,{value}" +def image_path_to_inline_data(path: str | Path) -> dict[str, str]: + """Convert a local image path to a Gemini ``inlineData`` payload dict.""" + mime, encoded = _read_image_b64(path) + return {"mimeType": mime, "data": encoded} + + +def _b64_image_data_url(value: str) -> str: + encoded = "".join(value.split()) + try: + raw = base64.b64decode(encoded, validate=True) + except binascii.Error as exc: + raise ImageGenerationError("generated image payload was not valid base64") from exc + mime = detect_image_mime(raw) + if mime is None: + raise ImageGenerationError("generated image payload was not a supported image") + return f"data:{mime};base64,{encoded}" def _aihubmix_size(aspect_ratio: str | None, image_size: str | None) -> str: @@ -106,8 +121,49 @@ async def _download_image_data_url( return f"data:{mime};base64,{encoded}" -class OpenRouterImageGenerationClient: - """Small async client for OpenRouter Chat Completions image generation.""" +# --------------------------------------------------------------------------- +# Registry +# --------------------------------------------------------------------------- + +_IMAGE_GEN_PROVIDERS: dict[str, type[ImageGenerationProvider]] = {} + + +def register_image_gen_provider(cls: type[ImageGenerationProvider]) -> None: + name = cls.provider_name + if not name: + raise ValueError(f"{cls.__name__} must set provider_name") + _IMAGE_GEN_PROVIDERS[name] = cls + + +def get_image_gen_provider(name: str) -> type[ImageGenerationProvider] | None: + return _IMAGE_GEN_PROVIDERS.get(name) + + +def image_gen_provider_names() -> tuple[str, ...]: + """Return registered image generation provider names in registry order.""" + return tuple(_IMAGE_GEN_PROVIDERS) + + +def image_gen_provider_configs(config: Any) -> dict[str, Any]: + providers_cfg = config.providers + return { + name: pc + for name in _IMAGE_GEN_PROVIDERS + if (pc := getattr(providers_cfg, name, None)) is not None + } + + +# --------------------------------------------------------------------------- +# Base class +# --------------------------------------------------------------------------- + + +class ImageGenerationProvider(ABC): + """Base class for image generation provider clients.""" + + provider_name: str = "" + missing_key_message: str = "" + default_timeout: float = _DEFAULT_TIMEOUT_S def __init__( self, @@ -116,20 +172,71 @@ class OpenRouterImageGenerationClient: api_base: str | None = None, extra_headers: dict[str, str] | None = None, extra_body: dict[str, Any] | None = None, - timeout: float = _DEFAULT_TIMEOUT_S, + timeout: float | None = None, client: httpx.AsyncClient | None = None, ) -> None: self.api_key = api_key - self.api_base = _provider_base_url( - "openrouter", - api_base, - "https://openrouter.ai/api/v1", - ) + self.api_base = self._resolve_base_url(api_base) self.extra_headers = extra_headers or {} self.extra_body = extra_body or {} - self.timeout = timeout + self.timeout = timeout if timeout is not None else self.default_timeout self._client = client + def _resolve_base_url(self, api_base: str | None) -> str: + if api_base: + return api_base.rstrip("/") + spec = find_by_name(self.provider_name) + if spec and spec.default_api_base: + return spec.default_api_base.rstrip("/") + return self._default_base_url() + + def _default_base_url(self) -> str: + return "" + + @abstractmethod + async def generate( + self, + *, + prompt: str, + model: str, + reference_images: list[str] | None = None, + aspect_ratio: str | None = None, + image_size: str | None = None, + ) -> GeneratedImageResponse: ... + + def _require_images(self, images: list[str], data: dict[str, Any]) -> None: + if images: + return + provider_error = data.get("error") if isinstance(data, dict) else None + label = self.provider_name + if provider_error: + raise ImageGenerationError(f"{label} returned no images: {provider_error}") + raise ImageGenerationError(f"{label} returned no images for this request") + + async def _http_post( + self, + url: str, + *, + headers: dict[str, str], + body: dict[str, Any], + ) -> httpx.Response: + if self._client is not None: + return await self._client.post(url, headers=headers, json=body) + async with httpx.AsyncClient(timeout=self.timeout) as c: + return await c.post(url, headers=headers, json=body) + + +class OpenRouterImageGenerationClient(ImageGenerationProvider): + """Small async client for OpenRouter Chat Completions image generation.""" + + provider_name = "openrouter" + missing_key_message = ( + "OpenRouter API key is not configured. Set providers.openrouter.apiKey." + ) + + def _default_base_url(self) -> str: + return "https://openrouter.ai/api/v1" + async def generate( self, *, @@ -140,9 +247,7 @@ class OpenRouterImageGenerationClient: image_size: str | None = None, ) -> GeneratedImageResponse: if not self.api_key: - raise ImageGenerationError( - "OpenRouter API key is not configured. Set providers.openrouter.apiKey." - ) + raise ImageGenerationError(self.missing_key_message) content: str | list[dict[str, Any]] references = list(reference_images or []) @@ -178,12 +283,7 @@ class OpenRouterImageGenerationClient: **self.extra_headers, } url = f"{self.api_base}/chat/completions" - - if self._client is not None: - response = await self._client.post(url, headers=headers, json=body) - else: - async with httpx.AsyncClient(timeout=self.timeout) as client: - response = await client.post(url, headers=headers, json=body) + response = await self._http_post(url, headers=headers, body=body) try: response.raise_for_status() @@ -208,11 +308,7 @@ class OpenRouterImageGenerationClient: if isinstance(url_value, str) and url_value.startswith("data:image/"): images.append(url_value) - if not images: - provider_error = data.get("error") if isinstance(data, dict) else None - if provider_error: - raise ImageGenerationError(f"OpenRouter returned no images: {provider_error}") - raise ImageGenerationError("OpenRouter returned no images for this request") + self._require_images(images, data) return GeneratedImageResponse( images=images, @@ -221,29 +317,17 @@ class OpenRouterImageGenerationClient: ) -class AIHubMixImageGenerationClient: +class AIHubMixImageGenerationClient(ImageGenerationProvider): """Small async client for AIHubMix unified image generation.""" - def __init__( - self, - *, - api_key: str | None, - api_base: str | None = None, - extra_headers: dict[str, str] | None = None, - extra_body: dict[str, Any] | None = None, - timeout: float = _AIHUBMIX_TIMEOUT_S, - client: httpx.AsyncClient | None = None, - ) -> None: - self.api_key = api_key - self.api_base = _provider_base_url( - "aihubmix", - api_base, - "https://aihubmix.com/v1", - ) - self.extra_headers = extra_headers or {} - self.extra_body = extra_body or {} - self.timeout = timeout - self._client = client + provider_name = "aihubmix" + missing_key_message = ( + "AIHubMix API key is not configured. Set providers.aihubmix.apiKey." + ) + default_timeout = _AIHUBMIX_TIMEOUT_S + + def _default_base_url(self) -> str: + return "https://aihubmix.com/v1" async def generate( self, @@ -255,9 +339,7 @@ class AIHubMixImageGenerationClient: image_size: str | None = None, ) -> GeneratedImageResponse: if not self.api_key: - raise ImageGenerationError( - "AIHubMix API key is not configured. Set providers.aihubmix.apiKey." - ) + raise ImageGenerationError(self.missing_key_message) refs = list(reference_images or []) headers = { @@ -266,16 +348,8 @@ class AIHubMixImageGenerationClient: } size = _aihubmix_size(aspect_ratio, image_size) - if self._client is not None: - return await self._generate_with_client( - self._client, - prompt=prompt, - model=model, - reference_images=refs, - size=size, - headers=headers, - ) - async with httpx.AsyncClient(timeout=self.timeout) as client: + client = self._client or httpx.AsyncClient(timeout=self.timeout) + try: return await self._generate_with_client( client, prompt=prompt, @@ -284,6 +358,9 @@ class AIHubMixImageGenerationClient: size=size, headers=headers, ) + finally: + if self._client is None: + await client.aclose() async def _generate_with_client( self, @@ -332,15 +409,182 @@ class AIHubMixImageGenerationClient: payload = response.json() images = await _aihubmix_images_from_payload(client, payload) - if not images: - provider_error = payload.get("error") if isinstance(payload, dict) else None - if provider_error: - raise ImageGenerationError(f"AIHubMix returned no images: {provider_error}") - raise ImageGenerationError("AIHubMix returned no images for this request") + self._require_images(images, payload) return GeneratedImageResponse(images=images, content="", raw=payload) +def _http_error_detail(response: httpx.Response) -> str: + """Extract a readable error message from an HTTP error response.""" + try: + data = response.json() + if isinstance(data, dict): + err = data.get("error") + if isinstance(err, dict): + return err.get("message") or str(err) + if err: + return str(err) + except Exception: + pass + return response.text[:500] or "" + + +class GeminiImageGenerationClient(ImageGenerationProvider): + """Async client for Gemini/Imagen image generation via the Generative Language API.""" + + provider_name = "gemini" + missing_key_message = ( + "Gemini API key is not configured. Set providers.gemini.apiKey." + ) + default_timeout = _GEMINI_DEFAULT_TIMEOUT_S + + def _default_base_url(self) -> str: + return "https://generativelanguage.googleapis.com/v1beta" + + def _resolve_base_url(self, api_base: str | None) -> str: + # The Gemini provider's registry default_api_base is the OpenAI-compat + # shim (.../v1beta/openai/), which has no image endpoints. + # Skip the registry lookup and use the native API base directly. + if api_base: + return api_base.rstrip("/") + return self._default_base_url() + + async def generate( + self, + *, + prompt: str, + model: str, + reference_images: list[str] | None = None, + aspect_ratio: str | None = None, + image_size: str | None = None, + ) -> GeneratedImageResponse: + if not self.api_key: + raise ImageGenerationError(self.missing_key_message) + if "imagen" in model.lower(): + if reference_images: + logger.warning( + "Imagen models do not support reference images; " + "ignoring {} reference image(s) for {}", + len(reference_images), + model, + ) + return await self._generate_imagen( + prompt=prompt, model=model, aspect_ratio=aspect_ratio + ) + return await self._generate_gemini_flash( + prompt=prompt, model=model, reference_images=reference_images or [] + ) + + async def _generate_imagen( + self, + *, + prompt: str, + model: str, + aspect_ratio: str | None, + ) -> GeneratedImageResponse: + parameters: dict[str, Any] = {"sampleCount": 1} + if aspect_ratio in _GEMINI_IMAGEN_ASPECT_RATIOS: + parameters["aspectRatio"] = aspect_ratio + body: dict[str, Any] = { + "instances": [{"prompt": prompt}], + "parameters": parameters, + } + body.update(self.extra_body) + + url = f"{self.api_base}/models/{model}:predict" + headers = { + "x-goog-api-key": self.api_key or "", + "Content-Type": "application/json", + **self.extra_headers, + } + response = await self._http_post(url, headers=headers, body=body) + + try: + response.raise_for_status() + except httpx.HTTPStatusError as exc: + detail = _http_error_detail(response) + logger.error("Gemini Imagen generation failed (HTTP {}): {}", response.status_code, detail) + raise ImageGenerationError( + f"Gemini Imagen generation failed (HTTP {response.status_code}): {detail}" + ) from exc + + data = response.json() + images: list[str] = [] + for prediction in data.get("predictions") or []: + if not isinstance(prediction, dict): + continue + b64 = prediction.get("bytesBase64Encoded") + mime = prediction.get("mimeType", "image/png") + if isinstance(b64, str) and b64: + images.append(f"data:{mime};base64,{b64}") + + self._require_images(images, data) + + return GeneratedImageResponse(images=images, content="", raw=data) + + async def _generate_gemini_flash( + self, + *, + prompt: str, + model: str, + reference_images: list[str], + ) -> GeneratedImageResponse: + parts: list[dict[str, Any]] = [ + {"inlineData": image_path_to_inline_data(path)} for path in reference_images + ] + parts.append({"text": prompt}) + + body: dict[str, Any] = { + "contents": [{"role": "user", "parts": parts}], + "generationConfig": {"responseModalities": ["TEXT", "IMAGE"]}, + } + body.update(self.extra_body) + + url = f"{self.api_base}/models/{model}:generateContent" + headers = { + "x-goog-api-key": self.api_key or "", + "Content-Type": "application/json", + **self.extra_headers, + } + response = await self._http_post(url, headers=headers, body=body) + + try: + response.raise_for_status() + except httpx.HTTPStatusError as exc: + detail = _http_error_detail(response) + logger.error("Gemini image generation failed (HTTP {}): {}", response.status_code, detail) + raise ImageGenerationError( + f"Gemini image generation failed (HTTP {response.status_code}): {detail}" + ) from exc + + data = response.json() + images: list[str] = [] + text_parts: list[str] = [] + for candidate in data.get("candidates") or []: + if not isinstance(candidate, dict): + continue + content = candidate.get("content") or {} + for part in content.get("parts") or []: + if not isinstance(part, dict): + continue + if "text" in part: + text_parts.append(part["text"]) + inline = part.get("inlineData") + if isinstance(inline, dict): + mime = inline.get("mimeType", "image/png") + b64 = inline.get("data", "") + if b64: + images.append(f"data:{mime};base64,{b64}") + + self._require_images(images, data) + + return GeneratedImageResponse( + images=images, + content="\n".join(t for t in text_parts if t).strip(), + raw=data, + ) + + async def _aihubmix_images_from_payload( client: httpx.AsyncClient, payload: dict[str, Any], @@ -368,13 +612,13 @@ async def _aihubmix_images_from_payload( b64_json = value.get("b64_json") if isinstance(b64_json, str) and b64_json: - images.append(_b64_png_data_url(b64_json)) + images.append(_b64_image_data_url(b64_json)) elif b64_json is not None: await collect(b64_json) bytes_base64 = value.get("bytesBase64") or value.get("bytes_base64") or value.get("base64") if isinstance(bytes_base64, str) and bytes_base64: - images.append(_b64_png_data_url(bytes_base64)) + images.append(_b64_image_data_url(bytes_base64)) image_url = value.get("image_url") or value.get("imageUrl") if isinstance(image_url, dict): @@ -393,3 +637,130 @@ async def _aihubmix_images_from_payload( for candidate in candidates: await collect(candidate) return images + + +_MINIMAX_TIMEOUT_S = 300.0 + +_MINIMAX_ASPECT_RATIO_SIZES = { + "1:1": "1:1", + "16:9": "16:9", + "4:3": "4:3", + "3:2": "3:2", + "2:3": "2:3", + "3:4": "3:4", + "9:16": "9:16", + "21:9": "21:9", +} + + +class MiniMaxImageGenerationClient(ImageGenerationProvider): + """Async client for MiniMax image generation API.""" + + provider_name = "minimax" + missing_key_message = ( + "MiniMax API key is not configured. Set providers.minimax.apiKey." + ) + default_timeout = _MINIMAX_TIMEOUT_S + + def _default_base_url(self) -> str: + return "https://api.minimaxi.com/v1" + + def _resolve_aspect_ratio(self, aspect_ratio: str | None) -> str: + if aspect_ratio and aspect_ratio in _MINIMAX_ASPECT_RATIO_SIZES: + return _MINIMAX_ASPECT_RATIO_SIZES[aspect_ratio] + return "1:1" + + async def generate( + self, + *, + prompt: str, + model: str, + reference_images: list[str] | None = None, + aspect_ratio: str | None = None, + image_size: str | None = None, + ) -> GeneratedImageResponse: + if not self.api_key: + raise ImageGenerationError(self.missing_key_message) + + headers = { + "Authorization": f"Bearer {self.api_key}", + "Content-Type": "application/json", + **self.extra_headers, + } + + body: dict[str, Any] = { + "model": model, + "prompt": prompt, + "response_format": "base64", + } + + resolved_ratio = self._resolve_aspect_ratio(aspect_ratio) + body["aspect_ratio"] = resolved_ratio + + refs = list(reference_images or []) + if refs: + image_refs = [image_path_to_data_url(path) for path in refs] + body["subject_reference"] = [ + {"type": "character", "image_file": ref} for ref in image_refs + ] + + body.update(self.extra_body) + + client = self._client or httpx.AsyncClient(timeout=self.timeout) + try: + return await self._generate_with_client(client, body, headers) + finally: + if self._client is None: + await client.aclose() + + async def _generate_with_client( + self, + client: httpx.AsyncClient, + body: dict[str, Any], + headers: dict[str, str], + ) -> GeneratedImageResponse: + url = f"{self.api_base}/image_generation" + try: + response = await client.post(url, headers=headers, json=body) + except httpx.TimeoutException as exc: + raise ImageGenerationError("MiniMax image generation timed out") from exc + except httpx.RequestError as exc: + raise ImageGenerationError(f"MiniMax image generation request failed: {exc}") from exc + + try: + response.raise_for_status() + except httpx.HTTPStatusError as exc: + detail = response.text[:500] + raise ImageGenerationError(f"MiniMax image generation failed: {detail}") from exc + + payload = response.json() + images = _minimax_images_from_payload(payload) + + self._require_images(images, payload) + + return GeneratedImageResponse(images=images, content="", raw=payload) + + +def _minimax_images_from_payload(payload: dict[str, Any]) -> list[str]: + """Extract base64 images from MiniMax API response. + + MiniMax returns images in ``data.image_base64`` (list of base64 strings). + """ + images: list[str] = [] + data = payload.get("data") + if not isinstance(data, dict): + return images + for b64 in data.get("image_base64") or []: + if isinstance(b64, str) and b64: + images.append(_b64_image_data_url(b64)) + return images + + +# --------------------------------------------------------------------------- +# Provider registration +# --------------------------------------------------------------------------- + +register_image_gen_provider(OpenRouterImageGenerationClient) +register_image_gen_provider(AIHubMixImageGenerationClient) +register_image_gen_provider(GeminiImageGenerationClient) +register_image_gen_provider(MiniMaxImageGenerationClient) diff --git a/nanobot/providers/openai_codex_provider.py b/nanobot/providers/openai_codex_provider.py index 38209f59..523b2a72 100644 --- a/nanobot/providers/openai_codex_provider.py +++ b/nanobot/providers/openai_codex_provider.py @@ -40,6 +40,7 @@ class OpenAICodexProvider(LLMProvider): reasoning_effort: str | None, tool_choice: str | dict[str, Any] | None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: """Shared request logic for both chat() and chat_stream().""" model = model or self.default_model @@ -70,6 +71,7 @@ class OpenAICodexProvider(LLMProvider): content, tool_calls, finish_reason = await _request_codex( DEFAULT_CODEX_URL, headers, body, verify=True, on_content_delta=on_content_delta, + on_tool_call_delta=on_tool_call_delta, ) except Exception as e: if "CERTIFICATE_VERIFY_FAILED" not in str(e): @@ -78,6 +80,7 @@ class OpenAICodexProvider(LLMProvider): content, tool_calls, finish_reason = await _request_codex( DEFAULT_CODEX_URL, headers, body, verify=False, on_content_delta=on_content_delta, + on_tool_call_delta=on_tool_call_delta, ) return LLMResponse(content=content, tool_calls=tool_calls, finish_reason=finish_reason) except Exception as e: @@ -100,9 +103,18 @@ class OpenAICodexProvider(LLMProvider): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: _ = on_thinking_delta - return await self._call_codex(messages, tools, model, reasoning_effort, tool_choice, on_content_delta) + return await self._call_codex( + messages, + tools, + model, + reasoning_effort, + tool_choice, + on_content_delta, + on_tool_call_delta, + ) def get_default_model(self) -> str: return self.default_model @@ -138,6 +150,7 @@ async def _request_codex( body: dict[str, Any], verify: bool, on_content_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> tuple[str, list[ToolCallRequest], str]: async with httpx.AsyncClient(timeout=60.0, verify=verify) as client: async with client.stream("POST", url, headers=headers, json=body) as response: @@ -148,7 +161,7 @@ async def _request_codex( _friendly_error(response.status_code, text.decode("utf-8", "ignore")), retry_after=retry_after, ) - return await consume_sse(response, on_content_delta) + return await consume_sse(response, on_content_delta, on_tool_call_delta) def _prompt_cache_key(messages: list[dict[str, Any]]) -> str: diff --git a/nanobot/providers/openai_compat_provider.py b/nanobot/providers/openai_compat_provider.py index 2bcb840c..2f845541 100644 --- a/nanobot/providers/openai_compat_provider.py +++ b/nanobot/providers/openai_compat_provider.py @@ -999,6 +999,21 @@ class OpenAICompatProvider(LLMProvider): if fn_prov: buf["fn_prov"] = fn_prov + def _accum_legacy_function_call(function_call: Any) -> None: + """Accumulate legacy ``delta.function_call`` streaming chunks.""" + if not function_call: + return + buf = tc_bufs.setdefault(0, { + "id": "", "name": "", "arguments": "", + "extra_content": None, "prov": None, "fn_prov": None, + }) + fn_name = _get(function_call, "name") + if fn_name: + buf["name"] = str(fn_name) + fn_args = _get(function_call, "arguments") + if fn_args: + buf["arguments"] += str(fn_args) + for chunk in chunks: if isinstance(chunk, str): content_parts.append(chunk) @@ -1029,6 +1044,7 @@ class OpenAICompatProvider(LLMProvider): reasoning_parts.append(text) for idx, tc in enumerate(delta.get("tool_calls") or []): _accum_tc(tc, idx) + _accum_legacy_function_call(delta.get("function_call")) usage = cls._extract_usage(chunk_map) or usage continue @@ -1047,8 +1063,10 @@ class OpenAICompatProvider(LLMProvider): reasoning = getattr(delta, "reasoning", None) if reasoning: reasoning_parts.append(reasoning) - for tc in (delta.tool_calls or []) if delta else []: + for tc in (getattr(delta, "tool_calls", None) or []) if delta else []: _accum_tc(tc, getattr(tc, "index", 0)) + if delta: + _accum_legacy_function_call(getattr(delta, "function_call", None)) return LLMResponse( content="".join(content_parts) or None, @@ -1203,6 +1221,7 @@ class OpenAICompatProvider(LLMProvider): tool_choice: str | dict[str, Any] | None = None, on_content_delta: Callable[[str], Awaitable[None]] | None = None, on_thinking_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> LLMResponse: idle_timeout_s = int(os.environ.get("NANOBOT_STREAM_IDLE_TIMEOUT_S", "90")) try: @@ -1226,9 +1245,16 @@ class OpenAICompatProvider(LLMProvider): except StopAsyncIteration: break - content, tool_calls, finish_reason, usage, reasoning_content = await consume_sdk_stream( + ( + content, + tool_calls, + finish_reason, + usage, + reasoning_content, + ) = await consume_sdk_stream( _timed_stream(), on_content_delta, + on_tool_call_delta=on_tool_call_delta, ) self._record_responses_success(model, reasoning_effort) return LLMResponse( @@ -1252,6 +1278,12 @@ class OpenAICompatProvider(LLMProvider): messages, tools, model, max_tokens, temperature, reasoning_effort, tool_choice, ) + if self._spec and self._spec.name == "zhipu" and tools and on_tool_call_delta: + # Z.AI/GLM keeps streaming tool-call arguments behind an + # explicit provider flag. Pass it through the OpenAI SDK's + # extra_body escape hatch so the usual delta.tool_calls path + # can surface live file-edit progress. + kwargs.setdefault("extra_body", {})["tool_stream"] = True kwargs["stream"] = True kwargs["stream_options"] = {"include_usage": True} stream = await self._client.chat.completions.create(**kwargs) @@ -1279,6 +1311,28 @@ class OpenAICompatProvider(LLMProvider): r_text = self._extract_text_content(reasoning) if r_text: await on_thinking_delta(r_text) + if on_tool_call_delta: + for idx, tool_delta in enumerate( + getattr(delta_obj, "tool_calls", None) or [] + ): + fn = _get(tool_delta, "function") + tool_index = _get(tool_delta, "index") + await on_tool_call_delta({ + "index": tool_index if tool_index is not None else idx, + "call_id": str(_get(tool_delta, "id") or ""), + "name": str(_get(fn, "name") or "") if fn is not None else "", + "arguments_delta": ( + str(_get(fn, "arguments") or "") if fn is not None else "" + ), + }) + function_call = getattr(delta_obj, "function_call", None) + if function_call: + await on_tool_call_delta({ + "index": 0, + "call_id": "", + "name": str(_get(function_call, "name") or ""), + "arguments_delta": str(_get(function_call, "arguments") or ""), + }) return self._parse_chunks(chunks) except asyncio.TimeoutError: return LLMResponse( diff --git a/nanobot/providers/openai_responses/parsing.py b/nanobot/providers/openai_responses/parsing.py index 9e3f0ef0..707652d7 100644 --- a/nanobot/providers/openai_responses/parsing.py +++ b/nanobot/providers/openai_responses/parsing.py @@ -62,6 +62,7 @@ async def iter_sse(response: httpx.Response) -> AsyncGenerator[dict[str, Any], N async def consume_sse( response: httpx.Response, on_content_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> tuple[str, list[ToolCallRequest], str]: """Consume a Responses API SSE stream into ``(content, tool_calls, finish_reason)``.""" content = "" @@ -82,6 +83,12 @@ async def consume_sse( "name": item.get("name"), "arguments": item.get("arguments") or "", } + if on_tool_call_delta: + await on_tool_call_delta({ + "call_id": str(call_id), + "name": str(item.get("name") or ""), + "arguments_delta": "", + }) elif event_type == "response.output_text.delta": delta_text = event.get("delta") or "" content += delta_text @@ -90,7 +97,14 @@ async def consume_sse( elif event_type == "response.function_call_arguments.delta": call_id = event.get("call_id") if call_id and call_id in tool_call_buffers: - tool_call_buffers[call_id]["arguments"] += event.get("delta") or "" + delta = event.get("delta") or "" + tool_call_buffers[call_id]["arguments"] += delta + if on_tool_call_delta and delta: + await on_tool_call_delta({ + "call_id": str(call_id), + "name": str(tool_call_buffers[call_id].get("name") or ""), + "arguments_delta": str(delta), + }) elif event_type == "response.function_call_arguments.done": call_id = event.get("call_id") if call_id and call_id in tool_call_buffers: @@ -210,6 +224,7 @@ def parse_response_output(response: Any) -> LLMResponse: async def consume_sdk_stream( stream: Any, on_content_delta: Callable[[str], Awaitable[None]] | None = None, + on_tool_call_delta: Callable[[dict[str, Any]], Awaitable[None]] | None = None, ) -> tuple[str, list[ToolCallRequest], str, dict[str, int], str | None]: """Consume an SDK async stream from ``client.responses.create(stream=True)``.""" content = "" @@ -232,6 +247,12 @@ async def consume_sdk_stream( "name": getattr(item, "name", None), "arguments": getattr(item, "arguments", None) or "", } + if on_tool_call_delta: + await on_tool_call_delta({ + "call_id": str(call_id), + "name": str(getattr(item, "name", None) or ""), + "arguments_delta": "", + }) elif event_type == "response.output_text.delta": delta_text = getattr(event, "delta", "") or "" content += delta_text @@ -240,7 +261,14 @@ async def consume_sdk_stream( elif event_type == "response.function_call_arguments.delta": call_id = getattr(event, "call_id", None) if call_id and call_id in tool_call_buffers: - tool_call_buffers[call_id]["arguments"] += getattr(event, "delta", "") or "" + delta = getattr(event, "delta", "") or "" + tool_call_buffers[call_id]["arguments"] += delta + if on_tool_call_delta and delta: + await on_tool_call_delta({ + "call_id": str(call_id), + "name": str(tool_call_buffers[call_id].get("name") or ""), + "arguments_delta": str(delta), + }) elif event_type == "response.function_call_arguments.done": call_id = getattr(event, "call_id", None) if call_id and call_id in tool_call_buffers: diff --git a/nanobot/providers/registry.py b/nanobot/providers/registry.py index e6f02218..0f8e4593 100644 --- a/nanobot/providers/registry.py +++ b/nanobot/providers/registry.py @@ -390,6 +390,16 @@ PROVIDERS: tuple[ProviderSpec, ...] = ( backend="openai_compat", default_api_base="https://api.longcat.chat/openai/v1", ), + # Ant Ling: OpenAI-compatible API for Ling/Ring model families. + ProviderSpec( + name="ant_ling", + keywords=("ant_ling", "ant-ling", "ling-", "ring-"), + env_key="ANT_LING_API_KEY", + display_name="Ant Ling", + backend="openai_compat", + detect_by_base_keyword="ant-ling.com", + default_api_base="https://api.ant-ling.com/v1", + ), # === Local deployment (matched by config key, NOT by api_base) ========= # vLLM / any OpenAI-compatible local server ProviderSpec( diff --git a/nanobot/utils/webui_turn_helpers.py b/nanobot/session/webui_turns.py similarity index 99% rename from nanobot/utils/webui_turn_helpers.py rename to nanobot/session/webui_turns.py index 6a3ac2ba..de1083b0 100644 --- a/nanobot/utils/webui_turn_helpers.py +++ b/nanobot/session/webui_turns.py @@ -1,4 +1,4 @@ -"""Outbound helpers for the WebSocket/WebUI wire contract. +"""Session turn helpers for WebUI-capable WebSocket sessions. AgentLoop uses these without importing a concrete channel plugin; only ``channel == "websocket"`` messages are affected. diff --git a/nanobot/skills/image-generation/SKILL.md b/nanobot/skills/image-generation/SKILL.md index 3ba0e2f4..d50fb064 100644 --- a/nanobot/skills/image-generation/SKILL.md +++ b/nanobot/skills/image-generation/SKILL.md @@ -15,7 +15,7 @@ If the `generate_image` tool is not available in the current tool list, tell the - Image editing: pass the saved artifact path or user image path in `reference_images`. - Iterative edits in the same conversation: prefer the most recent generated image artifact if the user says things like "make it brighter", "change the background", or "try another version". - Ambiguous edits: ask a short clarifying question if multiple recent images could be the target. -- In the current chat, do not call `message` just to announce or resend generated images. The runtime attaches images from `generate_image` to the final assistant reply automatically. +- After generating images, call the `message` tool with the artifact paths in the `media` parameter to deliver them to the user. ## Prompt Rules @@ -42,52 +42,6 @@ For follow-up edits, pass the prior artifact `path` to `reference_images`. If th Do not include internal replay markers such as `[Message Time: ...]`, `[image: /local/path]`, `generate_image(...)`, or `message(...)` in user-facing replies. -## Provider Notes - -Do not ask users to paste API keys into chat. If configuration is needed, describe the fields; LLM provider and BYOK changes are hot-reloaded for new turns. - -For OpenRouter, the image tool expects: - -```json -{ - "providers": { - "openrouter": { - "apiKey": "sk-or-..." - } - }, - "tools": { - "imageGeneration": { - "enabled": true, - "provider": "openrouter", - "model": "openai/gpt-5.4-image-2" - } - } -} -``` - -For AIHubMix, the image tool expects: - -```json -{ - "providers": { - "aihubmix": { - "apiKey": "sk-..." - } - }, - "tools": { - "imageGeneration": { - "enabled": true, - "provider": "aihubmix", - "model": "gpt-image-2-free" - } - } -} -``` - -AIHubMix `gpt-image-2-free` uses AIHubMix's unified predictions endpoint internally (`/v1/models/openai/gpt-image-2-free/predictions`), not the OpenAI Images `/v1/images/generations` endpoint. If it fails with "Incorrect model ID", do not assume the key lacks permission until the provider config, model name, and gateway restart have been checked. - -`providers.aihubmix.extraBody` can be used for provider-specific options. For example, `"extraBody": {"quality": "low"}` is optional but can make `gpt-image-2-free` faster and less likely to time out. - ## Examples Generate a new image: diff --git a/nanobot/templates/agent/identity.md b/nanobot/templates/agent/identity.md index 6548c1de..e6fa5535 100644 --- a/nanobot/templates/agent/identity.md +++ b/nanobot/templates/agent/identity.md @@ -30,5 +30,5 @@ Output is rendered in a terminal. Avoid markdown headings and tables. Use plain Reply directly with text for the current conversation. Do not use the 'message' tool for normal replies in the current chat. When you need to call tools before answering, do not include the final user-visible answer in the same assistant message as the tool calls. Wait for the tool results, then answer once. -Use the 'message' tool only for proactive sends, cross-channel delivery, or explicitly sending existing local files as attachments. When a tool such as 'generate_image' creates user-visible media, the runtime attaches those artifacts to the final assistant reply automatically, so do not call 'message' just to announce or resend them. +Use the 'message' tool only for proactive sends, cross-channel delivery, or explicitly sending existing local files as attachments. When 'generate_image' creates images, call 'message' with the artifact paths in the 'media' parameter to deliver them to the user. To send an existing local file that was not automatically attached by another tool, call 'message' with the 'media' parameter. Do NOT use read_file to "send" a file — reading a file only shows its content to you, it does NOT deliver the file to the user. Example: message(content="Here is the document", channel="telegram", chat_id="...", media=["/path/to/file.pdf"]) diff --git a/nanobot/utils/__init__.py b/nanobot/utils/__init__.py index 9ad157c2..15dbe2e9 100644 --- a/nanobot/utils/__init__.py +++ b/nanobot/utils/__init__.py @@ -1,6 +1,42 @@ """Utility functions for nanobot.""" +from __future__ import annotations + +import sys +from importlib import import_module +from types import ModuleType + from nanobot.utils.helpers import ensure_dir from nanobot.utils.path import abbreviate_path __all__ = ["ensure_dir", "abbreviate_path"] + + +class _LazyModuleAlias(ModuleType): + def __init__(self, name: str, target: str) -> None: + super().__init__(name) + self.__dict__["_target"] = target + + def _load(self) -> ModuleType: + module = import_module(self.__dict__["_target"]) + sys.modules[self.__name__] = module + return module + + def __getattr__(self, name: str) -> object: + return getattr(self._load(), name) + + def __dir__(self) -> list[str]: + return sorted(set(super().__dir__()) | set(dir(self._load()))) + + +_LEGACY_MODULE_ALIASES = { + "webui_thread_disk": "nanobot.webui.thread_disk", + "webui_transcript": "nanobot.webui.transcript", + "webui_turn_helpers": "nanobot.session.webui_turns", +} + +for _legacy_name, _target_name in _LEGACY_MODULE_ALIASES.items(): + sys.modules.setdefault( + f"{__name__}.{_legacy_name}", + _LazyModuleAlias(f"{__name__}.{_legacy_name}", _target_name), + ) diff --git a/nanobot/utils/artifacts.py b/nanobot/utils/artifacts.py index eca706ee..6366c18c 100644 --- a/nanobot/utils/artifacts.py +++ b/nanobot/utils/artifacts.py @@ -21,8 +21,6 @@ _MIME_EXTENSIONS = { "image/webp": ".webp", "image/gif": ".gif", } -_GENERATE_IMAGE_TOOL_NAME = "generate_image" - class ArtifactError(ValueError): """Raised when an artifact cannot be safely decoded or stored.""" @@ -115,48 +113,10 @@ def generated_image_tool_result(artifacts: list[dict[str, Any]]) -> str: "artifacts": artifacts, "next_step": ( "Use these artifact paths as reference_images for follow-up edits. " - "For the current chat, reply naturally; the runtime attaches generated images automatically. " - "Do not call message just to announce or resend them. Keep raw paths internal unless the user asks for debug details." + "Call the message tool with the artifact paths in the media parameter " + "to deliver the images to the user. Keep raw paths internal unless the " + "user asks for debug details." ), }, ensure_ascii=False, ) - - -def _extract_text_payload(content: Any) -> str | None: - if isinstance(content, str): - return content - if isinstance(content, list): - parts: list[str] = [] - for block in content: - if isinstance(block, dict) and isinstance(block.get("text"), str): - parts.append(block["text"]) - return "\n".join(parts) if parts else None - return None - - -def generated_image_paths_from_messages(messages: list[dict[str, Any]]) -> list[str]: - """Collect generated image artifact paths from generate_image tool results.""" - paths: list[str] = [] - seen: set[str] = set() - for message in messages: - if message.get("role") != "tool" or message.get("name") != _GENERATE_IMAGE_TOOL_NAME: - continue - payload = _extract_text_payload(message.get("content")) - if not payload: - continue - try: - data = json.loads(payload) - except json.JSONDecodeError: - continue - artifacts = data.get("artifacts") if isinstance(data, dict) else None - if not isinstance(artifacts, list): - continue - for artifact in artifacts: - if not isinstance(artifact, dict): - continue - path = artifact.get("path") - if isinstance(path, str) and path and path not in seen: - paths.append(path) - seen.add(path) - return paths diff --git a/nanobot/utils/file_edit_events.py b/nanobot/utils/file_edit_events.py index 8164aa18..b5d2f6d7 100644 --- a/nanobot/utils/file_edit_events.py +++ b/nanobot/utils/file_edit_events.py @@ -4,13 +4,17 @@ from __future__ import annotations import difflib import json -from dataclasses import dataclass +import re +import time +from dataclasses import dataclass, field from pathlib import Path -from typing import Any +from typing import Any, Awaitable, Callable TRACKED_FILE_EDIT_TOOLS = frozenset({"write_file", "edit_file", "notebook_edit"}) _MAX_SNAPSHOT_BYTES = 2 * 1024 * 1024 +_LIVE_EMIT_INTERVAL_S = 0.18 +_LIVE_EMIT_LINE_STEP = 24 @dataclass(slots=True) @@ -103,6 +107,8 @@ def line_diff_stats(before: str | None, after: str | None) -> tuple[int, int]: """Return ``(added, deleted)`` for a UTF-8 text line-level diff.""" if before is None or after is None: return 0, 0 + if before == "": + return _text_line_count(after), 0 before_lines = before.replace("\r\n", "\n").splitlines() after_lines = after.replace("\r\n", "\n").splitlines() added = 0 @@ -118,6 +124,28 @@ def line_diff_stats(before: str | None, after: str | None) -> tuple[int, int]: return added, deleted +def _text_line_count(text: str) -> int: + if not text: + return 0 + line_count = 0 + last_was_newline = False + last_was_cr = False + for ch in text: + if ch == "\r": + line_count += 1 + last_was_newline = True + last_was_cr = True + elif ch == "\n": + if not last_was_cr: + line_count += 1 + last_was_newline = True + last_was_cr = False + else: + last_was_newline = False + last_was_cr = False + return line_count if last_was_newline else line_count + 1 + + def prepare_file_edit_tracker( *, call_id: str, @@ -160,12 +188,22 @@ def build_file_edit_start_event( ) -def build_file_edit_end_event(tracker: FileEditTracker) -> dict[str, Any]: +def build_file_edit_end_event( + tracker: FileEditTracker, + params: dict[str, Any] | None = None, +) -> dict[str, Any]: after = read_file_snapshot(tracker.path) + counted = False if tracker.before.countable and after.countable: added, deleted = line_diff_stats(tracker.before.text, after.text) + counted = True else: - added, deleted = 0, 0 + predicted_after = _predict_after_text(tracker.tool, params or {}, tracker.before) + if tracker.before.countable and predicted_after is not None: + added, deleted = line_diff_stats(tracker.before.text, predicted_after) + counted = True + else: + added, deleted = 0, 0 return _event_payload( tracker, phase="end", @@ -173,11 +211,14 @@ def build_file_edit_end_event(tracker: FileEditTracker) -> dict[str, Any]: added=added, deleted=deleted, approximate=False, - binary=after.binary or after.oversized or after.unreadable, + binary=(after.binary or after.oversized or after.unreadable) and not counted, ) -def build_file_edit_error_event(tracker: FileEditTracker, error: str | None = None) -> dict[str, Any]: +def build_file_edit_error_event( + tracker: FileEditTracker, + error: str | None = None, +) -> dict[str, Any]: payload = _event_payload( tracker, phase="error", @@ -191,6 +232,427 @@ def build_file_edit_error_event(tracker: FileEditTracker, error: str | None = No return payload +def build_file_edit_live_event( + tracker: FileEditTracker, + *, + added: int, + deleted: int = 0, +) -> dict[str, Any]: + """Build an approximate in-progress event while tool-call arguments stream.""" + return _event_payload( + tracker, + phase="start", + status="editing", + added=added, + deleted=deleted, + approximate=True, + ) + + +def build_file_edit_pending_event( + *, + call_id: str, + tool_name: str, + added: int = 0, + deleted: int = 0, +) -> dict[str, Any]: + """Build an early placeholder before the streamed JSON path is available.""" + return { + "version": 1, + "call_id": str(call_id or ""), + "tool": tool_name, + "path": "", + "phase": "start", + "added": max(0, int(added)), + "deleted": max(0, int(deleted)), + "approximate": True, + "status": "editing", + "pending": True, + } + + +class StreamingFileEditTracker: + """Track file-edit tool arguments while the model is still streaming them. + + Tool execution events only begin after the provider has completed the full + function call. For large ``write_file`` calls, the long wait is usually the + model producing the JSON ``content`` argument. Large ``edit_file`` calls + can have the same wait while ``old_text`` / ``new_text`` stream in. This + tracker converts those argument deltas into approximate WebUI file-edit + events before the final exact diff is available. + """ + + def __init__( + self, + *, + workspace: Path | None, + tools: Any, + emit: Callable[[list[dict[str, Any]]], Awaitable[None]], + ) -> None: + self._workspace = workspace + self._tools = tools + self._emit = emit + self._states: dict[str, _StreamingFileEditState] = {} + + async def update(self, payload: dict[str, Any]) -> None: + key = _stream_key(payload) + if not key: + return + state = self._states.get(key) + if state is None: + state = _StreamingFileEditState(key=key) + self._states[key] = state + + state.apply_delta(payload) + if state.name not in {"write_file", "edit_file"}: + return + if state.path is None: + state.path = _extract_complete_json_string(state.arguments, "path") + if state.path is None: + added, deleted = state.live_diff_counts() + now = time.monotonic() + if state.should_emit_pending(added, deleted, now): + state.mark_pending_emitted(added, deleted, now) + await self._emit([build_file_edit_pending_event( + call_id=state.call_id or state.key, + tool_name=state.name, + added=added, + deleted=deleted, + )]) + return + if state.tracker is None: + tool = self._tools.get(state.name) if hasattr(self._tools, "get") else None + state.tracker = prepare_file_edit_tracker( + call_id=state.call_id or state.key, + tool_name=state.name, + tool=tool, + workspace=self._workspace, + params={"path": state.path}, + ) + if state.tracker is None: + return + + added, deleted = state.live_diff_counts() + now = time.monotonic() + if not state.should_emit(added, deleted, now): + return + state.mark_emitted(added, deleted, now) + await self._emit([build_file_edit_live_event( + state.tracker, + added=added, + deleted=deleted, + )]) + + async def flush(self) -> None: + events: list[dict[str, Any]] = [] + now = time.monotonic() + for state in self._states.values(): + if state.tracker is None: + continue + added, deleted = state.live_diff_counts() + if ( + state.last_emitted_added == added + and state.last_emitted_deleted == deleted + and state.emitted_once + ): + continue + state.mark_emitted(added, deleted, now) + events.append(build_file_edit_live_event( + state.tracker, + added=added, + deleted=deleted, + )) + if events: + await self._emit(events) + + def apply_final_call_ids(self, final_tool_calls: list[Any]) -> None: + """Keep final start/end events keyed to any earlier streamed placeholder.""" + for tool_call in final_tool_calls: + canonical = self.canonical_call_id_for(tool_call) + if canonical: + try: + tool_call.id = canonical + except Exception: + pass + + def canonical_call_id_for(self, tool_call: Any) -> str | None: + for state in self._states.values(): + if state.matches_final_tool_call(tool_call): + return state.call_id or (state.tracker.call_id if state.tracker else None) or state.key + return None + + async def error_unmatched( + self, + final_tool_calls: list[Any], + error: str, + ) -> None: + """Mark streamed edits as failed when no final tool call will run.""" + events: list[dict[str, Any]] = [] + for state in self._states.values(): + if state.tracker is None: + continue + if any(state.matches_final_tool_call(tool_call) for tool_call in final_tool_calls): + continue + events.append(build_file_edit_error_event(state.tracker, error)) + if events: + await self._emit(events) + + +@dataclass(slots=True) +class _StreamingJsonStringField: + key: str + scan_pos: int | None = None + closed: bool = False + escape: bool = False + unicode_remaining: int = 0 + unicode_buffer: str = "" + newline_count: int = 0 + has_chars: bool = False + last_char_newline: bool = False + last_char_cr: bool = False + + @property + def line_count(self) -> int: + if not self.has_chars: + return 0 + return self.newline_count + (0 if self.last_char_newline else 1) + + def reset(self) -> None: + self.scan_pos = None + self.closed = False + self.escape = False + self.unicode_remaining = 0 + self.unicode_buffer = "" + self.newline_count = 0 + self.has_chars = False + self.last_char_newline = False + self.last_char_cr = False + + def scan(self, source: str) -> None: + if self.closed: + return + if self.scan_pos is None: + match = re.search(rf'"{re.escape(self.key)}"\s*:\s*"', source) + if match is None: + return + self.scan_pos = match.end() + i = self.scan_pos + while i < len(source): + ch = source[i] + if self.unicode_remaining > 0: + self.unicode_buffer += ch + self.unicode_remaining -= 1 + if self.unicode_remaining == 0: + try: + decoded = chr(int(self.unicode_buffer, 16)) + except ValueError: + decoded = "x" + self.unicode_buffer = "" + self._mark_char(decoded) + i += 1 + continue + if self.escape: + self.escape = False + if ch == "u": + self.unicode_remaining = 4 + self.unicode_buffer = "" + elif ch == "n": + self._mark_char("\n") + elif ch == "r": + self._mark_char("\r") + else: + self._mark_char(ch) + i += 1 + continue + if ch == "\\": + self.escape = True + i += 1 + continue + if ch == '"': + self.closed = True + i += 1 + break + self._mark_char(ch) + i += 1 + self.scan_pos = i + + def _mark_char(self, ch: str) -> None: + self.has_chars = True + if ch == "\r": + self.newline_count += 1 + self.last_char_newline = True + self.last_char_cr = True + elif ch == "\n": + if not self.last_char_cr: + self.newline_count += 1 + self.last_char_newline = True + self.last_char_cr = False + else: + self.last_char_newline = False + self.last_char_cr = False + + +@dataclass(slots=True) +class _StreamingFileEditState: + key: str + call_id: str = "" + name: str = "" + arguments: str = "" + path: str | None = None + tracker: FileEditTracker | None = None + content: _StreamingJsonStringField = field( + default_factory=lambda: _StreamingJsonStringField("content") + ) + old_text: _StreamingJsonStringField = field( + default_factory=lambda: _StreamingJsonStringField("old_text") + ) + new_text: _StreamingJsonStringField = field( + default_factory=lambda: _StreamingJsonStringField("new_text") + ) + emitted_once: bool = False + last_emitted_added: int = -1 + last_emitted_deleted: int = -1 + last_emit_at: float = 0.0 + pending_emitted: bool = False + last_pending_added: int = -1 + last_pending_deleted: int = -1 + last_pending_at: float = 0.0 + + def apply_delta(self, payload: dict[str, Any]) -> None: + call_id = payload.get("call_id") + if isinstance(call_id, str) and call_id: + self.call_id = call_id + name = payload.get("name") + if isinstance(name, str) and name: + self.name = name + args = payload.get("arguments") + if isinstance(args, str): + self.arguments = args + self.content.reset() + self.old_text.reset() + self.new_text.reset() + return + delta = payload.get("arguments_delta") + if isinstance(delta, str) and delta: + self.arguments += delta + + def live_diff_counts(self) -> tuple[int, int]: + if self.name == "write_file": + self.content.scan(self.arguments) + return self.content.line_count, 0 + if self.name == "edit_file": + self.old_text.scan(self.arguments) + self.new_text.scan(self.arguments) + return self.new_text.line_count, self.old_text.line_count + return 0, 0 + + def should_emit(self, added: int, deleted: int, now: float) -> bool: + if not self.emitted_once: + return True + if added == self.last_emitted_added and deleted == self.last_emitted_deleted: + return False + if max( + abs(added - self.last_emitted_added), + abs(deleted - self.last_emitted_deleted), + ) >= _LIVE_EMIT_LINE_STEP: + return True + return now - self.last_emit_at >= _LIVE_EMIT_INTERVAL_S + + def mark_emitted(self, added: int, deleted: int, now: float) -> None: + self.emitted_once = True + self.last_emitted_added = added + self.last_emitted_deleted = deleted + self.last_emit_at = now + + def should_emit_pending(self, added: int, deleted: int, now: float) -> bool: + if not self.pending_emitted: + return True + if added == self.last_pending_added and deleted == self.last_pending_deleted: + return False + if max( + abs(added - self.last_pending_added), + abs(deleted - self.last_pending_deleted), + ) >= _LIVE_EMIT_LINE_STEP: + return True + return now - self.last_pending_at >= _LIVE_EMIT_INTERVAL_S + + def mark_pending_emitted(self, added: int, deleted: int, now: float) -> None: + self.pending_emitted = True + self.last_pending_added = added + self.last_pending_deleted = deleted + self.last_pending_at = now + + def matches_final_tool_call(self, tool_call: Any) -> bool: + call_id = getattr(tool_call, "id", None) + canonical = self.call_id or (self.tracker.call_id if self.tracker else "") + if isinstance(call_id, str) and call_id and canonical and call_id == canonical: + return True + name = getattr(tool_call, "name", None) + if name != self.name: + return False + arguments = getattr(tool_call, "arguments", None) + if not isinstance(arguments, dict): + return False + path = arguments.get("path") + if self.path is None and isinstance(path, str) and path: + self.path = path + return True + return isinstance(path, str) and path == self.path + + +def _stream_key(payload: dict[str, Any]) -> str: + index = payload.get("index") + if isinstance(index, int): + return f"idx:{index}" + if isinstance(index, str) and index: + return f"idx:{index}" + call_id = payload.get("call_id") + if isinstance(call_id, str) and call_id: + return f"id:{call_id}" + return "" + + +def _extract_complete_json_string(source: str, key: str) -> str | None: + match = re.search(rf'"{re.escape(key)}"\s*:\s*"', source) + if match is None: + return None + out: list[str] = [] + i = match.end() + escape = False + while i < len(source): + ch = source[i] + if escape: + escape = False + if ch == "n": + out.append("\n") + elif ch == "r": + out.append("\r") + elif ch == "t": + out.append("\t") + elif ch == "u": + digits = source[i + 1:i + 5] + if len(digits) < 4: + return None + try: + out.append(chr(int(digits, 16))) + except ValueError: + return None + i += 4 + else: + out.append(ch) + i += 1 + continue + if ch == "\\": + escape = True + i += 1 + continue + if ch == '"': + return "".join(out) + out.append(ch) + i += 1 + return None + + def _event_payload( tracker: FileEditTracker, *, @@ -206,6 +668,7 @@ def _event_payload( "call_id": tracker.call_id, "tool": tracker.tool, "path": tracker.display_path, + "absolute_path": tracker.path.as_posix(), "phase": phase, "added": max(0, int(added)), "deleted": max(0, int(deleted)), @@ -260,8 +723,14 @@ def _predict_notebook_after_text(params: dict[str, Any], before_text: str) -> st return None new_source = params.get("new_source") source = new_source if isinstance(new_source, str) else "" - cell_type = params.get("cell_type") if params.get("cell_type") in ("code", "markdown") else "code" - mode = params.get("edit_mode") if params.get("edit_mode") in ("replace", "insert", "delete") else "replace" + cell_type = ( + params.get("cell_type") if params.get("cell_type") in ("code", "markdown") else "code" + ) + mode = ( + params.get("edit_mode") + if params.get("edit_mode") in ("replace", "insert", "delete") + else "replace" + ) if mode == "delete": if 0 <= cell_index < len(cells): cells.pop(cell_index) diff --git a/nanobot/utils/session_attachments.py b/nanobot/utils/session_attachments.py deleted file mode 100644 index d761d33b..00000000 --- a/nanobot/utils/session_attachments.py +++ /dev/null @@ -1,74 +0,0 @@ -"""Session replay: ensure assistant ``media`` paths are under the media root. - -WebUI history signing (``/api/.../messages``) only works for files inside -``get_media_dir``. Tool-driven attachments may live in the workspace; stage -copies into the websocket media bucket before persisting message JSON. -""" - -from __future__ import annotations - -import shutil -import uuid -from pathlib import Path -from typing import Any - -from loguru import logger - -from nanobot.config.paths import get_media_dir -from nanobot.utils.helpers import safe_filename - - -def stage_media_paths_for_session_replay(paths: list[str]) -> list[str]: - """Keep local files only; copy anything outside the media root into ``media/websocket``.""" - root = get_media_dir().resolve() - out: list[str] = [] - seen: set[str] = set() - for raw in paths: - if not isinstance(raw, str) or not raw.strip(): - continue - if raw.startswith(("http://", "https://")): - continue - try: - p = Path(raw).expanduser().resolve() - except OSError: - continue - if not p.is_file(): - continue - try: - p.relative_to(root) - key = str(p) - except ValueError: - try: - media_dir = get_media_dir("websocket") - staged = media_dir / f"{uuid.uuid4().hex[:12]}-{safe_filename(p.name) or 'attachment'}" - shutil.copyfile(p, staged) - key = str(staged.resolve()) - except OSError as exc: - logger.warning("failed to stage session media from {}: {}", raw, exc) - continue - if key not in seen: - out.append(key) - seen.add(key) - return out - - -def merge_turn_media_into_last_assistant( - all_messages: list[dict[str, Any]], - generated_image_paths: list[str], - extra_attachment_paths: list[str], -) -> None: - """Attach staged paths to the last assistant row in *all_messages* (in-place).""" - merged = list( - dict.fromkeys( - [ - *stage_media_paths_for_session_replay(generated_image_paths), - *stage_media_paths_for_session_replay(extra_attachment_paths), - ] - ) - ) - last = all_messages[-1] if all_messages else None - if not merged or not last or last.get("role") != "assistant": - return - existing = last.get("media") - base = existing if isinstance(existing, list) else [] - last["media"] = list(dict.fromkeys([*base, *merged])) diff --git a/nanobot/webui/__init__.py b/nanobot/webui/__init__.py new file mode 100644 index 00000000..1ee95c7b --- /dev/null +++ b/nanobot/webui/__init__.py @@ -0,0 +1,2 @@ +"""Backend helpers for the bundled WebUI surface.""" + diff --git a/nanobot/webui/settings_api.py b/nanobot/webui/settings_api.py new file mode 100644 index 00000000..a5ab13c5 --- /dev/null +++ b/nanobot/webui/settings_api.py @@ -0,0 +1,609 @@ +"""Settings REST helpers for the WebUI HTTP surface. + +The WebSocket channel owns transport/authentication. This module owns the +settings payload shape and the allowlisted config mutations exposed to WebUI. +""" + +from __future__ import annotations + +from typing import Any +from zoneinfo import ZoneInfo + +from nanobot.config.loader import get_config_path, load_config, save_config +from nanobot.providers.image_generation import ( + get_image_gen_provider, + image_gen_provider_names, +) +from nanobot.providers.registry import PROVIDERS, find_by_name + +QueryParams = dict[str, list[str]] + +_WEB_SEARCH_PROVIDER_OPTIONS: tuple[dict[str, str], ...] = ( + {"name": "duckduckgo", "label": "DuckDuckGo", "credential": "none"}, + {"name": "brave", "label": "Brave Search", "credential": "api_key"}, + {"name": "tavily", "label": "Tavily", "credential": "api_key"}, + {"name": "searxng", "label": "SearXNG", "credential": "base_url"}, + {"name": "jina", "label": "Jina", "credential": "api_key"}, + {"name": "kagi", "label": "Kagi", "credential": "api_key"}, + {"name": "olostep", "label": "Olostep", "credential": "api_key"}, +) +_WEB_SEARCH_PROVIDER_BY_NAME = { + provider["name"]: provider for provider in _WEB_SEARCH_PROVIDER_OPTIONS +} + +_IMAGE_GENERATION_ASPECT_RATIOS = { + "1:1", + "3:4", + "9:16", + "4:3", + "16:9", + "3:2", + "2:3", + "21:9", +} + + +class WebUISettingsError(ValueError): + """User-facing settings validation failure.""" + + def __init__(self, message: str, *, status: int = 400) -> None: + super().__init__(message) + self.message = message + self.status = status + + +def _query_first(query: QueryParams, key: str) -> str | None: + values = query.get(key) + return values[0] if values else None + + +def _query_first_alias(query: QueryParams, snake: str, camel: str) -> str | None: + value = _query_first(query, snake) + return _query_first(query, camel) if value is None else value + + +def _mask_secret_hint(secret: str | None) -> str | None: + if not secret: + return None + if len(secret) <= 8: + return "••••" + return f"{secret[:4]}••••{secret[-4:]}" + + +def _provider_requires_api_key(spec: Any) -> bool: + if spec.backend == "azure_openai": + return True + if spec.is_local or spec.is_direct: + return False + return True + + +def _provider_configured_for_settings(spec: Any, provider_config: Any) -> bool: + if _provider_requires_api_key(spec): + return bool(provider_config.api_key) + return bool( + provider_config.api_key + or provider_config.api_base + or getattr(provider_config, "region", None) + or getattr(provider_config, "profile", None) + ) + + +def _parse_bool(value: str, field: str) -> bool: + normalized = value.strip().lower() + if normalized not in {"1", "0", "true", "false", "yes", "no"}: + raise WebUISettingsError(f"{field} must be boolean") + return normalized in {"1", "true", "yes"} + + +def _image_generation_provider_rows(config: Any) -> list[dict[str, Any]]: + rows: list[dict[str, Any]] = [] + for name in image_gen_provider_names(): + spec = find_by_name(name) + provider_config = getattr(config.providers, name, None) + configured = ( + _provider_configured_for_settings(spec, provider_config) + if spec is not None and provider_config is not None + else bool(getattr(provider_config, "api_key", None)) + ) + rows.append( + { + "name": name, + "label": spec.label if spec is not None else name, + "configured": configured, + "api_key_hint": _mask_secret_hint( + getattr(provider_config, "api_key", None) + ), + "api_base": getattr(provider_config, "api_base", None), + "default_api_base": ( + spec.default_api_base if spec and spec.default_api_base else None + ), + } + ) + return rows + + +def settings_payload(*, requires_restart: bool = False) -> dict[str, Any]: + config = load_config() + defaults = config.agents.defaults + active_preset_name = defaults.model_preset or "default" + try: + effective_preset = config.resolve_preset() + except Exception: + effective_preset = config.resolve_default_preset() + active_preset_name = "default" + + provider_name = ( + config.get_provider_name(effective_preset.model, preset=effective_preset) + or effective_preset.provider + ) + provider = config.get_provider(effective_preset.model, preset=effective_preset) + selected_provider = provider_name + if effective_preset.provider != "auto": + spec = find_by_name(effective_preset.provider) + selected_provider = spec.name if spec else provider_name + + providers = [] + for spec in PROVIDERS: + provider_config = getattr(config.providers, spec.name, None) + if provider_config is None or spec.is_oauth: + continue + providers.append( + { + "name": spec.name, + "label": spec.label, + "configured": _provider_configured_for_settings(spec, provider_config), + "api_key_required": _provider_requires_api_key(spec), + "api_key_hint": _mask_secret_hint(provider_config.api_key), + "api_base": provider_config.api_base, + "default_api_base": spec.default_api_base or None, + } + ) + + search_config = config.tools.web.search + image_config = config.tools.image_generation + search_provider = ( + search_config.provider + if search_config.provider in _WEB_SEARCH_PROVIDER_BY_NAME + else "duckduckgo" + ) + image_providers = _image_generation_provider_rows(config) + selected_image_provider = next( + ( + provider + for provider in image_providers + if provider["name"] == image_config.provider + ), + None, + ) + model_presets = [ + { + "name": "default", + "label": "Default", + "active": active_preset_name == "default", + "is_default": True, + "model": defaults.model, + "provider": defaults.provider, + "max_tokens": defaults.max_tokens, + "context_window_tokens": defaults.context_window_tokens, + "temperature": defaults.temperature, + "reasoning_effort": defaults.reasoning_effort, + } + ] + for name, preset in config.model_presets.items(): + model_presets.append( + { + "name": name, + "label": name, + "active": active_preset_name == name, + "is_default": False, + "model": preset.model, + "provider": preset.provider, + "max_tokens": preset.max_tokens, + "context_window_tokens": preset.context_window_tokens, + "temperature": preset.temperature, + "reasoning_effort": preset.reasoning_effort, + } + ) + + exec_config = config.tools.exec + return { + "agent": { + "model": effective_preset.model, + "provider": selected_provider, + "resolved_provider": provider_name, + "has_api_key": bool(provider and provider.api_key), + "model_preset": active_preset_name, + "max_tokens": effective_preset.max_tokens, + "context_window_tokens": effective_preset.context_window_tokens, + "temperature": effective_preset.temperature, + "reasoning_effort": effective_preset.reasoning_effort, + "timezone": defaults.timezone, + "bot_name": defaults.bot_name, + "bot_icon": defaults.bot_icon, + "tool_hint_max_length": defaults.tool_hint_max_length, + }, + "model_presets": model_presets, + "providers": providers, + "web_search": { + "provider": search_provider, + "api_key_hint": _mask_secret_hint(search_config.api_key), + "base_url": search_config.base_url or None, + "max_results": search_config.max_results, + "timeout": search_config.timeout, + "providers": list(_WEB_SEARCH_PROVIDER_OPTIONS), + }, + "web": { + "enable": config.tools.web.enable, + "proxy": config.tools.web.proxy, + "user_agent": config.tools.web.user_agent, + "search": { + "max_results": search_config.max_results, + "timeout": search_config.timeout, + }, + "fetch": { + "use_jina_reader": config.tools.web.fetch.use_jina_reader, + }, + }, + "image_generation": { + "enabled": image_config.enabled, + "provider": image_config.provider, + "provider_configured": bool( + selected_image_provider and selected_image_provider["configured"] + ), + "model": image_config.model, + "default_aspect_ratio": image_config.default_aspect_ratio, + "default_image_size": image_config.default_image_size, + "max_images_per_turn": image_config.max_images_per_turn, + "save_dir": image_config.save_dir, + "providers": image_providers, + }, + "runtime": { + "config_path": str(get_config_path().expanduser()), + "workspace_path": str(config.workspace_path), + "gateway_host": config.gateway.host, + "gateway_port": config.gateway.port, + "heartbeat": { + "enabled": config.gateway.heartbeat.enabled, + "interval_s": config.gateway.heartbeat.interval_s, + "keep_recent_messages": config.gateway.heartbeat.keep_recent_messages, + }, + "dream": { + "schedule": defaults.dream.describe_schedule(), + "max_batch_size": defaults.dream.max_batch_size, + "max_iterations": defaults.dream.max_iterations, + "annotate_line_ages": defaults.dream.annotate_line_ages, + }, + "unified_session": defaults.unified_session, + }, + "advanced": { + "restrict_to_workspace": config.tools.restrict_to_workspace, + "ssrf_whitelist_count": len(config.tools.ssrf_whitelist), + "mcp_server_count": len(config.tools.mcp_servers), + "exec_enabled": exec_config.enable, + "exec_sandbox": exec_config.sandbox or None, + "exec_path_append_set": bool(exec_config.path_append), + }, + "requires_restart": requires_restart, + } + + +def update_agent_settings(query: QueryParams) -> dict[str, Any]: + config = load_config() + defaults = config.agents.defaults + changed = False + restart_required = False + + if "model_preset" in query or "modelPreset" in query: + preset = (_query_first_alias(query, "model_preset", "modelPreset") or "").strip() + preset_value = None if not preset or preset == "default" else preset + if preset_value is not None and preset_value not in config.model_presets: + raise WebUISettingsError("unknown model preset") + if defaults.model_preset != preset_value: + defaults.model_preset = preset_value + changed = True + + model = _query_first(query, "model") + if model is not None: + model = model.strip() + if not model: + raise WebUISettingsError("model is required") + if defaults.model != model: + defaults.model = model + changed = True + + provider = _query_first(query, "provider") + if provider is not None: + provider = provider.strip() + if not provider: + raise WebUISettingsError("provider is required") + spec = find_by_name(provider) + if spec is None: + raise WebUISettingsError("unknown provider") + provider_config = getattr(config.providers, provider, None) + if ( + provider_config is None + or not _provider_configured_for_settings(spec, provider_config) + ): + raise WebUISettingsError("provider is not configured") + if defaults.provider != provider: + defaults.provider = provider + changed = True + + timezone = _query_first(query, "timezone") + if timezone is not None: + timezone = timezone.strip() + if not timezone: + raise WebUISettingsError("timezone is required") + try: + ZoneInfo(timezone) + except Exception: + raise WebUISettingsError("invalid timezone") from None + if defaults.timezone != timezone: + defaults.timezone = timezone + changed = True + restart_required = True + + bot_name = _query_first_alias(query, "bot_name", "botName") + if bot_name is not None: + bot_name = bot_name.strip() + if not bot_name: + raise WebUISettingsError("bot_name is required") + if defaults.bot_name != bot_name: + defaults.bot_name = bot_name + changed = True + restart_required = True + + bot_icon = _query_first_alias(query, "bot_icon", "botIcon") + if bot_icon is not None: + bot_icon = bot_icon.strip() + if defaults.bot_icon != bot_icon: + defaults.bot_icon = bot_icon + changed = True + restart_required = True + + tool_hint_max_length = _query_first_alias( + query, + "tool_hint_max_length", + "toolHintMaxLength", + ) + if tool_hint_max_length is not None: + try: + parsed = int(tool_hint_max_length) + except ValueError: + raise WebUISettingsError("tool_hint_max_length must be an integer") from None + if parsed < 20 or parsed > 500: + raise WebUISettingsError("tool_hint_max_length must be between 20 and 500") + if defaults.tool_hint_max_length != parsed: + defaults.tool_hint_max_length = parsed + changed = True + restart_required = True + + if changed: + save_config(config) + return settings_payload(requires_restart=restart_required) + + +def update_provider_settings(query: QueryParams) -> dict[str, Any]: + provider_name = (_query_first(query, "provider") or "").strip() + if not provider_name: + raise WebUISettingsError("provider is required") + spec = find_by_name(provider_name) + if spec is None or spec.is_oauth: + raise WebUISettingsError("unknown provider") + + config = load_config() + provider_config = getattr(config.providers, spec.name, None) + if provider_config is None: + raise WebUISettingsError("unknown provider") + + changed = False + if "api_key" in query or "apiKey" in query: + api_key = _query_first_alias(query, "api_key", "apiKey") + api_key = (api_key or "").strip() or None + if provider_config.api_key != api_key: + provider_config.api_key = api_key + changed = True + + if "api_base" in query or "apiBase" in query: + api_base = _query_first_alias(query, "api_base", "apiBase") + api_base = (api_base or "").strip() or None + if provider_config.api_base != api_base: + provider_config.api_base = api_base + changed = True + + if changed: + save_config(config) + image_config = config.tools.image_generation + restart_required = ( + changed + and image_config.enabled + and image_config.provider == spec.name + and get_image_gen_provider(spec.name) is not None + ) + return settings_payload(requires_restart=restart_required) + + +def update_web_search_settings(query: QueryParams) -> dict[str, Any]: + provider_name = (_query_first(query, "provider") or "").strip().lower() + provider_option = _WEB_SEARCH_PROVIDER_BY_NAME.get(provider_name) + if provider_option is None: + raise WebUISettingsError("unknown web search provider") + + config = load_config() + search_config = config.tools.web.search + web_config = config.tools.web + previous_provider = search_config.provider + changed = False + restart_required = False + + def set_search_value(attr: str, value: object) -> None: + nonlocal changed + if getattr(search_config, attr) != value: + setattr(search_config, attr, value) + changed = True + + def set_fetch_value(attr: str, value: object) -> None: + nonlocal changed + if getattr(web_config.fetch, attr) != value: + setattr(web_config.fetch, attr, value) + changed = True + + if search_config.provider != provider_name: + search_config.provider = provider_name + changed = True + + credential = provider_option["credential"] + if credential == "none": + set_search_value("api_key", "") + set_search_value("base_url", "") + elif credential == "base_url": + base_url = _query_first_alias(query, "base_url", "baseUrl") + base_url = base_url.strip() if base_url is not None else None + if not base_url and previous_provider == provider_name and search_config.base_url: + base_url = search_config.base_url + if not base_url: + raise WebUISettingsError("base_url is required") + set_search_value("base_url", base_url) + set_search_value("api_key", "") + else: + api_key = _query_first_alias(query, "api_key", "apiKey") + api_key = api_key.strip() if api_key is not None else None + if not api_key and previous_provider == provider_name and search_config.api_key: + api_key = search_config.api_key + if not api_key: + raise WebUISettingsError("api_key is required") + set_search_value("api_key", api_key) + set_search_value("base_url", "") + + max_results = _query_first_alias(query, "max_results", "maxResults") + if max_results is not None: + try: + parsed = int(max_results) + except ValueError: + raise WebUISettingsError("max_results must be an integer") from None + if parsed < 1 or parsed > 10: + raise WebUISettingsError("max_results must be between 1 and 10") + set_search_value("max_results", parsed) + + timeout = _query_first(query, "timeout") + if timeout is not None: + try: + parsed_timeout = int(timeout) + except ValueError: + raise WebUISettingsError("timeout must be an integer") from None + if parsed_timeout < 1 or parsed_timeout > 120: + raise WebUISettingsError("timeout must be between 1 and 120") + set_search_value("timeout", parsed_timeout) + + use_jina_reader = _query_first_alias(query, "use_jina_reader", "useJinaReader") + if use_jina_reader is not None: + normalized = use_jina_reader.strip().lower() + if normalized not in {"1", "0", "true", "false", "yes", "no"}: + raise WebUISettingsError("use_jina_reader must be boolean") + previous_jina_reader = web_config.fetch.use_jina_reader + set_fetch_value("use_jina_reader", normalized in {"1", "true", "yes"}) + if web_config.fetch.use_jina_reader != previous_jina_reader: + restart_required = True + + if changed: + save_config(config) + return settings_payload(requires_restart=restart_required) + + +def update_image_generation_settings(query: QueryParams) -> dict[str, Any]: + config = load_config() + image_config = config.tools.image_generation + changed = False + + provider_name = _query_first(query, "provider") + if provider_name is not None: + provider_name = provider_name.strip().lower() + if not provider_name: + raise WebUISettingsError("image generation provider is required") + if get_image_gen_provider(provider_name) is None: + raise WebUISettingsError("unknown image generation provider") + if image_config.provider != provider_name: + image_config.provider = provider_name + changed = True + + enabled = _query_first(query, "enabled") + if enabled is not None: + parsed_enabled = _parse_bool(enabled, "enabled") + if image_config.enabled != parsed_enabled: + image_config.enabled = parsed_enabled + changed = True + + model = _query_first(query, "model") + if model is not None: + model = model.strip() + if not model: + raise WebUISettingsError("image generation model is required") + if len(model) > 200: + raise WebUISettingsError("image generation model is too long") + if image_config.model != model: + image_config.model = model + changed = True + + default_aspect_ratio = _query_first_alias( + query, + "default_aspect_ratio", + "defaultAspectRatio", + ) + if default_aspect_ratio is not None: + default_aspect_ratio = default_aspect_ratio.strip() + if default_aspect_ratio not in _IMAGE_GENERATION_ASPECT_RATIOS: + raise WebUISettingsError("unsupported image generation aspect ratio") + if image_config.default_aspect_ratio != default_aspect_ratio: + image_config.default_aspect_ratio = default_aspect_ratio + changed = True + + default_image_size = _query_first_alias( + query, + "default_image_size", + "defaultImageSize", + ) + if default_image_size is not None: + default_image_size = default_image_size.strip() + if not default_image_size: + raise WebUISettingsError("default image size is required") + if len(default_image_size) > 32 or not all( + char.isascii() and (char.isalnum() or char in {"x", "X", ":", "-", "_"}) + for char in default_image_size + ): + raise WebUISettingsError("unsupported image generation size") + if image_config.default_image_size != default_image_size: + image_config.default_image_size = default_image_size + changed = True + + max_images_per_turn = _query_first_alias( + query, + "max_images_per_turn", + "maxImagesPerTurn", + ) + if max_images_per_turn is not None: + try: + parsed_max = int(max_images_per_turn) + except ValueError: + raise WebUISettingsError("max_images_per_turn must be an integer") from None + if parsed_max < 1 or parsed_max > 8: + raise WebUISettingsError("max_images_per_turn must be between 1 and 8") + if image_config.max_images_per_turn != parsed_max: + image_config.max_images_per_turn = parsed_max + changed = True + + if image_config.enabled: + selected_provider = next( + ( + provider + for provider in _image_generation_provider_rows(config) + if provider["name"] == image_config.provider + ), + None, + ) + if not selected_provider or not selected_provider["configured"]: + raise WebUISettingsError("image generation provider is not configured") + + if changed: + save_config(config) + return settings_payload(requires_restart=changed) diff --git a/nanobot/webui/sidebar_state.py b/nanobot/webui/sidebar_state.py new file mode 100644 index 00000000..12d26c10 --- /dev/null +++ b/nanobot/webui/sidebar_state.py @@ -0,0 +1,193 @@ +"""Persisted WebUI sidebar workspace state. + +This state is UI-only metadata, scoped to the active nanobot instance data +directory (the directory containing the current config.json). It deliberately +does not modify agent sessions. +""" + +from __future__ import annotations + +import json +import os +import time +from pathlib import Path +from typing import Any + +from loguru import logger + +from nanobot.config.paths import get_webui_dir + +WEBUI_SIDEBAR_STATE_SCHEMA_VERSION = 1 +_MAX_STATE_FILE_BYTES = 256 * 1024 +_MAX_LIST_ITEMS = 2_000 +_MAX_MAP_ITEMS = 2_000 +_MAX_KEY_LEN = 512 +_MAX_TITLE_LEN = 160 +_MAX_TAG_LEN = 40 +_ALLOWED_DENSITIES = {"comfortable", "compact"} +_ALLOWED_SORTS = {"updated_desc", "created_desc", "title_asc"} + + +def webui_sidebar_state_path() -> Path: + return get_webui_dir() / "sidebar-state.json" + + +def default_webui_sidebar_state() -> dict[str, Any]: + return { + "schema_version": WEBUI_SIDEBAR_STATE_SCHEMA_VERSION, + "pinned_keys": [], + "archived_keys": [], + "title_overrides": {}, + "tags_by_key": {}, + "collapsed_groups": {}, + "view": { + "density": "comfortable", + "show_previews": False, + "show_timestamps": False, + "show_archived": False, + "sort": "updated_desc", + }, + "updated_at": None, + } + + +def _clean_string(value: Any, *, max_len: int = _MAX_KEY_LEN) -> str | None: + if not isinstance(value, str): + return None + cleaned = value.strip() + if not cleaned: + return None + return cleaned[:max_len] + + +def _clean_string_list(value: Any, *, max_len: int = _MAX_KEY_LEN) -> list[str]: + if not isinstance(value, list): + return [] + out: list[str] = [] + seen: set[str] = set() + for item in value[:_MAX_LIST_ITEMS]: + cleaned = _clean_string(item, max_len=max_len) + if cleaned is None or cleaned in seen: + continue + seen.add(cleaned) + out.append(cleaned) + return out + + +def _clean_bool_map(value: Any) -> dict[str, bool]: + if not isinstance(value, dict): + return {} + out: dict[str, bool] = {} + for key, raw in list(value.items())[:_MAX_MAP_ITEMS]: + cleaned_key = _clean_string(key) + if cleaned_key is None: + continue + out[cleaned_key] = bool(raw) + return out + + +def _clean_title_overrides(value: Any) -> dict[str, str]: + if not isinstance(value, dict): + return {} + out: dict[str, str] = {} + for key, raw_title in list(value.items())[:_MAX_MAP_ITEMS]: + cleaned_key = _clean_string(key) + cleaned_title = _clean_string(raw_title, max_len=_MAX_TITLE_LEN) + if cleaned_key is None or cleaned_title is None: + continue + out[cleaned_key] = cleaned_title + return out + + +def _clean_tags_by_key(value: Any) -> dict[str, list[str]]: + if not isinstance(value, dict): + return {} + out: dict[str, list[str]] = {} + for key, raw_tags in list(value.items())[:_MAX_MAP_ITEMS]: + cleaned_key = _clean_string(key) + if cleaned_key is None: + continue + tags = _clean_string_list(raw_tags, max_len=_MAX_TAG_LEN)[:12] + if tags: + out[cleaned_key] = tags + return out + + +def _clean_view(value: Any) -> dict[str, Any]: + default = default_webui_sidebar_state()["view"] + if not isinstance(value, dict): + return dict(default) + density = value.get("density") + sort = value.get("sort") + return { + "density": density if density in _ALLOWED_DENSITIES else default["density"], + "show_previews": bool(value.get("show_previews", default["show_previews"])), + "show_timestamps": bool(value.get("show_timestamps", default["show_timestamps"])), + "show_archived": bool(value.get("show_archived", default["show_archived"])), + "sort": sort if sort in _ALLOWED_SORTS else default["sort"], + } + + +def normalize_webui_sidebar_state(raw: Any) -> dict[str, Any]: + """Return a schema-v1 sidebar state from any older/partial input.""" + if not isinstance(raw, dict): + raw = {} + state = default_webui_sidebar_state() + state["pinned_keys"] = _clean_string_list(raw.get("pinned_keys")) + state["archived_keys"] = _clean_string_list(raw.get("archived_keys")) + state["title_overrides"] = _clean_title_overrides(raw.get("title_overrides")) + state["tags_by_key"] = _clean_tags_by_key(raw.get("tags_by_key")) + state["collapsed_groups"] = _clean_bool_map(raw.get("collapsed_groups")) + state["view"] = _clean_view(raw.get("view")) + updated_at = raw.get("updated_at") + state["updated_at"] = updated_at if isinstance(updated_at, str) else None + return state + + +def read_webui_sidebar_state() -> dict[str, Any]: + path = webui_sidebar_state_path() + if not path.is_file(): + return default_webui_sidebar_state() + try: + if path.stat().st_size > _MAX_STATE_FILE_BYTES: + logger.warning("webui sidebar state too large, ignoring: {}", path) + return default_webui_sidebar_state() + with open(path, encoding="utf-8") as f: + raw = json.load(f) + except (OSError, json.JSONDecodeError) as e: + logger.warning("read webui sidebar state failed {}: {}", path, e) + return default_webui_sidebar_state() + return normalize_webui_sidebar_state(raw) + + +def write_webui_sidebar_state(raw: dict[str, Any]) -> dict[str, Any]: + state = normalize_webui_sidebar_state(raw) + state["updated_at"] = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()) + encoded = json.dumps( + state, + ensure_ascii=False, + indent=2, + sort_keys=True, + ).encode("utf-8") + if len(encoded) > _MAX_STATE_FILE_BYTES: + raise ValueError("sidebar state is too large") + + path = webui_sidebar_state_path() + path.parent.mkdir(parents=True, exist_ok=True) + tmp = path.with_suffix(".json.tmp") + with open(tmp, "wb") as f: + f.write(encoded) + f.write(b"\n") + f.flush() + os.fsync(f.fileno()) + os.replace(tmp, path) + try: + dir_fd = os.open(path.parent, os.O_RDONLY) + except OSError: + return state + try: + os.fsync(dir_fd) + finally: + os.close(dir_fd) + return state + diff --git a/nanobot/utils/webui_thread_disk.py b/nanobot/webui/thread_disk.py similarity index 90% rename from nanobot/utils/webui_thread_disk.py rename to nanobot/webui/thread_disk.py index 65f12825..03438f8a 100644 --- a/nanobot/utils/webui_thread_disk.py +++ b/nanobot/webui/thread_disk.py @@ -1,4 +1,4 @@ -"""Legacy WebUI JSON snapshot path helpers (JSON file); transcripts use webui_transcript.""" +"""Legacy WebUI JSON snapshot path helpers (JSON file); transcripts use transcript.""" from __future__ import annotations @@ -8,7 +8,7 @@ from loguru import logger from nanobot.config.paths import get_webui_dir from nanobot.session.manager import SessionManager -from nanobot.utils.webui_transcript import delete_webui_transcript +from nanobot.webui.transcript import delete_webui_transcript def webui_thread_file_path(session_key: str) -> Path: diff --git a/nanobot/utils/webui_transcript.py b/nanobot/webui/transcript.py similarity index 87% rename from nanobot/utils/webui_transcript.py rename to nanobot/webui/transcript.py index 819804a0..d7978d9f 100644 --- a/nanobot/utils/webui_transcript.py +++ b/nanobot/webui/transcript.py @@ -166,6 +166,17 @@ def replay_transcript_to_ui_messages( def _ensure_activity_segment() -> str: return active_activity_segment_id or _new_activity_segment() + def close_activity_for_answer() -> None: + nonlocal active_activity_segment_id, active_file_edit_segment_id + active_activity_segment_id = None + active_file_edit_segment_id = None + + def close_file_edit_phase_before_activity() -> None: + nonlocal active_activity_segment_id, active_file_edit_segment_id + if active_file_edit_segment_id: + active_activity_segment_id = None + active_file_edit_segment_id = None + def attach_reasoning_chunk(prev: list[dict[str, Any]], chunk: str, idx: int) -> None: for i in range(len(prev) - 1, -1, -1): candidate = prev[i] @@ -265,7 +276,7 @@ def replay_transcript_to_ui_messages( return def absorb_complete(extra: dict[str, Any], idx: int) -> None: - nonlocal active_activity_segment_id + nonlocal active_activity_segment_id, active_file_edit_segment_id last = messages[-1] if messages else None if last and is_reasoning_only_placeholder(last): messages[-1] = { @@ -284,35 +295,50 @@ def replay_transcript_to_ui_messages( }, ) active_activity_segment_id = None + active_file_edit_segment_id = None def _file_edit_key(edit: dict[str, Any]) -> str: - return "|".join( - str(edit.get(k) or "") - for k in ("call_id", "tool", "path") - ) + call_id = str(edit.get("call_id") or "") + tool = str(edit.get("tool") or "") + if call_id: + return f"{call_id}|{tool}" + return f"{tool}|{edit.get('path') or ''}" + + def find_file_edit_trace_index( + segment: str | None, + edits: list[dict[str, Any]], + ) -> int | None: + incoming_keys = {_file_edit_key(edit) for edit in edits if isinstance(edit, dict)} + for i in range(len(messages) - 1, -1, -1): + candidate = messages[i] + if candidate.get("role") == "user": + break + if candidate.get("kind") != "trace" or not candidate.get("fileEdits"): + continue + if segment and candidate.get("activitySegmentId") == segment: + return i + existing_edits = candidate.get("fileEdits") + if not isinstance(existing_edits, list): + continue + for existing in existing_edits: + if isinstance(existing, dict) and _file_edit_key(existing) in incoming_keys: + return i + return None def upsert_file_edits(edits: list[dict[str, Any]], idx: int) -> None: nonlocal active_file_edit_segment_id if not edits: return - last = messages[-1] if messages else None - if ( - active_file_edit_segment_id - and last - and last.get("kind") == "trace" - and last.get("fileEdits") - ): - segment = active_file_edit_segment_id + segment = active_file_edit_segment_id + target_index = find_file_edit_trace_index(segment, edits) + if target_index is not None: + last = messages[target_index] + segment = str(last.get("activitySegmentId") or segment or _new_activity_segment(activate=False)) + active_file_edit_segment_id = segment else: - segment = _new_activity_segment(activate=False) + if not segment: + segment = _new_activity_segment(activate=False) active_file_edit_segment_id = segment - if not ( - last - and last.get("kind") == "trace" - and not last.get("isStreaming") - and last.get("fileEdits") - and last.get("activitySegmentId") == segment - ): messages.append( { "id": _new_id("tr", idx), @@ -325,7 +351,11 @@ def replay_transcript_to_ui_messages( "createdAt": _ts_base + idx, }, ) - last = messages[-1] + target_index = len(messages) - 1 + last = messages[target_index] + if not segment: + segment = _new_activity_segment(activate=False) + active_file_edit_segment_id = segment existing = list(last.get("fileEdits") or []) index_by_key = { _file_edit_key(edit): pos @@ -338,11 +368,14 @@ def replay_transcript_to_ui_messages( key = _file_edit_key(edit) if key in index_by_key: pos = index_by_key[key] - existing[pos] = {**existing[pos], **edit} + merged = {**existing[pos], **edit} + if edit.get("path") and not edit.get("pending"): + merged.pop("pending", None) + existing[pos] = merged else: index_by_key[key] = len(existing) existing.append(dict(edit)) - messages[-1] = { + messages[target_index] = { **last, "fileEdits": existing, "activitySegmentId": last.get("activitySegmentId") or segment, @@ -387,6 +420,7 @@ def replay_transcript_to_ui_messages( chunk = rec.get("text") if not isinstance(chunk, str): continue + close_activity_for_answer() adopted = find_active_placeholder(messages) if buffer_message_id is None else None if buffer_message_id is None: if adopted: @@ -425,6 +459,7 @@ def replay_transcript_to_ui_messages( chunk = rec.get("text") if not isinstance(chunk, str) or not chunk: continue + close_file_edit_phase_before_activity() attach_reasoning_chunk(messages, chunk, idx) continue @@ -446,6 +481,7 @@ def replay_transcript_to_ui_messages( line = rec.get("text") if not isinstance(line, str) or not line: continue + close_file_edit_phase_before_activity() attach_reasoning_chunk(messages, line, idx) close_reasoning(messages) continue diff --git a/tests/agent/test_context_prompt_cache.py b/tests/agent/test_context_prompt_cache.py index 4b6f3dad..bbafd489 100644 --- a/tests/agent/test_context_prompt_cache.py +++ b/tests/agent/test_context_prompt_cache.py @@ -314,8 +314,8 @@ def test_system_prompt_keeps_message_tool_out_of_current_chat_replies(tmp_path) prompt = builder.build_system_prompt(channel="slack") assert "Do not use the 'message' tool for normal replies in the current chat" in prompt - assert "the runtime attaches those artifacts to the final assistant reply automatically" in prompt - assert "do not call 'message' just to announce or resend them" in prompt + assert "When 'generate_image' creates images" in prompt + assert "call 'message' with the artifact paths in the 'media' parameter" in prompt assert "Wait for the tool results, then answer once" in prompt diff --git a/tests/agent/test_loop_image_generation_media.py b/tests/agent/test_loop_image_generation_media.py index 6c10ecb1..cfcc3b2c 100644 --- a/tests/agent/test_loop_image_generation_media.py +++ b/tests/agent/test_loop_image_generation_media.py @@ -29,14 +29,15 @@ class FakeImageClient: @pytest.mark.asyncio -async def test_generated_image_media_is_attached_to_final_assistant_message( +async def test_outbound_no_longer_carries_generated_media( tmp_path: Path, monkeypatch: pytest.MonkeyPatch, ) -> None: + """Media delivery is now the LLM's responsibility via the message tool.""" set_config_path(tmp_path / "config.json") monkeypatch.setattr( - "nanobot.agent.tools.image_generation.OpenRouterImageGenerationClient", - FakeImageClient, + "nanobot.agent.tools.image_generation.get_image_gen_provider", + lambda name: FakeImageClient if name == "openrouter" else None, ) provider = MagicMock() provider.get_default_model.return_value = "test-model" @@ -81,9 +82,6 @@ async def test_generated_image_media_is_attached_to_final_assistant_message( assert result is not None assert result.content == "Done" - assert len(result.media) == 1 - assert Path(result.media[0]).is_file() - - session = loop.sessions.get_or_create("websocket:chat-image") - assert session.messages[-1]["role"] == "assistant" - assert session.messages[-1]["media"] == result.media + # OutboundMessage no longer carries generated media — + # the LLM sends images via the message tool instead. + assert result.media == [] diff --git a/tests/agent/test_loop_progress.py b/tests/agent/test_loop_progress.py index 43a69143..f7bd038b 100644 --- a/tests/agent/test_loop_progress.py +++ b/tests/agent/test_loop_progress.py @@ -133,6 +133,7 @@ class TestToolEventProgress: "call_id": "call-write", "tool": "write_file", "path": "foo.txt", + "absolute_path": (tmp_path / "foo.txt").resolve().as_posix(), "phase": "start", "added": 2, "deleted": 1, @@ -309,6 +310,100 @@ class TestToolEventProgress: await invoke_file_edit_progress(telegram_progress, edit_events) assert bus.outbound_size == 0 + @pytest.mark.asyncio + async def test_goal_turn_keeps_live_file_edit_progress_for_webui(self, tmp_path: Path) -> None: + """The /goal command rewrites the prompt but must not bypass WebUI file-edit progress.""" + bus = MessageBus() + provider = MagicMock() + provider.supports_progress_deltas = True + provider.get_default_model.return_value = "test-model" + call_count = 0 + target = tmp_path / "goal.txt" + + async def chat_stream_with_retry(*, on_tool_call_delta=None, **kwargs): + nonlocal call_count + call_count += 1 + if call_count == 1: + assert on_tool_call_delta is not None + await on_tool_call_delta({ + "index": 0, + "call_id": "call-goal-write", + "name": "write_file", + "arguments_delta": '{"path":"goal.txt","content":"', + }) + await on_tool_call_delta({ + "index": 0, + "arguments_delta": "one\\ntwo\\nthree\\n", + }) + await on_tool_call_delta({"index": 0, "arguments_delta": '"}'}) + return LLMResponse( + content=None, + tool_calls=[ + ToolCallRequest( + id="call-goal-write", + name="write_file", + arguments={ + "path": "goal.txt", + "content": "one\ntwo\nthree\n", + }, + ) + ], + usage={}, + ) + return LLMResponse(content="Done", tool_calls=[], usage={}) + + async def execute(name: str, params: dict) -> str: + assert name == "write_file" + target.write_text(params["content"], encoding="utf-8") + return "ok" + + provider.chat_stream_with_retry = chat_stream_with_retry + provider.chat_with_retry = AsyncMock() + loop = AgentLoop(bus=bus, provider=provider, workspace=tmp_path, model="test-model") + loop.tools.get_definitions = MagicMock(return_value=[ + {"type": "function", "function": {"name": "write_file"}}, + ]) + loop.tools.prepare_call = MagicMock( + return_value=( + None, + {"path": "goal.txt", "content": "one\ntwo\nthree\n"}, + None, + ), + ) + loop.tools.execute = AsyncMock(side_effect=execute) + loop.consolidator.maybe_consolidate_by_tokens = AsyncMock(return_value=False) # type: ignore[method-assign] + + await loop._dispatch(InboundMessage( + channel="websocket", + sender_id="u1", + chat_id="chat1", + content="/goal create goal file", + metadata={"_wants_stream": True}, + )) + + outbound = [] + while bus.outbound_size > 0: + outbound.append(await bus.consume_outbound()) + + edit_events = [ + event + for msg in outbound + for event in msg.metadata.get("_file_edit_events", []) + ] + assert any( + event["status"] == "editing" + and event["approximate"] + and event["added"] == 3 + for event in edit_events + ) + assert any( + event["status"] == "done" + and not event["approximate"] + and event["added"] == 3 + for event in edit_events + ) + provider.chat_with_retry.assert_not_awaited() + @pytest.mark.asyncio async def test_non_streaming_channel_does_not_publish_codex_progress_deltas( self, @@ -556,7 +651,7 @@ class TestToolEventProgress: return False monkeypatch.setattr( - "nanobot.utils.webui_turn_helpers.maybe_generate_webui_title_after_turn", + "nanobot.session.webui_turns.maybe_generate_webui_title_after_turn", fake_title_after_turn, ) scheduled_title: list[object] = [] @@ -603,7 +698,7 @@ class TestToolEventProgress: raise AssertionError("command-only turns should not generate titles") monkeypatch.setattr( - "nanobot.utils.webui_turn_helpers.maybe_generate_webui_title_after_turn", + "nanobot.session.webui_turns.maybe_generate_webui_title_after_turn", fake_title_after_turn, ) scheduled: list[object] = [] diff --git a/tests/agent/test_loop_save_turn.py b/tests/agent/test_loop_save_turn.py index 9814c386..06ed8a0c 100644 --- a/tests/agent/test_loop_save_turn.py +++ b/tests/agent/test_loop_save_turn.py @@ -11,7 +11,7 @@ from nanobot.bus.queue import MessageBus from nanobot.providers.base import LLMResponse from nanobot.session.goal_state import GOAL_STATE_KEY from nanobot.session.manager import Session, SessionManager -from nanobot.utils.webui_turn_helpers import ( +from nanobot.session.webui_turns import ( TITLE_GENERATION_MAX_TOKENS, TITLE_GENERATION_REASONING_EFFORT, WEBUI_SESSION_METADATA_KEY, @@ -143,7 +143,7 @@ def test_webui_title_update_uses_captured_llm_runtime( return False monkeypatch.setattr( - "nanobot.utils.webui_turn_helpers.maybe_generate_webui_title_after_turn", + "nanobot.session.webui_turns.maybe_generate_webui_title_after_turn", fake_title_after_turn, ) coordinator = WebuiTurnCoordinator( diff --git a/tests/agent/test_runner_progress_deltas.py b/tests/agent/test_runner_progress_deltas.py index 13d5ea79..27a85ab8 100644 --- a/tests/agent/test_runner_progress_deltas.py +++ b/tests/agent/test_runner_progress_deltas.py @@ -6,7 +6,7 @@ import pytest from nanobot.agent.runner import AgentRunner, AgentRunSpec from nanobot.config.schema import AgentDefaults -from nanobot.providers.base import LLMResponse +from nanobot.providers.base import LLMResponse, ToolCallRequest _MAX_TOOL_RESULT_CHARS = AgentDefaults().max_tool_result_chars @@ -77,3 +77,220 @@ async def test_runner_streams_provider_progress_deltas_by_default(): assert result.final_content == "hello" assert [call.args[0] for call in progress_cb.await_args_list] == ["he", "llo"] provider.chat_with_retry.assert_not_awaited() + + +@pytest.mark.asyncio +async def test_runner_streams_live_write_file_activity_from_tool_argument_deltas(tmp_path): + provider = MagicMock() + provider.supports_progress_deltas = True + call_count = 0 + progress_events: list[dict] = [] + + async def progress_cb(content, *, file_edit_events=None, **kwargs): + if file_edit_events: + progress_events.extend(file_edit_events) + + class Tools: + def get_definitions(self): + return [{"type": "function", "function": {"name": "write_file"}}] + + def get(self, name): + return None + + async def execute(self, name, params): + assert name == "write_file" + assert any(event["approximate"] and event["added"] == 24 for event in progress_events) + target = tmp_path / params["path"] + target.write_text(params["content"], encoding="utf-8") + return "ok" + + async def chat_stream_with_retry(*, on_tool_call_delta=None, **kwargs): + nonlocal call_count + call_count += 1 + if call_count == 1: + assert on_tool_call_delta is not None + await on_tool_call_delta({ + "index": 0, + "call_id": "call-write", + "name": "write_file", + "arguments_delta": '{"path":"big.txt","content":"', + }) + await on_tool_call_delta({"index": 0, "arguments_delta": "line\\n" * 24}) + return LLMResponse( + content=None, + tool_calls=[ + ToolCallRequest( + id="call-write", + name="write_file", + arguments={"path": "big.txt", "content": "line\n" * 24}, + ) + ], + usage={}, + ) + return LLMResponse(content="done", tool_calls=[], usage={}) + + provider.chat_stream_with_retry = chat_stream_with_retry + provider.chat_with_retry = AsyncMock() + + runner = AgentRunner(provider) + result = await runner.run(AgentRunSpec( + initial_messages=[{"role": "user", "content": "write a large file"}], + tools=Tools(), + model="test-model", + max_iterations=2, + max_tool_result_chars=_MAX_TOOL_RESULT_CHARS, + progress_callback=progress_cb, + workspace=tmp_path, + )) + + assert result.final_content == "done" + assert any(event["approximate"] and event["added"] == 24 for event in progress_events) + assert any( + not event["approximate"] and event["phase"] == "end" and event["added"] == 24 + for event in progress_events + ) + provider.chat_with_retry.assert_not_awaited() + + +@pytest.mark.asyncio +async def test_runner_streams_live_edit_file_activity_from_tool_argument_deltas(tmp_path): + provider = MagicMock() + provider.supports_progress_deltas = True + call_count = 0 + progress_events: list[dict] = [] + target = tmp_path / "notes.txt" + target.write_text("old\nkeep\n", encoding="utf-8") + + async def progress_cb(content, *, file_edit_events=None, **kwargs): + if file_edit_events: + progress_events.extend(file_edit_events) + + class Tools: + def get_definitions(self): + return [{"type": "function", "function": {"name": "edit_file"}}] + + def get(self, name): + return None + + async def execute(self, name, params): + assert name == "edit_file" + assert any( + event["tool"] == "edit_file" + and event["approximate"] + and event["added"] == 3 + and event["deleted"] == 2 + for event in progress_events + ) + target.write_text(params["new_text"], encoding="utf-8") + return "ok" + + async def chat_stream_with_retry(*, on_tool_call_delta=None, **kwargs): + nonlocal call_count + call_count += 1 + if call_count == 1: + assert on_tool_call_delta is not None + await on_tool_call_delta({ + "index": 0, + "call_id": "call-edit", + "name": "edit_file", + "arguments_delta": ( + '{"path":"notes.txt","old_text":"old\\nkeep\\n","new_text":"' + ), + }) + await on_tool_call_delta({ + "index": 0, + "arguments_delta": "new\\nkeep\\nextra\\n", + }) + await on_tool_call_delta({"index": 0, "arguments_delta": '"}'}) + return LLMResponse( + content=None, + tool_calls=[ + ToolCallRequest( + id="call-edit", + name="edit_file", + arguments={ + "path": "notes.txt", + "old_text": "old\nkeep\n", + "new_text": "new\nkeep\nextra\n", + }, + ) + ], + usage={}, + ) + return LLMResponse(content="done", tool_calls=[], usage={}) + + provider.chat_stream_with_retry = chat_stream_with_retry + provider.chat_with_retry = AsyncMock() + + runner = AgentRunner(provider) + result = await runner.run(AgentRunSpec( + initial_messages=[{"role": "user", "content": "edit a file"}], + tools=Tools(), + model="test-model", + max_iterations=2, + max_tool_result_chars=_MAX_TOOL_RESULT_CHARS, + progress_callback=progress_cb, + workspace=tmp_path, + )) + + assert result.final_content == "done" + assert any( + event["tool"] == "edit_file" + and event["approximate"] + and event["added"] == 3 + and event["deleted"] == 2 + for event in progress_events + ) + assert any( + event["tool"] == "edit_file" + and not event["approximate"] + and event["phase"] == "end" + and event["added"] == 2 + and event["deleted"] == 1 + for event in progress_events + ) + provider.chat_with_retry.assert_not_awaited() + + +@pytest.mark.asyncio +async def test_runner_marks_unfinished_live_write_file_activity_failed(tmp_path): + provider = MagicMock() + provider.supports_progress_deltas = True + progress_events: list[dict] = [] + + async def progress_cb(content, *, file_edit_events=None, **kwargs): + if file_edit_events: + progress_events.extend(file_edit_events) + + async def chat_stream_with_retry(*, on_tool_call_delta=None, **kwargs): + assert on_tool_call_delta is not None + await on_tool_call_delta({ + "index": 0, + "call_id": "call-write", + "name": "write_file", + "arguments_delta": '{"path":"aborted.txt","content":"partial\\n', + }) + return LLMResponse(content="stopped", tool_calls=[], finish_reason="stop", usage={}) + + provider.chat_stream_with_retry = chat_stream_with_retry + provider.chat_with_retry = AsyncMock() + tools = MagicMock() + tools.get_definitions.return_value = [{"type": "function", "function": {"name": "write_file"}}] + tools.get.return_value = None + + runner = AgentRunner(provider) + result = await runner.run(AgentRunSpec( + initial_messages=[{"role": "user", "content": "write a large file"}], + tools=tools, + model="test-model", + max_iterations=1, + max_tool_result_chars=_MAX_TOOL_RESULT_CHARS, + progress_callback=progress_cb, + workspace=tmp_path, + )) + + assert result.final_content == "stopped" + assert progress_events[-1]["path"] == "aborted.txt" + assert progress_events[-1]["phase"] == "error" + assert progress_events[-1]["status"] == "error" + provider.chat_with_retry.assert_not_awaited() diff --git a/tests/agent/test_session_media_persist.py b/tests/agent/test_session_media_persist.py deleted file mode 100644 index 98b77ffd..00000000 --- a/tests/agent/test_session_media_persist.py +++ /dev/null @@ -1,34 +0,0 @@ -"""Tests for staging attachment paths into the media bucket for session replay.""" - -from pathlib import Path - -from nanobot.config.loader import set_config_path -from nanobot.config.paths import get_media_dir -from nanobot.utils.session_attachments import stage_media_paths_for_session_replay - - -def test_persist_media_stages_workspace_file(tmp_path: Path) -> None: - set_config_path(tmp_path / "config.json") - outside = tmp_path / "workspace" / "report.md" - outside.parent.mkdir(parents=True) - outside.write_text("body", encoding="utf-8") - - out = stage_media_paths_for_session_replay([str(outside)]) - - assert len(out) == 1 - staged = Path(out[0]) - assert staged.is_file() - assert staged.read_text(encoding="utf-8") == "body" - assert staged.resolve().is_relative_to(get_media_dir().resolve()) - - -def test_persist_media_keeps_files_already_under_media_root(tmp_path: Path) -> None: - set_config_path(tmp_path / "config.json") - media = get_media_dir("websocket") - media.mkdir(parents=True, exist_ok=True) - inside = media / "keep-me.txt" - inside.write_text("x", encoding="utf-8") - - out = stage_media_paths_for_session_replay([str(inside.resolve())]) - - assert out == [str(inside.resolve())] diff --git a/tests/channels/test_websocket_channel.py b/tests/channels/test_websocket_channel.py index c6f9d66a..78953864 100644 --- a/tests/channels/test_websocket_channel.py +++ b/tests/channels/test_websocket_channel.py @@ -29,7 +29,8 @@ from nanobot.channels.websocket import ( publish_runtime_model_update, ) from nanobot.config.loader import load_config, save_config -from nanobot.config.schema import Config +from nanobot.config.schema import Config, ModelPresetConfig +from nanobot.webui.settings_api import settings_payload # -- Shared helpers (aligned with test_websocket_integration.py) --------------- @@ -756,7 +757,7 @@ async def test_maybe_push_turn_run_wall_clock_skips_when_no_active_turn() -> Non channel = WebSocketChannel({"enabled": True, "allowFrom": ["*"]}, bus) mock_ws = AsyncMock() channel._attach(mock_ws, "chat-1") - from nanobot.utils import webui_turn_helpers as wth + from nanobot.session import webui_turns as wth wth._WEBSOCKET_TURN_WALL_STARTED_AT.clear() await channel._maybe_push_turn_run_wall_clock("chat-1") @@ -769,7 +770,7 @@ async def test_maybe_push_turn_run_wall_clock_replays_running() -> None: channel = WebSocketChannel({"enabled": True, "allowFrom": ["*"]}, bus) mock_ws = AsyncMock() channel._attach(mock_ws, "chat-1") - from nanobot.utils import webui_turn_helpers as wth + from nanobot.session import webui_turns as wth wth._WEBSOCKET_TURN_WALL_STARTED_AT.clear() try: @@ -991,6 +992,11 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist( config = Config() config.agents.defaults.model = "openai/gpt-4o" config.providers.openai.api_key = "secret-key" + config.model_presets["deep"] = ModelPresetConfig( + model="anthropic/claude-opus-4-5", + provider="anthropic", + reasoning_effort="high", + ) config.tools.web.search.provider = "brave" config.tools.web.search.api_key = "brave-secret" save_config(config, config_path) @@ -1011,21 +1017,49 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist( body = settings.json() assert body["agent"]["model"] == "openai/gpt-4o" assert body["agent"]["provider"] == "openai" + assert body["agent"]["model_preset"] == "default" + assert body["agent"]["max_tokens"] == 8192 + assert body["agent"]["timezone"] == "UTC" + assert body["agent"]["tool_hint_max_length"] == 40 + presets = {preset["name"]: preset for preset in body["model_presets"]} + assert presets["default"]["active"] is True + assert presets["deep"]["reasoning_effort"] == "high" providers = {provider["name"]: provider for provider in body["providers"]} assert providers["openai"]["configured"] is True assert providers["openai"]["api_key_hint"] == "secr••••-key" assert providers["azure_openai"]["api_key_required"] is True assert providers["openrouter"]["configured"] is False assert providers["openrouter"]["api_key_required"] is True + assert providers["ant_ling"]["label"] == "Ant Ling" + assert providers["ant_ling"]["default_api_base"] == "https://api.ant-ling.com/v1" assert providers["atomic_chat"]["configured"] is False assert providers["atomic_chat"]["api_key_required"] is False assert providers["atomic_chat"]["default_api_base"] == "http://localhost:1337/v1" assert body["agent"]["has_api_key"] is True assert body["web_search"]["provider"] == "brave" assert body["web_search"]["api_key_hint"] == "brav••••cret" + assert body["web_search"]["max_results"] == 5 + assert body["web"]["fetch"]["use_jina_reader"] is True search_providers = {provider["name"]: provider for provider in body["web_search"]["providers"]} assert search_providers["duckduckgo"]["credential"] == "none" assert search_providers["searxng"]["credential"] == "base_url" + assert body["image_generation"]["enabled"] is False + assert body["image_generation"]["provider"] == "openrouter" + assert body["image_generation"]["provider_configured"] is False + assert body["image_generation"]["default_aspect_ratio"] == "1:1" + image_providers = { + provider["name"]: provider + for provider in body["image_generation"]["providers"] + } + assert image_providers["openrouter"]["label"] == "OpenRouter" + assert image_providers["openrouter"]["configured"] is False + assert image_providers["gemini"]["label"] == "Gemini" + assert body["runtime"]["config_path"] == str(config_path) + assert body["runtime"]["workspace_path"].endswith(".nanobot/workspace") + assert body["runtime"]["gateway_port"] == 18790 + assert body["advanced"]["exec_enabled"] is True + assert body["advanced"]["mcp_server_count"] == 0 + assert body["restart_required_sections"] == [] assert "secret-key" not in settings.text assert "brave-secret" not in settings.text @@ -1040,6 +1074,7 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist( assert provider_body["requires_restart"] is False provider_rows = {provider["name"]: provider for provider in provider_body["providers"]} assert provider_rows["openrouter"]["configured"] is True + assert provider_body["image_generation"]["provider_configured"] is True assert "sk-or-test" not in provider_updated.text local_provider_updated = await _http_get( @@ -1059,34 +1094,117 @@ async def test_settings_api_returns_safe_subset_and_updates_whitelist( updated = await _http_get( "http://127.0.0.1:" f"{port}/api/settings/update?model=atomic_chat/test" - "&provider=atomic_chat", + "&provider=atomic_chat&timezone=Asia%2FShanghai" + "&bot_name=Nano&bot_icon=N&tool_hint_max_length=120", headers={"Authorization": "Bearer tok"}, ) assert updated.status_code == 200 - assert updated.json()["requires_restart"] is False + updated_body = updated.json() + assert updated_body["requires_restart"] is True + assert updated_body["restart_required_sections"] == ["runtime"] + + preset_updated = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/update?model_preset=deep", + headers={"Authorization": "Bearer tok"}, + ) + assert preset_updated.status_code == 200 + assert preset_updated.json()["agent"]["model"] == "anthropic/claude-opus-4-5" + + bad_preset = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/update?model_preset=missing", + headers={"Authorization": "Bearer tok"}, + ) + assert bad_preset.status_code == 400 search_updated = await _http_get( "http://127.0.0.1:" f"{port}/api/settings/web-search/update?provider=searxng" - "&base_url=https%3A%2F%2Fsearch.example.com", + "&base_url=https%3A%2F%2Fsearch.example.com" + "&max_results=8&timeout=45&use_jina_reader=false", headers={"Authorization": "Bearer tok"}, ) assert search_updated.status_code == 200 search_body = search_updated.json() - assert search_body["requires_restart"] is False + assert search_body["requires_restart"] is True + assert search_body["restart_required_sections"] == ["runtime", "web"] assert search_body["web_search"]["provider"] == "searxng" assert search_body["web_search"]["api_key_hint"] is None assert search_body["web_search"]["base_url"] == "https://search.example.com" + assert search_body["web_search"]["max_results"] == 8 + assert search_body["web"]["fetch"]["use_jina_reader"] is False + + image_updated = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/image-generation/update?enabled=true" + "&provider=openrouter&model=openai%2Fgpt-image-1" + "&default_aspect_ratio=16%3A9&default_image_size=2K" + "&max_images_per_turn=3", + headers={"Authorization": "Bearer tok"}, + ) + assert image_updated.status_code == 200 + image_body = image_updated.json() + assert image_body["requires_restart"] is True + assert image_body["restart_required_sections"] == ["image", "runtime", "web"] + assert image_body["image_generation"]["enabled"] is True + assert image_body["image_generation"]["model"] == "openai/gpt-image-1" + assert image_body["image_generation"]["default_aspect_ratio"] == "16:9" + assert image_body["image_generation"]["default_image_size"] == "2K" + assert image_body["image_generation"]["max_images_per_turn"] == 3 + + image_provider_updated = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/provider/update?provider=openrouter" + "&api_key=sk-or-next&api_base=https%3A%2F%2Fopenrouter.ai%2Fapi%2Fv1", + headers={"Authorization": "Bearer tok"}, + ) + assert image_provider_updated.status_code == 200 + assert image_provider_updated.json()["requires_restart"] is True + assert image_provider_updated.json()["restart_required_sections"] == [ + "image", + "runtime", + "web", + ] + assert "sk-or-next" not in image_provider_updated.text + + bad_web = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/web-search/update?provider=duckduckgo&max_results=99", + headers={"Authorization": "Bearer tok"}, + ) + assert bad_web.status_code == 400 + + bad_image = await _http_get( + "http://127.0.0.1:" + f"{port}/api/settings/image-generation/update?provider=missing", + headers={"Authorization": "Bearer tok"}, + ) + assert bad_image.status_code == 400 saved = load_config(config_path) assert saved.agents.defaults.model == "atomic_chat/test" assert saved.agents.defaults.provider == "atomic_chat" - assert saved.providers.openrouter.api_key == "sk-or-test" + assert saved.agents.defaults.model_preset == "deep" + assert saved.agents.defaults.timezone == "Asia/Shanghai" + assert saved.agents.defaults.bot_name == "Nano" + assert saved.agents.defaults.bot_icon == "N" + assert saved.agents.defaults.tool_hint_max_length == 120 + assert saved.providers.openrouter.api_key == "sk-or-next" assert saved.providers.openrouter.api_base == "https://openrouter.ai/api/v1" assert saved.providers.atomic_chat.api_base == "http://localhost:1337/v1" assert saved.tools.web.search.provider == "searxng" assert saved.tools.web.search.api_key == "" assert saved.tools.web.search.base_url == "https://search.example.com" + assert saved.tools.web.search.max_results == 8 + assert saved.tools.web.search.timeout == 45 + assert saved.tools.web.fetch.use_jina_reader is False + assert saved.tools.image_generation.enabled is True + assert saved.tools.image_generation.provider == "openrouter" + assert saved.tools.image_generation.model == "openai/gpt-image-1" + assert saved.tools.image_generation.default_aspect_ratio == "16:9" + assert saved.tools.image_generation.default_image_size == "2K" + assert saved.tools.image_generation.max_images_per_turn == 3 finally: await channel.stop() await server_task @@ -1131,7 +1249,7 @@ def test_settings_payload_normalizes_camel_case_provider( save_config(config, config_path) monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path) - body = _ch(bus)._settings_payload() + body = settings_payload() assert body["agent"]["provider"] == "minimax_anthropic" @@ -1548,6 +1666,54 @@ def test_parse_envelope_rejects_legacy_and_garbage() -> None: assert _parse_envelope('{"type":123}') is None +def test_sessions_list_includes_active_run_started_at() -> None: + from websockets.datastructures import Headers + from websockets.http11 import Request + + from nanobot.session import webui_turns as wth + + bus = MagicMock() + channel = _ch(bus) + channel._api_tokens["tok"] = time.monotonic() + 300.0 + channel._session_manager = MagicMock() + channel._session_manager.list_sessions.return_value = [ + { + "key": "websocket:chat-1", + "created_at": "2026-05-19T10:00:00Z", + "updated_at": "2026-05-19T10:01:00Z", + "title": "Running", + "preview": "work", + "path": "/private/path", + }, + { + "key": "cli:chat-2", + "created_at": "2026-05-19T10:00:00Z", + "updated_at": "2026-05-19T10:01:00Z", + }, + ] + + wth._WEBSOCKET_TURN_WALL_STARTED_AT.clear() + try: + wth._WEBSOCKET_TURN_WALL_STARTED_AT["chat-1"] = 1_700_000_000.0 + req = Request("/api/sessions", Headers([("Authorization", "Bearer tok")])) + resp = channel._handle_sessions_list(req) + finally: + wth._WEBSOCKET_TURN_WALL_STARTED_AT.clear() + + assert resp.status_code == 200 + body = json.loads(resp.body.decode()) + assert body["sessions"] == [ + { + "key": "websocket:chat-1", + "created_at": "2026-05-19T10:00:00Z", + "updated_at": "2026-05-19T10:01:00Z", + "title": "Running", + "preview": "work", + "run_started_at": 1_700_000_000.0, + } + ] + + @pytest.mark.parametrize( ("value", "expected"), [ @@ -1574,7 +1740,7 @@ def test_handle_webui_thread_get_returns_json(tmp_path, monkeypatch) -> None: from websockets.datastructures import Headers from websockets.http11 import Request - from nanobot.utils.webui_transcript import append_transcript_object + from nanobot.webui.transcript import append_transcript_object monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) key = "websocket:c1" diff --git a/tests/channels/test_websocket_http_routes.py b/tests/channels/test_websocket_http_routes.py index 9286670d..ddb45dfb 100644 --- a/tests/channels/test_websocket_http_routes.py +++ b/tests/channels/test_websocket_http_routes.py @@ -6,6 +6,7 @@ import json from pathlib import Path from typing import Any from unittest.mock import AsyncMock, MagicMock +from urllib.parse import urlencode import httpx import pytest @@ -176,13 +177,62 @@ async def test_sessions_list_only_returns_websocket_sessions_by_default( await server_task +@pytest.mark.asyncio +async def test_webui_sidebar_state_routes_are_config_dir_scoped( + bus: MagicMock, tmp_path: Path, monkeypatch: pytest.MonkeyPatch +) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + sm = _seed_session(tmp_path, key="websocket:sidebar") + channel = _ch(bus, session_manager=sm, port=29911) + server_task = asyncio.create_task(channel.start()) + await asyncio.sleep(0.3) + try: + boot = await _http_get("http://127.0.0.1:29911/webui/bootstrap") + token = boot.json()["token"] + auth = {"Authorization": f"Bearer {token}"} + + initial = await _http_get( + "http://127.0.0.1:29911/api/webui/sidebar-state", + headers=auth, + ) + assert initial.status_code == 200 + assert initial.json()["schema_version"] == 1 + assert initial.json()["pinned_keys"] == [] + + payload = { + "pinned_keys": ["websocket:sidebar"], + "archived_keys": ["websocket:old"], + "title_overrides": {"websocket:sidebar": "Pinned work"}, + "view": {"density": "compact", "show_archived": True}, + } + query = urlencode({"state": json.dumps(payload)}) + updated = await _http_get( + f"http://127.0.0.1:29911/api/webui/sidebar-state/update?{query}", + headers=auth, + ) + assert updated.status_code == 200 + body = updated.json() + assert body["pinned_keys"] == ["websocket:sidebar"] + assert body["title_overrides"] == {"websocket:sidebar": "Pinned work"} + assert body["view"]["density"] == "compact" + + state_path = tmp_path / "webui" / "sidebar-state.json" + assert state_path.is_file() + assert json.loads(state_path.read_text(encoding="utf-8"))["pinned_keys"] == [ + "websocket:sidebar" + ] + finally: + await channel.stop() + await server_task + + @pytest.mark.asyncio async def test_session_delete_removes_file( bus: MagicMock, tmp_path: Path, monkeypatch: pytest.MonkeyPatch ) -> None: monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) sm = _seed_session(tmp_path, key="websocket:doomed") - from nanobot.utils.webui_transcript import append_transcript_object + from nanobot.webui.transcript import append_transcript_object append_transcript_object("websocket:doomed", {"event": "user", "chat_id": "doomed", "text": "x"}) channel = _ch(bus, session_manager=sm, port=29903) diff --git a/tests/providers/test_ant_ling_provider.py b/tests/providers/test_ant_ling_provider.py new file mode 100644 index 00000000..64f93cca --- /dev/null +++ b/tests/providers/test_ant_ling_provider.py @@ -0,0 +1,73 @@ +"""Tests for the Ant Ling provider registration.""" + +from unittest.mock import patch + +from nanobot.config.schema import Config, ProvidersConfig +from nanobot.providers.openai_compat_provider import OpenAICompatProvider +from nanobot.providers.registry import PROVIDERS, find_by_name + + +def test_ant_ling_config_field_exists() -> None: + config = ProvidersConfig() + + assert hasattr(config, "ant_ling") + + +def test_ant_ling_provider_in_registry() -> None: + specs = {spec.name: spec for spec in PROVIDERS} + + assert "ant_ling" in specs + ant_ling = specs["ant_ling"] + assert ant_ling.backend == "openai_compat" + assert ant_ling.env_key == "ANT_LING_API_KEY" + assert ant_ling.display_name == "Ant Ling" + assert ant_ling.default_api_base == "https://api.ant-ling.com/v1" + + +def test_find_by_name_accepts_ant_ling_spellings() -> None: + spec = find_by_name("ant_ling") + + assert spec is not None + assert find_by_name("ant-ling") is spec + assert find_by_name("antLing") is spec + + +def test_ant_ling_model_auto_matches_with_default_api_base() -> None: + config = Config.model_validate({ + "providers": { + "antLing": { + "apiKey": "ling-key", + }, + }, + "agents": { + "defaults": { + "model": "Ling-2.6-flash", + }, + }, + }) + + assert config.get_provider_name("Ling-2.6-flash") == "ant_ling" + assert config.get_api_key("Ling-2.6-flash") == "ling-key" + assert config.get_api_base("Ling-2.6-flash") == "https://api.ant-ling.com/v1" + + +def test_ant_ling_preserves_official_model_name() -> None: + spec = find_by_name("ant_ling") + with patch("nanobot.providers.openai_compat_provider.AsyncOpenAI"): + provider = OpenAICompatProvider( + api_key="ling-key", + default_model="Ling-2.6-flash", + spec=spec, + ) + + kwargs = provider._build_kwargs( + messages=[{"role": "user", "content": "hi"}], + tools=None, + model="Ling-2.6-flash", + max_tokens=1024, + temperature=0.7, + reasoning_effort=None, + tool_choice=None, + ) + + assert kwargs["model"] == "Ling-2.6-flash" diff --git a/tests/providers/test_anthropic_stream_idle.py b/tests/providers/test_anthropic_stream_idle.py index da4939bf..d46f291f 100644 --- a/tests/providers/test_anthropic_stream_idle.py +++ b/tests/providers/test_anthropic_stream_idle.py @@ -129,6 +129,74 @@ async def test_chat_stream_invokes_on_thinking_delta_for_thinking_delta() -> Non assert text_parts == ["X"] +@pytest.mark.asyncio +async def test_chat_stream_invokes_tool_call_delta_for_input_json_delta() -> None: + provider = AnthropicProvider(api_key="sk-test") + provider._client = MagicMock() + + chunks = [ + SimpleNamespace( + type="content_block_start", + index=1, + content_block=SimpleNamespace( + type="tool_use", + id="toolu_1", + name="write_file", + ), + ), + SimpleNamespace( + type="content_block_delta", + index=1, + delta=SimpleNamespace( + type="input_json_delta", + partial_json='{"path":"notes.md","content":"', + ), + ), + SimpleNamespace( + type="content_block_delta", + index=1, + delta=SimpleNamespace(type="input_json_delta", partial_json="line\\n"), + ), + ] + fake = _FakeAsyncStream(chunks) + stream_cm = MagicMock() + stream_cm.__aenter__ = AsyncMock(return_value=fake) + stream_cm.__aexit__ = AsyncMock(return_value=None) + provider._client.messages.stream = MagicMock(return_value=stream_cm) + + deltas: list[dict] = [] + + async def on_tool_delta(delta: dict) -> None: + deltas.append(delta) + + await provider.chat_stream( + messages=[{"role": "user", "content": "write"}], + on_tool_call_delta=on_tool_delta, + ) + + assert deltas == [ + { + "index": 1, + "call_id": "toolu_1", + "name": "write_file", + "arguments_delta": "", + }, + { + "index": 1, + "call_id": "toolu_1", + "name": "write_file", + "arguments_delta": '{"path":"notes.md","content":"', + }, + { + "index": 1, + "call_id": "toolu_1", + "name": "write_file", + "arguments_delta": "line\\n", + }, + ] + fake.get_final_message.assert_awaited_once() + + @pytest.mark.asyncio async def test_chat_stream_without_callback_still_finalizes() -> None: provider = AnthropicProvider(api_key="sk-test") diff --git a/tests/providers/test_image_generation.py b/tests/providers/test_image_generation.py index 8f2801d6..c38f9488 100644 --- a/tests/providers/test_image_generation.py +++ b/tests/providers/test_image_generation.py @@ -1,5 +1,6 @@ from __future__ import annotations +import base64 from pathlib import Path from typing import Any @@ -8,8 +9,10 @@ import pytest from nanobot.providers.image_generation import ( AIHubMixImageGenerationClient, + GeminiImageGenerationClient, GeneratedImageResponse, ImageGenerationError, + MiniMaxImageGenerationClient, OpenRouterImageGenerationClient, ) @@ -23,6 +26,7 @@ PNG_DATA_URL = ( "data:image/png;base64," "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII=" ) +JPEG_BYTES = b"\xff\xd8\xff\xe0" + b"0" * 12 class FakeResponse: @@ -202,3 +206,184 @@ async def test_aihubmix_image_generation_downloads_url_response() -> None: assert response.images[0].startswith("data:image/png;base64,") assert fake.get_calls[0]["url"] == "https://cdn.example/image.png" + + +@pytest.mark.asyncio +async def test_aihubmix_base64_response_uses_detected_mime() -> None: + raw_b64 = base64.b64encode(JPEG_BYTES).decode("ascii") + fake = FakeClient(FakeResponse({"output": {"b64_json": raw_b64}})) + client = AIHubMixImageGenerationClient( + api_key="sk-ahm-test", + client=fake, # type: ignore[arg-type] + ) + + response = await client.generate(prompt="draw", model="gpt-image-2-free") + + assert response.images == [f"data:image/jpeg;base64,{raw_b64}"] + + +RAW_B64 = PNG_DATA_URL.removeprefix("data:image/png;base64,") + + +@pytest.mark.asyncio +async def test_gemini_imagen_payload_and_response() -> None: + fake = FakeClient( + FakeResponse({"predictions": [{"bytesBase64Encoded": RAW_B64, "mimeType": "image/png"}]}) + ) + client = GeminiImageGenerationClient( + api_key="AIza-test", + api_base="https://generativelanguage.googleapis.com/v1beta", + client=fake, # type: ignore[arg-type] + ) + + response = await client.generate( + prompt="a sunset", + model="imagen-4.0-generate-001", + aspect_ratio="16:9", + ) + + assert response.images == [PNG_DATA_URL] + assert response.content == "" + call = fake.calls[0] + assert call["url"].endswith(":predict") + assert call["headers"]["x-goog-api-key"] == "AIza-test" + assert "params" not in call + body = call["json"] + assert body["instances"] == [{"prompt": "a sunset"}] + assert body["parameters"]["sampleCount"] == 1 + assert body["parameters"]["aspectRatio"] == "16:9" + + +@pytest.mark.asyncio +async def test_gemini_imagen_ignores_unsupported_aspect_ratio() -> None: + fake = FakeClient( + FakeResponse({"predictions": [{"bytesBase64Encoded": RAW_B64, "mimeType": "image/png"}]}) + ) + client = GeminiImageGenerationClient(api_key="AIza-test", client=fake) # type: ignore[arg-type] + + await client.generate(prompt="a sunset", model="imagen-4.0-generate-001", aspect_ratio="2:3") + + body = fake.calls[0]["json"] + assert "aspectRatio" not in body["parameters"] + + +@pytest.mark.asyncio +async def test_gemini_flash_payload_and_response() -> None: + fake = FakeClient( + FakeResponse( + { + "candidates": [ + { + "content": { + "parts": [ + {"text": "here is your image"}, + {"inlineData": {"mimeType": "image/png", "data": RAW_B64}}, + ] + } + } + ] + } + ) + ) + client = GeminiImageGenerationClient( + api_key="AIza-test", + api_base="https://generativelanguage.googleapis.com/v1beta", + client=fake, # type: ignore[arg-type] + ) + + response = await client.generate( + prompt="draw a cat", + model="gemini-2.0-flash-preview-image-generation", + ) + + assert response.images == [PNG_DATA_URL] + assert response.content == "here is your image" + call = fake.calls[0] + assert call["url"].endswith(":generateContent") + assert call["headers"]["x-goog-api-key"] == "AIza-test" + assert "params" not in call + body = call["json"] + assert body["generationConfig"]["responseModalities"] == ["TEXT", "IMAGE"] + assert body["contents"][0]["parts"][-1] == {"text": "draw a cat"} + + +@pytest.mark.asyncio +async def test_gemini_flash_reference_images(tmp_path: Path) -> None: + ref = tmp_path / "ref.png" + ref.write_bytes(PNG_BYTES) + fake = FakeClient( + FakeResponse( + { + "candidates": [ + { + "content": { + "parts": [{"inlineData": {"mimeType": "image/png", "data": RAW_B64}}] + } + } + ] + } + ) + ) + client = GeminiImageGenerationClient(api_key="AIza-test", client=fake) # type: ignore[arg-type] + + response = await client.generate( + prompt="edit this", + model="gemini-2.0-flash-preview-image-generation", + reference_images=[str(ref)], + ) + + assert response.images == [PNG_DATA_URL] + parts = fake.calls[0]["json"]["contents"][0]["parts"] + assert parts[0]["inlineData"]["mimeType"] == "image/png" + assert parts[0]["inlineData"]["data"].startswith("iVBOR") + assert parts[1] == {"text": "edit this"} + + +@pytest.mark.asyncio +async def test_gemini_requires_api_key() -> None: + client = GeminiImageGenerationClient(api_key=None) + + with pytest.raises(ImageGenerationError, match="API key"): + await client.generate(prompt="draw", model="imagen-4.0-generate-001") + + +@pytest.mark.asyncio +async def test_gemini_no_images_raises() -> None: + fake = FakeClient(FakeResponse({"candidates": [{"content": {"parts": [{"text": "sorry"}]}}]})) + client = GeminiImageGenerationClient(api_key="AIza-test", client=fake) # type: ignore[arg-type] + + with pytest.raises(ImageGenerationError, match="returned no images"): + await client.generate(prompt="draw", model="gemini-2.0-flash-preview-image-generation") + + +@pytest.mark.asyncio +async def test_minimax_payload_and_response_with_reference_image(tmp_path: Path) -> None: + ref = tmp_path / "ref.png" + ref.write_bytes(PNG_BYTES) + fake = FakeClient(FakeResponse({"data": {"image_base64": [RAW_B64]}})) + client = MiniMaxImageGenerationClient( + api_key="sk-mm-test", + api_base="https://api.minimaxi.com/v1/", + extra_headers={"X-Test": "1"}, + client=fake, # type: ignore[arg-type] + ) + + response = await client.generate( + prompt="draw a character", + model="image-01", + reference_images=[str(ref)], + aspect_ratio="21:9", + ) + + assert response.images == [PNG_DATA_URL] + call = fake.calls[0] + assert call["url"] == "https://api.minimaxi.com/v1/image_generation" + assert call["headers"]["Authorization"] == "Bearer sk-mm-test" + assert call["headers"]["X-Test"] == "1" + body = call["json"] + assert body["model"] == "image-01" + assert body["prompt"] == "draw a character" + assert body["response_format"] == "base64" + assert body["aspect_ratio"] == "21:9" + assert body["subject_reference"][0]["type"] == "character" + assert body["subject_reference"][0]["image_file"].startswith("data:image/png;base64,") diff --git a/tests/providers/test_litellm_kwargs.py b/tests/providers/test_litellm_kwargs.py index 7ae97159..3acb2e76 100644 --- a/tests/providers/test_litellm_kwargs.py +++ b/tests/providers/test_litellm_kwargs.py @@ -164,6 +164,130 @@ def _fake_chat_stream_reasoning_chunks(): return _stream() +def _fake_chat_stream_tool_call_chunks(): + """Mimic OpenAI-compatible streaming tool-call argument deltas.""" + + async def _stream(): + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason=None, + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=[ + SimpleNamespace( + index=0, + id="call_write", + function=SimpleNamespace( + name="write_file", + arguments='{"path":"notes.md","content":"', + ), + ) + ], + ), + ), + ], + usage=None, + ) + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason=None, + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=[ + SimpleNamespace( + index=0, + id=None, + function=SimpleNamespace(name=None, arguments='line\\n"}'), + ) + ], + ), + ), + ], + usage=None, + ) + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason="tool_calls", + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=None, + ), + ), + ], + usage=SimpleNamespace(prompt_tokens=10, completion_tokens=5, total_tokens=15), + ) + + return _stream() + + +def _fake_chat_stream_legacy_function_call_chunks(): + """Mimic older OpenAI-compatible ``delta.function_call`` chunks.""" + + async def _stream(): + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason=None, + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=None, + function_call=SimpleNamespace( + name="write_file", + arguments='{"path":"notes.md","content":"', + ), + ), + ), + ], + usage=None, + ) + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason=None, + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=None, + function_call=SimpleNamespace( + name=None, + arguments='line\\n"}', + ), + ), + ), + ], + usage=None, + ) + yield SimpleNamespace( + choices=[ + SimpleNamespace( + finish_reason="function_call", + delta=SimpleNamespace( + content=None, + reasoning_content=None, + reasoning=None, + tool_calls=None, + function_call=None, + ), + ), + ], + usage=SimpleNamespace(prompt_tokens=10, completion_tokens=5, total_tokens=15), + ) + + return _stream() + + @pytest.mark.asyncio async def test_openai_compat_stream_forwards_reasoning_deltas_deepseek_style() -> None: """Regression: DeepSeek-V4 / reasoner expose ``delta.reasoning_content`` during streaming.""" @@ -202,6 +326,98 @@ async def test_openai_compat_stream_forwards_reasoning_deltas_deepseek_style() - mock_chat.assert_awaited_once() +@pytest.mark.asyncio +@pytest.mark.parametrize( + ("provider_name", "model"), + [ + ("openai", "gpt-4o"), + ("deepseek", "deepseek-chat"), + ("minimax", "MiniMax-M2.7"), + ("zhipu", "glm-4.6"), + ], +) +async def test_openai_compat_stream_forwards_tool_call_argument_deltas( + provider_name: str, + model: str, +) -> None: + mock_chat = AsyncMock(return_value=_fake_chat_stream_tool_call_chunks()) + spec = find_by_name(provider_name) + deltas: list[dict] = [] + + async def on_tool_delta(delta: dict) -> None: + deltas.append(delta) + + with patch("nanobot.providers.openai_compat_provider.AsyncOpenAI") as mock_openai: + client_instance = mock_openai.return_value + client_instance.chat.completions.create = mock_chat + + provider = OpenAICompatProvider( + api_key="sk-test", + default_model=model, + spec=spec, + ) + result = await provider.chat_stream( + messages=[{"role": "user", "content": "write"}], + tools=[{"type": "function", "function": {"name": "write_file"}}], + model=model, + on_tool_call_delta=on_tool_delta, + ) + + assert deltas == [ + { + "index": 0, + "call_id": "call_write", + "name": "write_file", + "arguments_delta": '{"path":"notes.md","content":"', + }, + {"index": 0, "call_id": "", "name": "", "arguments_delta": 'line\\n"}'}, + ] + assert result.tool_calls[0].name == "write_file" + assert result.tool_calls[0].arguments == {"path": "notes.md", "content": "line\n"} + kwargs = mock_chat.await_args.kwargs + if provider_name == "zhipu": + assert kwargs["extra_body"]["tool_stream"] is True + else: + assert kwargs.get("extra_body", {}).get("tool_stream") is None + + +@pytest.mark.asyncio +async def test_openai_compat_stream_forwards_legacy_function_call_argument_deltas() -> None: + mock_chat = AsyncMock(return_value=_fake_chat_stream_legacy_function_call_chunks()) + deltas: list[dict] = [] + + async def on_tool_delta(delta: dict) -> None: + deltas.append(delta) + + with patch("nanobot.providers.openai_compat_provider.AsyncOpenAI") as mock_openai: + client_instance = mock_openai.return_value + client_instance.chat.completions.create = mock_chat + + provider = OpenAICompatProvider( + api_key="sk-test", + default_model="deepseek-chat", + spec=find_by_name("deepseek"), + ) + result = await provider.chat_stream( + messages=[{"role": "user", "content": "write"}], + tools=[{"type": "function", "function": {"name": "write_file"}}], + model="deepseek-chat", + on_tool_call_delta=on_tool_delta, + ) + + assert deltas == [ + { + "index": 0, + "call_id": "", + "name": "write_file", + "arguments_delta": '{"path":"notes.md","content":"', + }, + {"index": 0, "call_id": "", "name": "", "arguments_delta": 'line\\n"}'}, + ] + assert result.tool_calls[0].name == "write_file" + assert result.tool_calls[0].arguments == {"path": "notes.md", "content": "line\n"} + + class _FakeResponsesError(Exception): def __init__(self, status_code: int, text: str): super().__init__(text) diff --git a/tests/providers/test_llm_response.py b/tests/providers/test_llm_response.py index ca9644dc..fff0ccaa 100644 --- a/tests/providers/test_llm_response.py +++ b/tests/providers/test_llm_response.py @@ -44,9 +44,15 @@ class TestShouldExecuteTools: resp = _response("stop") assert resp.should_execute_tools is True + def test_legacy_function_call_reason_executes(self) -> None: + # Older OpenAI-compatible streaming APIs can still use the singular + # function_call finish reason while carrying a tool-call-shaped payload. + resp = _response("function_call") + assert resp.should_execute_tools is True + @pytest.mark.parametrize( "anomalous_reason", - ["refusal", "content_filter", "error", "length", "function_call", ""], + ["refusal", "content_filter", "error", "length", ""], ) def test_tool_calls_under_anomalous_reason_blocked(self, anomalous_reason: str) -> None: # This is the #3220 bug: gateways injecting tool_calls under any of these diff --git a/tests/providers/test_openai_codex_provider.py b/tests/providers/test_openai_codex_provider.py index ef9a91a7..e31b8547 100644 --- a/tests/providers/test_openai_codex_provider.py +++ b/tests/providers/test_openai_codex_provider.py @@ -16,7 +16,15 @@ async def test_codex_prompt_cache_key_uses_stable_conversation_prefix(monkeypatc lambda: SimpleNamespace(account_id="acct", access="token"), ) - async def fake_request(url, headers, body, verify, on_content_delta=None): + async def fake_request( + url, + headers, + body, + verify, + on_content_delta=None, + on_tool_call_delta=None, + ): + _ = on_tool_call_delta bodies.append(body) return "ok", [], "stop" diff --git a/tests/providers/test_openai_responses.py b/tests/providers/test_openai_responses.py index ce422065..74a934f8 100644 --- a/tests/providers/test_openai_responses.py +++ b/tests/providers/test_openai_responses.py @@ -453,6 +453,56 @@ class TestConsumeSdkStream: assert tool_calls[0].name == "get_weather" assert tool_calls[0].arguments == {"city": "SF"} + @pytest.mark.asyncio + async def test_tool_call_argument_delta_callback(self): + item_added = MagicMock(type="function_call", call_id="c1", id="fc1", arguments="") + item_added.name = "write_file" + ev1 = MagicMock(type="response.output_item.added", item=item_added) + ev2 = MagicMock( + type="response.function_call_arguments.delta", + call_id="c1", + delta='{"path":"a.txt","content":"', + ) + ev3 = MagicMock( + type="response.function_call_arguments.delta", + call_id="c1", + delta='hello\\n', + ) + ev4 = MagicMock( + type="response.function_call_arguments.done", + call_id="c1", + arguments='{"path":"a.txt","content":"hello\\n"}', + ) + item_done = MagicMock( + type="function_call", + call_id="c1", + id="fc1", + arguments='{"path":"a.txt","content":"hello\\n"}', + ) + item_done.name = "write_file" + ev5 = MagicMock(type="response.output_item.done", item=item_done) + resp_obj = MagicMock(status="completed", usage=None, output=[]) + ev6 = MagicMock(type="response.completed", response=resp_obj) + deltas: list[dict] = [] + + async def cb(delta: dict) -> None: + deltas.append(delta) + + async def stream(): + for e in [ev1, ev2, ev3, ev4, ev5, ev6]: + yield e + + await consume_sdk_stream(stream(), on_tool_call_delta=cb) + assert deltas == [ + {"call_id": "c1", "name": "write_file", "arguments_delta": ""}, + { + "call_id": "c1", + "name": "write_file", + "arguments_delta": '{"path":"a.txt","content":"', + }, + {"call_id": "c1", "name": "write_file", "arguments_delta": "hello\\n"}, + ] + @pytest.mark.asyncio async def test_usage_extracted(self): usage_obj = MagicMock(input_tokens=10, output_tokens=5, total_tokens=15) diff --git a/tests/tools/test_image_generation_tool.py b/tests/tools/test_image_generation_tool.py index 2afdbdff..92ed8a33 100644 --- a/tests/tools/test_image_generation_tool.py +++ b/tests/tools/test_image_generation_tool.py @@ -44,8 +44,8 @@ async def test_generate_image_tool_stores_artifact_and_source_images( set_config_path(tmp_path / "config.json") FakeImageClient.instances = [] monkeypatch.setattr( - "nanobot.agent.tools.image_generation.OpenRouterImageGenerationClient", - FakeImageClient, + "nanobot.agent.tools.image_generation.get_image_gen_provider", + lambda name: FakeImageClient if name == "openrouter" else None, ) ref = tmp_path / "ref.png" ref.write_bytes(PNG_BYTES) @@ -98,8 +98,8 @@ async def test_generate_image_tool_selects_aihubmix_provider( set_config_path(tmp_path / "config.json") FakeImageClient.instances = [] monkeypatch.setattr( - "nanobot.agent.tools.image_generation.AIHubMixImageGenerationClient", - FakeImageClient, + "nanobot.agent.tools.image_generation.get_image_gen_provider", + lambda name: FakeImageClient if name == "aihubmix" else None, ) tool = ImageGenerationTool( workspace=tmp_path, diff --git a/tests/utils/test_artifacts.py b/tests/utils/test_artifacts.py index 64d2e3f3..941c1a40 100644 --- a/tests/utils/test_artifacts.py +++ b/tests/utils/test_artifacts.py @@ -10,8 +10,6 @@ from nanobot.config.loader import set_config_path from nanobot.utils.artifacts import ( ArtifactError, decode_image_data_url, - generated_image_paths_from_messages, - generated_image_tool_result, store_generated_image_artifact, ) @@ -66,22 +64,3 @@ def test_store_generated_image_artifact_rejects_unsafe_save_dir(tmp_path: Path) model="m", save_dir="../outside", ) - - -def test_generated_image_paths_from_tool_results() -> None: - result = generated_image_tool_result( - [ - {"id": "img_1", "path": "/tmp/one.png"}, - {"id": "img_2", "path": "/tmp/two.png"}, - ] - ) - payload = json.loads(result) - - assert generated_image_paths_from_messages( - [ - {"role": "tool", "name": "generate_image", "content": result}, - {"role": "tool", "name": "other", "content": result}, - ] - ) == ["/tmp/one.png", "/tmp/two.png"] - assert "runtime attaches generated images automatically" in payload["next_step"] - assert "Do not call message" in payload["next_step"] diff --git a/tests/utils/test_file_edit_events.py b/tests/utils/test_file_edit_events.py index 6176a5e3..cdaae516 100644 --- a/tests/utils/test_file_edit_events.py +++ b/tests/utils/test_file_edit_events.py @@ -1,6 +1,8 @@ from __future__ import annotations +import asyncio from pathlib import Path +from types import SimpleNamespace from nanobot.utils.file_edit_events import ( build_file_edit_end_event, @@ -8,6 +10,7 @@ from nanobot.utils.file_edit_events import ( line_diff_stats, prepare_file_edit_tracker, read_file_snapshot, + StreamingFileEditTracker, ) @@ -20,6 +23,10 @@ def test_line_diff_stats_normalizes_crlf() -> None: assert line_diff_stats("a\r\nb\r\n", "a\nb\nc\n") == (1, 0) +def test_line_diff_stats_counts_new_file_crlf_lines_once() -> None: + assert line_diff_stats("", "a\r\nb\r\n") == (2, 0) + + def test_write_file_start_predicts_and_end_calibrates_exact_diff(tmp_path: Path) -> None: target = tmp_path / "notes.txt" target.write_text("old\nkeep\n", encoding="utf-8") @@ -39,6 +46,7 @@ def test_write_file_start_predicts_and_end_calibrates_exact_diff(tmp_path: Path) "call_id": "call-write", "tool": "write_file", "path": "notes.txt", + "absolute_path": (tmp_path / "notes.txt").resolve().as_posix(), "phase": "start", "added": 2, "deleted": 1, @@ -73,6 +81,307 @@ def test_binary_file_is_reported_but_not_counted(tmp_path: Path) -> None: assert (event["added"], event["deleted"]) == (0, 0) +def test_oversized_write_file_end_uses_known_content_for_exact_count(tmp_path: Path) -> None: + target = tmp_path / "large.txt" + params = {"path": "large.txt", "content": "x" * (2 * 1024 * 1024 + 1)} + tracker = prepare_file_edit_tracker( + call_id="call-large", + tool_name="write_file", + tool=None, + workspace=tmp_path, + params=params, + ) + + assert tracker is not None + target.write_text(params["content"], encoding="utf-8") + event = build_file_edit_end_event(tracker, params) + assert event.get("binary") is not True + assert event["added"] == 1 + assert event["deleted"] == 0 + + +def test_streaming_write_file_tracker_emits_live_line_counts(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"path":"notes.md","content":"', + }) + await tracker.update({ + "index": 0, + "arguments_delta": "line\\n" * 24, + }) + + asyncio.run(run()) + + assert events[0] == { + "version": 1, + "call_id": "call-live", + "tool": "write_file", + "path": "notes.md", + "absolute_path": (tmp_path / "notes.md").resolve().as_posix(), + "phase": "start", + "added": 0, + "deleted": 0, + "approximate": True, + "status": "editing", + } + assert events[-1]["path"] == "notes.md" + assert events[-1]["status"] == "editing" + assert events[-1]["approximate"] is True + assert events[-1]["added"] == 24 + assert events[-1]["deleted"] == 0 + + +def test_streaming_write_file_tracker_emits_pending_before_path(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"content":"line\\n', + }) + await tracker.update({ + "index": 0, + "arguments_delta": 'more\\n","path":"late.md"', + }) + + asyncio.run(run()) + + assert events[0] == { + "version": 1, + "call_id": "call-live", + "tool": "write_file", + "path": "", + "phase": "start", + "added": 1, + "deleted": 0, + "approximate": True, + "status": "editing", + "pending": True, + } + assert events[-1]["path"] == "late.md" + assert events[-1].get("pending") is not True + assert events[-1]["added"] == 2 + + +def test_streaming_write_file_tracker_flushes_small_pending_count(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"path":"small.md","content":"one\\n', + }) + await tracker.flush() + + asyncio.run(run()) + assert events + assert events[-1]["path"] == "small.md" + assert events[-1]["added"] == 1 + + +def test_streaming_write_file_tracker_normalizes_crlf_line_counts(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"path":"windows.txt","content":"one\\r\\ntwo\\r\\n', + }) + await tracker.flush() + + asyncio.run(run()) + assert events[-1]["path"] == "windows.txt" + assert events[-1]["added"] == 2 + + +def test_streaming_write_file_tracker_counts_unicode_escaped_newlines(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"path":"unicode.txt","content":"one\\u000atwo', + }) + await tracker.flush() + + asyncio.run(run()) + assert events[-1]["path"] == "unicode.txt" + assert events[-1]["added"] == 2 + + +def test_streaming_edit_file_tracker_emits_live_line_counts(tmp_path: Path) -> None: + target = tmp_path / "notes.md" + target.write_text("old\nkeep\n", encoding="utf-8") + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-edit", + "name": "edit_file", + "arguments_delta": '{"path":"notes.md","old_text":"old\\nkeep","new_text":"', + }) + await tracker.update({ + "index": 0, + "arguments_delta": "new\\nkeep\\nextra\\n" * 8, + }) + + asyncio.run(run()) + + assert events[0] == { + "version": 1, + "call_id": "call-edit", + "tool": "edit_file", + "path": "notes.md", + "absolute_path": (tmp_path / "notes.md").resolve().as_posix(), + "phase": "start", + "added": 0, + "deleted": 2, + "approximate": True, + "status": "editing", + } + assert events[-1]["path"] == "notes.md" + assert events[-1]["status"] == "editing" + assert events[-1]["approximate"] is True + assert events[-1]["added"] == 24 + assert events[-1]["deleted"] == 2 + + +def test_streaming_tracker_applies_canonical_call_id_to_final_tool(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "name": "write_file", + "arguments_delta": '{"path":"matched.md","content":"one\\n', + }) + final = SimpleNamespace( + id="provider-final-id", + name="write_file", + arguments={"path": "matched.md", "content": "one\n"}, + ) + tracker.apply_final_call_ids([final]) + assert final.id == "idx:0" + + asyncio.run(run()) + + +def test_streaming_edit_file_tracker_flushes_small_pending_count(tmp_path: Path) -> None: + target = tmp_path / "small.py" + target.write_text("old\n", encoding="utf-8") + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-edit", + "name": "edit_file", + "arguments_delta": '{"path":"small.py","old_text":"old\\n","new_text":"new\\nextra', + }) + await tracker.flush() + + asyncio.run(run()) + assert events + assert events[-1]["path"] == "small.py" + assert events[-1]["added"] == 2 + assert events[-1]["deleted"] == 1 + + +def test_streaming_write_file_tracker_errors_unmatched_live_edits(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "call-live", + "name": "write_file", + "arguments_delta": '{"path":"aborted.md","content":"one\\n', + }) + await tracker.error_unmatched([], "Tool call did not complete.") + + asyncio.run(run()) + assert events[-1]["path"] == "aborted.md" + assert events[-1]["phase"] == "error" + assert events[-1]["status"] == "error" + + +def test_streaming_write_file_tracker_keeps_matched_final_tool_call(tmp_path: Path) -> None: + events: list[dict] = [] + + async def emit(batch: list[dict]) -> None: + events.extend(batch) + + async def run() -> None: + tracker = StreamingFileEditTracker(workspace=tmp_path, tools={}, emit=emit) + await tracker.update({ + "index": 0, + "call_id": "idx-only", + "name": "write_file", + "arguments_delta": '{"path":"matched.md","content":"one\\n', + }) + await tracker.error_unmatched([ + SimpleNamespace( + id="final-call", + name="write_file", + arguments={"path": "matched.md", "content": "one\n"}, + ) + ], "Tool call did not complete.") + + asyncio.run(run()) + assert events + assert all(event["status"] == "editing" for event in events) + + def test_untracked_tools_do_not_prepare_file_edit_tracker(tmp_path: Path) -> None: assert prepare_file_edit_tracker( call_id="call-exec", diff --git a/tests/utils/test_webui_compat_imports.py b/tests/utils/test_webui_compat_imports.py new file mode 100644 index 00000000..ccb97e28 --- /dev/null +++ b/tests/utils/test_webui_compat_imports.py @@ -0,0 +1,14 @@ +import importlib + +from nanobot.session import webui_turns +from nanobot.webui import thread_disk, transcript + + +def test_legacy_webui_utils_imports_resolve_to_new_modules() -> None: + legacy_thread_disk = importlib.import_module("nanobot.utils.webui_thread_disk") + legacy_transcript = importlib.import_module("nanobot.utils.webui_transcript") + legacy_turn_helpers = importlib.import_module("nanobot.utils.webui_turn_helpers") + + assert legacy_thread_disk.delete_webui_thread is thread_disk.delete_webui_thread + assert legacy_transcript.append_transcript_object is transcript.append_transcript_object + assert legacy_turn_helpers.mark_webui_session is webui_turns.mark_webui_session diff --git a/tests/utils/test_webui_sidebar_state.py b/tests/utils/test_webui_sidebar_state.py new file mode 100644 index 00000000..0244a304 --- /dev/null +++ b/tests/utils/test_webui_sidebar_state.py @@ -0,0 +1,73 @@ +import json + +from nanobot.webui.sidebar_state import ( + default_webui_sidebar_state, + read_webui_sidebar_state, + webui_sidebar_state_path, + write_webui_sidebar_state, +) + + +def test_sidebar_state_defaults_when_file_missing(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + + state = read_webui_sidebar_state() + + assert state == default_webui_sidebar_state() + assert webui_sidebar_state_path() == tmp_path / "webui" / "sidebar-state.json" + + +def test_sidebar_state_normalizes_old_or_partial_payload(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + path = webui_sidebar_state_path() + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text( + json.dumps( + { + "pinned_keys": ["websocket:a", "websocket:a", "", 123], + "archived_keys": ["websocket:b"], + "title_overrides": {"websocket:a": " Release notes ", "bad": ""}, + "tags_by_key": {"websocket:a": ["work", "work", ""]}, + "collapsed_groups": {"Earlier": 1}, + "view": {"density": "tiny", "show_archived": True, "sort": "nope"}, + } + ), + encoding="utf-8", + ) + + state = read_webui_sidebar_state() + + assert state["schema_version"] == 1 + assert state["pinned_keys"] == ["websocket:a"] + assert state["archived_keys"] == ["websocket:b"] + assert state["title_overrides"] == {"websocket:a": "Release notes"} + assert state["tags_by_key"] == {"websocket:a": ["work"]} + assert state["collapsed_groups"] == {"Earlier": True} + assert state["view"] == { + "density": "comfortable", + "show_previews": False, + "show_timestamps": False, + "show_archived": True, + "sort": "updated_desc", + } + + +def test_sidebar_state_write_is_scoped_to_config_data_dir(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + + state = write_webui_sidebar_state( + { + "pinned_keys": ["websocket:a"], + "archived_keys": ["websocket:b"], + "title_overrides": {"websocket:a": "Release"}, + "view": {"density": "compact", "show_previews": True}, + } + ) + + assert state["pinned_keys"] == ["websocket:a"] + assert state["archived_keys"] == ["websocket:b"] + assert state["title_overrides"] == {"websocket:a": "Release"} + assert state["view"]["density"] == "compact" + assert state["view"]["show_previews"] is True + assert webui_sidebar_state_path().is_file() + assert read_webui_sidebar_state()["pinned_keys"] == ["websocket:a"] diff --git a/tests/utils/test_webui_thread_disk.py b/tests/utils/test_webui_thread_disk.py index 36680b45..53094d65 100644 --- a/tests/utils/test_webui_thread_disk.py +++ b/tests/utils/test_webui_thread_disk.py @@ -2,8 +2,8 @@ from __future__ import annotations -from nanobot.utils.webui_thread_disk import delete_webui_thread, webui_thread_file_path -from nanobot.utils.webui_transcript import append_transcript_object, webui_transcript_path +from nanobot.webui.thread_disk import delete_webui_thread, webui_thread_file_path +from nanobot.webui.transcript import append_transcript_object, webui_transcript_path def test_delete_webui_thread_removes_legacy_json_and_transcript(tmp_path, monkeypatch) -> None: diff --git a/tests/utils/test_webui_transcript.py b/tests/utils/test_webui_transcript.py index 4ed9c132..4c2226f0 100644 --- a/tests/utils/test_webui_transcript.py +++ b/tests/utils/test_webui_transcript.py @@ -2,7 +2,7 @@ from __future__ import annotations -from nanobot.utils.webui_transcript import ( +from nanobot.webui.transcript import ( WEBUI_TRANSCRIPT_SCHEMA_VERSION, append_transcript_object, read_transcript_lines, @@ -145,8 +145,203 @@ def test_replay_tool_events_dedupes_finish_after_start() -> None: ] +def test_replay_file_edit_progress_merges_after_interleaved_activity(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + key = "websocket:t-file-progress" + for ev in ( + {"event": "user", "chat_id": "t-file-progress", "text": "edit"}, + { + "event": "message", + "chat_id": "t-file-progress", + "text": 'write_file({"path":"foo.txt"})', + "kind": "tool_hint", + }, + { + "event": "file_edit", + "chat_id": "t-file-progress", + "edits": [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "foo.txt", + "phase": "start", + "added": 12, + "deleted": 0, + "approximate": True, + "status": "editing", + }, + ], + }, + { + "event": "message", + "chat_id": "t-file-progress", + "text": "still working", + "kind": "progress", + }, + { + "event": "file_edit", + "chat_id": "t-file-progress", + "edits": [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "foo.txt", + "phase": "end", + "added": 30, + "deleted": 0, + "approximate": False, + "status": "done", + }, + ], + }, + ): + append_transcript_object(key, ev) + + msgs = replay_transcript_to_ui_messages(read_transcript_lines(key)) + file_edit_messages = [msg for msg in msgs if msg.get("fileEdits")] + + assert len(file_edit_messages) == 1 + assert file_edit_messages[0]["fileEdits"] == [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "foo.txt", + "phase": "end", + "added": 30, + "deleted": 0, + "approximate": False, + "status": "done", + }, + ] + + +def test_replay_file_edit_pending_placeholder_upgrades_to_path(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + key = "websocket:t-file-pending" + for ev in ( + {"event": "user", "chat_id": "t-file-pending", "text": "write"}, + { + "event": "file_edit", + "chat_id": "t-file-pending", + "edits": [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "", + "phase": "start", + "added": 1, + "deleted": 0, + "approximate": True, + "status": "editing", + "pending": True, + }, + ], + }, + { + "event": "file_edit", + "chat_id": "t-file-pending", + "edits": [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "foo.txt", + "phase": "start", + "added": 12, + "deleted": 0, + "approximate": True, + "status": "editing", + }, + ], + }, + ): + append_transcript_object(key, ev) + + msgs = replay_transcript_to_ui_messages(read_transcript_lines(key)) + file_edit_messages = [msg for msg in msgs if msg.get("fileEdits")] + + assert len(file_edit_messages) == 1 + assert file_edit_messages[0]["fileEdits"] == [ + { + "version": 1, + "call_id": "call-write", + "tool": "write_file", + "path": "foo.txt", + "phase": "start", + "added": 12, + "deleted": 0, + "approximate": True, + "status": "editing", + }, + ] + + +def test_replay_keeps_new_file_edit_after_reasoning_in_order(tmp_path, monkeypatch) -> None: + monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) + key = "websocket:t-file-order" + for ev in ( + {"event": "user", "chat_id": "t-file-order", "text": "edit"}, + { + "event": "file_edit", + "chat_id": "t-file-order", + "edits": [ + { + "version": 1, + "call_id": "call-one", + "tool": "write_file", + "path": "one.txt", + "phase": "start", + "added": 10, + "deleted": 0, + "approximate": True, + "status": "editing", + }, + ], + }, + {"event": "reasoning_delta", "chat_id": "t-file-order", "text": "Check next."}, + {"event": "reasoning_end", "chat_id": "t-file-order"}, + { + "event": "file_edit", + "chat_id": "t-file-order", + "edits": [ + { + "version": 1, + "call_id": "call-two", + "tool": "write_file", + "path": "two.txt", + "phase": "start", + "added": 20, + "deleted": 0, + "approximate": True, + "status": "editing", + }, + ], + }, + ): + append_transcript_object(key, ev) + + msgs = replay_transcript_to_ui_messages(read_transcript_lines(key)) + + assert [msg.get("fileEdits", [{}])[0].get("path") if msg.get("fileEdits") else msg.get("reasoning") for msg in msgs[1:]] == [ + "one.txt", + "Check next.", + "two.txt", + ] + file_edit_segments = [ + msg.get("activitySegmentId") + for msg in msgs + if msg.get("fileEdits") + ] + assert len(file_edit_segments) == 2 + assert file_edit_segments[0] != file_edit_segments[1] + + def test_build_response_schema(monkeypatch, tmp_path) -> None: - from nanobot.utils.webui_transcript import build_webui_thread_response + from nanobot.webui.transcript import build_webui_thread_response monkeypatch.setattr("nanobot.config.paths.get_data_dir", lambda: tmp_path) key = "websocket:t3" diff --git a/tests/utils/test_webui_turn_helpers.py b/tests/utils/test_webui_turn_helpers.py index f3c0b174..be01c5f4 100644 --- a/tests/utils/test_webui_turn_helpers.py +++ b/tests/utils/test_webui_turn_helpers.py @@ -5,7 +5,7 @@ from unittest.mock import AsyncMock, MagicMock import pytest from nanobot.bus.events import InboundMessage -from nanobot.utils import webui_turn_helpers as wth +from nanobot.session import webui_turns as wth @pytest.fixture(autouse=True) diff --git a/webui/package-lock.json b/webui/package-lock.json index 471d08bb..2f278a23 100644 --- a/webui/package-lock.json +++ b/webui/package-lock.json @@ -26,6 +26,7 @@ "react-markdown": "^9.0.1", "react-syntax-highlighter": "^15.6.1", "rehype-katex": "^7.0.1", + "remark-breaks": "^4.0.0", "remark-gfm": "^4.0.0", "remark-math": "^6.0.0", "tailwind-merge": "^2.6.0" @@ -3922,6 +3923,20 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/mdast-util-newline-to-break": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-newline-to-break/-/mdast-util-newline-to-break-2.0.0.tgz", + "integrity": "sha512-MbgeFca0hLYIEx/2zGsszCSEJJ1JSCdiY5xQxRcLDDGa8EPvlLPupJ4DSajbMPAnC0je8jfb9TiUATnxxrHUog==", + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-find-and-replace": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/mdast-util-phrasing": { "version": "4.1.0", "license": "MIT", @@ -5141,6 +5156,21 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/remark-breaks": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-4.0.0.tgz", + "integrity": "sha512-IjEjJOkH4FuJvHZVIW0QCDWxcG96kCq7An/KVH2NfJe6rKZU2AsHeB3OEjPNRxi4QC34Xdx7I2KGYn6IpT7gxQ==", + "license": "MIT", + "dependencies": { + "@types/mdast": "^4.0.0", + "mdast-util-newline-to-break": "^2.0.0", + "unified": "^11.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/remark-gfm": { "version": "4.0.1", "license": "MIT", diff --git a/webui/src/App.tsx b/webui/src/App.tsx index 7ff9bae2..c303446e 100644 --- a/webui/src/App.tsx +++ b/webui/src/App.tsx @@ -1,13 +1,16 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { DeleteConfirm } from "@/components/DeleteConfirm"; +import { RenameChatDialog } from "@/components/RenameChatDialog"; import { Sidebar } from "@/components/Sidebar"; +import { SessionSearchDialog } from "@/components/SessionSearchDialog"; import { SettingsView } from "@/components/settings/SettingsView"; import { ThreadShell } from "@/components/thread/ThreadShell"; -import { Sheet, SheetContent } from "@/components/ui/sheet"; +import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet"; import { useSessions } from "@/hooks/useSessions"; import { useDeferredTitleRefresh } from "@/hooks/useDeferredTitleRefresh"; +import { useSidebarState } from "@/hooks/useSidebarState"; import { ThemeProvider, useTheme } from "@/hooks/useTheme"; import { cn } from "@/lib/utils"; import { @@ -37,6 +40,7 @@ type BootState = }; const SIDEBAR_STORAGE_KEY = "nanobot-webui.sidebar"; +const COMPLETED_RUNS_STORAGE_KEY = "nanobot-webui.sidebar.completed-runs.v1"; const RESTART_STARTED_KEY = "nanobot-webui.restartStartedAt"; const SIDEBAR_WIDTH = 272; const TOKEN_REFRESH_MARGIN_MS = 30_000; @@ -121,6 +125,29 @@ function readSidebarOpen(): boolean { } } +function readCompletedRunChatIds(): Set { + if (typeof window === "undefined") return new Set(); + try { + const raw = window.localStorage.getItem(COMPLETED_RUNS_STORAGE_KEY); + const parsed = raw ? JSON.parse(raw) : []; + if (!Array.isArray(parsed)) return new Set(); + return new Set(parsed.filter((item): item is string => typeof item === "string")); + } catch { + return new Set(); + } +} + +function writeCompletedRunChatIds(chatIds: Set): void { + try { + window.localStorage.setItem( + COMPLETED_RUNS_STORAGE_KEY, + JSON.stringify(Array.from(chatIds)), + ); + } catch { + // ignore storage errors (private mode, etc.) + } +} + export default function App() { const { t } = useTranslation(); const [state, setState] = useState({ status: "loading" }); @@ -293,18 +320,28 @@ function Shell({ const { client } = useClient(); const { theme, toggle } = useTheme(); const { sessions, loading, refresh, createChat, deleteChat } = useSessions(); + const { state: sidebarState, update: updateSidebarState } = + useSidebarState(sessions, !loading); const [activeKey, setActiveKey] = useState(null); const [view, setView] = useState("chat"); const [desktopSidebarOpen, setDesktopSidebarOpen] = useState(readSidebarOpen); const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false); + const [sessionSearchOpen, setSessionSearchOpen] = useState(false); const [pendingDelete, setPendingDelete] = useState<{ key: string; label: string; } | null>(null); + const [pendingRename, setPendingRename] = useState<{ + key: string; + label: string; + } | null>(null); const restartSawDisconnectRef = useRef(false); const [restartToast, setRestartToast] = useState(null); const [isRestarting, setIsRestarting] = useState(false); + const [runningChatIds, setRunningChatIds] = useState>(() => new Set()); + const [completedChatIds, setCompletedChatIds] = useState>(readCompletedRunChatIds); + const runningChatIdsRef = useRef>(new Set()); useEffect(() => { try { @@ -317,12 +354,58 @@ function Shell({ } }, [desktopSidebarOpen]); - + useEffect(() => { + writeCompletedRunChatIds(completedChatIds); + }, [completedChatIds]); const activeSession = useMemo(() => { if (!activeKey) return null; return sessions.find((s) => s.key === activeKey) ?? null; }, [sessions, activeKey]); + const runningChatIdList = useMemo(() => Array.from(runningChatIds), [runningChatIds]); + const completedChatIdList = useMemo(() => Array.from(completedChatIds), [completedChatIds]); + + useEffect(() => { + if (loading) return; + const knownChatIds = new Set(sessions.map((session) => session.chatId)); + setCompletedChatIds((current) => { + const next = new Set( + Array.from(current).filter((chatId) => knownChatIds.has(chatId)), + ); + return next.size === current.size ? current : next; + }); + }, [loading, sessions]); + + useEffect(() => { + if (loading) return; + const activeRunIds = sessions + .filter((session) => typeof session.runStartedAt === "number") + .map((session) => session.chatId); + if (activeRunIds.length === 0) return; + + for (const chatId of activeRunIds) { + client.attach(chatId); + } + setRunningChatIds((current) => { + let changed = false; + const next = new Set(current); + for (const chatId of activeRunIds) { + if (!next.has(chatId)) changed = true; + next.add(chatId); + } + if (!changed) return current; + runningChatIdsRef.current = next; + return next; + }); + setCompletedChatIds((current) => { + let changed = false; + const next = new Set(current); + for (const chatId of activeRunIds) { + if (next.delete(chatId)) changed = true; + } + return changed ? next : current; + }); + }, [client, loading, sessions]); const closeDesktopSidebar = useCallback(() => { setDesktopSidebarOpen(false); @@ -364,14 +447,129 @@ function Shell({ const onSelectChat = useCallback( (key: string) => { + const selectedChatId = sessions.find((session) => session.key === key)?.chatId; + if (selectedChatId) { + setCompletedChatIds((current) => { + if (!current.has(selectedChatId)) return current; + const next = new Set(current); + next.delete(selectedChatId); + return next; + }); + } setActiveKey(key); setView("chat"); setMobileSidebarOpen(false); }, - [], + [sessions], + ); + + const onTogglePin = useCallback( + (key: string) => { + void updateSidebarState((current) => { + const pinned = new Set(current.pinned_keys); + if (pinned.has(key)) { + pinned.delete(key); + } else { + pinned.add(key); + } + return { + ...current, + pinned_keys: Array.from(pinned), + }; + }); + }, + [updateSidebarState], + ); + + const onRequestRename = useCallback((key: string, label: string) => { + setPendingRename({ key, label }); + }, []); + + const onConfirmRename = useCallback( + (title: string) => { + if (!pendingRename) return; + const key = pendingRename.key; + setPendingRename(null); + void updateSidebarState((current) => { + const titleOverrides = { ...current.title_overrides }; + const cleaned = title.trim(); + if (cleaned) { + titleOverrides[key] = cleaned; + } else { + delete titleOverrides[key]; + } + return { + ...current, + title_overrides: titleOverrides, + }; + }); + }, + [pendingRename, updateSidebarState], + ); + + const onToggleArchive = useCallback( + (key: string) => { + void updateSidebarState((current) => { + const archived = new Set(current.archived_keys); + const pinned = current.pinned_keys.filter((item) => item !== key); + if (archived.has(key)) { + archived.delete(key); + } else { + archived.add(key); + } + return { + ...current, + pinned_keys: pinned, + archived_keys: Array.from(archived), + }; + }); + if (activeKey === key && !sidebarState.archived_keys.includes(key)) { + const archived = new Set([...sidebarState.archived_keys, key]); + const next = sessions.find((session) => !archived.has(session.key)); + setActiveKey(next?.key ?? null); + } + }, + [activeKey, sessions, sidebarState.archived_keys, updateSidebarState], + ); + + const onToggleArchived = useCallback(() => { + void updateSidebarState((current) => ({ + ...current, + view: { + ...current.view, + show_archived: !current.view.show_archived, + }, + })); + }, [updateSidebarState]); + + const onUpdateSidebarView = useCallback( + (viewUpdate: Partial) => { + void updateSidebarState((current) => ({ + ...current, + view: { + ...current.view, + ...viewUpdate, + }, + })); + }, + [updateSidebarState], + ); + + const onOpenSessionSearch = useCallback(() => { + setMobileSidebarOpen(false); + setSessionSearchOpen(true); + }, []); + + const onSelectSearchResult = useCallback( + (key: string) => { + setSessionSearchOpen(false); + onSelectChat(key); + }, + [onSelectChat], ); const onOpenSettings = useCallback(() => { + setSessionSearchOpen(false); setView("settings"); setMobileSidebarOpen(false); }, []); @@ -405,6 +603,35 @@ function Shell({ }); }, [client, onModelNameChange]); + useEffect(() => { + return client.onRunStatus((chatId, startedAt) => { + if (startedAt != null) { + const nextRunning = new Set(runningChatIdsRef.current); + nextRunning.add(chatId); + runningChatIdsRef.current = nextRunning; + setRunningChatIds(nextRunning); + setCompletedChatIds((current) => { + if (!current.has(chatId)) return current; + const next = new Set(current); + next.delete(chatId); + return next; + }); + return; + } + + if (!runningChatIdsRef.current.has(chatId)) return; + const nextRunning = new Set(runningChatIdsRef.current); + nextRunning.delete(chatId); + runningChatIdsRef.current = nextRunning; + setRunningChatIds(nextRunning); + setCompletedChatIds((current) => { + const next = new Set(current); + next.add(chatId); + return next; + }); + }); + }, [client]); + useEffect(() => { return client.onStatus((status) => { let startedAt = 0; @@ -452,7 +679,8 @@ function Shell({ }, [pendingDelete, deleteChat, activeKey, sessions]); const headerTitle = activeSession - ? activeSession.title || + ? sidebarState.title_overrides[activeSession.key] || + activeSession.title || deriveTitle(activeSession.preview, t("chat.newChat")) : t("app.brand"); @@ -476,7 +704,21 @@ function Shell({ onSelect: onSelectChat, onRequestDelete: (key: string, label: string) => setPendingDelete({ key, label }), + onTogglePin, + onRequestRename, + onToggleArchive, onOpenSettings, + onOpenSearch: onOpenSessionSearch, + onToggleArchived, + onUpdateView: onUpdateSidebarView, + pinnedKeys: sidebarState.pinned_keys, + archivedKeys: sidebarState.archived_keys, + titleOverrides: sidebarState.title_overrides, + runningChatIds: runningChatIdList, + completedChatIds: completedChatIdList, + viewState: sidebarState.view, + showArchived: sidebarState.view.show_archived, + archivedCount: sidebarState.archived_keys.length, }; const showMainSidebar = view !== "settings"; @@ -513,14 +755,32 @@ function Shell({ - + {t("sidebar.navigation")} + ) : null} + {showMainSidebar ? ( + + ) : null} +
setPendingDelete(null)} onConfirm={onConfirmDelete} /> + setPendingRename(null)} + onConfirm={onConfirmRename} + /> {restartToast ? (
void; onRequestDelete: (key: string, label: string) => void; + onTogglePin: (key: string) => void; + onRequestRename: (key: string, label: string) => void; + onToggleArchive: (key: string) => void; + pinnedKeys?: string[]; + archivedKeys?: string[]; + titleOverrides?: Record; + runningChatIds?: string[]; + completedChatIds?: string[]; + density?: SidebarDensity; + showPreviews?: boolean; + showTimestamps?: boolean; + sort?: SidebarSortMode; + showArchived?: boolean; + actionMenuPortalContainer?: HTMLElement | null; loading?: boolean; emptyLabel?: string; } @@ -25,6 +47,20 @@ export function ChatList({ activeKey, onSelect, onRequestDelete, + onTogglePin, + onRequestRename, + onToggleArchive, + pinnedKeys = [], + archivedKeys = [], + titleOverrides = {}, + runningChatIds = [], + completedChatIds = [], + density = "comfortable", + showPreviews = false, + showTimestamps = false, + sort = "updated_desc", + showArchived = false, + actionMenuPortalContainer, loading, emptyLabel, }: ChatListProps) { @@ -46,10 +82,25 @@ export function ChatList({ } const groups = groupSessions(sessions, { + pinned: t("chat.groups.pinned"), + all: t("chat.groups.all"), today: t("chat.groups.today"), yesterday: t("chat.groups.yesterday"), earlier: t("chat.groups.earlier"), + archived: t("chat.groups.archived"), + fallbackTitle: t("chat.newChat"), + }, { + pinnedKeys, + archivedKeys, + titleOverrides, + showArchived, + sort, }); + const pinned = new Set(pinnedKeys); + const archived = new Set(archivedKeys); + const running = new Set(runningChatIds); + const completed = new Set(completedChatIds); + const compact = density === "compact"; return (
@@ -66,15 +117,29 @@ export function ChatList({ id: s.chatId.slice(0, 6), }); const generatedTitle = s.title?.trim() || ""; - const title = - generatedTitle || deriveTitle(s.preview, t("chat.newChat")); + const title = displayTitle(s, titleOverrides, t("chat.newChat")); const tooltipTitle = - generatedTitle || deriveTitle(s.preview, fallbackTitle); + titleOverrides[s.key]?.trim() || + generatedTitle || + deriveTitle(s.preview, fallbackTitle); + const isPinned = pinned.has(s.key); + const isArchived = archived.has(s.key); + const preview = s.preview.trim(); + const showPreview = showPreviews && preview && preview !== title; + const timestamp = showTimestamps + ? relativeTime(s.updatedAt ?? s.createdAt) + : ""; + const activityState = running.has(s.chatId) + ? "running" + : completed.has(s.chatId) + ? "complete" + : null; return (
  • onSelect(s.key)} title={tooltipTitle} - className="min-w-0 flex-1 overflow-hidden py-1.5 text-left" + className={cn( + "min-w-0 flex-1 overflow-hidden text-left", + compact ? "py-1" : "py-1.5", + )} > {title} + {showPreview ? ( + + {preview} + + ) : null} + {timestamp ? ( + + {timestamp} + + ) : null} + event.preventDefault()} > + onTogglePin(s.key)} + > + {isPinned ? ( + + ) : ( + + )} + {isPinned ? t("chat.unpin") : t("chat.pin")} + + onRequestRename(s.key, title)} + > + + {t("chat.rename")} + + onToggleArchive(s.key)} + > + {isArchived ? ( + + ) : ( + + )} + {isArchived ? t("chat.unarchive") : t("chat.archive")} + { window.setTimeout(() => onRequestDelete(s.key, title), 0); @@ -127,16 +233,85 @@ export function ChatList({ ); } +function SessionActivityIndicator({ + state, +}: { + state: "running" | "complete" | null; +}) { + const { t } = useTranslation(); + + if (state === "running") { + const label = t("chat.activity.running"); + return ( + + + + ); + } + + if (state === "complete") { + const label = t("chat.activity.complete"); + return ( + + + + ); + } + + return @@ -79,7 +89,7 @@ export function FileReferenceChip({ "shadow-lg backdrop-blur", )} > - {path} + {fullPath} diff --git a/webui/src/components/RenameChatDialog.tsx b/webui/src/components/RenameChatDialog.tsx new file mode 100644 index 00000000..c9e334b2 --- /dev/null +++ b/webui/src/components/RenameChatDialog.tsx @@ -0,0 +1,75 @@ +import { useEffect, useState } from "react"; +import { useTranslation } from "react-i18next"; + +import { Button } from "@/components/ui/button"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from "@/components/ui/dialog"; +import { Input } from "@/components/ui/input"; + +interface RenameChatDialogProps { + open: boolean; + title: string; + onCancel: () => void; + onConfirm: (title: string) => void; +} + +export function RenameChatDialog({ + open, + title, + onCancel, + onConfirm, +}: RenameChatDialogProps) { + const { t } = useTranslation(); + const [value, setValue] = useState(title); + + useEffect(() => { + if (open) setValue(title); + }, [open, title]); + + const trimmed = value.trim(); + + return ( + { + if (!next) onCancel(); + }}> + +
    { + event.preventDefault(); + if (!trimmed) return; + onConfirm(trimmed); + }} + > + + {t("chat.renameTitle")} + + {t("chat.renameDescription")} + + + setValue(event.target.value)} + placeholder={t("chat.renamePlaceholder")} + autoFocus + maxLength={160} + /> + + + + +
    +     +     + ); +} diff --git a/webui/src/components/SessionSearchDialog.tsx b/webui/src/components/SessionSearchDialog.tsx new file mode 100644 index 00000000..3ddea067 --- /dev/null +++ b/webui/src/components/SessionSearchDialog.tsx @@ -0,0 +1,213 @@ +import { type KeyboardEvent, useEffect, useMemo, useRef, useState } from "react"; +import { Search } from "lucide-react"; +import { useTranslation } from "react-i18next"; + +import { + Dialog, + DialogContent, + DialogDescription, + DialogTitle, +} from "@/components/ui/dialog"; +import { deriveTitle } from "@/lib/format"; +import { cn } from "@/lib/utils"; +import type { ChatSummary } from "@/lib/types"; + +interface SessionSearchDialogProps { + open: boolean; + sessions: ChatSummary[]; + activeKey: string | null; + loading: boolean; + titleOverrides?: Record; + onOpenChange: (open: boolean) => void; + onSelect: (key: string) => void; +} + +export function SessionSearchDialog({ + open, + sessions, + activeKey, + loading, + titleOverrides = {}, + onOpenChange, + onSelect, +}: SessionSearchDialogProps) { + const { t } = useTranslation(); + const inputRef = useRef(null); + const [query, setQuery] = useState(""); + const [highlightedIndex, setHighlightedIndex] = useState(0); + + const normalizedQuery = query.trim().toLowerCase(); + const results = useMemo(() => { + if (!normalizedQuery) return sessions; + const terms = normalizedQuery.split(/\s+/).filter(Boolean); + return sessions.filter((session) => + sessionMatchesTerms(session, terms, titleOverrides[session.key]), + ); + }, [normalizedQuery, sessions, titleOverrides]); + + useEffect(() => { + if (!open) return; + setQuery(""); + setHighlightedIndex(0); + window.setTimeout(() => inputRef.current?.focus(), 0); + }, [open]); + + useEffect(() => { + setHighlightedIndex(0); + }, [normalizedQuery]); + + useEffect(() => { + setHighlightedIndex((index) => + results.length === 0 ? 0 : Math.min(index, results.length - 1), + ); + }, [results.length]); + + const handleSelect = (key: string) => { + onOpenChange(false); + onSelect(key); + }; + + const handleKeyDown = (event: KeyboardEvent) => { + if (event.key === "ArrowDown") { + event.preventDefault(); + setHighlightedIndex((index) => + results.length === 0 ? 0 : Math.min(index + 1, results.length - 1), + ); + return; + } + if (event.key === "ArrowUp") { + event.preventDefault(); + setHighlightedIndex((index) => Math.max(index - 1, 0)); + return; + } + if (event.key === "Enter") { + const highlighted = results[highlightedIndex]; + if (!highlighted) return; + event.preventDefault(); + handleSelect(highlighted.key); + } + }; + + const emptyLabel = normalizedQuery + ? t("sidebar.noSearchResults") + : t("chat.noSessions"); + const sectionLabel = normalizedQuery + ? t("sidebar.searchResults") + : t("sidebar.recent"); + + if (!open) return null; + + return ( + + + {t("sidebar.searchAria")} + + {t("sidebar.searchPlaceholder")} + +
    + + setQuery(event.target.value)} + onKeyDown={handleKeyDown} + placeholder={t("sidebar.searchPlaceholder")} + aria-label={t("sidebar.searchAria")} + className="h-full min-w-0 flex-1 bg-transparent text-[15px] font-medium text-foreground outline-none placeholder:text-muted-foreground/75" + /> +
    + +
    +
    + {sectionLabel} +
    + + {loading && sessions.length === 0 ? ( +
    + {t("chat.loading")} +
    + ) : results.length === 0 ? ( +
    + {emptyLabel} +
    + ) : ( +
      + {results.map((session, index) => { + const title = titleOverrides[session.key]?.trim() || + session.title?.trim() || + deriveTitle(session.preview, t("chat.newChat")); + const preview = session.preview.trim(); + const showPreview = + preview.length > 0 && + preview.toLowerCase() !== title.trim().toLowerCase(); + const highlighted = index === highlightedIndex; + const active = session.key === activeKey; + return ( +
    • + +
      • + ); + })} +
    + )} +
    +     +     + ); +} + +function sessionMatchesTerms( + session: ChatSummary, + terms: string[], + titleOverride?: string, +) { + const haystack = [ + titleOverride, + session.title, + session.preview, + ] + .filter(Boolean) + .join(" ") + .toLowerCase(); + + return terms.every((term) => haystack.includes(term)); +} diff --git a/webui/src/components/Sidebar.tsx b/webui/src/components/Sidebar.tsx index cd55475f..53acfc3a 100644 --- a/webui/src/components/Sidebar.tsx +++ b/webui/src/components/Sidebar.tsx @@ -1,5 +1,7 @@ -import { useMemo, useState } from "react"; +import { useState } from "react"; import { + Archive, + ListFilter, Menu, Search, Settings, @@ -10,9 +12,22 @@ import { useTranslation } from "react-i18next"; import { ChatList } from "@/components/ChatList"; import { ConnectionBadge } from "@/components/ConnectionBadge"; import { Button } from "@/components/ui/button"; +import { + DropdownMenu, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuLabel, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuSeparator, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; import { Separator } from "@/components/ui/separator"; -import { cn } from "@/lib/utils"; -import type { ChatSummary } from "@/lib/types"; +import type { + ChatSummary, + SidebarSortMode, + SidebarViewState, +} from "@/lib/types"; interface SidebarProps { sessions: ChatSummary[]; @@ -21,34 +36,33 @@ interface SidebarProps { onNewChat: () => void; onSelect: (key: string) => void; onRequestDelete: (key: string, label: string) => void; + onTogglePin: (key: string) => void; + onRequestRename: (key: string, label: string) => void; + onToggleArchive: (key: string) => void; onOpenSettings: () => void; + onOpenSearch: () => void; + onToggleArchived: () => void; + onUpdateView: (view: Partial) => void; onCollapse: () => void; + containActionMenus?: boolean; + pinnedKeys?: string[]; + archivedKeys?: string[]; + titleOverrides?: Record; + runningChatIds?: string[]; + completedChatIds?: string[]; + viewState?: SidebarViewState; + showArchived?: boolean; + archivedCount?: number; } export function Sidebar(props: SidebarProps) { const { t } = useTranslation(); - const [query, setQuery] = useState(""); - const normalizedQuery = query.trim().toLowerCase(); - const filteredSessions = useMemo(() => { - if (!normalizedQuery) return props.sessions; - const terms = normalizedQuery.split(/\s+/).filter(Boolean); - return props.sessions.filter((session) => { - const haystack = [ - session.title, - session.preview, - session.chatId, - session.channel, - session.key, - ] - .filter(Boolean) - .join(" ") - .toLowerCase(); - return terms.every((term) => haystack.includes(term)); - }); - }, [normalizedQuery, props.sessions]); + const [menuPortalContainer, setMenuPortalContainer] = + useState(null); return (
    - + + + {props.archivedCount ? ( + + ) : null}
    @@ -132,3 +163,83 @@ export function Sidebar(props: SidebarProps) { ); } + +function SidebarViewMenu({ + view, + onUpdateView, +}: { + view?: SidebarViewState; + onUpdateView: (view: Partial) => void; +}) { + const { t } = useTranslation(); + const sort = view?.sort ?? "updated_desc"; + const setSort = (value: string) => { + if (isSidebarSortMode(value)) onUpdateView({ sort: value }); + }; + + return ( + + + + + + + {t("sidebar.viewOptions")} + + + onUpdateView({ density: checked ? "compact" : "comfortable" }) + } + onSelect={(event) => event.preventDefault()} + > + {t("sidebar.compactList")} + + + onUpdateView({ show_previews: Boolean(checked) }) + } + onSelect={(event) => event.preventDefault()} + > + {t("sidebar.showPreviews")} + + + onUpdateView({ show_timestamps: Boolean(checked) }) + } + onSelect={(event) => event.preventDefault()} + > + {t("sidebar.showTimestamps")} + + + + {t("sidebar.sortLabel")} + + + + {t("sidebar.sortUpdated")} + + + {t("sidebar.sortCreated")} + + + {t("sidebar.sortTitle")} + + + + + ); +} + +function isSidebarSortMode(value: string): value is SidebarSortMode { + return value === "updated_desc" || value === "created_desc" || value === "title_asc"; +} diff --git a/webui/src/components/settings/SettingsView.tsx b/webui/src/components/settings/SettingsView.tsx index 116b67d6..d4a47c1f 100644 --- a/webui/src/components/settings/SettingsView.tsx +++ b/webui/src/components/settings/SettingsView.tsx @@ -1,27 +1,45 @@ -import { useCallback, useEffect, useMemo, useState, type Dispatch, type ReactNode, type SetStateAction } from "react"; import { + useCallback, + useEffect, + useMemo, + useState, + type Dispatch, + type ReactNode, + type SetStateAction, +} from "react"; +import { + Activity, Bot, Brain, - ChevronLeft, - ChevronDown, Check, + ChevronDown, + ChevronLeft, + ChevronRight, Cloud, Cpu, Database, Eye, EyeOff, - Pencil, Gem, + Globe2, Grid3X3, + HardDrive, Hexagon, - Loader2, - LogOut, + ImageIcon, + Info, KeyRound, Layers, + Loader2, + LogOut, Moon, Orbit, + Palette, + Pencil, RotateCcw, - Settings, + Search, + Server, + ShieldCheck, + SlidersHorizontal, Sparkles, Triangle, Waves, @@ -41,16 +59,58 @@ import { import { Input } from "@/components/ui/input"; import { fetchSettings, + updateImageGenerationSettings, updateProviderSettings, updateSettings, updateWebSearchSettings, } from "@/lib/api"; import { cn } from "@/lib/utils"; import { useClient } from "@/providers/ClientProvider"; -import type { SettingsPayload, WebSearchSettingsUpdate } from "@/lib/types"; +import type { + ImageGenerationSettingsUpdate, + SettingsPayload, + WebSearchSettingsUpdate, +} from "@/lib/types"; -type SettingsSectionKey = "general" | "byok"; -type ByokPaneKey = "llm" | "web-search"; +type SettingsSectionKey = + | "overview" + | "appearance" + | "models" + | "providers" + | "image" + | "web" + | "runtime" + | "advanced"; + +type LocalDensity = "comfortable" | "compact"; +type LocalActivityMode = "auto" | "expanded"; + +interface LocalPreferences { + density: LocalDensity; + activityMode: LocalActivityMode; + codeWrap: boolean; +} + +interface AgentSettingsDraft { + model: string; + provider: string; + modelPreset: string; + timezone: string; + botName: string; + botIcon: string; + toolHintMaxLength: number; +} + +type PendingRestartSection = "runtime" | "web" | "image"; +type PendingRestartSections = Record; + +const LOCAL_PREFS_STORAGE_KEY = "nanobot-webui.settings-preferences"; + +const DEFAULT_LOCAL_PREFS: LocalPreferences = { + density: "comfortable", + activityMode: "auto", + codeWrap: true, +}; const LOCAL_UNCONFIGURED_PROVIDER_ORDER = new Map( ["vllm", "ollama", "lm_studio", "atomic_chat", "ovms"].map((name, index) => [ @@ -59,6 +119,14 @@ const LOCAL_UNCONFIGURED_PROVIDER_ORDER = new Map( ]), ); +const IMAGE_ASPECT_RATIO_OPTIONS = ["1:1", "3:4", "9:16", "4:3", "16:9", "3:2", "2:3", "21:9"]; +const IMAGE_SIZE_OPTIONS = ["1K", "2K", "4K", "1024x1024", "1536x1024", "1024x1536"]; +const EMPTY_PENDING_RESTART_SECTIONS: PendingRestartSections = { + runtime: false, + web: false, + image: false, +}; + interface SettingsViewProps { theme: "light" | "dark"; onToggleTheme: () => void; @@ -69,6 +137,34 @@ interface SettingsViewProps { isRestarting?: boolean; } +function readLocalPreferences(): LocalPreferences { + try { + const raw = window.localStorage.getItem(LOCAL_PREFS_STORAGE_KEY); + if (!raw) return DEFAULT_LOCAL_PREFS; + const parsed = JSON.parse(raw) as Partial; + return { + density: parsed.density === "compact" ? "compact" : "comfortable", + activityMode: parsed.activityMode === "expanded" ? "expanded" : "auto", + codeWrap: parsed.codeWrap !== false, + }; + } catch { + return DEFAULT_LOCAL_PREFS; + } +} + +function modelPresetValue(payload: SettingsPayload): string { + return payload.agent.model_preset || "default"; +} + +function defaultPreset(payload: SettingsPayload): SettingsPayload["model_presets"][number] | null { + return payload.model_presets.find((preset) => preset.is_default) ?? null; +} + +function editableDefaultProvider(payload: SettingsPayload): string { + const base = defaultPreset(payload); + return base?.provider ?? payload.agent.provider ?? payload.agent.resolved_provider ?? ""; +} + export function SettingsView({ theme, onToggleTheme, @@ -85,35 +181,87 @@ export function SettingsView({ const [saving, setSaving] = useState(false); const [providerSaving, setProviderSaving] = useState(null); const [webSearchSaving, setWebSearchSaving] = useState(false); + const [imageGenerationSaving, setImageGenerationSaving] = useState(false); const [error, setError] = useState(null); - const [activeSection, setActiveSection] = useState("general"); + const [activeSection, setActiveSection] = useState("overview"); const [expandedProvider, setExpandedProvider] = useState(null); + const [providerQuery, setProviderQuery] = useState(""); const [providerForms, setProviderForms] = useState>({}); const [visibleProviderKeys, setVisibleProviderKeys] = useState>({}); const [editingProviderKeys, setEditingProviderKeys] = useState>({}); + const [pendingRestartSections, setPendingRestartSections] = useState( + EMPTY_PENDING_RESTART_SECTIONS, + ); + const [localPrefs, setLocalPrefs] = useState(() => readLocalPreferences()); const [webSearchForm, setWebSearchForm] = useState({ provider: "duckduckgo", apiKey: "", baseUrl: "", + maxResults: 5, + timeout: 30, + useJinaReader: true, + }); + const [imageGenerationForm, setImageGenerationForm] = useState({ + enabled: false, + provider: "openrouter", + model: "openai/gpt-5.4-image-2", + defaultAspectRatio: "1:1", + defaultImageSize: "1K", + maxImagesPerTurn: 4, }); const [webSearchKeyVisible, setWebSearchKeyVisible] = useState(false); const [webSearchKeyEditing, setWebSearchKeyEditing] = useState(false); - const [form, setForm] = useState({ + const [form, setForm] = useState({ model: "", provider: "", + modelPreset: "default", + timezone: "UTC", + botName: "nanobot", + botIcon: "", + toolHintMaxLength: 40, }); + const text = useCallback( + (key: string, fallback: string, options?: Record) => + t(key, { defaultValue: fallback, ...(options ?? {}) }), + [t], + ); + const applyPayload = useCallback((payload: SettingsPayload) => { + const fallbackDefault = defaultPreset(payload); setSettings(payload); setForm({ - model: payload.agent.model, - provider: payload.agent.provider, + model: fallbackDefault?.model ?? payload.agent.model, + provider: editableDefaultProvider(payload), + modelPreset: modelPresetValue(payload), + timezone: payload.agent.timezone, + botName: payload.agent.bot_name, + botIcon: payload.agent.bot_icon, + toolHintMaxLength: payload.agent.tool_hint_max_length, }); setWebSearchForm((prev) => ({ provider: payload.web_search.provider, apiKey: prev.provider === payload.web_search.provider ? prev.apiKey ?? "" : "", baseUrl: payload.web_search.base_url ?? "", + maxResults: payload.web_search.max_results, + timeout: payload.web_search.timeout, + useJinaReader: payload.web.fetch.use_jina_reader, })); + setImageGenerationForm({ + enabled: payload.image_generation.enabled, + provider: payload.image_generation.provider, + model: payload.image_generation.model, + defaultAspectRatio: payload.image_generation.default_aspect_ratio, + defaultImageSize: payload.image_generation.default_image_size, + maxImagesPerTurn: payload.image_generation.max_images_per_turn, + }); + if (payload.restart_required_sections) { + setPendingRestartSections({ + runtime: payload.restart_required_sections.includes("runtime"), + web: payload.restart_required_sections.includes("web"), + image: payload.restart_required_sections.includes("image"), + }); + } }, []); useEffect(() => { @@ -137,6 +285,14 @@ export function SettingsView({ }; }, [applyPayload, token]); + useEffect(() => { + try { + window.localStorage.setItem(LOCAL_PREFS_STORAGE_KEY, JSON.stringify(localPrefs)); + } catch { + // Browser-only preferences should never block settings. + } + }, [localPrefs]); + useEffect(() => { if (!settings) return; setProviderForms((prev) => { @@ -151,21 +307,59 @@ export function SettingsView({ }); }, [settings]); - const dirty = useMemo(() => { + const modelDirty = useMemo(() => { if (!settings) return false; + const preset = modelPresetValue(settings); + const base = defaultPreset(settings); return ( - form.model !== settings.agent.model || - form.provider !== settings.agent.provider + form.modelPreset !== preset || + (form.modelPreset === "default" && + (form.model !== (base?.model ?? settings.agent.model) || + form.provider !== editableDefaultProvider(settings))) ); }, [form, settings]); - const save = async () => { - if (!dirty || saving) return; + const runtimeDirty = useMemo(() => { + if (!settings) return false; + return ( + form.timezone !== settings.agent.timezone || + form.botName !== settings.agent.bot_name || + form.botIcon !== settings.agent.bot_icon || + form.toolHintMaxLength !== settings.agent.tool_hint_max_length + ); + }, [form, settings]); + + const imageGenerationDirty = useMemo(() => { + if (!settings) return false; + return ( + imageGenerationForm.enabled !== settings.image_generation.enabled || + imageGenerationForm.provider !== settings.image_generation.provider || + imageGenerationForm.model !== settings.image_generation.model || + imageGenerationForm.defaultAspectRatio !== settings.image_generation.default_aspect_ratio || + imageGenerationForm.defaultImageSize !== settings.image_generation.default_image_size || + imageGenerationForm.maxImagesPerTurn !== settings.image_generation.max_images_per_turn + ); + }, [imageGenerationForm, settings]); + + const hasPendingRestart = useMemo( + () => + !!settings?.requires_restart || + pendingRestartSections.runtime || + pendingRestartSections.web || + pendingRestartSections.image, + [pendingRestartSections, settings?.requires_restart], + ); + + const saveModelSettings = async () => { + if (!settings || !modelDirty || saving) return; setSaving(true); try { + const defaultModel = defaultPreset(settings)?.model ?? settings.agent.model; + const defaultProvider = editableDefaultProvider(settings); const payload = await updateSettings(token, { - model: form.model, - ...(form.provider ? { provider: form.provider } : {}), + modelPreset: form.modelPreset, + ...(form.modelPreset === "default" && form.model !== defaultModel ? { model: form.model } : {}), + ...(form.modelPreset === "default" && form.provider !== defaultProvider ? { provider: form.provider } : {}), }); applyPayload(payload); onModelNameChange(payload.agent.model || null); @@ -177,6 +371,45 @@ export function SettingsView({ } }; + const saveRuntimeSettings = async () => { + if (!settings || !runtimeDirty || saving) return; + setSaving(true); + try { + const payload = await updateSettings(token, { + timezone: form.timezone, + botName: form.botName, + botIcon: form.botIcon, + toolHintMaxLength: form.toolHintMaxLength, + }); + applyPayload(payload); + if (payload.requires_restart) { + setPendingRestartSections((prev) => ({ ...prev, runtime: true })); + } + setError(null); + } catch (err) { + setError((err as Error).message); + } finally { + setSaving(false); + } + }; + + const saveImageGenerationSettings = async () => { + if (!settings || !imageGenerationDirty || imageGenerationSaving) return; + setImageGenerationSaving(true); + try { + const payload = await updateImageGenerationSettings(token, imageGenerationForm); + applyPayload(payload); + if (payload.requires_restart) { + setPendingRestartSections((prev) => ({ ...prev, image: true })); + } + setError(null); + } catch (err) { + setError((err as Error).message); + } finally { + setImageGenerationSaving(false); + } + }; + const saveProvider = async (providerName: string) => { if (providerSaving) return; const provider = settings?.providers.find((item) => item.name === providerName); @@ -196,6 +429,9 @@ export function SettingsView({ apiBase: providerForm.apiBase.trim(), }); applyPayload(payload); + if (payload.requires_restart) { + setPendingRestartSections((prev) => ({ ...prev, image: true })); + } setProviderForms((prev) => ({ ...prev, [providerName]: { @@ -235,15 +471,29 @@ export function SettingsView({ setWebSearchSaving(true); try { - const update: WebSearchSettingsUpdate = { provider: webSearchForm.provider }; + const webFetchRestartRequired = + (webSearchForm.useJinaReader ?? settings.web.fetch.use_jina_reader) !== + settings.web.fetch.use_jina_reader; + const update: WebSearchSettingsUpdate = { + provider: webSearchForm.provider, + maxResults: webSearchForm.maxResults, + timeout: webSearchForm.timeout, + useJinaReader: webSearchForm.useJinaReader, + }; if (provider.credential === "api_key" && apiKey) update.apiKey = apiKey; if (provider.credential === "base_url") update.baseUrl = baseUrl; const payload = await updateWebSearchSettings(token, update); applyPayload(payload); + if (payload.requires_restart || webFetchRestartRequired) { + setPendingRestartSections((prev) => ({ ...prev, web: true })); + } setWebSearchForm((prev) => ({ provider: payload.web_search.provider, apiKey: "", baseUrl: payload.web_search.base_url ?? prev.baseUrl ?? "", + maxResults: payload.web_search.max_results, + timeout: payload.web_search.timeout, + useJinaReader: payload.web.fetch.use_jina_reader, })); setWebSearchKeyVisible(false); setWebSearchKeyEditing(false); @@ -280,6 +530,9 @@ export function SettingsView({ provider: settings.web_search.provider, apiKey: "", baseUrl: settings.web_search.base_url ?? "", + maxResults: settings.web_search.max_results, + timeout: settings.web_search.timeout, + useJinaReader: settings.web.fetch.use_jina_reader, }); setWebSearchKeyVisible(false); setWebSearchKeyEditing(false); @@ -287,11 +540,14 @@ export function SettingsView({ const handleWebSearchProviderChange = useCallback((provider: string) => { if (!settings) return; - setWebSearchForm({ + setWebSearchForm((prev) => ({ provider, apiKey: "", baseUrl: provider === settings.web_search.provider ? settings.web_search.base_url ?? "" : "", - }); + maxResults: prev.maxResults ?? settings.web_search.max_results, + timeout: prev.timeout ?? settings.web_search.timeout, + useJinaReader: prev.useJinaReader ?? settings.web.fetch.use_jina_reader, + })); setWebSearchKeyVisible(false); setWebSearchKeyEditing(false); }, [settings]); @@ -318,8 +574,132 @@ export function SettingsView({ }); }; + const renderSection = () => { + if (!settings) return null; + switch (activeSection) { + case "overview": + return ( + + ); + case "appearance": + return ( + + ); + case "models": + return ( + setActiveSection("providers")} + /> + ); + case "providers": + return ( + + setProviderForms((prev) => ({ + ...prev, + [provider]: { + apiKey: prev[provider]?.apiKey ?? "", + apiBase: prev[provider]?.apiBase ?? "", + ...value, + }, + })) + } + onSaveProvider={saveProvider} + onResetProviderDraft={resetProviderDraft} + imageProviderRestartPending={pendingRestartSections.image} + onRestart={onRestart} + isRestarting={isRestarting} + /> + ); + case "image": + return ( + setActiveSection("providers")} + onRestart={onRestart} + isRestarting={isRestarting} + requiresRestartPending={pendingRestartSections.image} + /> + ); + case "web": + return ( + setWebSearchKeyVisible((visible) => !visible)} + onToggleKeyEditing={() => { + setWebSearchKeyEditing((editing) => !editing); + setWebSearchKeyVisible(false); + setWebSearchForm((prev) => ({ ...prev, apiKey: "" })); + }} + onReset={resetWebSearchDraft} + onSave={saveWebSearch} + onRestart={onRestart} + isRestarting={isRestarting} + requiresRestartPending={pendingRestartSections.web} + /> + ); + case "runtime": + return ( + + ); + case "advanced": + return ; + default: + return null; + } + }; + return ( -
    +
    -
    -
    +
    +

    {t("settings.sidebar.title")}

    -

    - {t(`settings.nav.${activeSection}`)} +

    + {text(`settings.nav.${activeSection}`, titleForSection(activeSection))}

    @@ -356,59 +736,7 @@ export function SettingsView({ {error}
    ) : null} - {activeSection === "general" ? ( - setActiveSection("byok")} - /> - ) : ( - - setProviderForms((prev) => ({ - ...prev, - [provider]: { - apiKey: prev[provider]?.apiKey ?? "", - apiBase: prev[provider]?.apiBase ?? "", - ...value, - }, - })) - } - onSaveProvider={saveProvider} - onChangeWebSearchForm={setWebSearchForm} - onChangeWebSearchProvider={handleWebSearchProviderChange} - onToggleWebSearchKey={() => setWebSearchKeyVisible((visible) => !visible)} - onToggleWebSearchKeyEditing={() => { - setWebSearchKeyEditing((editing) => !editing); - setWebSearchKeyVisible(false); - setWebSearchForm((prev) => ({ ...prev, apiKey: "" })); - }} - onResetProviderDraft={resetProviderDraft} - onResetWebSearchDraft={resetWebSearchDraft} - onSaveWebSearch={saveWebSearch} - /> - )} + {renderSection()}
    ) : null}
    @@ -417,10 +745,20 @@ export function SettingsView({ ); } -const SETTINGS_NAV_ITEMS = [ - { key: "general", icon: Settings }, - { key: "byok", icon: KeyRound }, -] as const; +const SETTINGS_NAV_ITEMS: Array<{ key: SettingsSectionKey; icon: LucideIcon; fallback: string }> = [ + { key: "overview", icon: Activity, fallback: "Overview" }, + { key: "appearance", icon: Palette, fallback: "Appearance" }, + { key: "models", icon: SlidersHorizontal, fallback: "Models" }, + { key: "providers", icon: KeyRound, fallback: "Providers" }, + { key: "image", icon: ImageIcon, fallback: "Image" }, + { key: "web", icon: Globe2, fallback: "Web" }, + { key: "runtime", icon: Server, fallback: "Runtime" }, + { key: "advanced", icon: ShieldCheck, fallback: "Advanced" }, +]; + +function titleForSection(section: SettingsSectionKey): string { + return SETTINGS_NAV_ITEMS.find((item) => item.key === section)?.fallback ?? "Settings"; +} function SettingsSidebar({ activeSection, @@ -435,23 +773,26 @@ function SettingsSidebar({ }) { const { t } = useTranslation(); return ( -
    + ); +} + +function AppearanceSettings({ + theme, + onToggleTheme, + localPrefs, + onChangeLocalPrefs, }: { theme: "light" | "dark"; onToggleTheme: () => void; - form: { - model: string; - provider: string; - }; - setForm: Dispatch>; - settings: SettingsPayload; - dirty: boolean; - saving: boolean; - onSave: () => void; - onRestart?: () => void; - isRestarting?: boolean; - onOpenByok: () => void; + localPrefs: LocalPreferences; + onChangeLocalPrefs: Dispatch>; }) { const { t } = useTranslation(); - const configuredProviders = settings.providers.filter((provider) => provider.configured); - const providerValue = configuredProviders.some((provider) => provider.name === form.provider) - ? form.provider - : ""; + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); return ( -
    +
    {t("settings.sections.interface")} @@ -568,335 +1034,193 @@ function GeneralSettings({
    +
    + {tx("settings.sections.localPreferences", "Local preferences")} + + + + onChangeLocalPrefs((prev) => ({ ...prev, density: density as LocalDensity })) + } + /> + + + + onChangeLocalPrefs((prev) => ({ ...prev, activityMode: activityMode as LocalActivityMode })) + } + /> + + + onChangeLocalPrefs((prev) => ({ ...prev, codeWrap }))} + label={localPrefs.codeWrap ? tx("settings.values.on", "On") : tx("settings.values.off", "Off")} + /> + + +
    +
    + ); +} + +function ModelsSettings({ + form, + setForm, + settings, + dirty, + saving, + onSave, + onOpenProviders, +}: { + form: AgentSettingsDraft; + setForm: Dispatch>; + settings: SettingsPayload; + dirty: boolean; + saving: boolean; + onSave: () => void; + onOpenProviders: () => void; +}) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + const configuredProviders = settings.providers.filter((provider) => provider.configured); + const showAutoProvider = defaultPreset(settings)?.provider === "auto" || form.provider === "auto"; + const providerOptions = showAutoProvider + ? [{ name: "auto", label: tx("settings.values.auto", "Auto") }, ...configuredProviders] + : configuredProviders; + const providerValue = providerOptions.some((provider) => provider.name === form.provider) + ? form.provider + : ""; + const selectedPreset = settings.model_presets.find((preset) => preset.name === form.modelPreset); + return ( +
    +
    + {tx("settings.sections.presets", "Presets")} +
    + {settings.model_presets.map((preset) => ( + + ))} +
    +
    +
    {t("settings.sections.ai")} - setForm((prev) => ({ ...prev, provider }))} - /> + {selectedPreset?.label ?? form.modelPreset} - - - setForm((prev) => ({ ...prev, model: event.target.value }))} - className="h-8 w-[280px] rounded-full text-[13px]" - /> - - - {(dirty || saving || settings.requires_restart) ? ( - - ) : null} + {form.modelPreset === "default" ? ( + <> + + setForm((prev) => ({ ...prev, provider }))} + /> + + + setForm((prev) => ({ ...prev, model: event.target.value }))} + className="h-8 w-[min(280px,70vw)] rounded-full text-[13px]" + /> + + + ) : ( + + + {selectedPreset?.model ?? settings.agent.model} + + + )} + {configuredProviders.length === 0 ? ( - ) : null}
    - - {onRestart && ( -
    - {t("settings.sections.system")} - - - - - - - {settings.runtime.config_path || t("settings.values.notAvailable")} - - - -
    - )}
    ); } -function ProviderPicker({ - providers, - value, - emptyLabel, - onChange, -}: { - providers: Array<{ name: string; label: string }>; - value: string; - emptyLabel: string; - onChange: (provider: string) => void; -}) { - const selectedProvider = providers.find((provider) => provider.name === value) ?? null; - const disabled = providers.length === 0; - - return ( - - - - - - {providers.map((provider) => { - const selected = provider.name === value; - return ( - onChange(provider.name)} - className={cn( - "flex cursor-default items-center justify-between gap-2 rounded-[12px] px-3 py-2 text-[13px]", - "focus:bg-muted focus:text-foreground", - selected && "bg-primary/10 text-primary focus:bg-primary/12 focus:text-primary", - )} - > - {provider.label} - {selected ? : null} - - ); - })} - - - ); -} - -function WebSearchByokSettings({ - settings, - form, - keyVisible, - keyEditing, - saving, - onChangeForm, - onChangeProvider, - onToggleKey, - onToggleKeyEditing, - onSave, -}: { - settings: SettingsPayload; - form: WebSearchSettingsUpdate; - keyVisible: boolean; - keyEditing: boolean; - saving: boolean; - onChangeForm: Dispatch>; - onChangeProvider: (provider: string) => void; - onToggleKey: () => void; - onToggleKeyEditing: () => void; - onSave: () => void; -}) { - const { t } = useTranslation(); - const selectedProvider = - settings.web_search.providers.find((provider) => provider.name === form.provider) ?? - settings.web_search.providers[0]; - const hasExistingSecret = - selectedProvider?.credential === "api_key" && - form.provider === settings.web_search.provider && - !!settings.web_search.api_key_hint; - const showKeyInput = selectedProvider?.credential === "api_key" && (!hasExistingSecret || keyEditing); - const apiKey = form.apiKey?.trim() ?? ""; - const baseUrl = form.baseUrl?.trim() ?? ""; - const dirty = - form.provider !== settings.web_search.provider || - apiKey.length > 0 || - baseUrl !== (settings.web_search.base_url ?? ""); - const missingCredential = - selectedProvider?.credential === "api_key" - ? !apiKey && !hasExistingSecret - : selectedProvider?.credential === "base_url" - ? !baseUrl - : false; - - return ( -
    - - - - - - {selectedProvider?.credential === "none" ? ( - - - {t("settings.byok.webSearch.noCredentialRequired")} - - - ) : null} - - {selectedProvider?.credential === "api_key" ? ( - -
    - {showKeyInput ? ( - <> - - onChangeForm((prev) => ({ ...prev, apiKey: event.target.value })) - } - placeholder={ - hasExistingSecret - ? t("settings.byok.apiKeyConfiguredPlaceholder") - : t("settings.byok.apiKeyPlaceholder") - } - className="h-9 rounded-full pr-11 text-[13px]" - /> - - - ) : ( - <> -
    - {settings.web_search.api_key_hint ?? t("settings.byok.configuredKeyHint")} -
    - - - )} -
    -     - ) : null} - - {selectedProvider?.credential === "base_url" ? ( - - - onChangeForm((prev) => ({ ...prev, baseUrl: event.target.value })) - } - placeholder={t("settings.byok.webSearch.baseUrlPlaceholder")} - className="h-9 w-[280px] rounded-full text-[13px]" - /> - - ) : null} - -
    -
    - {missingCredential - ? t("settings.byok.webSearch.missingCredential") - : t("settings.byok.webSearch.saveHint")} -
    - -
    -     -
    - ); -} - -function ByokSettings({ +function ProvidersSettings({ settings, expandedProvider, providerForms, visibleProviderKeys, editingProviderKeys, providerSaving, - webSearchForm, - webSearchKeyVisible, - webSearchKeyEditing, - webSearchSaving, + query, + onQueryChange, onToggleProvider, onToggleProviderKey, onToggleProviderKeyEditing, onChangeProviderForm, onSaveProvider, - onChangeWebSearchForm, - onChangeWebSearchProvider, - onToggleWebSearchKey, - onToggleWebSearchKeyEditing, onResetProviderDraft, - onResetWebSearchDraft, - onSaveWebSearch, + imageProviderRestartPending, + onRestart, + isRestarting, }: { settings: SettingsPayload; expandedProvider: string | null; @@ -904,39 +1228,27 @@ function ByokSettings({ visibleProviderKeys: Record; editingProviderKeys: Record; providerSaving: string | null; - webSearchForm: WebSearchSettingsUpdate; - webSearchKeyVisible: boolean; - webSearchKeyEditing: boolean; - webSearchSaving: boolean; + query: string; + onQueryChange: (query: string) => void; onToggleProvider: (provider: string) => void; onToggleProviderKey: (provider: string) => void; onToggleProviderKeyEditing: (provider: string) => void; onChangeProviderForm: (provider: string, value: Partial<{ apiKey: string; apiBase: string }>) => void; onSaveProvider: (provider: string) => void; - onChangeWebSearchForm: Dispatch>; - onChangeWebSearchProvider: (provider: string) => void; - onToggleWebSearchKey: () => void; - onToggleWebSearchKeyEditing: () => void; onResetProviderDraft: (provider: string) => void; - onResetWebSearchDraft: () => void; - onSaveWebSearch: () => void; + imageProviderRestartPending: boolean; + onRestart?: () => void; + isRestarting?: boolean; }) { const { t } = useTranslation(); - const [activePane, setActivePane] = useState("llm"); - const [showAllUnconfigured, setShowAllUnconfigured] = useState(false); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); const configuredProviders = settings.providers.filter((provider) => provider.configured); const unconfiguredProviders = useMemo( () => orderUnconfiguredProviders(settings.providers.filter((provider) => !provider.configured)), [settings.providers], ); - const initialUnconfiguredCount = 6; - const visibleUnconfiguredProviders = showAllUnconfigured - ? unconfiguredProviders - : unconfiguredProviders.slice(0, initialUnconfiguredCount); - const hiddenUnconfiguredCount = Math.max( - 0, - unconfiguredProviders.length - visibleUnconfiguredProviders.length, - ); + const filteredConfigured = filterProviders(configuredProviders, query); + const filteredUnconfigured = filterProviders(unconfiguredProviders, query); const renderProviderRow = (provider: SettingsPayload["providers"][number]) => { const expanded = expandedProvider === provider.name; const form = providerForms[provider.name] ?? { @@ -953,10 +1265,7 @@ function ByokSettings({ const missingOptionalCredential = !apiKeyRequired && !provider.configured && !apiKey && !apiBase; return ( -
    +
    {expanded ? ( @@ -1057,7 +1362,15 @@ function ByokSettings({ className="h-9 rounded-full text-[13px]" /> -
    +
    + +
    +
    + ) : null} +
    + + onQueryChange(event.target.value)} + placeholder={tx("settings.providers.searchPlaceholder", "Search providers")} + className="h-10 rounded-full pl-9 text-[13px]" + /> +
    + - {panes.map((pane) => { - const selected = activePane === pane.key; + {filteredConfigured.map(renderProviderRow)} + + + {filteredUnconfigured.map(renderProviderRow)} + +
    + ); +} + +function ImageGenerationSettings({ + settings, + form, + dirty, + saving, + onChangeForm, + onSave, + onOpenProviders, + onRestart, + isRestarting, + requiresRestartPending, +}: { + settings: SettingsPayload; + form: ImageGenerationSettingsUpdate; + dirty: boolean; + saving: boolean; + onChangeForm: Dispatch>; + onSave: () => void; + onOpenProviders: () => void; + onRestart?: () => void; + isRestarting?: boolean; + requiresRestartPending: boolean; +}) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + const selectedProvider = + settings.image_generation.providers.find((provider) => provider.name === form.provider) ?? + settings.image_generation.providers[0]; + const providerConfigured = !!selectedProvider?.configured; + const missingCredential = form.enabled && !providerConfigured; + const aspectOptions = optionRowsWithCurrent( + IMAGE_ASPECT_RATIO_OPTIONS.map((value) => ({ name: value, label: value })), + form.defaultAspectRatio, + ); + const sizeOptions = optionRowsWithCurrent( + IMAGE_SIZE_OPTIONS.map((value) => ({ name: value, label: value })), + form.defaultImageSize, + ); + + return ( +
    +
    + {tx("settings.sections.imageGeneration", "Image generation")} + + + onChangeForm((prev) => ({ ...prev, enabled }))} + label={form.enabled ? tx("settings.values.on", "On") : tx("settings.values.off", "Off")} + /> + + + onChangeForm((prev) => ({ ...prev, provider }))} + /> + + +
    + + {providerConfigured + ? tx("settings.values.configured", "Configured") + : tx("settings.values.notConfigured", "Not configured")} + + {!providerConfigured ? ( + + ) : null} +
    +     + + + {selectedProvider?.api_base || selectedProvider?.default_api_base || selectedProvider?.name || tx("settings.values.notAvailable", "Not available")} + + +     +
    + +
    + {tx("settings.sections.imageDefaults", "Defaults")} + + + onChangeForm((prev) => ({ ...prev, model: event.target.value }))} + className="h-8 w-[min(300px,70vw)] rounded-full text-[13px]" + /> + + + + onChangeForm((prev) => ({ ...prev, defaultAspectRatio })) + } + /> + + + + onChangeForm((prev) => ({ ...prev, defaultImageSize })) + } + /> + + + + onChangeForm((prev) => ({ ...prev, maxImagesPerTurn })) + } + /> + + + + +
    +
    + ); +} + +function WebSettings({ + settings, + form, + keyVisible, + keyEditing, + saving, + onChangeForm, + onChangeProvider, + onToggleKey, + onToggleKeyEditing, + onReset, + onSave, + onRestart, + isRestarting, + requiresRestartPending, +}: { + settings: SettingsPayload; + form: WebSearchSettingsUpdate; + keyVisible: boolean; + keyEditing: boolean; + saving: boolean; + onChangeForm: Dispatch>; + onChangeProvider: (provider: string) => void; + onToggleKey: () => void; + onToggleKeyEditing: () => void; + onReset: () => void; + onSave: () => void; + onRestart?: () => void; + isRestarting?: boolean; + requiresRestartPending: boolean; +}) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + const selectedProvider = + settings.web_search.providers.find((provider) => provider.name === form.provider) ?? + settings.web_search.providers[0]; + const hasExistingSecret = + selectedProvider?.credential === "api_key" && + form.provider === settings.web_search.provider && + !!settings.web_search.api_key_hint; + const showKeyInput = selectedProvider?.credential === "api_key" && (!hasExistingSecret || keyEditing); + const apiKey = form.apiKey?.trim() ?? ""; + const baseUrl = form.baseUrl?.trim() ?? ""; + const effectiveJinaReader = form.useJinaReader ?? settings.web.fetch.use_jina_reader; + const dirty = + form.provider !== settings.web_search.provider || + apiKey.length > 0 || + baseUrl !== (settings.web_search.base_url ?? "") || + form.maxResults !== settings.web_search.max_results || + form.timeout !== settings.web_search.timeout || + effectiveJinaReader !== settings.web.fetch.use_jina_reader; + const jinaReaderDirty = effectiveJinaReader !== settings.web.fetch.use_jina_reader; + const missingCredential = + selectedProvider?.credential === "api_key" + ? !apiKey && !hasExistingSecret + : selectedProvider?.credential === "base_url" + ? !baseUrl + : false; + + return ( +
    +
    + {tx("settings.sections.webSearch", "Web search")} + + + + + + {selectedProvider?.credential === "none" ? ( + + {t("settings.byok.webSearch.noCredentialRequired")} + + ) : null} + + {selectedProvider?.credential === "api_key" ? ( + +
    + {showKeyInput ? ( + <> + + onChangeForm((prev) => ({ ...prev, apiKey: event.target.value })) + } + placeholder={ + hasExistingSecret + ? t("settings.byok.apiKeyConfiguredPlaceholder") + : t("settings.byok.apiKeyPlaceholder") + } + className="h-9 rounded-full pr-11 text-[13px]" + /> + + + ) : ( + <> +
    + {settings.web_search.api_key_hint ?? t("settings.byok.configuredKeyHint")} +
    + + + )} +
    +     + ) : null} + + {selectedProvider?.credential === "base_url" ? ( + + + onChangeForm((prev) => ({ ...prev, baseUrl: event.target.value })) + } + placeholder={t("settings.byok.webSearch.baseUrlPlaceholder")} + className="h-9 w-[280px] rounded-full text-[13px]" + /> + + ) : null} +     +
    + +
    + {tx("settings.sections.webBehavior", "Behavior")} + + + onChangeForm((prev) => ({ ...prev, maxResults }))} + /> + + + onChangeForm((prev) => ({ ...prev, timeout }))} + suffix="s" + /> + + + onChangeForm((prev) => ({ ...prev, useJinaReader }))} + label={effectiveJinaReader ? tx("settings.values.on", "On") : tx("settings.values.off", "Off")} + /> + + + +
    +
    + ); +} + +function RuntimeSettings({ + form, + setForm, + settings, + dirty, + saving, + onSave, + onRestart, + isRestarting, + requiresRestartPending, +}: { + form: AgentSettingsDraft; + setForm: Dispatch>; + settings: SettingsPayload; + dirty: boolean; + saving: boolean; + onSave: () => void; + onRestart?: () => void; + isRestarting?: boolean; + requiresRestartPending: boolean; +}) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + return ( +
    +
    + {tx("settings.sections.identity", "Identity")} + + + setForm((prev) => ({ ...prev, botName: event.target.value }))} + className="h-8 w-[220px] rounded-full text-[13px]" + /> + + + setForm((prev) => ({ ...prev, botIcon: event.target.value }))} + className="h-8 w-[120px] rounded-full text-center text-[13px]" + /> + + + setForm((prev) => ({ ...prev, timezone: event.target.value }))} + className="h-8 w-[220px] rounded-full text-[13px]" + /> + + + setForm((prev) => ({ ...prev, toolHintMaxLength }))} + /> + + + +
    + +
    + {t("settings.sections.system")} + + {onRestart && !requiresRestartPending ? ( + + + + ) : null} + + + + + + +
    +
    + ); +} + +function AdvancedSettings({ settings }: { settings: SettingsPayload }) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + return ( +
    +
    + {tx("settings.sections.safety", "Safety")} + + + + + + +
    + +
    + {tx("settings.sections.integrations", "Integrations")} + + + + + + + {tx("settings.actions.openDocs", "Open docs")} + + + +
    +
    + ); +} + +function ProviderPicker({ + providers, + value, + emptyLabel, + onChange, +}: { + providers: Array<{ name: string; label: string }>; + value: string; + emptyLabel: string; + onChange: (provider: string) => void; +}) { + const selectedProvider = providers.find((provider) => provider.name === value) ?? null; + const disabled = providers.length === 0; + + return ( + + + + + + {providers.map((provider) => { + const selected = provider.name === value; return ( - + {provider.label} + {selected ? : null} + ); })} -
    - {activePane === "llm" ? ( -
    -
    - -
    - {configuredProviders.length > 0 ? ( -
    - {configuredProviders.map(renderProviderRow)} -
    - ) : ( - {t("settings.byok.noConfiguredProviders")} - )} -
    -
    + + + ); +} -
    - -
    -
    - {visibleUnconfiguredProviders.map(renderProviderRow)} -
    -
    - {hiddenUnconfiguredCount > 0 ? ( - - ) : showAllUnconfigured && unconfiguredProviders.length > initialUnconfiguredCount ? ( - - ) : null} -
    -
    - ) : ( - - )} -
    +function ProviderSection({ + title, + count, + empty, + children, +}: { + title: string; + count: number; + empty: string; + children: ReactNode; +}) { + return ( +
    + +
    + {count > 0 ? ( +
    {children}
    + ) : ( + {empty} + )} +
    +
    ); } @@ -1224,6 +2098,34 @@ function providerVisibilityRank(provider: SettingsPayload["providers"][number]): return 200; } +function filterProviders( + providers: SettingsPayload["providers"], + query: string, +): SettingsPayload["providers"] { + const normalized = query.trim().toLowerCase(); + if (!normalized) return providers; + return providers.filter((provider) => + `${provider.name} ${provider.label} ${provider.api_base ?? ""} ${provider.default_api_base ?? ""}` + .toLowerCase() + .includes(normalized), + ); +} + +function optionRowsWithCurrent( + options: Array<{ name: string; label: string }>, + value: string, +): Array<{ name: string; label: string }> { + if (!value || options.some((option) => option.name === value)) return options; + return [{ name: value, label: value }, ...options]; +} + +function providerLabel( + providers: Array<{ name: string; label: string }>, + value: string, +): string { + return providers.find((provider) => provider.name === value)?.label ?? value; +} + const PROVIDER_ICONS: Record = { custom: Hexagon, openrouter: Sparkles, @@ -1246,6 +2148,7 @@ const PROVIDER_ICONS: Record = { byteplus: Cloud, byteplus_coding_plan: Cloud, qianfan: Database, + ant_ling: Sparkles, azure_openai: Cloud, bedrock: Database, vllm: Cpu, @@ -1265,6 +2168,45 @@ function ProviderIcon({ provider }: { provider: string }) { ); } +function OverviewListRow({ + icon: Icon, + title, + value, + caption, + onClick, +}: { + icon: LucideIcon; + title: string; + value: string; + caption: string; + onClick: () => void; +}) { + return ( + + ); +} + function SettingsSectionTitle({ children }: { children: ReactNode }) { return (

    @@ -1305,6 +2247,99 @@ function SettingsRow({ ); } +function ReadOnlyRow({ title, value }: { title: string; value: string }) { + return ( + + + {value} + + + ); +} + +function RestartSettingsFooter({ + dirty, + saving, + pendingRestart, + disabled = false, + message, + dirtyMessage, + pendingMessage, + onSave, + onRestart, + onReset, + isRestarting, +}: { + dirty: boolean; + saving: boolean; + pendingRestart: boolean; + disabled?: boolean; + message?: string; + dirtyMessage?: string; + pendingMessage?: string; + onSave: () => void; + onRestart?: () => void; + onReset?: () => void; + isRestarting?: boolean; +}) { + const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + const statusMessage = + message ?? + (pendingRestart && !dirty + ? pendingMessage ?? tx("settings.status.savedRestartApply", "Saved. Restart when ready.") + : dirty + ? dirtyMessage ?? t("settings.status.unsaved") + : undefined); + const statusTone = disabled ? "danger" : dirty || pendingRestart ? "accent" : undefined; + + return ( +
    +
    + {statusMessage} +
    +
    + {pendingRestart && !dirty && onRestart ? ( + + ) : null} + {onReset ? ( + + ) : null} + +
    +
    + ); +} + function SettingsFooter({ dirty, saving, @@ -1317,14 +2352,161 @@ function SettingsFooter({ onSave: () => void; }) { const { t } = useTranslation(); + const tx = (key: string, fallback: string) => t(key, { defaultValue: fallback }); + const statusMessage = dirty + ? t("settings.status.unsaved") + : saved + ? t("settings.status.savedRestart") + : tx("settings.status.upToDate", "Up to date."); return ( -
    +
    - {saved ? t("settings.status.savedRestart") : t("settings.status.unsaved")} + + {statusMessage} + +
    +
    +
    - +
    + ); +} + +function SettingsStatusMessage({ + children, + tone, +}: { + children?: ReactNode; + tone?: "accent" | "danger"; +}) { + if (!children) return null; + return ( + + {tone ? ( + + ) : null} + {children} + + ); +} + +function StatusPill({ + children, + tone = "neutral", +}: { + children: ReactNode; + tone?: "neutral" | "success" | "warning"; +}) { + return ( + + {children} + + ); +} + +function SegmentedControl({ + value, + options, + onChange, +}: { + value: string; + options: Array<{ value: string; label: string }>; + onChange: (value: string) => void; +}) { + return ( +
    + {options.map((option) => ( + + ))} +
    + ); +} + +function ToggleButton({ + checked, + onChange, + label, +}: { + checked: boolean; + onChange: (checked: boolean) => void; + label: string; +}) { + return ( + + ); +} + +function NumberInput({ + value, + min, + max, + onChange, + suffix, +}: { + value: number; + min: number; + max: number; + onChange: (value: number) => void; + suffix?: string; +}) { + return ( +
    + { + const parsed = Number(event.target.value); + if (Number.isFinite(parsed)) onChange(parsed); + }} + className="h-8 w-24 rounded-full text-[13px]" + /> + {suffix ? {suffix} : null}
    ); } diff --git a/webui/src/components/thread/AgentActivityCluster.tsx b/webui/src/components/thread/AgentActivityCluster.tsx index 792a4156..46be8b43 100644 --- a/webui/src/components/thread/AgentActivityCluster.tsx +++ b/webui/src/components/thread/AgentActivityCluster.tsx @@ -30,16 +30,19 @@ interface ActivityCounts { hasEditingFiles: boolean; hasFailedFiles: boolean; primaryFilePath?: string; + primaryFileTooltipPath?: string; } interface FileEditSummary { key: string; path: string; + absolute_path?: string; added: number; deleted: number; approximate: boolean; binary: boolean; status: UIFileEdit["status"]; + pending: boolean; error?: string; } @@ -61,8 +64,10 @@ function countActivity(messages: UIMessage[], fileEdits: FileEditSummary[]): Act let hasEditingFiles = false; let failedFileCount = 0; let primaryFilePath: string | undefined; + let primaryFileTooltipPath: string | undefined; for (const edit of fileEdits) { primaryFilePath = edit.path; + primaryFileTooltipPath = edit.absolute_path || edit.path; if (edit.status === "editing") { hasEditingFiles = true; } @@ -84,6 +89,7 @@ function countActivity(messages: UIMessage[], fileEdits: FileEditSummary[]): Act hasEditingFiles, hasFailedFiles: fileEdits.length > 0 && failedFileCount === fileEdits.length, primaryFilePath, + primaryFileTooltipPath, }; } @@ -117,7 +123,9 @@ export function AgentActivityCluster({ hasEditingFiles, hasFailedFiles, primaryFilePath, + primaryFileTooltipPath, } = countActivity(messages, fileEdits); + const hasPendingFileEdit = fileEdits.some((edit) => edit.pending); const [userToggledOuter, setUserToggledOuter] = useState(false); const [outerOpenLocal, setOuterOpenLocal] = useState(false); @@ -130,11 +138,15 @@ export function AgentActivityCluster({ const hasLiveEditingFiles = isTurnStreaming && hasEditingFiles; const headerBusy = fileCount > 0 ? hasEditingFiles : isTurnStreaming; + const singleFilePath = fileCount === 1 ? primaryFilePath : undefined; + const singleFileTooltipPath = fileCount === 1 ? primaryFileTooltipPath : undefined; const fileActivitySummary = fileCount > 0 - ? fileCount === 1 && primaryFilePath + ? hasPendingFileEdit && !singleFilePath + ? t("message.fileActivityPreparing", { defaultValue: "Preparing edit…" }) + : singleFilePath ? t(fileActivitySummaryKey(hasLiveEditingFiles, hasFailedFiles), { - file: shortFileName(primaryFilePath), + file: shortFileName(singleFilePath), defaultValue: `${fileActivityVerb(hasLiveEditingFiles, hasFailedFiles)} {{file}}`, }) : t(fileActivityManySummaryKey(hasLiveEditingFiles, hasFailedFiles), { @@ -241,15 +253,35 @@ export function AgentActivityCluster({ "text-xs text-muted-foreground transition-colors hover:bg-muted/45", )} aria-expanded={outerExpanded} + aria-label={summary} > - - {summary} - + {singleFilePath ? ( + + + {fileActivityVerb(hasLiveEditingFiles, hasFailedFiles)} + + + + ) : ( + + {summary} + + )} {fileCount > 0 && ( @@ -332,7 +364,8 @@ function fileActivityManySummaryKey(editing: boolean, failed: boolean): string { } function fileEditCallKey(edit: UIFileEdit): string { - return `${edit.call_id}|${edit.tool}|${edit.path}`; + if (edit.call_id) return `${edit.call_id}|${edit.tool}`; + return `${edit.tool}|${edit.path}`; } function collectFileEdits(messages: UIMessage[]): UIFileEdit[] { @@ -360,10 +393,12 @@ function summarizeFileEdits(edits: UIFileEdit[], active: boolean): FileEditSumma interface MutableSummary { key: string; path: string; + absolute_path?: string; added: number; deleted: number; approximate: boolean; binary: boolean; + pending: boolean; hasSuccessfulChange: boolean; hasActiveEditing: boolean; hasFailed: boolean; @@ -373,16 +408,18 @@ function summarizeFileEdits(edits: UIFileEdit[], active: boolean): FileEditSumma const order: string[] = []; const byPath = new Map(); for (const edit of latestFileEditEvents(edits)) { - const key = edit.path; + const key = edit.path || edit.call_id || edit.tool; let summary = byPath.get(key); if (!summary) { summary = { key, - path: edit.path, + path: edit.path || "", + absolute_path: edit.absolute_path, added: 0, deleted: 0, approximate: false, binary: false, + pending: false, hasSuccessfulChange: false, hasActiveEditing: false, hasFailed: false, @@ -391,6 +428,13 @@ function summarizeFileEdits(edits: UIFileEdit[], active: boolean): FileEditSumma order.push(key); } + if (edit.path && !summary.path) { + summary.path = edit.path; + } + if (edit.absolute_path) { + summary.absolute_path = edit.absolute_path; + } + summary.pending = summary.pending || !!edit.pending || !edit.path; if (active && edit.status === "editing") { summary.hasActiveEditing = true; summary.binary = summary.binary || !!edit.binary; @@ -429,11 +473,13 @@ function summarizeFileEdits(edits: UIFileEdit[], active: boolean): FileEditSumma return { key: summary.key, path: summary.path, + absolute_path: summary.absolute_path, added: summary.added, deleted: summary.deleted, approximate: summary.approximate, binary: summary.binary, status, + pending: summary.pending && !summary.path, error: summary.error, }; }); @@ -458,14 +504,24 @@ function FileEditRow({ edit }: { edit: FileEditSummary }) { return (
  • - + {edit.pending && !edit.path ? ( + + {t("message.fileEditPreparing", { defaultValue: "Preparing file edit…" })} + + ) : ( + + )} {failed ? ( @@ -487,13 +543,30 @@ function FileEditRow({ edit }: { edit: FileEditSummary }) { function DiffPair({ added, deleted }: { added: number; deleted: number }) { return ( - - - + - - - - + + + + + ); +} + +function DiffValue({ sign, value, className }: { sign: string; value: number; className: string }) { + const safeValue = Number.isFinite(value) ? Math.max(0, Math.round(value)) : 0; + return ( + + + {sign} + + {sign}{safeValue} ); } @@ -537,5 +610,37 @@ function AnimatedNumber({ value }: { value: number }) { return () => window.cancelAnimationFrame(frame); }, [safeValue, setAnimatedDisplay]); - return <>{display}; + return ; +} + +function RollingNumber({ value }: { value: number }) { + const digits = String(value).split(""); + return ( + + {digits.map((digit, index) => ( + + ))} + + ); +} + +function RollingDigit({ digit }: { digit: number }) { + const safeDigit = Number.isFinite(digit) ? Math.min(9, Math.max(0, digit)) : 0; + return ( + + + {Array.from({ length: 10 }, (_, n) => ( + + {n} + + ))} + + + ); } diff --git a/webui/src/components/ui/dialog.tsx b/webui/src/components/ui/dialog.tsx index d4ed442c..52792bab 100644 --- a/webui/src/components/ui/dialog.tsx +++ b/webui/src/components/ui/dialog.tsx @@ -24,26 +24,35 @@ const DialogOverlay = React.forwardRef< )); DialogOverlay.displayName = DialogPrimitive.Overlay.displayName; +interface DialogContentProps + extends React.ComponentPropsWithoutRef { + showCloseButton?: boolean; +} + const DialogContent = React.forwardRef< React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, children, ...props }, ref) => ( + DialogContentProps +>(({ className, children, showCloseButton = true, ...props }, ref) => ( - - {children} - - - Close - - +
    + + {children} + {showCloseButton ? ( + + + Close + + ) : null} + +
    )); DialogContent.displayName = DialogPrimitive.Content.displayName; diff --git a/webui/src/components/ui/dropdown-menu.tsx b/webui/src/components/ui/dropdown-menu.tsx index bd32944e..cc5ef6ee 100644 --- a/webui/src/components/ui/dropdown-menu.tsx +++ b/webui/src/components/ui/dropdown-menu.tsx @@ -47,11 +47,16 @@ const DropdownMenuSubContent = React.forwardRef< )); DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName; +interface DropdownMenuContentProps + extends React.ComponentPropsWithoutRef { + portalContainer?: HTMLElement | null; +} + const DropdownMenuContent = React.forwardRef< React.ElementRef, - React.ComponentPropsWithoutRef ->(({ className, sideOffset = 4, ...props }, ref) => ( - + DropdownMenuContentProps +>(({ className, sideOffset = 4, portalContainer, ...props }, ref) => ( + ): string { - return `${edit.call_id}|${edit.tool}|${edit.path}`; + if (edit.call_id) return `${edit.call_id}|${edit.tool}`; + return `${edit.tool}|${edit.path}`; } function normalizeFileEdit(edit: UIFileEdit): UIFileEdit | null { - if (!edit || !edit.path || !edit.tool) return null; + if (!edit || !edit.tool || (!edit.path && !edit.pending)) return null; const inferredStatus = edit.phase === "error" ? "error" : edit.phase === "end" ? "done" : "editing"; - return { + const normalized: UIFileEdit = { ...edit, call_id: edit.call_id || `${edit.tool}:${edit.path}`, added: Number.isFinite(edit.added) ? Math.max(0, Math.round(edit.added)) : 0, @@ -235,6 +236,8 @@ function normalizeFileEdit(edit: UIFileEdit): UIFileEdit | null { ? edit.status : inferredStatus, }; + if (edit.pending && !edit.path) normalized.pending = true; + return normalized; } function mergeFileEdits(existing: UIFileEdit[] | undefined, incoming: UIFileEdit[]): UIFileEdit[] { @@ -250,11 +253,31 @@ function mergeFileEdits(existing: UIFileEdit[] | undefined, incoming: UIFileEdit next.push(edit); continue; } - next[existingIndex] = { ...next[existingIndex], ...edit }; + const merged = { ...next[existingIndex], ...edit }; + if (edit.path && !edit.pending) delete merged.pending; + next[existingIndex] = merged; } return next; } +function findFileEditTraceIndex( + prev: UIMessage[], + segmentId: string | null, + incoming: UIFileEdit[], +): number | null { + const incomingKeys = new Set(incoming.map(fileEditKey)); + for (let i = prev.length - 1; i >= 0; i -= 1) { + const candidate = prev[i]; + if (candidate.role === "user") break; + if (candidate.kind !== "trace" || !candidate.fileEdits?.length) continue; + if (segmentId && candidate.activitySegmentId === segmentId) return i; + for (const existing of candidate.fileEdits) { + if (incomingKeys.has(fileEditKey(existing))) return i; + } + } + return null; +} + /** * Subscribe to a chat by ID. Returns the in-memory message list for the chat, * a streaming flag, and a ``send`` function. Initial history must be seeded @@ -534,6 +557,7 @@ export function useNanobotStream( if (suppressStreamUntilTurnEndRef.current) return; const chunk = typeof ev.text === "string" ? ev.text : ""; if (!chunk) return; + clearActivitySegment(); setIsStreaming(true); pendingStreamEventsRef.current.push({ kind: "delta", text: chunk }); schedulePendingStreamFlush(); @@ -544,6 +568,7 @@ export function useNanobotStream( if (suppressStreamUntilTurnEndRef.current) return; const chunk = ev.text; if (!chunk) return; + if (fileEditSegmentRef.current) clearActivitySegment(); setIsStreaming(true); pendingStreamEventsRef.current.push({ kind: "reasoning", text: chunk }); schedulePendingStreamFlush(); @@ -622,6 +647,7 @@ export function useNanobotStream( if (ev.kind === "reasoning") { const line = ev.text; if (!line) return; + if (fileEditSegmentRef.current) clearActivitySegment(); setMessages((prev) => closeReasoningStream(attachReasoningChunk(prev, line, { ensure: ensureActivitySegmentId, }))); @@ -691,6 +717,7 @@ export function useNanobotStream( // flight, drop the placeholder so we don't render the text twice. // Do NOT reset isStreaming here — only ``turn_end`` signals that // the full turn (all tool calls + final text) is complete. + clearActivitySegment(); setMessages((prev) => { const activeId = buffer.current?.messageId; buffer.current = null; @@ -715,27 +742,32 @@ export function useNanobotStream( if (ev.event === "file_edit") { const edits = Array.isArray(ev.edits) ? ev.edits : []; if (edits.length === 0) return; + const normalized = mergeFileEdits(undefined, edits); + if (normalized.length === 0) return; + const opensFileEditPhase = normalized.some( + (edit) => edit.status === "editing" || edit.phase === "start", + ); + let eventSegmentId = fileEditSegmentRef.current; + if (!eventSegmentId && opensFileEditPhase) { + eventSegmentId = detachedActivitySegmentId(); + fileEditSegmentRef.current = eventSegmentId; + } setMessages((prev) => { - const last = prev[prev.length - 1]; - let segmentId = fileEditSegmentRef.current; - if (!segmentId || !(last?.kind === "trace" && last.fileEdits?.length)) { - segmentId = detachedActivitySegmentId(); - fileEditSegmentRef.current = segmentId; - } - if ( - last - && last.kind === "trace" - && !last.isStreaming - && !!last.fileEdits?.length - && last.activitySegmentId === segmentId - ) { + let segmentId = eventSegmentId; + const targetIndex = findFileEditTraceIndex(prev, segmentId, normalized); + if (targetIndex !== null) { + const target = prev[targetIndex]; + segmentId = target.activitySegmentId ?? segmentId ?? detachedActivitySegmentId(); + if (opensFileEditPhase) fileEditSegmentRef.current = segmentId; const merged: UIMessage = { - ...last, - fileEdits: mergeFileEdits(last.fileEdits, edits), - activitySegmentId: last.activitySegmentId ?? segmentId, + ...target, + fileEdits: mergeFileEdits(target.fileEdits, normalized), + activitySegmentId: segmentId, }; - return [...prev.slice(0, -1), merged]; + return replaceMessageAt(prev, targetIndex, merged); } + segmentId = segmentId ?? detachedActivitySegmentId(); + if (opensFileEditPhase) fileEditSegmentRef.current = segmentId; return [ ...prev, { @@ -744,7 +776,7 @@ export function useNanobotStream( kind: "trace", content: "", traces: [], - fileEdits: mergeFileEdits(undefined, edits), + fileEdits: normalized, activitySegmentId: segmentId, createdAt: Date.now(), }, diff --git a/webui/src/hooks/useSidebarState.ts b/webui/src/hooks/useSidebarState.ts new file mode 100644 index 00000000..9b7ef056 --- /dev/null +++ b/webui/src/hooks/useSidebarState.ts @@ -0,0 +1,206 @@ +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; + +import { useClient } from "@/providers/ClientProvider"; +import { + fetchSidebarState, + updateSidebarState as persistSidebarState, +} from "@/lib/api"; +import type { ChatSummary, SidebarStatePayload } from "@/lib/types"; + +export const DEFAULT_SIDEBAR_STATE: SidebarStatePayload = { + schema_version: 1, + pinned_keys: [], + archived_keys: [], + title_overrides: {}, + tags_by_key: {}, + collapsed_groups: {}, + view: { + density: "comfortable", + show_previews: false, + show_timestamps: false, + show_archived: false, + sort: "updated_desc", + }, + updated_at: null, +}; + +function uniqueStrings(value: unknown): string[] { + if (!Array.isArray(value)) return []; + const out: string[] = []; + const seen = new Set(); + for (const item of value) { + if (typeof item !== "string") continue; + const cleaned = item.trim(); + if (!cleaned || seen.has(cleaned)) continue; + seen.add(cleaned); + out.push(cleaned); + } + return out; +} + +function stringMap(value: unknown): Record { + if (!value || typeof value !== "object" || Array.isArray(value)) return {}; + const out: Record = {}; + for (const [key, raw] of Object.entries(value)) { + if (typeof raw !== "string") continue; + const cleanedKey = key.trim(); + const cleanedValue = raw.trim(); + if (!cleanedKey || !cleanedValue) continue; + out[cleanedKey] = cleanedValue; + } + return out; +} + +function tagsMap(value: unknown): Record { + if (!value || typeof value !== "object" || Array.isArray(value)) return {}; + const out: Record = {}; + for (const [key, raw] of Object.entries(value)) { + const cleanedKey = key.trim(); + if (!cleanedKey) continue; + const tags = uniqueStrings(raw).slice(0, 12); + if (tags.length) out[cleanedKey] = tags; + } + return out; +} + +function boolMap(value: unknown): Record { + if (!value || typeof value !== "object" || Array.isArray(value)) return {}; + const out: Record = {}; + for (const [key, raw] of Object.entries(value)) { + const cleanedKey = key.trim(); + if (cleanedKey) out[cleanedKey] = Boolean(raw); + } + return out; +} + +export function normalizeSidebarState(raw: unknown): SidebarStatePayload { + if (!raw || typeof raw !== "object" || Array.isArray(raw)) { + return { ...DEFAULT_SIDEBAR_STATE, view: { ...DEFAULT_SIDEBAR_STATE.view } }; + } + const value = raw as Partial; + const view = value.view && typeof value.view === "object" + ? value.view + : DEFAULT_SIDEBAR_STATE.view; + const density = view.density === "compact" ? "compact" : "comfortable"; + const sort = ["updated_desc", "created_desc", "title_asc"].includes(view.sort) + ? view.sort + : "updated_desc"; + return { + schema_version: 1, + pinned_keys: uniqueStrings(value.pinned_keys), + archived_keys: uniqueStrings(value.archived_keys), + title_overrides: stringMap(value.title_overrides), + tags_by_key: tagsMap(value.tags_by_key), + collapsed_groups: boolMap(value.collapsed_groups), + view: { + density, + show_previews: Boolean(view.show_previews), + show_timestamps: Boolean(view.show_timestamps), + show_archived: Boolean(view.show_archived), + sort, + }, + updated_at: typeof value.updated_at === "string" ? value.updated_at : null, + }; +} + +function pruneMissingSessions( + state: SidebarStatePayload, + sessions: ChatSummary[], +): SidebarStatePayload { + const valid = new Set(sessions.map((session) => session.key)); + const filterKeys = (keys: string[]) => keys.filter((key) => valid.has(key)); + const filterMap = (map: Record): Record => { + const out: Record = {}; + for (const [key, value] of Object.entries(map)) { + if (valid.has(key)) out[key] = value; + } + return out; + }; + return { + ...state, + pinned_keys: filterKeys(state.pinned_keys), + archived_keys: filterKeys(state.archived_keys), + title_overrides: filterMap(state.title_overrides), + tags_by_key: filterMap(state.tags_by_key), + }; +} + +function sameState(a: SidebarStatePayload, b: SidebarStatePayload): boolean { + return JSON.stringify(a) === JSON.stringify(b); +} + +export function useSidebarState( + sessions: ChatSummary[], + sessionsLoaded: boolean, +): { + state: SidebarStatePayload; + loading: boolean; + update: ( + updater: (state: SidebarStatePayload) => SidebarStatePayload, + ) => Promise; +} { + const { token } = useClient(); + const tokenRef = useRef(token); + const stateRef = useRef(DEFAULT_SIDEBAR_STATE); + const persistVersionRef = useRef(0); + const [state, setState] = useState(DEFAULT_SIDEBAR_STATE); + const [loading, setLoading] = useState(true); + tokenRef.current = token; + stateRef.current = state; + + useEffect(() => { + let cancelled = false; + setLoading(true); + (async () => { + try { + const loaded = normalizeSidebarState(await fetchSidebarState(tokenRef.current)); + if (cancelled) return; + stateRef.current = loaded; + setState(loaded); + } catch { + if (cancelled) return; + stateRef.current = DEFAULT_SIDEBAR_STATE; + setState(DEFAULT_SIDEBAR_STATE); + } finally { + if (!cancelled) setLoading(false); + } + })(); + return () => { + cancelled = true; + }; + }, []); + + const update = useCallback( + async (updater: (current: SidebarStatePayload) => SidebarStatePayload) => { + const next = normalizeSidebarState(updater(stateRef.current)); + const version = persistVersionRef.current + 1; + persistVersionRef.current = version; + stateRef.current = next; + setState(next); + try { + const persisted = normalizeSidebarState( + await persistSidebarState(tokenRef.current, next), + ); + if (persistVersionRef.current !== version) return; + stateRef.current = persisted; + setState(persisted); + } catch { + // Keep the optimistic UI state. Older gateways or transient auth expiry + // should not break the chat list; the next refresh can try again. + } + }, + [], + ); + + const pruned = useMemo(() => { + if (!sessionsLoaded || loading) return state; + return pruneMissingSessions(state, sessions); + }, [loading, sessions, sessionsLoaded, state]); + + useEffect(() => { + if (!sessionsLoaded || loading || sameState(pruned, state)) return; + void update(() => pruned); + }, [loading, pruned, sessionsLoaded, state, update]); + + return { state, loading, update }; +} diff --git a/webui/src/i18n/locales/en/common.json b/webui/src/i18n/locales/en/common.json index 38dc79d7..f44332f9 100644 --- a/webui/src/i18n/locales/en/common.json +++ b/webui/src/i18n/locales/en/common.json @@ -45,8 +45,16 @@ "toggleTheme": "Toggle theme", "home": "Home", "newChat": "New chat", - "searchAria": "Search chats", - "searchPlaceholder": "Search chats", + "searchAria": "Search", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", + "searchPlaceholder": "Search", "searchResults": "Results", "noSearchResults": "No matching chats.", "recent": "Recent", @@ -65,12 +73,31 @@ }, "nav": { "general": "General", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "Interface", "ai": "AI", - "system": "System" + "system": "System", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "imageGeneration": "Image generation", + "imageDefaults": "Defaults", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "capabilities": "Capabilities", + "integrations": "Integrations" }, "rows": { "theme": "Theme", @@ -78,31 +105,104 @@ "provider": "Provider", "model": "Model", "restart": "Restart nanobot", - "configPath": "Config path" + "configPath": "Config path", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "pendingChanges": "Pending changes", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "imageGeneration": "Image generation", + "imageProvider": "Image provider", + "imageProviderStatus": "Provider status", + "imageProviderBase": "Provider base", + "imageModel": "Image model", + "defaultAspectRatio": "Default aspect", + "defaultImageSize": "Default size", + "maxImagesPerTurn": "Max images per turn", + "imageSaveDir": "Save directory", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "Switch between light and dark appearance.", "language": "Choose the language used by the WebUI.", "provider": "Select the provider that should serve new model requests.", "model": "Set the default model name used by nanobot.", - "configPath": "The gateway configuration file currently in use." + "configPath": "The gateway configuration file currently in use.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "imageGeneration": "Expose generate_image in chats when a configured image provider is available.", + "imageProvider": "Choose the registry provider used by generate_image.", + "imageProviderStatus": "Image generation reuses provider credentials from Providers.", + "imageModel": "Model name sent to the selected image provider.", + "defaultAspectRatio": "Used when the prompt does not choose an aspect ratio.", + "defaultImageSize": "Size hint sent to providers that support it.", + "maxImagesPerTurn": "Upper bound for one generate_image request.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "Light", "dark": "Dark", - "notAvailable": "Not available" + "notAvailable": "Not available", + "enabled": "Enabled", + "disabled": "Disabled", + "restartPending": "Restart pending", + "ready": "Ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "Loading settings...", "loadError": "Could not load settings", "unsaved": "Unsaved changes.", - "savedRestart": "Saved. Restart nanobot to apply." + "upToDate": "Up to date.", + "savedRestart": "Saved. Restart nanobot to apply.", + "restartAfterSaving": "Save changes, then restart when ready.", + "savedRestartApply": "Saved. Restart when ready.", + "imageProviderRestart": "Image provider changes saved. Restart when ready." }, "actions": { "save": "Save", "saving": "Saving", "edit": "Edit", - "cancel": "Cancel" + "cancel": "Cancel", + "openDocs": "Open docs" }, "byok": { "description": "Bring your own provider keys. Nanobot reads these values from the current config and only configured providers can be selected in General.", @@ -145,6 +245,26 @@ "missingCredential": "Add the required credential before saving.", "saveHint": "Changes apply to new web search requests." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "imageGeneration": "Image generation", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." + }, + "image": { + "selectProvider": "Select provider", + "selectAspect": "Select aspect", + "selectSize": "Select size", + "configureProvider": "Configure provider", + "missingCredential": "Configure this provider before enabling image generation." } }, "chat": { @@ -152,12 +272,30 @@ "loading": "Loading…", "noSessions": "No sessions yet.", "actions": "Chat actions for {{title}}", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "Delete", "newChat": "New chat", "groups": { + "pinned": "Pinned", + "all": "Chats", "today": "Today", "yesterday": "Yesterday", - "earlier": "Earlier" + "earlier": "Earlier", + "archived": "Archived" } }, "deleteConfirm": { diff --git a/webui/src/i18n/locales/es/common.json b/webui/src/i18n/locales/es/common.json index 86df20b3..e658803e 100644 --- a/webui/src/i18n/locales/es/common.json +++ b/webui/src/i18n/locales/es/common.json @@ -30,13 +30,25 @@ "collapse": "Contraer barra lateral", "toggleTheme": "Cambiar tema", "newChat": "Nuevo chat", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "Recientes", "refreshSessions": "Actualizar sesiones", "settings": "Configuración", "language": { "label": "Idioma", "ariaLabel": "Cambiar idioma" - } + }, + "searchAria": "Buscar", + "searchPlaceholder": "Buscar", + "searchResults": "Resultados", + "noSearchResults": "No hay chats coincidentes." }, "settings": { "backToChat": "Volver al chat", @@ -46,12 +58,28 @@ }, "nav": { "general": "General", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "Interfaz", "ai": "IA", - "system": "Sistema" + "system": "Sistema", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "Tema", @@ -59,19 +87,70 @@ "provider": "Proveedor", "model": "Modelo", "restart": "Reiniciar nanobot", - "configPath": "Ruta de configuración" + "configPath": "Ruta de configuración", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "Cambia entre apariencia clara y oscura.", "language": "Elige el idioma usado por la WebUI.", "provider": "Selecciona el proveedor para nuevas solicitudes de modelo.", "model": "Define el nombre del modelo predeterminado que usa nanobot.", - "configPath": "El archivo de configuración que usa actualmente el gateway." + "configPath": "El archivo de configuración que usa actualmente el gateway.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "Claro", "dark": "Oscuro", - "notAvailable": "No disponible" + "notAvailable": "No disponible", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "Cargando configuración...", @@ -83,7 +162,8 @@ "save": "Guardar", "saving": "Guardando", "edit": "Editar", - "cancel": "Cancelar" + "cancel": "Cancelar", + "openDocs": "Open docs" }, "byok": { "description": "Usa tus propias claves de proveedor. Nanobot lee estos valores desde la configuración actual, y solo los proveedores configurados se pueden elegir en General.", @@ -126,6 +206,18 @@ "missingCredential": "Añade la credencial requerida antes de guardar.", "saveHint": "Los cambios se aplican a nuevas solicitudes de web search." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "Cargando…", "noSessions": "Todavía no hay sesiones.", "actions": "Acciones del chat {{title}}", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "Eliminar", - "newChat": "Nuevo chat" + "newChat": "Nuevo chat", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "¿Eliminar este chat?", diff --git a/webui/src/i18n/locales/fr/common.json b/webui/src/i18n/locales/fr/common.json index aa2b6214..a6f80e72 100644 --- a/webui/src/i18n/locales/fr/common.json +++ b/webui/src/i18n/locales/fr/common.json @@ -30,13 +30,25 @@ "collapse": "Réduire la barre latérale", "toggleTheme": "Changer de thème", "newChat": "Nouvelle discussion", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "Récentes", "refreshSessions": "Actualiser les sessions", "settings": "Paramètres", "language": { "label": "Langue", "ariaLabel": "Changer de langue" - } + }, + "searchAria": "Rechercher", + "searchPlaceholder": "Rechercher", + "searchResults": "Résultats", + "noSearchResults": "Aucun chat correspondant." }, "settings": { "backToChat": "Retour à la discussion", @@ -46,12 +58,28 @@ }, "nav": { "general": "Général", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "Interface", "ai": "IA", - "system": "Système" + "system": "Système", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "Thème", @@ -59,19 +87,70 @@ "provider": "Fournisseur", "model": "Modèle", "restart": "Redémarrer nanobot", - "configPath": "Chemin de configuration" + "configPath": "Chemin de configuration", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "Basculer entre les apparences claire et sombre.", "language": "Choisissez la langue utilisée par le WebUI.", "provider": "Sélectionnez le fournisseur des nouvelles requêtes de modèle.", "model": "Définissez le nom du modèle par défaut utilisé par nanobot.", - "configPath": "Le fichier de configuration actuellement utilisé par la passerelle." + "configPath": "Le fichier de configuration actuellement utilisé par la passerelle.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "Clair", "dark": "Sombre", - "notAvailable": "Indisponible" + "notAvailable": "Indisponible", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "Chargement des paramètres...", @@ -83,7 +162,8 @@ "save": "Enregistrer", "saving": "Enregistrement", "edit": "Modifier", - "cancel": "Annuler" + "cancel": "Annuler", + "openDocs": "Open docs" }, "byok": { "description": "Utilisez vos propres clés de fournisseur. Nanobot lit ces valeurs depuis la configuration actuelle, et seuls les fournisseurs configurés peuvent être sélectionnés dans Général.", @@ -126,6 +206,18 @@ "missingCredential": "Ajoutez l'identifiant requis avant d'enregistrer.", "saveHint": "Les changements s'appliquent aux nouvelles requêtes web search." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "Chargement…", "noSessions": "Aucune session pour le moment.", "actions": "Actions de la discussion {{title}}", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "Supprimer", - "newChat": "Nouvelle discussion" + "newChat": "Nouvelle discussion", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "Supprimer cette discussion ?", diff --git a/webui/src/i18n/locales/id/common.json b/webui/src/i18n/locales/id/common.json index 062a3573..e64db602 100644 --- a/webui/src/i18n/locales/id/common.json +++ b/webui/src/i18n/locales/id/common.json @@ -30,13 +30,25 @@ "collapse": "Ciutkan sidebar", "toggleTheme": "Ganti tema", "newChat": "Obrolan baru", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "Terbaru", "refreshSessions": "Segarkan sesi", "settings": "Pengaturan", "language": { "label": "Bahasa", "ariaLabel": "Ganti bahasa" - } + }, + "searchAria": "Cari", + "searchPlaceholder": "Cari", + "searchResults": "Hasil", + "noSearchResults": "Tidak ada chat yang cocok." }, "settings": { "backToChat": "Kembali ke obrolan", @@ -46,12 +58,28 @@ }, "nav": { "general": "Umum", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "Antarmuka", "ai": "AI", - "system": "Sistem" + "system": "Sistem", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "Tema", @@ -59,19 +87,70 @@ "provider": "Penyedia", "model": "Model", "restart": "Mulai ulang nanobot", - "configPath": "Path konfigurasi" + "configPath": "Path konfigurasi", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "Beralih antara tampilan terang dan gelap.", "language": "Pilih bahasa yang digunakan WebUI.", "provider": "Pilih penyedia untuk permintaan model baru.", "model": "Atur nama model default yang digunakan nanobot.", - "configPath": "File konfigurasi gateway yang sedang digunakan." + "configPath": "File konfigurasi gateway yang sedang digunakan.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "Terang", "dark": "Gelap", - "notAvailable": "Tidak tersedia" + "notAvailable": "Tidak tersedia", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "Memuat pengaturan...", @@ -83,7 +162,8 @@ "save": "Simpan", "saving": "Menyimpan", "edit": "Edit", - "cancel": "Batal" + "cancel": "Batal", + "openDocs": "Open docs" }, "byok": { "description": "Gunakan kunci provider Anda sendiri. Nanobot membaca nilai ini dari config saat ini, dan hanya provider yang sudah dikonfigurasi yang bisa dipilih di Umum.", @@ -126,6 +206,18 @@ "missingCredential": "Tambahkan kredensial yang diperlukan sebelum menyimpan.", "saveHint": "Perubahan berlaku untuk permintaan web search baru." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "Memuat…", "noSessions": "Belum ada sesi.", "actions": "Aksi obrolan untuk {{title}}", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "Hapus", - "newChat": "Obrolan baru" + "newChat": "Obrolan baru", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "Hapus obrolan ini?", diff --git a/webui/src/i18n/locales/ja/common.json b/webui/src/i18n/locales/ja/common.json index 225c9d8b..c1bacd12 100644 --- a/webui/src/i18n/locales/ja/common.json +++ b/webui/src/i18n/locales/ja/common.json @@ -30,13 +30,25 @@ "collapse": "サイドバーを閉じる", "toggleTheme": "テーマを切り替える", "newChat": "新しいチャット", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "最近のチャット", "refreshSessions": "セッションを更新", "settings": "設定", "language": { "label": "言語", "ariaLabel": "言語を変更" - } + }, + "searchAria": "検索", + "searchPlaceholder": "検索", + "searchResults": "検索結果", + "noSearchResults": "一致するチャットはありません。" }, "settings": { "backToChat": "チャットに戻る", @@ -46,12 +58,28 @@ }, "nav": { "general": "一般", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "インターフェース", "ai": "AI", - "system": "システム" + "system": "システム", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "テーマ", @@ -59,19 +87,70 @@ "provider": "プロバイダー", "model": "モデル", "restart": "nanobot を再起動", - "configPath": "設定パス" + "configPath": "設定パス", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "ライト表示とダーク表示を切り替えます。", "language": "WebUI で使用する言語を選択します。", "provider": "新しいモデルリクエストに使うプロバイダーを選択します。", "model": "nanobot が既定で使用するモデル名を設定します。", - "configPath": "現在ゲートウェイが使用している設定ファイルです。" + "configPath": "現在ゲートウェイが使用している設定ファイルです。", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "ライト", "dark": "ダーク", - "notAvailable": "利用不可" + "notAvailable": "利用不可", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "設定を読み込んでいます...", @@ -83,7 +162,8 @@ "save": "保存", "saving": "保存中", "edit": "編集", - "cancel": "キャンセル" + "cancel": "キャンセル", + "openDocs": "Open docs" }, "byok": { "description": "自分の provider キーを使います。Nanobot は現在の config から値を読み込み、設定済みの provider だけを一般設定で選択できます。", @@ -126,6 +206,18 @@ "missingCredential": "保存する前に必要な認証情報を入力してください。", "saveHint": "変更は新しい web search リクエストに適用されます。" } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "読み込み中…", "noSessions": "まだセッションがありません。", "actions": "「{{title}}」のチャット操作", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "削除", - "newChat": "新しいチャット" + "newChat": "新しいチャット", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "このチャットを削除しますか？", diff --git a/webui/src/i18n/locales/ko/common.json b/webui/src/i18n/locales/ko/common.json index c3b03860..f9493664 100644 --- a/webui/src/i18n/locales/ko/common.json +++ b/webui/src/i18n/locales/ko/common.json @@ -30,13 +30,25 @@ "collapse": "사이드바 접기", "toggleTheme": "테마 전환", "newChat": "새 채팅", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "최근 대화", "refreshSessions": "세션 새로고침", "settings": "설정", "language": { "label": "언어", "ariaLabel": "언어 변경" - } + }, + "searchAria": "검색", + "searchPlaceholder": "검색", + "searchResults": "결과", + "noSearchResults": "일치하는 채팅이 없습니다." }, "settings": { "backToChat": "채팅으로 돌아가기", @@ -46,12 +58,28 @@ }, "nav": { "general": "일반", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "인터페이스", "ai": "AI", - "system": "시스템" + "system": "시스템", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "테마", @@ -59,19 +87,70 @@ "provider": "제공자", "model": "모델", "restart": "nanobot 재시작", - "configPath": "설정 경로" + "configPath": "설정 경로", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "밝은 모드와 어두운 모드를 전환합니다.", "language": "WebUI에서 사용할 언어를 선택합니다.", "provider": "새 모델 요청에 사용할 제공자를 선택합니다.", "model": "nanobot이 기본으로 사용할 모델 이름을 설정합니다.", - "configPath": "현재 게이트웨이가 사용하는 설정 파일입니다." + "configPath": "현재 게이트웨이가 사용하는 설정 파일입니다.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "라이트", "dark": "다크", - "notAvailable": "사용할 수 없음" + "notAvailable": "사용할 수 없음", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "설정을 불러오는 중...", @@ -83,7 +162,8 @@ "save": "저장", "saving": "저장 중", "edit": "편집", - "cancel": "취소" + "cancel": "취소", + "openDocs": "Open docs" }, "byok": { "description": "직접 provider 키를 가져옵니다. Nanobot은 현재 config에서 값을 읽고, 설정된 provider만 일반 설정에서 선택할 수 있습니다.", @@ -126,6 +206,18 @@ "missingCredential": "저장하기 전에 필요한 자격 증명을 입력하세요.", "saveHint": "변경 사항은 새 web search 요청에 적용됩니다." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "불러오는 중…", "noSessions": "아직 세션이 없습니다.", "actions": "{{title}} 채팅 작업", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "삭제", - "newChat": "새 채팅" + "newChat": "새 채팅", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "이 채팅을 삭제할까요?", diff --git a/webui/src/i18n/locales/vi/common.json b/webui/src/i18n/locales/vi/common.json index 9efbcd77..805e82ce 100644 --- a/webui/src/i18n/locales/vi/common.json +++ b/webui/src/i18n/locales/vi/common.json @@ -30,13 +30,25 @@ "collapse": "Thu gọn thanh bên", "toggleTheme": "Chuyển giao diện", "newChat": "Cuộc trò chuyện mới", + "viewOptions": "View", + "compactList": "Compact list", + "showPreviews": "Show previews", + "showTimestamps": "Show time", + "sortLabel": "Sort", + "sortUpdated": "Recently updated", + "sortCreated": "Recently created", + "sortTitle": "Title A-Z", "recent": "Gần đây", "refreshSessions": "Làm mới phiên", "settings": "Cài đặt", "language": { "label": "Ngôn ngữ", "ariaLabel": "Đổi ngôn ngữ" - } + }, + "searchAria": "Tìm kiếm", + "searchPlaceholder": "Tìm kiếm", + "searchResults": "Kết quả", + "noSearchResults": "Không có cuộc trò chuyện phù hợp." }, "settings": { "backToChat": "Quay lại trò chuyện", @@ -46,12 +58,28 @@ }, "nav": { "general": "Chung", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "Giao diện", "ai": "AI", - "system": "Hệ thống" + "system": "Hệ thống", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "Giao diện", @@ -59,19 +87,70 @@ "provider": "Nhà cung cấp", "model": "Mô hình", "restart": "Khởi động lại nanobot", - "configPath": "Đường dẫn cấu hình" + "configPath": "Đường dẫn cấu hình", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "Chuyển giữa giao diện sáng và tối.", "language": "Chọn ngôn ngữ dùng trong WebUI.", "provider": "Chọn nhà cung cấp cho các yêu cầu mô hình mới.", "model": "Đặt tên mô hình mặc định mà nanobot sử dụng.", - "configPath": "Tệp cấu hình gateway hiện đang dùng." + "configPath": "Tệp cấu hình gateway hiện đang dùng.", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "Sáng", "dark": "Tối", - "notAvailable": "Không khả dụng" + "notAvailable": "Không khả dụng", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "Đang tải cài đặt...", @@ -83,7 +162,8 @@ "save": "Lưu", "saving": "Đang lưu", "edit": "Sửa", - "cancel": "Hủy" + "cancel": "Hủy", + "openDocs": "Open docs" }, "byok": { "description": "Dùng key provider của riêng bạn. Nanobot đọc các giá trị này từ config hiện tại, và chỉ provider đã cấu hình mới có thể chọn trong Chung.", @@ -126,6 +206,18 @@ "missingCredential": "Thêm thông tin bắt buộc trước khi lưu.", "saveHint": "Thay đổi áp dụng cho các yêu cầu web search mới." } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "Đang tải…", "noSessions": "Chưa có phiên nào.", "actions": "Tác vụ cho cuộc trò chuyện {{title}}", + "activity": { + "running": "Agent running", + "complete": "Agent finished" + }, + "pin": "Pin", + "unpin": "Unpin", + "rename": "Rename", + "renameTitle": "Rename chat", + "renameDescription": "Choose a local sidebar name for this chat.", + "renamePlaceholder": "Chat name", + "renameSave": "Save", + "archive": "Archive", + "unarchive": "Unarchive", + "showArchived": "Show archived", + "hideArchived": "Hide archived", "delete": "Xóa", - "newChat": "Cuộc trò chuyện mới" + "newChat": "Cuộc trò chuyện mới", + "groups": { + "pinned": "Pinned", + "all": "Chats", + "today": "Today", + "yesterday": "Yesterday", + "earlier": "Earlier", + "archived": "Archived" + } }, "deleteConfirm": { "title": "Xóa cuộc trò chuyện này?", diff --git a/webui/src/i18n/locales/zh-CN/common.json b/webui/src/i18n/locales/zh-CN/common.json index 6f1a4be2..18089c7a 100644 --- a/webui/src/i18n/locales/zh-CN/common.json +++ b/webui/src/i18n/locales/zh-CN/common.json @@ -33,8 +33,16 @@ "toggleTheme": "切换主题", "home": "首页", "newChat": "新建对话", - "searchAria": "搜索会话", - "searchPlaceholder": "搜索会话", + "searchAria": "搜索", + "viewOptions": "视图", + "compactList": "紧凑列表", + "showPreviews": "显示预览", + "showTimestamps": "显示时间", + "sortLabel": "排序", + "sortUpdated": "最近更新", + "sortCreated": "最近创建", + "sortTitle": "标题 A-Z", + "searchPlaceholder": "搜索", "searchResults": "搜索结果", "noSearchResults": "没有匹配的会话。", "recent": "最近对话", @@ -53,12 +61,31 @@ }, "nav": { "general": "通用", - "byok": "BYOK" + "byok": "BYOK", + "overview": "概览", + "appearance": "外观", + "models": "模型", + "providers": "提供商", + "image": "图片", + "web": "网页", + "runtime": "运行时", + "advanced": "高级" }, "sections": { "interface": "界面", "ai": "AI", - "system": "系统" + "system": "系统", + "status": "状态", + "localPreferences": "本地偏好", + "presets": "预设", + "imageGeneration": "图片生成", + "imageDefaults": "默认值", + "webSearch": "网页搜索", + "webBehavior": "行为", + "identity": "身份", + "safety": "安全", + "capabilities": "能力", + "integrations": "集成" }, "rows": { "theme": "主题", @@ -66,34 +93,107 @@ "provider": "提供商", "model": "模型", "restart": "重启 nanobot", - "configPath": "配置路径" + "configPath": "配置路径", + "activePreset": "当前预设", + "gateway": "网关", + "restartState": "重启状态", + "pendingChanges": "待处理更改", + "selectedPreset": "选中的预设", + "presetModel": "预设模型", + "density": "密度", + "activityMode": "活动细节", + "codeWrap": "代码换行", + "maxResults": "最大结果数", + "timeout": "超时", + "jinaReader": "Jina Reader", + "imageGeneration": "图片生成", + "imageProvider": "图片服务商", + "imageProviderStatus": "服务商状态", + "imageProviderBase": "服务商地址", + "imageModel": "图片模型", + "defaultAspectRatio": "默认比例", + "defaultImageSize": "默认尺寸", + "maxImagesPerTurn": "每轮最多图片数", + "imageSaveDir": "保存目录", + "botName": "Bot 名称", + "botIcon": "Bot 图标", + "timezone": "时区", + "toolHintMaxLength": "工具提示长度", + "workspacePath": "工作区路径", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "统一会话", + "restrictWorkspace": "限制在工作区内", + "execTool": "Exec 工具", + "execSandbox": "Exec 沙箱", + "ssrfWhitelist": "SSRF 白名单", + "mcpServers": "MCP 服务器", + "pathAppend": "PATH 追加", + "configurationDocs": "配置文档" }, "help": { "theme": "在浅色和深色外观之间切换。", "language": "选择 WebUI 使用的语言。", - "provider": "选择新模型请求使用的服务提供商。", + "provider": "选择新模型请求使用的服务商。", "model": "设置 nanobot 默认使用的模型名称。", - "configPath": "当前网关正在使用的配置文件。" + "configPath": "当前网关正在使用的配置文件。", + "selectedPreset": "命名预设在这里只读；需要编辑时请改 config.json。", + "presetModel": "切回 Default 后可在 WebUI 编辑模型和服务商。", + "density": "仅保存在当前浏览器。", + "activityMode": "选择默认显示多少 agent 活动细节。", + "codeWrap": "让较小屏幕上的长代码行更易读。", + "maxResults": "每次 web_search 返回的结果数量。", + "timeout": "搜索服务商请求超时秒数。", + "jinaReader": "可用时为 web_fetch 使用 Jina Reader。", + "imageGeneration": "当已配置图片服务商时，在对话中开放 generate_image。", + "imageProvider": "选择 generate_image 使用的服务商。", + "imageProviderStatus": "图片生成复用服务商页里的凭证配置。", + "imageModel": "发送给所选图片服务商的模型名称。", + "defaultAspectRatio": "当提示词没有选择比例时使用。", + "defaultImageSize": "发送给支持该能力的服务商的尺寸提示。", + "maxImagesPerTurn": "单次 generate_image 请求允许的图片上限。", + "botName": "显示在使用 bot 身份的运行时界面里。", + "botIcon": "显示在 bot 名称旁的短 emoji 或文本。", + "timezone": "运行时上下文和计划任务使用的 IANA 时区。", + "toolHintMaxLength": "工具进度提示显示的最大字符数。", + "advancedReadOnly": "高级安全控制在 WebUI 中只读；需要时请谨慎编辑 config.json。" }, "values": { "light": "浅色", "dark": "深色", - "notAvailable": "不可用" + "notAvailable": "不可用", + "enabled": "已启用", + "disabled": "已禁用", + "restartPending": "等待重启", + "ready": "就绪", + "comfortable": "舒适", + "compact": "紧凑", + "auto": "自动", + "expanded": "展开", + "on": "开", + "off": "关", + "configured": "已配置", + "notConfigured": "未配置" }, "status": { "loading": "正在加载设置...", "loadError": "无法加载设置", "unsaved": "有未保存的更改。", - "savedRestart": "已保存。重启 nanobot 后生效。" + "upToDate": "已是最新。", + "savedRestart": "已保存。重启 nanobot 后生效。", + "restartAfterSaving": "保存后，可在合适时重启。", + "savedRestartApply": "已保存，可稍后重启。", + "imageProviderRestart": "图片服务商改动已保存，可稍后重启。" }, "actions": { "save": "保存", "saving": "保存中", "edit": "编辑", - "cancel": "取消" + "cancel": "取消", + "openDocs": "打开文档" }, "byok": { - "description": "自带 provider key。Nanobot 会从当前 config 读取这些值，只有已配置的 provider 才能在通用设置里选择。", + "description": "自带服务商密钥。Nanobot 会从当前 config 读取这些值，只有已配置的服务商才能在通用设置里选择。", "configured": "已配置", "notConfigured": "未配置", "configuredSection": "已配置", @@ -105,22 +205,22 @@ "apiKeyPlaceholder": "输入 API key", "apiKeyConfiguredPlaceholder": "留空则保留当前 key", "configuredKeyHint": "已配置的 key", - "apiBasePlaceholder": "使用 provider 默认地址", - "apiKeyRequired": "需要 API key 才能配置此 provider。", + "apiBasePlaceholder": "使用服务商默认地址", + "apiKeyRequired": "需要 API key 才能配置此服务商。", "showApiKey": "显示 API key", "hideApiKey": "隐藏 API key", - "noConfiguredProviders": "没有已配置的 provider", - "configureFirst": "请先在 BYOK 里配置 provider。", + "noConfiguredProviders": "没有已配置的服务商", + "configureFirst": "请先在 BYOK 里配置服务商。", "openByok": "打开 BYOK", "tabs": { "ariaLabel": "BYOK 凭证类型", "llm": "LLM", - "webSearch": "Web Search" + "webSearch": "网页搜索" }, "webSearch": { - "provider": "搜索 provider", - "providerHelp": "选择 web search 工具使用的后端。", - "selectProvider": "选择 provider", + "provider": "搜索服务商", + "providerHelp": "选择网页搜索工具使用的后端。", + "selectProvider": "选择服务商", "credentials": "凭证", "noCredentialRequired": "无需 key", "noCredentialHelp": "DuckDuckGo 不需要保存 API key。", @@ -128,11 +228,31 @@ "baseUrl": "Base URL", "baseUrlHelp": "SearXNG 需要你自己的实例地址。", "baseUrlPlaceholder": "https://search.example.com", - "apiKeyRequired": "这个搜索 provider 需要 API key。", + "apiKeyRequired": "这个搜索服务商需要 API key。", "baseUrlRequired": "SearXNG 需要 Base URL。", "missingCredential": "填写所需凭证后才能保存。", - "saveHint": "改动会应用到新的 web search 请求。" + "saveHint": "改动会应用到新的网页搜索请求。" } + }, + "overview": { + "model": "当前模型", + "providers": "提供商", + "configuredCount": "已配置 {{count}} 个", + "totalProviders": "共 {{count}} 个可用", + "webSearch": "网页搜索", + "imageGeneration": "图片生成", + "workspace": "工作区" + }, + "providers": { + "searchPlaceholder": "搜索服务商", + "noMatches": "没有匹配的服务商。" + }, + "image": { + "selectProvider": "选择服务商", + "selectAspect": "选择比例", + "selectSize": "选择尺寸", + "configureProvider": "配置服务商", + "missingCredential": "启用图片生成前，请先配置这个服务商。" } }, "chat": { @@ -140,12 +260,30 @@ "loading": "加载中…", "noSessions": "还没有会话。", "actions": "“{{title}}” 的会话操作", + "activity": { + "running": "Agent 正在运行", + "complete": "Agent 已完成" + }, + "pin": "置顶", + "unpin": "取消置顶", + "rename": "重命名", + "renameTitle": "重命名对话", + "renameDescription": "为这个对话设置一个仅用于 WebUI 侧边栏的名称。", + "renamePlaceholder": "对话名称", + "renameSave": "保存", + "archive": "归档", + "unarchive": "取消归档", + "showArchived": "显示归档", + "hideArchived": "隐藏归档", "delete": "删除", "newChat": "新建对话", "groups": { + "pinned": "置顶", + "all": "对话", "today": "今天", "yesterday": "昨天", - "earlier": "更早" + "earlier": "更早", + "archived": "已归档" } }, "deleteConfirm": { @@ -282,7 +420,7 @@ }, "status": { "title": "查看状态", - "description": "显示运行时、provider 和 channel 状态。" + "description": "显示运行时、服务商和通道状态。" }, "history": { "title": "查看对话历史", diff --git a/webui/src/i18n/locales/zh-TW/common.json b/webui/src/i18n/locales/zh-TW/common.json index 1e26b155..cf1cd4aa 100644 --- a/webui/src/i18n/locales/zh-TW/common.json +++ b/webui/src/i18n/locales/zh-TW/common.json @@ -30,13 +30,25 @@ "collapse": "收合側邊欄", "toggleTheme": "切換主題", "newChat": "新增對話", + "viewOptions": "檢視", + "compactList": "緊湊列表", + "showPreviews": "顯示預覽", + "showTimestamps": "顯示時間", + "sortLabel": "排序", + "sortUpdated": "最近更新", + "sortCreated": "最近建立", + "sortTitle": "標題 A-Z", "recent": "最近對話", "refreshSessions": "重新整理會話", "settings": "設定", "language": { "label": "語言", "ariaLabel": "切換語言" - } + }, + "searchAria": "搜尋", + "searchPlaceholder": "搜尋", + "searchResults": "搜尋結果", + "noSearchResults": "沒有符合的對話。" }, "settings": { "backToChat": "返回對話", @@ -46,12 +58,28 @@ }, "nav": { "general": "一般", - "byok": "BYOK" + "byok": "BYOK", + "overview": "Overview", + "appearance": "Appearance", + "models": "Models", + "providers": "Providers", + "image": "Image", + "web": "Web", + "runtime": "Runtime", + "advanced": "Advanced" }, "sections": { "interface": "介面", "ai": "AI", - "system": "系統" + "system": "系統", + "status": "Status", + "localPreferences": "Local preferences", + "presets": "Presets", + "webSearch": "Web search", + "webBehavior": "Behavior", + "identity": "Identity", + "safety": "Safety", + "integrations": "Integrations" }, "rows": { "theme": "主題", @@ -59,19 +87,70 @@ "provider": "提供者", "model": "模型", "restart": "重新啟動 nanobot", - "configPath": "設定檔路徑" + "configPath": "設定檔路徑", + "activePreset": "Active preset", + "gateway": "Gateway", + "restartState": "Restart state", + "selectedPreset": "Selected preset", + "presetModel": "Preset model", + "density": "Density", + "activityMode": "Activity detail", + "codeWrap": "Code wrapping", + "maxResults": "Max results", + "timeout": "Timeout", + "jinaReader": "Jina reader", + "botName": "Bot name", + "botIcon": "Bot icon", + "timezone": "Timezone", + "toolHintMaxLength": "Tool hint length", + "workspacePath": "Workspace path", + "heartbeat": "Heartbeat", + "dream": "Dream", + "unifiedSession": "Unified session", + "restrictWorkspace": "Restrict to workspace", + "execTool": "Exec tool", + "execSandbox": "Exec sandbox", + "ssrfWhitelist": "SSRF whitelist", + "mcpServers": "MCP servers", + "pathAppend": "PATH append", + "configurationDocs": "Configuration docs" }, "help": { "theme": "在淺色與深色外觀之間切換。", "language": "選擇 WebUI 使用的語言。", "provider": "選擇新模型請求使用的服務提供者。", "model": "設定 nanobot 預設使用的模型名稱。", - "configPath": "目前閘道正在使用的設定檔。" + "configPath": "目前閘道正在使用的設定檔。", + "selectedPreset": "Named presets are read-only here; edit them in config.json.", + "presetModel": "Switch to Default to edit model and provider from the WebUI.", + "density": "Stored only in this browser.", + "activityMode": "Choose how much agent activity chrome to show by default.", + "codeWrap": "Keep long code lines readable on smaller screens.", + "maxResults": "Results returned by each web_search call.", + "timeout": "Seconds before a search provider request times out.", + "jinaReader": "Use Jina Reader for web_fetch when available.", + "botName": "Shown in runtime surfaces that use the configured bot identity.", + "botIcon": "Short emoji or text shown beside the bot name.", + "timezone": "IANA timezone used by runtime context and schedules.", + "toolHintMaxLength": "Maximum characters shown in tool progress hints.", + "advancedReadOnly": "Advanced safety controls are read-only in WebUI. Edit config.json intentionally when needed." }, "values": { "light": "淺色", "dark": "深色", - "notAvailable": "不可用" + "notAvailable": "不可用", + "enabled": "Enabled", + "disabled": "Disabled", + "restartRequired": "Restart required", + "liveReload": "Live reload ready", + "comfortable": "Comfortable", + "compact": "Compact", + "auto": "Auto", + "expanded": "Expanded", + "on": "On", + "off": "Off", + "configured": "Configured", + "notConfigured": "Not configured" }, "status": { "loading": "正在載入設定...", @@ -83,7 +162,8 @@ "save": "儲存", "saving": "儲存中", "edit": "編輯", - "cancel": "取消" + "cancel": "取消", + "openDocs": "Open docs" }, "byok": { "description": "自帶 provider key。Nanobot 會從目前 config 讀取這些值，只有已設定的 provider 才能在一般設定中選擇。", @@ -126,6 +206,18 @@ "missingCredential": "填寫必要憑證後才能儲存。", "saveHint": "變更會套用到新的 web search 請求。" } + }, + "overview": { + "model": "Current model", + "providers": "Providers", + "configuredCount": "{{count}} configured", + "totalProviders": "{{count}} available", + "webSearch": "Web search", + "workspace": "Workspace" + }, + "providers": { + "searchPlaceholder": "Search providers", + "noMatches": "No providers match this search." } }, "chat": { @@ -133,8 +225,31 @@ "loading": "載入中…", "noSessions": "目前還沒有會話。", "actions": "「{{title}}」的會話操作", + "activity": { + "running": "Agent 正在執行", + "complete": "Agent 已完成" + }, + "pin": "置頂", + "unpin": "取消置頂", + "rename": "重新命名", + "renameTitle": "重新命名對話", + "renameDescription": "為這個對話設定僅用於 WebUI 側邊欄的名稱。", + "renamePlaceholder": "對話名稱", + "renameSave": "儲存", + "archive": "封存", + "unarchive": "取消封存", + "showArchived": "顯示封存", + "hideArchived": "隱藏封存", "delete": "刪除", - "newChat": "新增對話" + "newChat": "新增對話", + "groups": { + "pinned": "置頂", + "all": "對話", + "today": "今天", + "yesterday": "昨天", + "earlier": "更早", + "archived": "已封存" + } }, "deleteConfirm": { "title": "刪除這個對話？", diff --git a/webui/src/lib/api.ts b/webui/src/lib/api.ts index 058ca29c..d3133675 100644 --- a/webui/src/lib/api.ts +++ b/webui/src/lib/api.ts @@ -1,8 +1,10 @@ import type { ChatSummary, + ImageGenerationSettingsUpdate, ProviderSettingsUpdate, SettingsPayload, SettingsUpdate, + SidebarStatePayload, SlashCommand, WebSearchSettingsUpdate, WebuiThreadPersistedPayload, @@ -52,6 +54,7 @@ export async function listSessions( updated_at: string | null; title?: string; preview?: string; + run_started_at?: number | null; }; const body = await request<{ sessions: Row[] }>( `${base}/api/sessions`, @@ -64,6 +67,7 @@ export async function listSessions( updatedAt: s.updated_at, title: s.title ?? "", preview: s.preview ?? "", + runStartedAt: s.run_started_at ?? null, })); } @@ -125,14 +129,43 @@ export async function listSlashCommands( })); } +export async function fetchSidebarState( + token: string, + base: string = "", +): Promise { + return request(`${base}/api/webui/sidebar-state`, token); +} + +export async function updateSidebarState( + token: string, + state: SidebarStatePayload, + base: string = "", +): Promise { + const query = new URLSearchParams(); + query.set("state", JSON.stringify(state)); + return request( + `${base}/api/webui/sidebar-state/update?${query}`, + token, + ); +} + export async function updateSettings( token: string, update: SettingsUpdate, base: string = "", ): Promise { const query = new URLSearchParams(); + if (update.modelPreset !== undefined) { + query.set("model_preset", update.modelPreset ?? "default"); + } if (update.model !== undefined) query.set("model", update.model); if (update.provider !== undefined) query.set("provider", update.provider); + if (update.timezone !== undefined) query.set("timezone", update.timezone); + if (update.botName !== undefined) query.set("bot_name", update.botName); + if (update.botIcon !== undefined) query.set("bot_icon", update.botIcon); + if (update.toolHintMaxLength !== undefined) { + query.set("tool_hint_max_length", String(update.toolHintMaxLength)); + } return request(`${base}/api/settings/update?${query}`, token); } @@ -160,8 +193,31 @@ export async function updateWebSearchSettings( query.set("provider", update.provider); if (update.apiKey !== undefined) query.set("api_key", update.apiKey); if (update.baseUrl !== undefined) query.set("base_url", update.baseUrl); + if (update.maxResults !== undefined) query.set("max_results", String(update.maxResults)); + if (update.timeout !== undefined) query.set("timeout", String(update.timeout)); + if (update.useJinaReader !== undefined) { + query.set("use_jina_reader", String(update.useJinaReader)); + } return request( `${base}/api/settings/web-search/update?${query}`, token, ); } + +export async function updateImageGenerationSettings( + token: string, + update: ImageGenerationSettingsUpdate, + base: string = "", +): Promise { + const query = new URLSearchParams(); + query.set("enabled", String(update.enabled)); + query.set("provider", update.provider); + query.set("model", update.model); + query.set("default_aspect_ratio", update.defaultAspectRatio); + query.set("default_image_size", update.defaultImageSize); + query.set("max_images_per_turn", String(update.maxImagesPerTurn)); + return request( + `${base}/api/settings/image-generation/update?${query}`, + token, + ); +} diff --git a/webui/src/lib/nanobot-client.ts b/webui/src/lib/nanobot-client.ts index dfddf688..0587520a 100644 --- a/webui/src/lib/nanobot-client.ts +++ b/webui/src/lib/nanobot-client.ts @@ -56,6 +56,7 @@ type StatusHandler = (status: ConnectionStatus) => void; type RuntimeModelHandler = (modelName: string | null, modelPreset?: string | null) => void; type SessionUpdateScope = "metadata" | "thread" | string; type SessionUpdateHandler = (chatId: string, scope?: SessionUpdateScope) => void; +type RunStatusHandler = (chatId: string, startedAt: number | null) => void; /** Structured connection-level errors surfaced to the UI. * @@ -102,6 +103,7 @@ export class NanobotClient { private statusHandlers = new Set(); private runtimeModelHandlers = new Set(); private sessionUpdateHandlers = new Set(); + private runStatusHandlers = new Set(); private errorHandlers = new Set(); // chat_id -> handlers listening on it private chatHandlers = new Map>(); @@ -172,6 +174,16 @@ export class NanobotClient { }; } + onRunStatus(handler: RunStatusHandler): Unsubscribe { + this.runStatusHandlers.add(handler); + for (const [chatId, startedAt] of this.runStartedAtByChatId) { + handler(chatId, startedAt); + } + return () => { + this.runStatusHandlers.delete(handler); + }; + } + /** Subscribe to transport-level faults (see :type:`StreamError`). */ onError(handler: ErrorHandler): Unsubscribe { this.errorHandlers.add(handler); @@ -194,9 +206,12 @@ export class NanobotClient { private recordGoalStatusForRunStrip(chatId: string, ev: InboundEvent): void { if (ev.event !== "goal_status") return; if (ev.status === "running" && typeof ev.started_at === "number") { + const previous = this.runStartedAtByChatId.get(chatId); this.runStartedAtByChatId.set(chatId, ev.started_at); - } else { + if (previous !== ev.started_at) this.emitRunStatus(chatId, ev.started_at); + } else if (this.runStartedAtByChatId.has(chatId)) { this.runStartedAtByChatId.delete(chatId); + this.emitRunStatus(chatId, null); } } @@ -389,6 +404,12 @@ export class NanobotClient { } } + private emitRunStatus(chatId: string, startedAt: number | null): void { + for (const handler of this.runStatusHandlers) { + handler(chatId, startedAt); + } + } + private dispatch(chatId: string, ev: InboundEvent): void { const handlers = this.chatHandlers.get(chatId); if (handlers !== undefined && handlers.size > 0) { diff --git a/webui/src/lib/types.ts b/webui/src/lib/types.ts index 8ffb4a70..66342e9a 100644 --- a/webui/src/lib/types.ts +++ b/webui/src/lib/types.ts @@ -89,6 +89,7 @@ export interface UIFileEdit { call_id: string; tool: string; path: string; + absolute_path?: string; phase?: "start" | "end" | "error" | string; added: number; deleted: number; @@ -96,6 +97,7 @@ export interface UIFileEdit { status: "editing" | "done" | "error"; binary?: boolean; error?: string; + pending?: boolean; } export interface ChatSummary { @@ -108,6 +110,30 @@ export interface ChatSummary { updatedAt: string | null; title?: string; preview: string; + /** Unix epoch seconds when this session currently has a turn in flight. */ + runStartedAt?: number | null; +} + +export type SidebarDensity = "comfortable" | "compact"; +export type SidebarSortMode = "updated_desc" | "created_desc" | "title_asc"; + +export interface SidebarViewState { + density: SidebarDensity; + show_previews: boolean; + show_timestamps: boolean; + show_archived: boolean; + sort: SidebarSortMode; +} + +export interface SidebarStatePayload { + schema_version: number; + pinned_keys: string[]; + archived_keys: string[]; + title_overrides: Record; + tags_by_key: Record; + collapsed_groups: Record; + view: SidebarViewState; + updated_at?: string | null; } export interface BootstrapResponse { @@ -123,7 +149,28 @@ export interface SettingsPayload { provider: string; resolved_provider: string | null; has_api_key: boolean; + model_preset: string | null; + max_tokens: number; + context_window_tokens: number; + temperature: number; + reasoning_effort: string | null; + timezone: string; + bot_name: string; + bot_icon: string; + tool_hint_max_length: number; }; + model_presets: Array<{ + name: string; + label: string; + active: boolean; + is_default: boolean; + model: string; + provider: string; + max_tokens: number; + context_window_tokens: number; + temperature: number; + reasoning_effort: string | null; + }>; providers: Array<{ name: string; label: string; @@ -137,21 +184,82 @@ export interface SettingsPayload { provider: string; api_key_hint?: string | null; base_url?: string | null; + max_results: number; + timeout: number; providers: Array<{ name: string; label: string; credential: "none" | "api_key" | "base_url"; }>; }; + web: { + enable: boolean; + proxy?: string | null; + user_agent?: string | null; + search: { + max_results: number; + timeout: number; + }; + fetch: { + use_jina_reader: boolean; + }; + }; + image_generation: { + enabled: boolean; + provider: string; + provider_configured: boolean; + model: string; + default_aspect_ratio: string; + default_image_size: string; + max_images_per_turn: number; + save_dir: string; + providers: Array<{ + name: string; + label: string; + configured: boolean; + api_key_hint?: string | null; + api_base?: string | null; + default_api_base?: string | null; + }>; + }; runtime: { config_path: string; + workspace_path: string; + gateway_host: string; + gateway_port: number; + heartbeat: { + enabled: boolean; + interval_s: number; + keep_recent_messages: number; + }; + dream: { + schedule: string; + max_batch_size: number; + max_iterations: number; + annotate_line_ages: boolean; + }; + unified_session: boolean; + }; + advanced: { + restrict_to_workspace: boolean; + ssrf_whitelist_count: number; + mcp_server_count: number; + exec_enabled: boolean; + exec_sandbox?: string | null; + exec_path_append_set: boolean; }; requires_restart: boolean; + restart_required_sections?: Array<"runtime" | "web" | "image">; } export interface SettingsUpdate { model?: string; provider?: string; + modelPreset?: string | null; + timezone?: string; + botName?: string; + botIcon?: string; + toolHintMaxLength?: number; } export interface ProviderSettingsUpdate { @@ -164,6 +272,18 @@ export interface WebSearchSettingsUpdate { provider: string; apiKey?: string; baseUrl?: string; + maxResults?: number; + timeout?: number; + useJinaReader?: boolean; +} + +export interface ImageGenerationSettingsUpdate { + enabled: boolean; + provider: string; + model: string; + defaultAspectRatio: string; + defaultImageSize: string; + maxImagesPerTurn: number; } export interface SlashCommand { diff --git a/webui/src/tests/agent-activity-cluster.test.tsx b/webui/src/tests/agent-activity-cluster.test.tsx index 12026850..041195e2 100644 --- a/webui/src/tests/agent-activity-cluster.test.tsx +++ b/webui/src/tests/agent-activity-cluster.test.tsx @@ -236,6 +236,7 @@ describe("AgentActivityCluster", () => { call_id: "call-edit", tool: "edit_file", path: "src/app.tsx", + absolute_path: "/Users/renxubin/project/src/app.tsx", phase: "end", added: 12, deleted: 3, @@ -250,13 +251,17 @@ describe("AgentActivityCluster", () => { ); expect(screen.getByRole("button", { name: /edited app\.tsx/i })).toBeInTheDocument(); + expect(screen.getByTestId("activity-header-file-reference")).toHaveTextContent("app.tsx"); + expect(screen.getByTestId("activity-header-file-reference")).toHaveAttribute( + "aria-label", + "/Users/renxubin/project/src/app.tsx", + ); fireEvent.click(screen.getByRole("button", { name: /edited app\.tsx/i })); expect(screen.queryByText("Edited files")).not.toBeInTheDocument(); - expect(screen.queryByText("Edited")).not.toBeInTheDocument(); const fileRef = screen.getByTestId("activity-file-reference"); expect(fileRef).toHaveTextContent("src/app.tsx"); - expect(fileRef).toHaveAttribute("aria-label", "src/app.tsx"); + expect(fileRef).toHaveAttribute("aria-label", "/Users/renxubin/project/src/app.tsx"); await waitFor(() => { expect(screen.getAllByText("+12").length).toBeGreaterThan(0); expect(screen.getAllByText("-3").length).toBeGreaterThan(0); @@ -266,6 +271,38 @@ describe("AgentActivityCluster", () => { } }); + it("renders pending file edit placeholders before the path is known", () => { + render( + , + ); + + expect(screen.getByRole("button", { name: /preparing edit/i })).toBeInTheDocument(); + fireEvent.click(screen.getByRole("button", { name: /preparing edit/i })); + expect(screen.getByText("Preparing file edit…")).toBeInTheDocument(); + }); + it("merges repeated edits for the same path and lets successful edits win over failures", async () => { const restoreMotion = installReducedMotion(); try { diff --git a/webui/src/tests/api.test.ts b/webui/src/tests/api.test.ts index baee87f6..831f36ae 100644 --- a/webui/src/tests/api.test.ts +++ b/webui/src/tests/api.test.ts @@ -2,9 +2,12 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; import { deleteSession, + fetchSidebarState, fetchWebuiThread, listSessions, listSlashCommands, + updateSidebarState, + updateImageGenerationSettings, updateProviderSettings, updateSettings, updateWebSearchSettings, @@ -46,12 +49,17 @@ describe("webui API helpers", () => { it("serializes settings updates as a narrow query string", async () => { await updateSettings("tok", { + modelPreset: "default", model: "openrouter/test", provider: "openrouter", + timezone: "Asia/Shanghai", + botName: "nanobot", + botIcon: "nb", + toolHintMaxLength: 120, }); expect(fetch).toHaveBeenCalledWith( - "/api/settings/update?model=openrouter%2Ftest&provider=openrouter", + "/api/settings/update?model_preset=default&model=openrouter%2Ftest&provider=openrouter&timezone=Asia%2FShanghai&bot_name=nanobot&bot_icon=nb&tool_hint_max_length=120", expect.objectContaining({ headers: { Authorization: "Bearer tok" }, }), @@ -77,16 +85,81 @@ describe("webui API helpers", () => { await updateWebSearchSettings("tok", { provider: "searxng", baseUrl: "https://search.example.com", + maxResults: 8, + timeout: 45, + useJinaReader: false, }); expect(fetch).toHaveBeenCalledWith( - "/api/settings/web-search/update?provider=searxng&base_url=https%3A%2F%2Fsearch.example.com", + "/api/settings/web-search/update?provider=searxng&base_url=https%3A%2F%2Fsearch.example.com&max_results=8&timeout=45&use_jina_reader=false", expect.objectContaining({ headers: { Authorization: "Bearer tok" }, }), ); }); + it("serializes image generation settings updates", async () => { + await updateImageGenerationSettings("tok", { + enabled: true, + provider: "openrouter", + model: "openai/gpt-5.4-image-2", + defaultAspectRatio: "16:9", + defaultImageSize: "2K", + maxImagesPerTurn: 3, + }); + + expect(fetch).toHaveBeenCalledWith( + "/api/settings/image-generation/update?enabled=true&provider=openrouter&model=openai%2Fgpt-5.4-image-2&default_aspect_ratio=16%3A9&default_image_size=2K&max_images_per_turn=3", + expect.objectContaining({ + headers: { Authorization: "Bearer tok" }, + }), + ); + }); + + it("reads and writes persisted sidebar state", async () => { + const state = { + schema_version: 1, + pinned_keys: ["websocket:chat-1"], + archived_keys: ["websocket:old"], + title_overrides: { "websocket:chat-1": "Release" }, + tags_by_key: {}, + collapsed_groups: {}, + view: { + density: "compact" as const, + show_previews: false, + show_timestamps: false, + show_archived: true, + sort: "updated_desc" as const, + }, + updated_at: null, + }; + vi.mocked(fetch).mockResolvedValueOnce({ + ok: true, + json: async () => state, + } as Response); + + await expect(fetchSidebarState("tok")).resolves.toEqual(state); + expect(fetch).toHaveBeenCalledWith( + "/api/webui/sidebar-state", + expect.objectContaining({ + headers: { Authorization: "Bearer tok" }, + }), + ); + + await updateSidebarState("tok", state); + const [url, init] = vi.mocked(fetch).mock.calls.at(-1)!; + expect(String(url).startsWith("/api/webui/sidebar-state/update?")).toBe(true); + expect(init).toEqual(expect.objectContaining({ + headers: { Authorization: "Bearer tok" }, + })); + const encodedState = new URLSearchParams(String(url).split("?", 2)[1]).get("state"); + expect(encodedState).toBeTruthy(); + expect(JSON.parse(encodedState ?? "{}")).toMatchObject({ + pinned_keys: ["websocket:chat-1"], + title_overrides: { "websocket:chat-1": "Release" }, + }); + }); + it("maps generated session titles from the sessions list", async () => { vi.mocked(fetch).mockResolvedValueOnce({ ok: true, @@ -97,6 +170,7 @@ describe("webui API helpers", () => { created_at: "2026-05-01T10:00:00", updated_at: "2026-05-01T10:01:00", title: "优化 WebUI 标题", + run_started_at: 1_700_000_000, }, ], }), @@ -107,6 +181,7 @@ describe("webui API helpers", () => { key: "websocket:chat-1", title: "优化 WebUI 标题", preview: "", + runStartedAt: 1_700_000_000, }, ]); }); diff --git a/webui/src/tests/app-layout.test.tsx b/webui/src/tests/app-layout.test.tsx index e766bcee..26a5b429 100644 --- a/webui/src/tests/app-layout.test.tsx +++ b/webui/src/tests/app-layout.test.tsx @@ -9,6 +9,8 @@ const createChatSpy = vi.fn().mockResolvedValue("chat-1"); const deleteChatSpy = vi.fn(); const toggleThemeSpy = vi.fn(); const updateUrlSpy = vi.fn(); +const attachSpy = vi.fn(); +const runStatusHandlers = new Set<(chatId: string, startedAt: number | null) => void>(); let mockSessions: ChatSummary[] = []; vi.mock("@/hooks/useSessions", async (importOriginal) => { @@ -67,9 +69,16 @@ vi.mock("@/lib/nanobot-client", () => { onRuntimeModelUpdate = () => () => {}; onError = () => () => {}; onChat = () => () => {}; + onSessionUpdate = () => () => {}; + onRunStatus = (handler: (chatId: string, startedAt: number | null) => void) => { + runStatusHandlers.add(handler); + return () => runStatusHandlers.delete(handler); + }; + getRunStartedAt = () => null; + getGoalState = () => undefined; sendMessage = vi.fn(); newChat = vi.fn(); - attach = vi.fn(); + attach = attachSpy; close = vi.fn(); updateUrl = updateUrlSpy; } @@ -89,6 +98,9 @@ describe("App layout", () => { createChatSpy.mockClear(); deleteChatSpy.mockReset(); toggleThemeSpy.mockReset(); + attachSpy.mockReset(); + runStatusHandlers.clear(); + localStorage.removeItem("nanobot-webui.sidebar.completed-runs.v1"); vi.mocked(fetchBootstrap).mockReset().mockResolvedValue({ token: "tok", ws_path: "/", @@ -175,6 +187,318 @@ describe("App layout", () => { expect(document.body.style.pointerEvents).not.toBe("none"); }, 15_000); + it("keeps the mobile session action menu inside the sidebar sheet", async () => { + mockSessions = [ + { + key: "websocket:chat-a", + channel: "websocket", + chatId: "chat-a", + createdAt: "2026-04-16T10:00:00Z", + updatedAt: "2026-04-16T10:00:00Z", + preview: "Existing chat", + }, + ]; + vi.stubGlobal( + "matchMedia", + vi.fn().mockImplementation((query: string) => ({ + matches: !query.includes("1024px"), + media: query, + onchange: null, + addListener: vi.fn(), + removeListener: vi.fn(), + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + dispatchEvent: vi.fn(), + })), + ); + + render(); + + await waitFor(() => expect(connectSpy).toHaveBeenCalled()); + fireEvent.click(screen.getByRole("button", { name: "Toggle sidebar" })); + + const sheet = await screen.findByRole("dialog"); + const mobileSidebar = within(sheet).getByRole("navigation", { + name: "Sidebar navigation", + }); + await waitFor(() => + expect( + within(mobileSidebar).getByRole("button", { name: /^Existing chat$/ }), + ).toBeInTheDocument(), + ); + + fireEvent.pointerDown( + within(mobileSidebar).getByLabelText("Chat actions for Existing chat"), + { button: 0 }, + ); + + const deleteItem = await within(sheet).findByRole("menuitem", { + name: "Delete", + }); + expect(deleteItem).toBeInTheDocument(); + + fireEvent.click(deleteItem); + await waitFor(() => + expect(screen.getByText("Delete this chat?")).toBeInTheDocument(), + ); + }, 15_000); + + it("applies persisted sidebar workspace state from the gateway", async () => { + mockSessions = [ + { + key: "websocket:chat-a", + channel: "websocket", + chatId: "chat-a", + createdAt: "2026-04-16T10:00:00Z", + updatedAt: "2026-04-16T10:00:00Z", + preview: "First chat", + }, + { + key: "websocket:chat-b", + channel: "websocket", + chatId: "chat-b", + createdAt: "2026-04-16T11:00:00Z", + updatedAt: "2026-04-16T11:00:00Z", + preview: "Second chat", + }, + ]; + const initialState = { + schema_version: 1, + pinned_keys: ["websocket:chat-b"], + archived_keys: ["websocket:chat-a"], + title_overrides: { "websocket:chat-b": "Roadmap" }, + tags_by_key: {}, + collapsed_groups: {}, + view: { + density: "comfortable", + show_previews: false, + show_timestamps: false, + show_archived: false, + sort: "updated_desc", + }, + updated_at: null, + }; + vi.stubGlobal( + "fetch", + vi.fn().mockImplementation(async (url: string | URL | Request) => { + const href = String(url); + if (href === "/api/webui/sidebar-state") { + return { ok: true, json: async () => initialState }; + } + if (href.startsWith("/api/webui/sidebar-state/update?")) { + const encoded = new URLSearchParams(href.split("?", 2)[1]).get("state"); + return { + ok: true, + json: async () => JSON.parse(encoded ?? "{}"), + }; + } + return { ok: false, status: 404 }; + }), + ); + + render(); + + await waitFor(() => expect(connectSpy).toHaveBeenCalled()); + const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); + await waitFor(() => + expect(within(sidebar).getByText("Pinned")).toBeInTheDocument(), + ); + expect(within(sidebar).getByRole("button", { name: /^Roadmap$/ })).toBeInTheDocument(); + expect(within(sidebar).queryByRole("button", { name: /^First chat$/ })).not.toBeInTheDocument(); + + fireEvent.click(within(sidebar).getByRole("button", { name: "Show archived" })); + await waitFor(() => + expect(within(sidebar).getByText("Archived")).toBeInTheDocument(), + ); + expect(within(sidebar).getByRole("button", { name: /^First chat$/ })).toBeInTheDocument(); + const updateUrl = vi.mocked(fetch).mock.calls + .map(([url]) => String(url)) + .find((url) => url.startsWith("/api/webui/sidebar-state/update?")); + expect(updateUrl).toBeTruthy(); + const encoded = new URLSearchParams(updateUrl?.split("?", 2)[1]).get("state"); + expect(JSON.parse(encoded ?? "{}").view.show_archived).toBe(true); + + fireEvent.pointerDown(within(sidebar).getByRole("button", { name: "View" }), { + button: 0, + ctrlKey: false, + }); + fireEvent.click(await screen.findByText("Compact list")); + await waitFor(() => { + const lastUpdateUrl = vi.mocked(fetch).mock.calls + .map(([url]) => String(url)) + .filter((url) => url.startsWith("/api/webui/sidebar-state/update?")) + .at(-1); + const lastEncoded = new URLSearchParams(lastUpdateUrl?.split("?", 2)[1]).get("state"); + expect(JSON.parse(lastEncoded ?? "{}").view.density).toBe("compact"); + }); + + fireEvent.click(screen.getByText("Title A-Z")); + await waitFor(() => { + const lastUpdateUrl = vi.mocked(fetch).mock.calls + .map(([url]) => String(url)) + .filter((url) => url.startsWith("/api/webui/sidebar-state/update?")) + .at(-1); + const lastEncoded = new URLSearchParams(lastUpdateUrl?.split("?", 2)[1]).get("state"); + expect(JSON.parse(lastEncoded ?? "{}").view.sort).toBe("title_asc"); + }); + }); + + it("sorts chats by displayed title when A-Z is persisted", async () => { + mockSessions = [ + { + key: "websocket:zulu", + channel: "websocket", + chatId: "zulu", + createdAt: "2026-04-16T12:00:00Z", + updatedAt: "2026-04-16T12:00:00Z", + title: "Zulu work", + preview: "later", + }, + { + key: "websocket:new", + channel: "websocket", + chatId: "new", + createdAt: "2026-04-15T12:00:00Z", + updatedAt: "2026-04-15T12:00:00Z", + preview: "hi nanobot", + }, + { + key: "websocket:alpha", + channel: "websocket", + chatId: "alpha", + createdAt: "2026-04-14T12:00:00Z", + updatedAt: "2026-04-14T12:00:00Z", + title: "Alpha plan", + preview: "earlier", + }, + ]; + const initialState = { + schema_version: 1, + pinned_keys: [], + archived_keys: [], + title_overrides: {}, + tags_by_key: {}, + collapsed_groups: {}, + view: { + density: "comfortable", + show_previews: false, + show_timestamps: false, + show_archived: false, + sort: "title_asc", + }, + updated_at: null, + }; + vi.stubGlobal( + "fetch", + vi.fn().mockImplementation(async (url: string | URL | Request) => { + const href = String(url); + if (href === "/api/webui/sidebar-state") { + return { ok: true, json: async () => initialState }; + } + return { ok: false, status: 404 }; + }), + ); + + render(); + + await waitFor(() => expect(connectSpy).toHaveBeenCalled()); + const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); + await waitFor(() => + expect(within(sidebar).getByText("Chats")).toBeInTheDocument(), + ); + const group = within(sidebar).getByText("Chats").closest("section"); + expect(group).toBeTruthy(); + const labels = within(group as HTMLElement) + .getAllByRole("button") + .map((button) => button.textContent?.trim()) + .filter(Boolean); + + expect(labels).toEqual(["Alpha plan", "New chat", "Zulu work"]); + }); + + it("shows running and completed session indicators in the sidebar", async () => { + mockSessions = [ + { + key: "websocket:chat-a", + channel: "websocket", + chatId: "chat-a", + createdAt: "2026-04-16T10:00:00Z", + updatedAt: "2026-04-16T10:00:00Z", + preview: "Working chat", + }, + { + key: "websocket:chat-b", + channel: "websocket", + chatId: "chat-b", + createdAt: "2026-04-16T11:00:00Z", + updatedAt: "2026-04-16T11:00:00Z", + preview: "Quiet chat", + }, + ]; + + render(); + + await waitFor(() => expect(connectSpy).toHaveBeenCalled()); + const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); + await waitFor(() => + expect( + within(sidebar).getByRole("button", { name: /^Working chat$/ }), + ).toBeInTheDocument(), + ); + + act(() => { + for (const handler of runStatusHandlers) handler("chat-a", 12_345); + }); + expect(within(sidebar).getByTitle("Agent running")).toBeInTheDocument(); + + act(() => { + for (const handler of runStatusHandlers) handler("chat-a", null); + }); + expect(within(sidebar).queryByTitle("Agent running")).not.toBeInTheDocument(); + expect(within(sidebar).getByTitle("Agent finished")).toBeInTheDocument(); + + await act(async () => { + fireEvent.click(within(sidebar).getByRole("button", { name: /^Working chat$/ })); + }); + expect(within(sidebar).queryByTitle("Agent finished")).not.toBeInTheDocument(); + }); + + it("restores sidebar run indicators after a page reload", async () => { + mockSessions = [ + { + key: "websocket:chat-a", + channel: "websocket", + chatId: "chat-a", + createdAt: "2026-04-16T10:00:00Z", + updatedAt: "2026-04-16T10:00:00Z", + preview: "Running after reload", + runStartedAt: 12_345, + }, + { + key: "websocket:chat-b", + channel: "websocket", + chatId: "chat-b", + createdAt: "2026-04-16T11:00:00Z", + updatedAt: "2026-04-16T11:00:00Z", + preview: "Completed after reload", + }, + ]; + localStorage.setItem( + "nanobot-webui.sidebar.completed-runs.v1", + JSON.stringify(["chat-b"]), + ); + + render(); + + await waitFor(() => expect(connectSpy).toHaveBeenCalled()); + const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); + await waitFor(() => + expect(within(sidebar).getByTitle("Agent running")).toBeInTheDocument(), + ); + expect(within(sidebar).getByTitle("Agent finished")).toBeInTheDocument(); + expect(attachSpy).toHaveBeenCalledWith("chat-a"); + }); + it("opens the settings view from the sidebar footer", async () => { mockSessions = [ { @@ -199,7 +523,42 @@ describe("App layout", () => { provider: "auto", resolved_provider: "openai", has_api_key: true, + model_preset: "default", + max_tokens: 8192, + context_window_tokens: 65536, + temperature: 0.1, + reasoning_effort: null, + timezone: "UTC", + bot_name: "nanobot", + bot_icon: "nb", + tool_hint_max_length: 40, }, + model_presets: [ + { + name: "default", + label: "Default", + active: true, + is_default: true, + model: "openai/gpt-4o", + provider: "auto", + max_tokens: 8192, + context_window_tokens: 65536, + temperature: 0.1, + reasoning_effort: null, + }, + { + name: "deep", + label: "deep", + active: false, + is_default: false, + model: "anthropic/claude-opus-4-5", + provider: "anthropic", + max_tokens: 8192, + context_window_tokens: 200000, + temperature: 0.1, + reasoning_effort: "high", + }, + ], providers: [ { name: "openai", @@ -214,6 +573,13 @@ describe("App layout", () => { api_key_required: true, default_api_base: "https://openrouter.ai/api/v1", }, + { + name: "ant_ling", + label: "Ant Ling", + configured: false, + api_key_required: true, + default_api_base: "https://api.ant-ling.com/v1", + }, { name: "azure_openai", label: "Azure OpenAI", @@ -262,14 +628,74 @@ describe("App layout", () => { provider: "brave", api_key_hint: "BSAo••••ew20", base_url: null, + max_results: 5, + timeout: 30, providers: [ { name: "duckduckgo", label: "DuckDuckGo", credential: "none" }, { name: "brave", label: "Brave Search", credential: "api_key" }, { name: "tavily", label: "Tavily", credential: "api_key" }, ], }, + web: { + enable: true, + proxy: null, + user_agent: null, + search: { max_results: 5, timeout: 30 }, + fetch: { use_jina_reader: true }, + }, + image_generation: { + enabled: false, + provider: "openrouter", + provider_configured: true, + model: "openai/gpt-5.4-image-2", + default_aspect_ratio: "1:1", + default_image_size: "1K", + max_images_per_turn: 4, + save_dir: "generated", + providers: [ + { + name: "openrouter", + label: "OpenRouter", + configured: true, + api_key_hint: "sk-o••••test", + api_base: "https://openrouter.ai/api/v1", + default_api_base: "https://openrouter.ai/api/v1", + }, + { + name: "gemini", + label: "Gemini", + configured: false, + api_key_hint: null, + api_base: null, + default_api_base: "https://generativelanguage.googleapis.com/v1beta/openai/", + }, + ], + }, runtime: { config_path: "/tmp/config.json", + workspace_path: "/tmp/workspace", + gateway_host: "127.0.0.1", + gateway_port: 18790, + heartbeat: { + enabled: true, + interval_s: 1800, + keep_recent_messages: 8, + }, + dream: { + schedule: "every 2h", + max_batch_size: 20, + max_iterations: 15, + annotate_line_ages: true, + }, + unified_session: false, + }, + advanced: { + restrict_to_workspace: false, + ssrf_whitelist_count: 0, + mcp_server_count: 0, + exec_enabled: true, + exec_sandbox: null, + exec_path_append_set: false, }, requires_restart: false, }), @@ -285,22 +711,34 @@ describe("App layout", () => { const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); fireEvent.click(within(sidebar).getByRole("button", { name: "Settings" })); - expect(await screen.findByRole("heading", { name: "General" })).toBeInTheDocument(); + expect(await screen.findByRole("heading", { name: "Overview" })).toBeInTheDocument(); expect(document.title).toBe("Settings · nanobot"); expect(screen.queryByRole("navigation", { name: "Sidebar navigation" })).not.toBeInTheDocument(); const settingsNav = screen.getByRole("navigation", { name: "Settings sections" }); - expect(within(settingsNav).getByRole("button", { name: "General" })).toHaveAttribute( + expect(settingsNav.className).toContain("overflow-x-auto"); + expect(settingsNav.className).not.toContain("grid-cols-2"); + expect(within(settingsNav).getByRole("button", { name: "Overview" })).toHaveAttribute( "aria-current", "page", ); - expect(within(settingsNav).getByRole("button", { name: "BYOK" })).toBeInTheDocument(); + expect(within(settingsNav).getByRole("button", { name: "Models" })).toBeInTheDocument(); + expect(within(settingsNav).getByRole("button", { name: "Providers" })).toBeInTheDocument(); + expect(within(settingsNav).getByRole("button", { name: "Image" })).toBeInTheDocument(); + expect(within(settingsNav).getByRole("button", { name: "Web" })).toBeInTheDocument(); + expect(within(settingsNav).getByRole("button", { name: "Advanced" })).toBeInTheDocument(); expect(screen.getByRole("button", { name: "Sign out" })).toBeInTheDocument(); + fireEvent.click(within(settingsNav).getByRole("button", { name: "Models" })); expect(screen.getByText("AI")).toBeInTheDocument(); - expect(screen.getByDisplayValue("openai/gpt-4o")).toBeInTheDocument(); - fireEvent.click(within(settingsNav).getByRole("button", { name: "BYOK" })); - expect(screen.getByRole("tab", { name: "LLM" })).toHaveAttribute("aria-selected", "true"); - expect(screen.getByRole("tab", { name: "Web Search" })).toBeInTheDocument(); + const modelInput = screen.getByDisplayValue("openai/gpt-4o"); + expect(modelInput).toBeInTheDocument(); + fireEvent.change(modelInput, { target: { value: "openai/gpt-4o-mini" } }); + expect(screen.getByText("Unsaved changes.").parentElement?.className).toContain( + "text-blue-600", + ); + fireEvent.change(modelInput, { target: { value: "openai/gpt-4o" } }); + fireEvent.click(within(settingsNav).getByRole("button", { name: "Providers" })); expect(screen.getByText("OpenRouter")).toBeInTheDocument(); + expect(screen.getByText("Ant Ling")).toBeInTheDocument(); expect(screen.getAllByText("Not configured").length).toBeGreaterThan(0); fireEvent.click(screen.getByText("OpenAI")); fireEvent.click(screen.getByRole("button", { name: "Edit" })); @@ -311,11 +749,20 @@ describe("App layout", () => { fireEvent.click(screen.getByText("OpenAI")); expect(screen.getByText("open••••-key")).toBeInTheDocument(); expect(screen.queryByDisplayValue("unsaved-openai-key")).not.toBeInTheDocument(); + fireEvent.click(screen.getByText("Ant Ling")); + expect(screen.getByDisplayValue("https://api.ant-ling.com/v1")).toBeInTheDocument(); fireEvent.click(screen.getByText("Atomic Chat")); expect(screen.getByDisplayValue("http://localhost:1337/v1")).toBeInTheDocument(); expect(screen.getByRole("button", { name: "Save" })).toBeEnabled(); - fireEvent.click(screen.getByRole("tab", { name: "Web Search" })); + fireEvent.click(within(settingsNav).getByRole("button", { name: "Image" })); + expect(screen.getByRole("heading", { name: "Image" })).toBeInTheDocument(); + expect(screen.getByText("Provider status")).toBeInTheDocument(); + expect(screen.getByDisplayValue("openai/gpt-5.4-image-2")).toBeInTheDocument(); + expect(screen.getByText("Save directory")).toBeInTheDocument(); + expect(screen.getByRole("button", { name: "Save" })).toBeDisabled(); + + fireEvent.click(within(settingsNav).getByRole("button", { name: "Web" })); expect(screen.getByText("Search provider")).toBeInTheDocument(); expect(screen.getByRole("button", { name: /Brave Search/ })).toBeInTheDocument(); expect(screen.getByText("BSAo••••ew20")).toBeInTheDocument(); @@ -329,6 +776,10 @@ describe("App layout", () => { fireEvent.click(screen.getByRole("menuitem", { name: "Brave Search" })); expect(screen.getByText("BSAo••••ew20")).toBeInTheDocument(); expect(screen.queryByDisplayValue("unsaved-brave-key")).not.toBeInTheDocument(); + + fireEvent.click(within(settingsNav).getByRole("button", { name: "Runtime" })); + expect(screen.getByText("Bot name")).toBeInTheDocument(); + expect(screen.getByRole("button", { name: "Save" })).toBeDisabled(); }); it("returns from settings to the blank start page when no session was active", async () => { @@ -363,19 +814,94 @@ describe("App layout", () => { provider: "openai", resolved_provider: "openai", has_api_key: true, + model_preset: "default", + max_tokens: 8192, + context_window_tokens: 65536, + temperature: 0.1, + reasoning_effort: null, + timezone: "UTC", + bot_name: "nanobot", + bot_icon: "nb", + tool_hint_max_length: 40, }, + model_presets: [ + { + name: "default", + label: "Default", + active: true, + is_default: true, + model: "openai/gpt-4o", + provider: "openai", + max_tokens: 8192, + context_window_tokens: 65536, + temperature: 0.1, + reasoning_effort: null, + }, + ], providers: [{ name: "openai", label: "OpenAI", configured: true }], web_search: { provider: "duckduckgo", api_key_hint: null, base_url: null, + max_results: 5, + timeout: 30, providers: [ { name: "duckduckgo", label: "DuckDuckGo", credential: "none" }, { name: "brave", label: "Brave Search", credential: "api_key" }, ], }, + web: { + enable: true, + proxy: null, + user_agent: null, + search: { max_results: 5, timeout: 30 }, + fetch: { use_jina_reader: true }, + }, + image_generation: { + enabled: false, + provider: "openrouter", + provider_configured: false, + model: "openai/gpt-5.4-image-2", + default_aspect_ratio: "1:1", + default_image_size: "1K", + max_images_per_turn: 4, + save_dir: "generated", + providers: [ + { + name: "openrouter", + label: "OpenRouter", + configured: false, + api_key_hint: null, + api_base: null, + default_api_base: "https://openrouter.ai/api/v1", + }, + ], + }, runtime: { config_path: "/tmp/config.json", + workspace_path: "/tmp/workspace", + gateway_host: "127.0.0.1", + gateway_port: 18790, + heartbeat: { + enabled: true, + interval_s: 1800, + keep_recent_messages: 8, + }, + dream: { + schedule: "every 2h", + max_batch_size: 20, + max_iterations: 15, + annotate_line_ages: true, + }, + unified_session: false, + }, + advanced: { + restrict_to_workspace: false, + ssrf_whitelist_count: 0, + mcp_server_count: 0, + exec_enabled: true, + exec_sandbox: null, + exec_path_append_set: false, }, requires_restart: false, }), @@ -393,14 +919,14 @@ describe("App layout", () => { await waitFor(() => expect(document.title).toBe("nanobot")); fireEvent.click(within(sidebar).getByRole("button", { name: "Settings" })); - expect(await screen.findByRole("heading", { name: "General" })).toBeInTheDocument(); + expect(await screen.findByRole("heading", { name: "Overview" })).toBeInTheDocument(); fireEvent.click(screen.getByRole("button", { name: "Back to chat" })); await waitFor(() => expect(document.title).toBe("nanobot")); expect(screen.getByText("What can I do for you?")).toBeInTheDocument(); }); - it("filters sidebar sessions through the lightweight search row", async () => { + it("filters sessions in the centered search dialog", async () => { mockSessions = [ { key: "websocket:chat-alpha", @@ -427,20 +953,43 @@ describe("App layout", () => { const sidebar = screen.getByRole("navigation", { name: "Sidebar navigation" }); expect(within(sidebar).getByText("Q2 roadmap")).toBeInTheDocument(); expect(within(sidebar).getByText("Travel ideas")).toBeInTheDocument(); + const newChatButton = within(sidebar).getByRole("button", { name: "New chat" }); + const searchButton = within(sidebar).getByRole("button", { name: "Search" }); + expect( + newChatButton.compareDocumentPosition(searchButton) & + Node.DOCUMENT_POSITION_FOLLOWING, + ).toBeTruthy(); - fireEvent.change(screen.getByRole("textbox", { name: "Search chats" }), { + fireEvent.click(searchButton); + const dialog = await screen.findByRole("dialog", { name: "Search" }); + expect(dialog).toHaveClass("origin-center"); + expect(dialog.className).not.toContain("translate-x"); + expect(dialog.className).not.toContain("translate-y"); + expect(within(dialog).getByText("Q2 roadmap")).toBeInTheDocument(); + expect(within(dialog).getByText("Travel ideas")).toBeInTheDocument(); + expect(within(dialog).queryByText("websocket")).not.toBeInTheDocument(); + expect(within(dialog).queryByText("#1")).not.toBeInTheDocument(); + + fireEvent.change(within(dialog).getByRole("textbox", { name: "Search" }), { target: { value: "planning" }, }); - expect(within(sidebar).getByText("Q2 roadmap")).toBeInTheDocument(); - expect(within(sidebar).queryByText("Travel ideas")).not.toBeInTheDocument(); + expect(within(dialog).getByText("Q2 roadmap")).toBeInTheDocument(); + expect(within(dialog).queryByText("Travel ideas")).not.toBeInTheDocument(); + expect(within(sidebar).getByText("Travel ideas")).toBeInTheDocument(); - fireEvent.change(screen.getByRole("textbox", { name: "Search chats" }), { + fireEvent.change(within(dialog).getByRole("textbox", { name: "Search" }), { target: { value: "road q2" }, }); - expect(within(sidebar).getByText("Q2 roadmap")).toBeInTheDocument(); - expect(within(sidebar).queryByText("Travel ideas")).not.toBeInTheDocument(); + expect(within(dialog).getByText("Q2 roadmap")).toBeInTheDocument(); + expect(within(dialog).queryByText("Travel ideas")).not.toBeInTheDocument(); + + fireEvent.click(within(dialog).getByRole("button", { name: /Q2 roadmap/ })); + + await waitFor(() => + expect(screen.queryByRole("dialog", { name: "Search" })).not.toBeInTheDocument(), + ); }); it("opens a blank start page without creating an empty chat", async () => { diff --git a/webui/src/tests/i18n.test.tsx b/webui/src/tests/i18n.test.tsx index 031b1aee..d1359121 100644 --- a/webui/src/tests/i18n.test.tsx +++ b/webui/src/tests/i18n.test.tsx @@ -8,7 +8,16 @@ import { resources } from "@/i18n"; const QUICK_ACTION_KEYS = ["plan", "analyze", "brainstorm", "code", "summarize", "more"]; const IMAGE_QUICK_ACTION_KEYS = ["icon", "sticker", "poster", "product", "portrait", "edit"]; -const SETTINGS_NAV_KEYS = ["general", "byok"]; +const SETTINGS_NAV_KEYS = [ + "overview", + "appearance", + "models", + "providers", + "image", + "web", + "runtime", + "advanced", +]; describe("webui i18n", () => { it("switches UI copy and document locale through the language switcher", async () => { @@ -87,4 +96,14 @@ describe("webui i18n", () => { expect(common.settings.byok.configuredKeyHint).toBeTruthy(); } }); + + it("keeps Simplified Chinese settings overview copy localized", () => { + const settings = resources["zh-CN"].common.settings; + + expect(settings.nav.web).toBe("网页"); + expect(settings.sections.webSearch).toBe("网页搜索"); + expect(settings.byok.tabs.webSearch).toBe("网页搜索"); + expect(settings.overview.webSearch).toBe("网页搜索"); + expect(settings.overview.workspace).toBe("工作区"); + }); }); diff --git a/webui/src/tests/message-bubble.test.tsx b/webui/src/tests/message-bubble.test.tsx index baae344d..e0476898 100644 --- a/webui/src/tests/message-bubble.test.tsx +++ b/webui/src/tests/message-bubble.test.tsx @@ -195,7 +195,8 @@ describe("MessageBubble", () => { const references = await screen.findAllByTestId("inline-file-path"); expect(references).toHaveLength(2); expect(references[0].parentElement).not.toHaveClass("translate-y-[0.08em]"); - expect(references[0].parentElement).toHaveClass("align-[0.14em]"); + expect(references[0].parentElement).toHaveClass("align-baseline"); + expect(references[0].parentElement).toHaveClass("leading-[inherit]"); expect(references[0]).toHaveTextContent("MarkdownTextRenderer.tsx"); expect(references[0]).not.toHaveTextContent("webui/src/components"); expect(screen.getByText("index.html")).toBeInTheDocument(); diff --git a/webui/src/tests/nanobot-client.test.ts b/webui/src/tests/nanobot-client.test.ts index 6b434bb3..9db74d46 100644 --- a/webui/src/tests/nanobot-client.test.ts +++ b/webui/src/tests/nanobot-client.test.ts @@ -132,6 +132,37 @@ describe("NanobotClient", () => { expect(client.getRunStartedAt("chat-strip")).toBeNull(); }); + it("notifies run status subscribers and replays running chats", () => { + const client = new NanobotClient({ + url: "ws://test", + reconnect: false, + socketFactory: (url) => new FakeSocket(url) as unknown as WebSocket, + }); + const handler = vi.fn(); + client.onRunStatus(handler); + client.connect(); + lastSocket().fakeOpen(); + lastSocket().fakeMessage({ + event: "goal_status", + chat_id: "chat-status", + status: "running", + started_at: 12_345, + }); + expect(handler).toHaveBeenCalledWith("chat-status", 12_345); + + const lateHandler = vi.fn(); + client.onRunStatus(lateHandler); + expect(lateHandler).toHaveBeenCalledWith("chat-status", 12_345); + + lastSocket().fakeMessage({ + event: "goal_status", + chat_id: "chat-status", + status: "idle", + }); + expect(handler).toHaveBeenCalledWith("chat-status", null); + expect(lateHandler).toHaveBeenCalledWith("chat-status", null); + }); + it("records goal_state per chat_id without an onChat subscriber", () => { const client = new NanobotClient({ url: "ws://test", diff --git a/webui/src/tests/useNanobotStream.test.tsx b/webui/src/tests/useNanobotStream.test.tsx index b221a655..b62414b5 100644 --- a/webui/src/tests/useNanobotStream.test.tsx +++ b/webui/src/tests/useNanobotStream.test.tsx @@ -424,6 +424,121 @@ describe("useNanobotStream", () => { ); }); + it("upgrades pending file_edit placeholders when the path arrives", () => { + const fake = fakeClient(); + const { result } = renderHook(() => useNanobotStream("chat-file-edit-pending", EMPTY_MESSAGES), { + wrapper: wrap(fake.client), + }); + + act(() => { + fake.emit("chat-file-edit-pending", { + event: "file_edit", + chat_id: "chat-file-edit-pending", + edits: [{ + call_id: "call-write", + tool: "write_file", + path: "", + phase: "start", + added: 1, + deleted: 0, + approximate: true, + status: "editing", + pending: true, + }], + }); + fake.emit("chat-file-edit-pending", { + event: "file_edit", + chat_id: "chat-file-edit-pending", + edits: [{ + call_id: "call-write", + tool: "write_file", + path: "foo.txt", + phase: "start", + added: 12, + deleted: 0, + approximate: true, + status: "editing", + }], + }); + }); + + const fileEditMessages = result.current.messages.filter((message) => message.fileEdits?.length); + expect(fileEditMessages).toHaveLength(1); + expect(fileEditMessages[0].fileEdits).toEqual([{ + call_id: "call-write", + tool: "write_file", + path: "foo.txt", + phase: "start", + added: 12, + deleted: 0, + approximate: true, + status: "editing", + }]); + }); + + it("merges file_edit updates after interleaved progress events", () => { + const fake = fakeClient(); + const { result } = renderHook(() => useNanobotStream("chat-file-edit-progress", EMPTY_MESSAGES), { + wrapper: wrap(fake.client), + }); + + act(() => { + fake.emit("chat-file-edit-progress", { + event: "message", + chat_id: "chat-file-edit-progress", + text: 'write_file({"path":"foo.txt"})', + kind: "tool_hint", + }); + fake.emit("chat-file-edit-progress", { + event: "file_edit", + chat_id: "chat-file-edit-progress", + edits: [{ + call_id: "call-write", + tool: "write_file", + path: "foo.txt", + phase: "start", + added: 12, + deleted: 0, + approximate: true, + status: "editing", + }], + }); + fake.emit("chat-file-edit-progress", { + event: "message", + chat_id: "chat-file-edit-progress", + text: "still working", + kind: "progress", + }); + fake.emit("chat-file-edit-progress", { + event: "file_edit", + chat_id: "chat-file-edit-progress", + edits: [{ + call_id: "call-write", + tool: "write_file", + path: "foo.txt", + phase: "end", + added: 30, + deleted: 0, + approximate: false, + status: "done", + }], + }); + }); + + const fileEditMessages = result.current.messages.filter((message) => message.fileEdits?.length); + expect(fileEditMessages).toHaveLength(1); + expect(fileEditMessages[0].fileEdits).toEqual([{ + call_id: "call-write", + tool: "write_file", + path: "foo.txt", + phase: "end", + added: 30, + deleted: 0, + approximate: false, + status: "done", + }]); + }); + it("starts a new assistant bubble for deltas after stream_end and activity", async () => { const fake = fakeClient(); const { result } = renderHook(() => useNanobotStream("chat-stream-segments", EMPTY_MESSAGES), { @@ -522,7 +637,67 @@ describe("useNanobotStream", () => { expect(result.current.messages[1].activitySegmentId).toBe(firstSegment); expect(result.current.messages[2].activitySegmentId).toBeTruthy(); expect(result.current.messages[2].activitySegmentId).not.toBe(firstSegment); - expect(result.current.messages[3].activitySegmentId).toBe(firstSegment); + expect(result.current.messages[3].activitySegmentId).toBeTruthy(); + expect(result.current.messages[3].activitySegmentId).not.toBe(result.current.messages[2].activitySegmentId); + }); + + it("keeps file edit blocks ordered across a new reasoning phase", async () => { + const fake = fakeClient(); + const { result } = renderHook(() => useNanobotStream("chat-file-order", EMPTY_MESSAGES), { + wrapper: wrap(fake.client), + }); + + act(() => { + fake.emit("chat-file-order", { + event: "file_edit", + chat_id: "chat-file-order", + edits: [{ + call_id: "call-one", + tool: "write_file", + path: "one.txt", + phase: "start", + added: 10, + deleted: 0, + approximate: true, + status: "editing", + }], + }); + fake.emit("chat-file-order", { + event: "reasoning_delta", + chat_id: "chat-file-order", + text: "Check the next file.", + }); + }); + + await flushStreamFrame(); + + act(() => { + fake.emit("chat-file-order", { + event: "file_edit", + chat_id: "chat-file-order", + edits: [{ + call_id: "call-two", + tool: "write_file", + path: "two.txt", + phase: "start", + added: 20, + deleted: 0, + approximate: true, + status: "editing", + }], + }); + }); + + expect(result.current.messages.map((message) => message.fileEdits?.[0]?.path ?? message.reasoning)).toEqual([ + "one.txt", + "Check the next file.", + "two.txt", + ]); + const fileEditSegments = result.current.messages + .filter((message) => message.fileEdits?.length) + .map((message) => message.activitySegmentId); + expect(fileEditSegments).toHaveLength(2); + expect(fileEditSegments[0]).not.toBe(fileEditSegments[1]); }); it("accumulates reasoning_delta chunks on a placeholder until reasoning_end", async () => {