mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
# Conflicts: # gateway/config.py # gateway/config_loader.py # gateway/readiness.py # hermes_cli/managed_scope.py # hermes_cli/plugin_python_deps.py # hermes_cli/plugins_cmd.py # hermes_cli/update_cmd_maint.py # plugin-catalog/hindsight.yaml # plugins/plugin_loader.py # providers/__init__.py # scripts/run_tests.sh # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_gateway_streaming_nested_config.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_verify_console_scripts.py # tests/tools/test_lazy_deps.py # tests/tui_gateway/test_subprocess_encoding.py # tools/lazy_deps.py
117 lines
4.9 KiB
Python
117 lines
4.9 KiB
Python
"""Tests for cold-start GIL stall mitigations (#60800).
|
|
|
|
The Desktop/TUI cold start could stall the event loop for ~14s because
|
|
synchronous CPU-bound work ran on the loop thread during the window
|
|
between ``HERMES_BACKEND_READY`` and the first prompt. Three fixes:
|
|
|
|
1. ``copilot_auth.resolve_copilot_token`` skips the ``gh auth token``
|
|
subprocess when a Copilot env var is explicitly set (even if invalid).
|
|
2. ``tui_gateway.ws.handle_ws`` runs ``resolve_skin()`` via
|
|
``asyncio.to_thread`` so the loop is not blocked by config/skin init.
|
|
3. ``web_server_lifecycle._warm_gateway_module`` pre-imports the heavy module
|
|
chains that the first WS connection + RPC burst would otherwise
|
|
import on the loop thread.
|
|
"""
|
|
|
|
from unittest.mock import patch
|
|
|
|
# ─── Fix 1: copilot_auth skips gh CLI when env var is set ──────────────
|
|
|
|
class TestCopilotAuthSkipsGhCli:
|
|
"""resolve_copilot_token must not call _try_gh_cli_token when any
|
|
Copilot env var is set, even if the token is an unsupported classic PAT.
|
|
|
|
See test_copilot_auth.py::TestResolveToken for the full env-var-priority
|
|
suite; these tests focus on the #60800 cold-start regression — the
|
|
gh CLI subprocess adds up to 5s on Windows and should not fire when
|
|
the user already expressed token intent via an env var.
|
|
"""
|
|
|
|
def test_invalid_env_var_skips_gh_cli(self, monkeypatch):
|
|
from hermes_cli.copilot_auth import resolve_copilot_token
|
|
|
|
monkeypatch.delenv("COPILOT_GITHUB_TOKEN", raising=False)
|
|
monkeypatch.delenv("GH_TOKEN", raising=False)
|
|
monkeypatch.setenv("GITHUB_TOKEN", "ghp_classic_pat_nope")
|
|
with patch("hermes_cli.copilot_auth._try_gh_cli_token") as mock_cli:
|
|
token, source = resolve_copilot_token()
|
|
assert token == ""
|
|
assert source == ""
|
|
mock_cli.assert_not_called()
|
|
|
|
def test_valid_env_var_skips_gh_cli(self, monkeypatch):
|
|
"""A valid token in an env var should return immediately — no CLI."""
|
|
from hermes_cli.copilot_auth import resolve_copilot_token
|
|
|
|
monkeypatch.setenv("GITHUB_TOKEN", "gho_valid_oauth_token")
|
|
with patch("hermes_cli.copilot_auth._try_gh_cli_token") as mock_cli:
|
|
token, source = resolve_copilot_token()
|
|
assert token == "gho_valid_oauth_token"
|
|
assert source == "GITHUB_TOKEN"
|
|
mock_cli.assert_not_called()
|
|
|
|
def test_no_env_vars_falls_back_to_gh_cli(self, monkeypatch):
|
|
"""When NO env var is set, the gh CLI fallback must still fire."""
|
|
from hermes_cli.copilot_auth import resolve_copilot_token
|
|
|
|
monkeypatch.delenv("COPILOT_GITHUB_TOKEN", raising=False)
|
|
monkeypatch.delenv("GH_TOKEN", raising=False)
|
|
monkeypatch.delenv("GITHUB_TOKEN", raising=False)
|
|
with patch(
|
|
"hermes_cli.copilot_auth._try_gh_cli_token",
|
|
return_value="gho_from_cli",
|
|
) as mock_cli:
|
|
token, source = resolve_copilot_token()
|
|
assert token == "gho_from_cli"
|
|
assert source == "gh auth token"
|
|
mock_cli.assert_called_once()
|
|
|
|
# ─── Fix 2: resolve_skin runs via to_thread in handle_ws ───────────────
|
|
|
|
|
|
def test_handle_ws_resolves_skin_off_the_loop_thread(monkeypatch):
|
|
"""Driving the real handle_ws: resolve_skin runs on a worker thread, never the
|
|
event-loop thread, and its result still reaches the gateway.ready frame
|
|
(#60800 cold-start stall; #72720 salvage)."""
|
|
import asyncio
|
|
import json
|
|
import threading
|
|
|
|
from tui_gateway import server, ws as ws_mod
|
|
|
|
idents = {}
|
|
frames = []
|
|
|
|
def _resolve_skin():
|
|
idents["skin"] = threading.get_ident()
|
|
return {"palette": "wired"}
|
|
|
|
monkeypatch.setattr(server, "resolve_skin", _resolve_skin)
|
|
monkeypatch.setattr(server, "_ensure_skin_watcher", lambda: None)
|
|
monkeypatch.setattr(server, "register_live_transport", lambda *_a, **_k: None)
|
|
monkeypatch.setattr(server, "_start_backend_heartbeat_refresher", lambda: None)
|
|
monkeypatch.setattr(server, "_schedule_startup_orphan_sweep", lambda: None, raising=False)
|
|
monkeypatch.setattr(server, "_WS_ORPHAN_REAP_GRACE_S", 0)
|
|
|
|
class FakeWS:
|
|
async def accept(self):
|
|
idents["loop"] = threading.get_ident()
|
|
|
|
async def send_text(self, line):
|
|
frames.append(json.loads(line))
|
|
|
|
async def receive_text(self):
|
|
raise ws_mod._WebSocketDisconnect()
|
|
|
|
async def close(self):
|
|
pass
|
|
|
|
asyncio.run(ws_mod.handle_ws(FakeWS()))
|
|
|
|
assert idents["skin"] != idents["loop"], (
|
|
"resolve_skin ran on the event loop thread — the #60800 cold-start stall is back")
|
|
ready = [f for f in frames if f.get("params", {}).get("type") == "gateway.ready"]
|
|
assert ready and ready[0]["params"]["payload"]["skin"] == {"palette": "wired"}
|
|
|
|
|
|
# ─── Fix 3: _warm_gateway_module pre-imports heavy chains ──────────────
|