agent/model_metadata.py

@@ -211,7 +211,8 @@ DEFAULT_CONTEXT_LENGTHS = {
     # Kimi
     "kimi": 262144,
     # Tencent — Hy3 Preview (Hunyuan) with 256K context window
-    "hy3-preview": 256000,
+    # OpenRouter reports 262144 (256 * 1024) which is the provider-native value.
+    "hy3-preview": 262144,
     # Nemotron — NVIDIA's open-weights series (128K context across all sizes)
     "nemotron": 131072,
     # Arcee

tests/gateway/conftest.py

@@ -239,6 +239,22 @@ _ensure_discord_mock()
 _ensure_openai_mock()
 
 
+@pytest.fixture(autouse=True)
+def _ensure_discord_available(monkeypatch):
+    """Defensive: ``test_discord_imports.py`` reloads
+    ``gateway.platforms.discord`` while ``sys.modules['discord']`` is
+    shadowed, which flips ``DISCORD_AVAILABLE`` to ``False`` for every
+    subsequent discord test in the same xdist worker.  This fixture
+    forces the correct state back before **every** gateway test so the
+    ~20 discord test files don't each need their own copy-paste guard.
+    """
+    import gateway.platforms.discord as _dp
+
+    monkeypatch.setattr(_dp, "DISCORD_AVAILABLE", True)
+    if getattr(_dp, "discord", None) is None and "discord" in sys.modules:
+        monkeypatch.setattr(_dp, "discord", sys.modules["discord"])
+
+
 # ---------------------------------------------------------------------------
 # Plugin-adapter anti-pattern guard
 # ---------------------------------------------------------------------------

tests/gateway/test_agent_cache.py

@@ -954,7 +954,7 @@ class TestAgentCacheSpilloverLive:
         runner = self._runner()
 
         N_THREADS = 8
-        PER_THREAD = 20  # 8 * 20 = 160 inserts into a 16-slot cache
+        PER_THREAD = 3  # 8 * 3 = 24 inserts into a 16-slot cache
 
         def worker(tid: int):
             for j in range(PER_THREAD):

tests/gateway/test_discord_allowed_mentions.py

@@ -104,6 +104,14 @@ _ENV_VARS = (
 
 @pytest.fixture(autouse=True)
 def _clear_allowed_mention_env(monkeypatch):
+    # Defensive: another test may have reloaded gateway.platforms.discord
+    # while discord was shadowed, flipping DISCORD_AVAILABLE to False or
+    # replacing discord.AllowedMentions.  Force the correct state back.
+    import gateway.platforms.discord as _dp
+
+    monkeypatch.setattr(_dp, "DISCORD_AVAILABLE", True)
+    if getattr(_dp, "discord", None) is not None:
+        monkeypatch.setattr(_dp.discord, "AllowedMentions", _FakeAllowedMentions)
     for name in _ENV_VARS:
         monkeypatch.delenv(name, raising=False)
 

tests/gateway/test_discord_connect.py

@@ -70,6 +70,17 @@ import gateway.platforms.discord as discord_platform  # noqa: E402
 from gateway.platforms.discord import DiscordAdapter  # noqa: E402
 
 
+@pytest.fixture(autouse=True)
+def _ensure_discord_state(monkeypatch):
+    """Defensive: another test may reload gateway.platforms.discord while
+    sys.modules['discord'] is shadowed. Force correct state back."""
+    monkeypatch.setattr(discord_platform, "DISCORD_AVAILABLE", True)
+    if getattr(discord_platform, "discord", None) is not None:
+        monkeypatch.setattr(
+            discord_platform.discord, "AllowedMentions", _FakeAllowedMentions
+        )
+
+
 class FakeTree:
     def __init__(self):
         self.sync = AsyncMock(return_value=[])

tests/gateway/test_discord_model_picker.py

@@ -6,12 +6,23 @@ installed its own mock at module-import time and clobbered sys.modules,
 breaking other gateway tests under pytest-xdist.
 """
 
+import sys
 from types import SimpleNamespace
 from unittest.mock import AsyncMock
 
 import pytest
 
-from gateway.platforms.discord import ModelPickerView
+import gateway.platforms.discord as discord_platform  # noqa: E402
+from gateway.platforms.discord import ModelPickerView  # noqa: E402
+
+
+@pytest.fixture(autouse=True)
+def _ensure_discord_state(monkeypatch):
+    """Defensive: another test may reload gateway.platforms.discord while
+    sys.modules['discord'] is shadowed. Force correct state back."""
+    monkeypatch.setattr(discord_platform, "DISCORD_AVAILABLE", True)
+    if discord_platform.discord is None and "discord" in sys.modules:
+        monkeypatch.setattr(discord_platform, "discord", sys.modules["discord"])
 
 
 @pytest.mark.asyncio

tests/hermes_cli/test_tencent_tokenhub_provider.py

@@ -307,7 +307,9 @@ class TestTencentTokenhubContextLength:
         # and falls through to the hardcoded default.
         with patch("agent.model_metadata.fetch_model_metadata", return_value={}):
             ctx = get_model_context_length("hy3-preview")
-        assert ctx == 256000
+        # OpenRouter authoritative metadata reports 262144 (256 * 1024);
+        # the hardcoded default aligns with that exact provider-native value.
+        assert ctx == 262144
 
 
 # =============================================================================

tests/tools/test_local_interrupt_cleanup.py

@@ -61,12 +61,15 @@ def _pgid_still_alive(pgid: int) -> bool:
 
 def _process_group_snapshot(pgid: int) -> str:
     """Return a process-table snapshot for diagnostics."""
-    return subprocess.run(
-        ["ps", "-o", "pid,ppid,pgid,stat,cmd", "-g", str(pgid)],
-        capture_output=True,
-        text=True,
-        check=False,
-    ).stdout.strip()
+    try:
+        return subprocess.run(
+            ["ps", "-o", "pid,ppid,pgid,stat,cmd", "-g", str(pgid)],
+            capture_output=True,
+            text=True,
+            check=False,
+        ).stdout.strip()
+    except FileNotFoundError:
+        return f"<ps unavailable; cannot snapshot pgid {pgid}>"
 
 
 def _wait_for_pgid_exit(pgid: int, timeout: float = 10.0) -> bool:
@@ -116,6 +119,15 @@ def test_kill_process_uses_cached_pgid_if_wrapper_already_exited(monkeypatch):
 def test_wait_for_process_kills_subprocess_on_keyboardinterrupt():
     """When KeyboardInterrupt arrives mid-poll, the subprocess group must be
     killed before the exception is re-raised."""
+    # Skip if we have no way to introspect processes in this environment.
+    try:
+        import psutil  # noqa: F401
+    except ImportError:
+        try:
+            subprocess.run(["ps", "-V"], capture_output=True, check=False)
+        except FileNotFoundError:
+            pytest.skip("psutil or ps required for process introspection")
+
     env = LocalEnvironment(cwd="/tmp")
     try:
         result_holder = {}

tests/tools/test_ssh_environment.py

@@ -49,6 +49,9 @@ class TestBuildSSHCommand:
                                                       stderr=iter([]),
                                                       stdin=MagicMock()))
         monkeypatch.setattr("tools.environments.base.time.sleep", lambda _: None)
+        # Defensive: containers without openssh-client would otherwise blow up
+        # on _ensure_ssh_available() inside SSHEnvironment.__init__.
+        monkeypatch.setattr(ssh_env, "_ensure_ssh_available", lambda: None)
 
     def test_base_flags(self):
         env = SSHEnvironment(host="h", user="u")
@@ -96,6 +99,9 @@ class TestControlSocketPath:
                                                       stderr=iter([]),
                                                       stdin=MagicMock()))
         monkeypatch.setattr("tools.environments.base.time.sleep", lambda _: None)
+        # Defensive: containers without openssh-client would otherwise blow up
+        # on _ensure_ssh_available() inside SSHEnvironment.__init__.
+        monkeypatch.setattr(ssh_env, "_ensure_ssh_available", lambda: None)
 
     # SSH appends ``.XXXXXXXXXXXXXXXX`` (17 bytes) to the ControlPath in
     # ControlMaster mode; the macOS sun_path field is 104 bytes including