From bcae3fcc4e0db772560ed64c59047503b1cb5629 Mon Sep 17 00:00:00 2001
From: "Dora (kyra-nest)" <chris+dora@cmullins.io>
Date: Mon, 11 May 2026 01:16:57 +0000
Subject: [PATCH] fix(honcho): align user context peer perspective

Use the shared observer/target resolver for session context so peer='user' and explicit configured peer IDs query Honcho from the same assistant-observed perspective when allowed. Add regression coverage for user alias, explicit peer, and self-observer fallback.
---
 plugins/memory/honcho/session.py     |  6 +-
 tests/test_honcho_session_context.py | 95 ++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_honcho_session_context.py

diff --git a/plugins/memory/honcho/session.py b/plugins/memory/honcho/session.py
index d8c6c0e6379..e40aafbcfc7 100644
--- a/plugins/memory/honcho/session.py
+++ b/plugins/memory/honcho/session.py
@@ -1007,11 +1007,11 @@ class HonchoSessionManager:
             return self._fetch_peer_context(peer_id, target=peer_id)
 
         try:
-            peer_id = self._resolve_peer_id(session, peer)
+            observer_peer_id, target_peer_id = self._resolve_observer_target(session, peer)
             ctx = honcho_session.context(
                 summary=True,
-                peer_target=peer_id,
-                peer_perspective=session.user_peer_id if peer == "user" else session.assistant_peer_id,
+                peer_target=target_peer_id or observer_peer_id,
+                peer_perspective=observer_peer_id,
             )
 
             result: dict[str, Any] = {}
diff --git a/tests/test_honcho_session_context.py b/tests/test_honcho_session_context.py
new file mode 100644
index 00000000000..97eb99d9d1e
--- /dev/null
+++ b/tests/test_honcho_session_context.py
@@ -0,0 +1,95 @@
+"""Tests for Honcho session context peer resolution."""
+
+from types import SimpleNamespace
+
+from plugins.memory.honcho.session import HonchoSession, HonchoSessionManager
+
+
+class _FakeSummary:
+    content = "summary"
+
+
+class _FakeContext:
+    summary = _FakeSummary()
+    peer_representation = "representation"
+    peer_card = ["fact"]
+    messages = []
+
+
+class _RecordingHonchoSession:
+    def __init__(self):
+        self.calls = []
+
+    def context(self, **kwargs):
+        self.calls.append(kwargs)
+        return _FakeContext()
+
+
+def _manager_with_cached_session(*, ai_observe_others=True):
+    cfg = SimpleNamespace(
+        write_frequency="turn",
+        dialectic_reasoning_level="low",
+        dialectic_dynamic=True,
+        dialectic_max_chars=600,
+        observation_mode="directional",
+        user_observe_me=True,
+        user_observe_others=True,
+        ai_observe_me=True,
+        ai_observe_others=ai_observe_others,
+        message_max_chars=25000,
+        dialectic_max_input_chars=10000,
+    )
+    mgr = HonchoSessionManager(honcho=SimpleNamespace(), config=cfg)
+    session = HonchoSession(
+        key="test-session",
+        user_peer_id="chris",
+        assistant_peer_id="hermes",
+        honcho_session_id="test-session",
+    )
+    fake_honcho_session = _RecordingHonchoSession()
+    mgr._cache[session.key] = session
+    mgr._sessions_cache[session.honcho_session_id] = fake_honcho_session
+    return mgr, fake_honcho_session
+
+
+def test_session_context_user_alias_uses_assistant_observer_when_ai_can_observe_others():
+    mgr, fake = _manager_with_cached_session(ai_observe_others=True)
+
+    result = mgr.get_session_context("test-session", peer="user")
+
+    assert result["summary"] == "summary"
+    assert fake.calls == [
+        {
+            "summary": True,
+            "peer_target": "chris",
+            "peer_perspective": "hermes",
+        }
+    ]
+
+
+def test_session_context_explicit_user_peer_matches_user_alias():
+    mgr, fake = _manager_with_cached_session(ai_observe_others=True)
+
+    mgr.get_session_context("test-session", peer="chris")
+
+    assert fake.calls == [
+        {
+            "summary": True,
+            "peer_target": "chris",
+            "peer_perspective": "hermes",
+        }
+    ]
+
+
+def test_session_context_user_alias_uses_user_self_observer_when_ai_cannot_observe_others():
+    mgr, fake = _manager_with_cached_session(ai_observe_others=False)
+
+    mgr.get_session_context("test-session", peer="user")
+
+    assert fake.calls == [
+        {
+            "summary": True,
+            "peer_target": "chris",
+            "peer_perspective": "chris",
+        }
+    ]