mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-25 17:18:11 +00:00
fix(tui_gateway): inject live session id into HERMES_SESSION_ID
_set_session_context() called set_session_vars() without session_id, so the HERMES_SESSION_ID contextvar was set to "" (explicitly empty) on every prompt.submit / session bind. The subprocess-env bridge (_inject_session_context_env) treats an explicit "" as authoritative and does NOT fall back to os.environ, so terminal/execute_code commands in a dashboard/TUI/web session saw an empty $HERMES_SESSION_ID — even though agent_init had populated it via set_current_session_id(). Every other set_session_vars() call site (gateway/run.py, cron, api_server) passes session_id; tui_gateway was the only one that dropped it, affecting all three of its frontends (Ink TUI, desktop, web). Fix: derive the live id in the existing _sessions lookup loop (agent.session_id, falling back to session_key — same derivation used at session finalize) and pass it through to set_session_vars. Adds tests/tui_gateway/test_session_id_injection.py covering agent id, session_key fallback, and unknown/ephemeral key.
This commit is contained in:
parent
886dddb82d
commit
3e340d93f4
2 changed files with 94 additions and 0 deletions
80
tests/tui_gateway/test_session_id_injection.py
Normal file
80
tests/tui_gateway/test_session_id_injection.py
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
"""Contract test: tui_gateway._set_session_context must inject the live
|
||||
session id into HERMES_SESSION_ID so terminal/execute_code subprocesses can
|
||||
read the current session's id.
|
||||
|
||||
Regression for the bug where _set_session_context called set_session_vars
|
||||
WITHOUT session_id, leaving the contextvar as "" (explicitly empty). Because
|
||||
the session-context bridge treats an explicit "" as authoritative and does NOT
|
||||
fall back to os.environ, every terminal command in a dashboard/TUI/web session
|
||||
saw an empty HERMES_SESSION_ID even though agent_init had set it via
|
||||
set_current_session_id().
|
||||
"""
|
||||
import pytest
|
||||
|
||||
from gateway.session_context import (
|
||||
get_session_env,
|
||||
_VAR_MAP,
|
||||
_UNSET,
|
||||
)
|
||||
import tui_gateway.server as server
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def _reset_contextvars():
|
||||
"""Reset all session contextvars to _UNSET between tests.
|
||||
|
||||
In production each asyncio.Task/worker thread gets a fresh context copy
|
||||
where the defaults are _UNSET. In tests functions share one thread
|
||||
context, so a value set by test A would leak into test B without this.
|
||||
"""
|
||||
yield
|
||||
for var in _VAR_MAP.values():
|
||||
var.set(_UNSET)
|
||||
|
||||
|
||||
class _FakeAgent:
|
||||
def __init__(self, session_id):
|
||||
self.session_id = session_id
|
||||
|
||||
|
||||
def _install_session(monkeypatch, *, session_key, agent_session_id, source="cli"):
|
||||
"""Register a fake session in server._sessions for the duration of a test."""
|
||||
sess = {
|
||||
"session_key": session_key,
|
||||
"source": source,
|
||||
"agent": _FakeAgent(agent_session_id) if agent_session_id is not None else None,
|
||||
"cwd": "/home/user",
|
||||
}
|
||||
monkeypatch.setattr(server, "_sessions", {session_key: sess}, raising=False)
|
||||
return sess
|
||||
|
||||
|
||||
def test_set_session_context_injects_agent_session_id(monkeypatch):
|
||||
"""HERMES_SESSION_ID must equal the live agent.session_id after binding."""
|
||||
_install_session(
|
||||
monkeypatch, session_key="skey-abc", agent_session_id="20260722_deadbeef"
|
||||
)
|
||||
|
||||
server._set_session_context("skey-abc", ui_session_id="ui-123")
|
||||
|
||||
assert get_session_env("HERMES_SESSION_ID") == "20260722_deadbeef"
|
||||
|
||||
|
||||
def test_set_session_context_falls_back_to_session_key(monkeypatch):
|
||||
"""When the agent has no session_id yet, fall back to the session_key
|
||||
(never leave HERMES_SESSION_ID empty for an identified session)."""
|
||||
_install_session(monkeypatch, session_key="skey-xyz", agent_session_id=None)
|
||||
|
||||
server._set_session_context("skey-xyz")
|
||||
|
||||
assert get_session_env("HERMES_SESSION_ID") == "skey-xyz"
|
||||
|
||||
|
||||
def test_set_session_context_unknown_key_uses_key(monkeypatch):
|
||||
"""An ephemeral/unknown session_key (not in _sessions) still binds the key
|
||||
itself rather than leaving the id empty."""
|
||||
monkeypatch.setattr(server, "_sessions", {}, raising=False)
|
||||
|
||||
server._set_session_context("ephemeral-key")
|
||||
|
||||
assert get_session_env("HERMES_SESSION_ID") == "ephemeral-key"
|
||||
|
|
@ -2573,13 +2573,27 @@ def _set_session_context(
|
|||
# it instead of falling back to the gateway launch dir.
|
||||
resolved = cwd if cwd is not None else _cwd_for_session_key(session_key)
|
||||
source = _resolve_session_platform()
|
||||
# Derive the live conversation id so terminal/execute_code subprocesses
|
||||
# can read HERMES_SESSION_ID. Without this, set_session_vars leaves the
|
||||
# session-id contextvar as "" (explicitly empty), and the subprocess-env
|
||||
# bridge treats that as authoritative — NOT falling back to os.environ —
|
||||
# so every command in a dashboard/TUI/web session saw an empty
|
||||
# HERMES_SESSION_ID even though agent_init set it via
|
||||
# set_current_session_id(). Prefer the agent's durable session_id, then
|
||||
# fall back to the session_key (matching the id derivation used at
|
||||
# session-finalize), so an identified session is never left blank.
|
||||
session_id = session_key
|
||||
with _sessions_lock:
|
||||
for sess in list(_sessions.values()):
|
||||
if sess.get("session_key") == session_key:
|
||||
source = _session_source(sess)
|
||||
session_id = (
|
||||
getattr(sess.get("agent"), "session_id", None) or session_key
|
||||
)
|
||||
break
|
||||
return set_session_vars(
|
||||
session_key=session_key,
|
||||
session_id=session_id,
|
||||
source=source,
|
||||
cwd=resolved,
|
||||
ui_session_id=ui_session_id,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue