Skip to content

fix(tui-gateway): scope MCP discovery to active profile - #72135

Closed
LionGateOS wants to merge 3 commits into
NousResearch:mainfrom
LionGateOS:fix/mcp-critical
Closed

fix(tui-gateway): scope MCP discovery to active profile#72135
LionGateOS wants to merge 3 commits into
NousResearch:mainfrom
LionGateOS:fix/mcp-critical

Conversation

@LionGateOS

@LionGateOS LionGateOS commented Jul 26, 2026

Copy link
Copy Markdown
Contributor

Summary

Fixes profile-scoped MCP discovery so MCP startup happens after the selected profile HERMES_HOME is bound.

Changes

  • Removed WebSocket-owned MCP discovery startup.
  • Starts MCP discovery during agent build after profile binding.
  • Propagates the active HERMES_HOME override into the background discovery thread.
  • Added regression coverage for profile-scoped MCP discovery.

Testing

  • uv run pytest -q tests/test_tui_gateway_ws.py tests/test_tui_gateway_server.py tests/tools/test_mcp_loop_profile_override.py tests/tui_gateway/test_wait_for_mcp_discovery.py tests/hermes_cli/test_mcp_startup.py
  • uv run ruff check tui_gateway/entry.py tui_gateway/server.py tui_gateway/ws.py tests/test_tui_gateway_server.py tests/test_tui_gateway_ws.py

Supersedes #42794.

@alt-glitch alt-glitch added type/bug Something isn't working P2 Medium — degraded but workaround exists comp/tui Terminal UI (ui-tui/ + tui_gateway/) tool/mcp MCP client and OAuth area/profiles Multi-profile isolation, HERMES_HOME scoping sweeper:risk-session-state Sweeper risk: may lose/corrupt/mis-associate session or context state needs-decision Awaiting maintainer decision before any implementation labels Jul 26, 2026
@alt-glitch

alt-glitch commented Jul 26, 2026

Copy link
Copy Markdown
Collaborator

This was generated by AI during triage.

Related: #67623 and superseded predecessor #42794. The current diffs are not redundant: this PR binds the selected profile before starting discovery and propagates its HERMES_HOME into the discovery thread, while #67623 has broader secret-scope changes. Maintainer decision needed on the intended consolidated mechanism.

@LionGateOS

LionGateOS commented Jul 26, 2026 via email

Copy link
Copy Markdown
Contributor Author

@teknium1 teknium1 mentioned this pull request Jul 26, 2026
Merged
teknium1 added a commit that referenced this pull request Jul 26, 2026
@teknium1
fix(mcp): propagate profile HERMES_HOME override into shared discover…
af8d698 
…y owner; restore stdio startup + WSTransport tests

Follow-up to @LionGateOS's #72135 salvage:
- Route ensure_mcp_discovery_started through hermes_cli.mcp_startup's
  shared owner instead of a hand-rolled bare thread, keeping the start
  lock, retry-after-zero-connected allowance, and interactive-OAuth
  suppression. The shared owner now captures the caller's context-local
  HERMES_HOME override and re-installs it inside the discovery thread,
  so discovery reads the selected profile's mcp_servers (#67605).
- Restore stdio TUI startup discovery in main() and the
  _mcp_discovery_enabled retry gate in wait_for_mcp_discovery, both
  dropped by the original branch.
- Restore the 3 WSTransport regression tests (send serialization,
  cross-batch ordering, drained-token ordering) deleted by the PR.
- Harden the profile-scoped discovery test against sibling-state leaks.
@teknium1

teknium1 commented Jul 26, 2026

Copy link
Copy Markdown
Contributor

Merged via PR #72219 — your three commits were cherry-picked onto current main with your authorship preserved in git log (rebase-merge). Thanks for the fix!

Follow-up hardening added on top: discovery now routes through the shared owner in hermes_cli/mcp_startup.py (keeps the start lock, retry-after-zero-connected allowance, and interactive-OAuth suppression) with the profile HERMES_HOME override propagated into the discovery thread there; the stdio TUI's startup discovery was restored; and the three WSTransport regression tests were restored.

#67605 stays open for the remaining halves (secret scope, ${VAR} interpolation, MoA presets, frozen import-time globals).

@teknium1 teknium1 closed this Jul 26, 2026
@teknium1 teknium1 mentioned this pull request Jul 26, 2026
Open
1 task
@LionGateOS

