Skip to content

fix(hermes-adapter): widen _ACTIVE_CLIENTS key with owner_id to prevent intra-process bridge fight #2292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiwipaulrob wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(hermes-adapter): widen _ACTIVE_CLIENTS key with owner_id to prevent intra-process bridge fight #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee05e39
fix(hermes-adapter): widen _ACTIVE_CLIENTS key with owner_id to preve…
kiwipaulrob Aug 27, 2026
f1d444c
fix: repair mangled __init__ signature from regex overmatch
kiwipaulrob Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apps/memos-local-plugin/adapters/hermes/memos_provider/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ def initialize(self, session_id: str, **kwargs: Any) -> None: # type: ignore[ov
MemosBridgeClient(
runtime_home=home,
extra_env=env,
owner_id=f"provider-{id(self)}",
)
),
before_spawn=lambda home=runtime_home: _prepare_shared_bridge(home),
Expand All @@ -526,6 +527,7 @@ def initialize(self, session_id: str, **kwargs: Any) -> None: # type: ignore[ov
new_bridge = MemosBridgeClient(
runtime_home=str(runtime_home),
extra_env=runtime_env,
owner_id=f"provider-{id(self)}",
)
new_bridge.register_host_handler(
"host.llm.complete",
Expand Down Expand Up @@ -2195,6 +2197,7 @@ def _reconnect_bridge(self, session_id: str = "", *, timeout: float = 30.0) -> N
MemosBridgeClient(
runtime_home=home,
extra_env=env,
owner_id=f"provider-{id(self)}",
)
),
before_spawn=lambda home=runtime_home: _prepare_shared_bridge(home),
Expand Down Expand Up @@ -2261,6 +2264,7 @@ def _reconnect_bridge(self, session_id: str = "", *, timeout: float = 30.0) -> N
new_bridge = MemosBridgeClient(
runtime_home=str(runtime_home),
extra_env=runtime_env,
owner_id=f"provider-{id(self)}",
)
logger.info(
"MemOS: new bridge created (pid=%s)",
Expand Down
9 changes: 8 additions & 1 deletion apps/memos-local-plugin/adapters/hermes/memos_provider/bridge_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# This is the Python-side guard against issue #1910 (bridge process leak:
# every turn spawns new bridge.cjs). Defence in depth on the Node side
# lives in ``bridge.cts`` via ``bridge-stdio.pid``.
_ACTIVE_CLIENTS: dict[tuple[str, bool, str], MemosBridgeClient] = {}
_ACTIVE_CLIENTS: dict[tuple[str, bool, str, str], MemosBridgeClient] = {}
_ACTIVE_CLIENTS_LOCK = threading.Lock()


Expand Down Expand Up @@ -150,6 +150,7 @@ def __init__(
no_viewer: bool = True,
extra_env: dict[str, str] | None = None,
runtime_home: str | None = None,
owner_id: str | None = None,
) -> None:
self._lock = threading.Lock()
self._next_id = 1
Expand Down Expand Up @@ -265,6 +266,10 @@ def __init__(
self._singleton_agent = agent
self._singleton_no_viewer = bool(no_viewer)
self._singleton_runtime_home = str(resolved_runtime_home)
# owner-keying: widen the singleton tracker key to (agent, no_viewer, home,
# owner_id) so concurrent provider instances in ONE process (gateway
# email/cron/subagent sessions) do not reap each other's bridges.
self._singleton_owner = owner_id or f"anon-{id(self)}"
previous = self._register_active()
if previous is not None and previous is not self:
prev_pid = getattr(previous, "pid", "?")
Expand All @@ -282,6 +287,7 @@ def _register_active(self) -> MemosBridgeClient | None:
self._singleton_agent,
self._singleton_no_viewer,
self._singleton_runtime_home,
self._singleton_owner,
)
with _ACTIVE_CLIENTS_LOCK:
previous = _ACTIVE_CLIENTS.get(key)
Expand All @@ -294,6 +300,7 @@ def _unregister_active(self) -> None:
self._singleton_agent,
self._singleton_no_viewer,
self._singleton_runtime_home,
self._singleton_owner,
)
with _ACTIVE_CLIENTS_LOCK:
if _ACTIVE_CLIENTS.get(key) is self:
Expand Down
Loading