Summary

This PR is a CI compatibility / regression-fix bundle only. It does not intentionally add product features.

It refreshes the branch onto current main and keeps a set of small defensive fixes that were needed to make the current test matrix reliable:

• restore gateway.session.normalize_whatsapp_identifier as a compatibility re-export;
• harden CI-hit compatibility paths around MCP tool calls without _rpc_lock, TUI session history stubs without include_ancestors, PTY/websocket EOF handling, Gemini native adapter mocks, stale dashboard process checks, config category merging, and gateway cancellation cleanup;
• make Claude Code keychain credential parsing tolerate mocked/non-string stdout in tests;
• keep MiniMax dotted-model normalization expectations in sync with current provider behavior;
• update auth-source and Anthropic header expectations after current upstream auth/provider changes;
• isolate Vercel setup tests from host VERCEL_PROJECT_ID / VERCEL_TEAM_ID environment leakage;
• reset leaked logger/worker/browser state in tests to avoid xdist/full-suite pollution;
• update the TUI Nix npm-deps hash after the upstream lockfile changed.

The intent is to keep this as a maintenance PR that restores CI compatibility on top of current upstream, rather than a behavior-changing feature PR.

Rebase / conflict status

• Rebased onto latest origin-upstream/main.
• Resolved the previous merge conflict in hermes_cli/web_server.py by preserving upstream structure and keeping the config-category compatibility mapping.
• Branch should no longer be dirty/conflicting after GitHub recomputes mergeability.

Test plan

• python -m py_compile agent/anthropic_adapter.py agent/auxiliary_client.py agent/copilot_acp_client.py agent/redact.py gateway/platforms/base.py gateway/run.py gateway/session.py hermes_cli/main.py hermes_cli/pty_bridge.py hermes_cli/web_server.py tools/mcp_tool.py tui_gateway/server.py tests/agent/test_anthropic_adapter.py tests/tools/test_mcp_dynamic_discovery.py
• python -m pytest -q tests/agent/test_minimax_provider.py::TestMinimaxPreserveDots::test_normalize_converts_without_preserve tests/hermes_cli/test_auth_commands.py::test_credential_sources_registry_has_expected_steps tests/hermes_cli/test_setup.py::test_vercel_setup_prefills_project_and_team_from_link_file tests/test_cli_skin_integration.py::TestCompactBannerSkinIntegration::test_compact_banner_shows_version_label tests/hermes_cli/test_web_server.py::TestPtyWebSocket::test_pub_broadcasts_to_events_subscribers → 5 passed
• python -m pytest -q tests/agent/test_anthropic_adapter.py tests/agent/test_minimax_provider.py tests/hermes_cli/test_auth_commands.py tests/hermes_cli/test_setup.py tests/hermes_cli/test_web_server.py::TestBuildSchemaFromConfig::test_no_single_field_categories tests/hermes_cli/test_web_server.py::TestPtyWebSocket::test_pub_broadcasts_to_events_subscribers tests/gateway/test_gateway_shutdown.py::test_cancel_background_tasks_cancels_inflight_message_processing tests/hermes_cli/test_gateway_service.py tests/hermes_cli/test_gateway_wsl.py tests/hermes_cli/test_backup.py tests/hermes_cli/test_claw.py tests/tools/test_mcp_dynamic_discovery.py tests/tools/test_local_interrupt_cleanup.py tests/tools/test_browser_orphan_reaper.py tests/run_agent/test_background_review_toolset_restriction.py → 546 passed