feat(desktop): polish desktop shell and shared WebUI surfaces (#4195)

* feat(desktop): add native host scaffold * feat(webui): track turns and usage in gateway * feat(webui): polish desktop chat experience * feat(apps): add ArcGIS and Joplin logos * feat(desktop): polish shell and shared surfaces * fix(webui): avoid preview chips for glob references * test: align CI expectations for token fallback * feat(webui): preview prompt rail entries * feat(webui): add prompt navigator drawer * style(webui): refine prompt navigator placement * style(webui): align prompt navigator with header actions * style(webui): simplify prompt navigator header * refactor(webui): clean thread resource refresh * feat(desktop): add native reply notifications * fix(webui): preserve desktop restart and replay state * fix(desktop): harden gateway proxy startup * fix(web): fall back when readability is unavailable * fix(desktop): hide window instead of closing on macos * fix(webui): unify desktop header actions * fix(webui): simplify prompt history rows * fix(desktop): log notification delivery failures * chore(desktop): clean source package artifacts * fix(cron): support one-time relative reminders * fix(webui): reveal scroll button in place * Revert "fix(cron): support one-time relative reminders" This reverts commit 4c4661da120a3c7283e0768412bae48604e7390b. * refactor(webui): extract token usage heatmap * docs(desktop): clarify contributor guides --------- Co-authored-by: chengyongru <2755839590@qq.com>
2026-06-06 19:49:33 +08:00
parent a1b9577224
commit ab9f49970d
103 changed files with 10483 additions and 1003 deletions
@@ -14,6 +14,7 @@ from nanobot.webui.settings_api import (
    create_model_configuration,
    provider_models_payload,
    settings_payload,
+    settings_usage_payload,
    update_agent_settings,
    update_model_configuration,
    update_network_safety_settings,
@@ -242,6 +243,52 @@ def test_settings_payload_includes_network_safety_fields(
    assert payload["advanced"]["ssrf_whitelist_count"] == 1


+def test_settings_payload_includes_token_usage_summary(
+    tmp_path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    config_path = tmp_path / "config.json"
+    config = Config()
+    save_config(config, config_path)
+    monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    from nanobot.webui.token_usage import record_token_usage
+
+    record_token_usage({"prompt_tokens": 10, "completion_tokens": 5})
+
+    payload = settings_payload()
+
+    assert payload["usage"]["total_tokens_30d"] == 15
+    assert payload["usage"]["total_tokens"] == 15
+    assert payload["usage"]["peak_day_tokens"] == 15
+    assert payload["usage"]["current_streak_days"] == 1
+    assert payload["usage"]["longest_streak_days"] == 1
+    assert payload["usage"]["active_days_30d"] == 1
+    assert payload["usage"]["requests_30d"] == 1
+
+
+def test_settings_usage_payload_returns_lightweight_token_usage(
+    tmp_path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    config_path = tmp_path / "config.json"
+    config = Config()
+    save_config(config, config_path)
+    monkeypatch.setattr("nanobot.config.loader._current_config_path", config_path)
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    from nanobot.webui.token_usage import record_token_usage
+
+    record_token_usage({"prompt_tokens": 20, "completion_tokens": 2})
+
+    payload = settings_usage_payload()
+
+    assert payload["total_tokens"] == 22
+    assert payload["requests_30d"] == 1
+    assert "agent" not in payload
+
+
 def test_update_network_safety_settings_writes_local_service_flag(
    tmp_path,
    monkeypatch: pytest.MonkeyPatch,
@@ -0,0 +1,148 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from types import SimpleNamespace
+
+import pytest
+
+from nanobot.agent.hook import AgentHookContext
+from nanobot.webui.token_usage import (
+    TokenUsageHook,
+    record_response_token_usage,
+    record_token_usage,
+    token_usage_payload,
+)
+
+
+def test_record_token_usage_aggregates_by_local_day(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    record_token_usage(
+        {"prompt_tokens": 100, "completion_tokens": 40, "cached_tokens": 20},
+        timezone_name="Asia/Shanghai",
+        now=datetime(2026, 6, 2, 18, 0, tzinfo=timezone.utc),
+    )
+    record_token_usage(
+        {"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15},
+        timezone_name="Asia/Shanghai",
+        now=datetime(2026, 6, 2, 19, 0, tzinfo=timezone.utc),
+    )
+
+    payload = token_usage_payload(
+        timezone_name="Asia/Shanghai",
+        now=datetime(2026, 6, 3, 12, 0, tzinfo=timezone.utc),
+    )
+
+    assert payload["total_tokens_30d"] == 155
+    assert payload["active_days_30d"] == 1
+    assert payload["requests_30d"] == 2
+    assert payload["days"] == [
+        {
+            "date": "2026-06-03",
+            "prompt_tokens": 110,
+            "completion_tokens": 45,
+            "cached_tokens": 20,
+            "total_tokens": 155,
+            "provider_tokens": 155,
+            "estimated_tokens": 0,
+            "requests": 2,
+            "provider_requests": 2,
+            "estimated_requests": 0,
+            "sources": {
+                "user": {
+                    "prompt_tokens": 110,
+                    "completion_tokens": 45,
+                    "cached_tokens": 20,
+                    "total_tokens": 155,
+                    "provider_tokens": 155,
+                    "estimated_tokens": 0,
+                    "requests": 2,
+                    "provider_requests": 2,
+                    "estimated_requests": 0,
+                }
+            },
+        }
+    ]
+
+
+def test_record_token_usage_skips_empty_usage(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    record_token_usage({"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0})
+
+    payload = token_usage_payload(now=datetime(2026, 6, 3, tzinfo=timezone.utc))
+    assert payload["days"] == []
+    assert payload["total_tokens_30d"] == 0
+
+
+def test_record_token_usage_keeps_estimated_split(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    record_token_usage(
+        {"prompt_tokens": 100, "completion_tokens": 25, "estimated_tokens": 125},
+        now=datetime(2026, 6, 3, tzinfo=timezone.utc),
+    )
+
+    payload = token_usage_payload(now=datetime(2026, 6, 3, tzinfo=timezone.utc))
+
+    assert payload["days"][0]["total_tokens"] == 125
+    assert payload["days"][0]["provider_tokens"] == 0
+    assert payload["days"][0]["estimated_tokens"] == 125
+    assert payload["days"][0]["estimated_requests"] == 1
+
+
+def test_record_token_usage_keeps_source_breakdown(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+
+    record_token_usage(
+        {"prompt_tokens": 100, "completion_tokens": 25},
+        source="user",
+        now=datetime(2026, 6, 3, tzinfo=timezone.utc),
+    )
+    record_token_usage(
+        {"prompt_tokens": 20, "completion_tokens": 5},
+        source="dream",
+        now=datetime(2026, 6, 3, tzinfo=timezone.utc),
+    )
+
+    payload = token_usage_payload(now=datetime(2026, 6, 3, tzinfo=timezone.utc))
+    row = payload["days"][0]
+
+    assert row["total_tokens"] == 150
+    assert row["sources"]["user"]["total_tokens"] == 125
+    assert row["sources"]["user"]["requests"] == 1
+    assert row["sources"]["dream"]["total_tokens"] == 25
+    assert row["sources"]["dream"]["requests"] == 1
+
+
+def test_record_response_token_usage_uses_response_usage(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+    monkeypatch.setattr("nanobot.webui.token_usage._local_day", lambda *_, **__: "2026-06-03")
+
+    record_response_token_usage(
+        SimpleNamespace(usage={"prompt_tokens": 20, "completion_tokens": 5}),
+        source="dream",
+    )
+
+    payload = token_usage_payload(now=datetime(2026, 6, 3, tzinfo=timezone.utc))
+    assert payload["days"][0]["sources"]["dream"]["total_tokens"] == 25
+
+
+@pytest.mark.asyncio
+async def test_token_usage_hook_classifies_source_from_session_key(tmp_path, monkeypatch) -> None:
+    monkeypatch.setattr("nanobot.webui.token_usage.get_webui_dir", lambda: tmp_path / "webui")
+    monkeypatch.setattr("nanobot.webui.token_usage._local_day", lambda *_, **__: "2026-06-03")
+
+    hook = TokenUsageHook()
+    await hook.after_iteration(
+        AgentHookContext(
+            iteration=0,
+            messages=[],
+            session_key="cron:drink-water",
+            usage={"prompt_tokens": 10, "completion_tokens": 5},
+        )
+    )
+
+    payload = token_usage_payload(now=datetime(2026, 6, 3, tzinfo=timezone.utc))
+
+    assert payload["days"][0]["sources"]["cron"]["total_tokens"] == 15