LionGateOS commented Jul 26, 2026 via email

Copy link
Copy Markdown
Contributor Author

@karlesnine karlesnine mentioned this pull request Jul 28, 2026
Merged
@LionGateOS

LionGateOS commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

Thanks for carrying this through and preserving authorship. I appreciate the consolidation into #72219 and the additional hardening around the shared MCP discovery owner and profile-scoped HERMES_HOME propagation.

I'll treat the remaining #67605 items as separate follow-up areas and avoid duplicating existing work.

randlee pushed a commit to randlee/hermes-agent that referenced this pull request Aug 11, 2026
@teknium1
fix(mcp): propagate profile HERMES_HOME override into shared discover…
aa4a9f0 
…y owner; restore stdio startup + WSTransport tests

Follow-up to @LionGateOS's NousResearch#72135 salvage:
- Route ensure_mcp_discovery_started through hermes_cli.mcp_startup's
  shared owner instead of a hand-rolled bare thread, keeping the start
  lock, retry-after-zero-connected allowance, and interactive-OAuth
  suppression. The shared owner now captures the caller's context-local
  HERMES_HOME override and re-installs it inside the discovery thread,
  so discovery reads the selected profile's mcp_servers (NousResearch#67605).
- Restore stdio TUI startup discovery in main() and the
  _mcp_discovery_enabled retry gate in wait_for_mcp_discovery, both
  dropped by the original branch.
- Restore the 3 WSTransport regression tests (send serialization,
  cross-batch ordering, drained-token ordering) deleted by the PR.
- Harden the profile-scoped discovery test against sibling-state leaks.
prmartinow pushed a commit to prmartinow/hermes-agent that referenced this pull request Aug 26, 2026
@teknium1
fix(mcp): propagate profile HERMES_HOME override into shared discover…
366b103 
…y owner; restore stdio startup + WSTransport tests

Follow-up to @LionGateOS's NousResearch#72135 salvage:
- Route ensure_mcp_discovery_started through hermes_cli.mcp_startup's
  shared owner instead of a hand-rolled bare thread, keeping the start
  lock, retry-after-zero-connected allowance, and interactive-OAuth
  suppression. The shared owner now captures the caller's context-local
  HERMES_HOME override and re-installs it inside the discovery thread,
  so discovery reads the selected profile's mcp_servers (NousResearch#67605).
- Restore stdio TUI startup discovery in main() and the
  _mcp_discovery_enabled retry gate in wait_for_mcp_discovery, both
  dropped by the original branch.
- Restore the 3 WSTransport regression tests (send serialization,
  cross-batch ordering, drained-token ordering) deleted by the PR.
- Harden the profile-scoped discovery test against sibling-state leaks.
melon-xf added a commit to melon-xf/hermes-agent that referenced this pull request Sep 3, 2026
@melon-xf
fix(mcp): propagate profile HERMES_HOME override into shared discover…
649a973 
…y owner; restore stdio startup + WSTransport tests

Follow-up to @LionGateOS's NousResearch#72135 salvage:
- Route ensure_mcp_discovery_started through hermes_cli.mcp_startup's
  shared owner instead of a hand-rolled bare thread, keeping the start
  lock, retry-after-zero-connected allowance, and interactive-OAuth
  suppression. The shared owner now captures the caller's context-local
  HERMES_HOME override and re-installs it inside the discovery thread,
  so discovery reads the selected profile's mcp_servers (NousResearch#67605).
- Restore stdio TUI startup discovery in main() and the
  _mcp_discovery_enabled retry gate in wait_for_mcp_discovery, both
  dropped by the original branch.
- Restore the 3 WSTransport regression tests (send serialization,
  cross-batch ordering, drained-token ordering) deleted by the PR.
- Harden the profile-scoped discovery test against sibling-state leaks.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

area/profiles Multi-profile isolation, HERMES_HOME scoping comp/tui Terminal UI (ui-tui/ + tui_gateway/) needs-decision Awaiting maintainer decision before any implementation P2 Medium — degraded but workaround exists sweeper:risk-session-state Sweeper risk: may lose/corrupt/mis-associate session or context state tool/mcp MCP client and OAuth type/bug Something isn't working

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@LionGateOS @alt-glitch @teknium1