a9838c2100
Under gateway.multiplex_profiles, os.environ holds the DEFAULT profile's .env; a
secondary profile's values exist only in the per-turn secret scope. Every reader
below still read os.environ/os.getenv at call time, so a secondary profile's turn
silently used the default profile's value.
Credentials (F6): FIRECRAWL_API_KEY (read_file hosted OCR), OPENVIKING_API_KEY,
mem0-OSS OPENAI_API_KEY, MODAL_TOKEN_ID/SECRET and BROWSER_USE_API_KEY presence
gates, and the xAI video plugin's os.getenv("XAI_API_KEY") fallback AFTER the
scoped resolver had already missed — the exact fallback-after-miss shape
gateway/AGENTS.md forbids. Deleted, not re-scoped: the resolver is the scope.
Identity / tenant (F7): MEM0_USER_ID/AGENT_ID/HOST/MODE, SUPERMEMORY_CONTAINER_TAG,
RETAINDB_PROJECT, OPENVIKING_ACCOUNT/USER/AGENT (and the whole layered() env
read), HINDSIGHT_BANK_ID/MODE/retain shaping, HERMES_HONCHO_HOST. A raw read
put a secondary profile's memories into the default profile's account/bank/
project/tenant and recalled them back into the default's turns. Each now uses
get_secret with the provider's own per-profile default on a miss.
Endpoints (F8): OPENAI_BASE_URL (aux custom runtime + direct-alias expansion),
XAI_BASE_URL/HERMES_XAI_BASE_URL (aux OAuth), NOUS_INFERENCE_BASE_URL (#65941,
both the aux builder and hermes_cli.auth_nous._nous_inference_env_override),
GATEWAY_PROXY_URL (same UnscopedSecretError-only fallback shape as
GATEWAY_PROXY_KEY three lines below), FIRECRAWL_API_URL, BROWSERBASE_BASE_URL,
SUPERMEMORY/RETAINDB/HONCHO/HINDSIGHT URLs. The keys beside them were already
scoped, so a secondary's key was sent to the default profile's proxy or host.
Targets / display (F11): WEIXIN_HOME_CHANNEL (message posted into the default's
chat), HERMES_LANGUAGE, and agent/i18n's process-wide lru_cache of
display.language — now keyed by HERMES_HOME.
Outbound webhooks: hooks.outbound[].secret_env resolved from os.environ while
the gateway registers each profile's targets inside that profile's scope, so a
secondary's deliveries were signed with the default's secret or left unsigned.
Agent-cache eviction: _spawn_release_thread started a bare threading.Thread, so
commit_memory_session -> provider on_session_end ran with an EMPTY context. The
thread now runs copy_context() and, for the unscoped housekeeping sweep, enters
the owning profile's _profile_runtime_scope resolved from the session key
(agent:<profile>:...). The pressure batch does the same per key.
session_search (#82903): agent/inline_tool_executors.py::_session_search
forwarded every schema argument except `profile`, so a gateway agent could
never select a named profile's store. Forwarded; the ownership-scoping design
in #87779/#87847 is a separate design call and is not attempted here.
Live repro (/tmp/mux_audit/fix-tool-memory-reads/repro.py): 28 FAIL on
origin/main -> 0 FAIL with this change; 10 new invariant tests red on base.
Fixes #82903
Fixes #65941
Fixes #99121
Addresses #87779
Co-authored-by: webtecnica <75556242+webtecnica@users.noreply.github.com>
Co-authored-by: Michael Versluis (Berry) <michael@wve.nl>
46 lines
2.1 KiB
Python
46 lines
2.1 KiB
Python
"""The inline ``session_search`` executor forwards ``profile`` so a routed gateway agent can read a
|
|
named profile's store instead of silently searching the injected (default) DB (#82903).
|
|
|
|
The gateway hard-injects ``db=agent._get_session_db_for_recall()``; without ``profile`` reaching
|
|
``tools.session_search_tool.session_search`` the tool's ``_resolve_profile_db`` never runs and
|
|
``profile="llm-wiki"`` returns the same rows as no profile at all.
|
|
"""
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from types import SimpleNamespace
|
|
|
|
from agent.inline_tool_executors import INLINE_TOOL_EXECUTORS, InlineToolContext
|
|
from hermes_state import SessionDB
|
|
|
|
|
|
def test_session_search_honours_requested_profile_db(tmp_path, monkeypatch):
|
|
hermes_home = tmp_path / ".hermes"
|
|
profile_home = hermes_home / "profiles" / "llm-wiki"
|
|
profile_home.mkdir(parents=True)
|
|
monkeypatch.setattr(Path, "home", lambda: tmp_path)
|
|
monkeypatch.setenv("HERMES_HOME", str(hermes_home))
|
|
|
|
current_db = SessionDB(hermes_home / "state.db")
|
|
current_db.create_session("default-session", source="gateway")
|
|
current_db.append_message("default-session", role="user", content="weekly report default")
|
|
current_db._conn.commit()
|
|
profile_db = SessionDB(profile_home / "state.db")
|
|
profile_db.create_session("profile-session", source="cli")
|
|
profile_db.append_message("profile-session", role="user", content="weekly report llm wiki")
|
|
profile_db._conn.commit()
|
|
profile_db.close()
|
|
|
|
agent = SimpleNamespace(_get_session_db_for_recall=lambda: current_db, session_id="gw-1")
|
|
ctx = InlineToolContext(effective_task_id="task-1", tool_call_id="call-1")
|
|
try:
|
|
routed = json.loads(INLINE_TOOL_EXECUTORS["session_search"](
|
|
agent, {"query": "weekly report", "profile": "llm-wiki"}, ctx))
|
|
missing = json.loads(INLINE_TOOL_EXECUTORS["session_search"](
|
|
agent, {"query": "weekly report", "profile": "missing-profile"}, ctx))
|
|
finally:
|
|
current_db.close()
|
|
|
|
assert [r["session_id"] for r in routed["results"]] == ["profile-session"]
|
|
assert missing["success"] is False and "default-session" not in json.dumps(missing)
|