diff --git a/plugins/memory/honcho/client.py b/plugins/memory/honcho/client.py
index 3365351679..1ef2a930c5 100644
--- a/plugins/memory/honcho/client.py
+++ b/plugins/memory/honcho/client.py
@@ -497,7 +497,8 @@ class HonchoClientConfig:
         import re
 
         result = self._resolve_session_name_base(cwd=cwd, session_title=session_title,
-                                                 session_id=session_id, gateway_session_key=gateway_session_key)
+                                                 session_id=session_id, gateway_session_key=gateway_session_key,
+                                                 session_title_source=session_title_source)
         if result and self.session_ai_peer_prefix and self.ai_peer:
             ai = re.sub(r'[^a-zA-Z0-9_-]+', '-', self.ai_peer).strip('-')
             if ai:
@@ -508,6 +509,7 @@ class HonchoClientConfig:
     def _resolve_session_name_base(
         self, cwd: str | None = None, session_title: str | None = None,
         session_id: str | None = None, gateway_session_key: str | None = None,
+        session_title_source: str | None = None,
     ) -> str | None:
         """Order: gateway session key (per-chat isolation no cwd/strategy gives) -> per-session
         strategy's session_id (authoritative, so a generated title never remaps a live conversation)
diff --git a/tests/tui_gateway/test_tui_gateway_server.py b/tests/tui_gateway/test_tui_gateway_server.py
index e2c3c607ad..cf41edb3c2 100644
--- a/tests/tui_gateway/test_tui_gateway_server.py
+++ b/tests/tui_gateway/test_tui_gateway_server.py
@@ -4619,7 +4619,7 @@ def test_build_branch_agent_carries_the_parent_login(monkeypatch, tmp_path):
     def fake_init_session(sid, key, agent, history, **kwargs):
         monkeypatch.setitem(server._sessions, sid, {"session_key": key, "transport": server._stdio_transport})
 
-    monkeypatch.setattr(server, "_set_session_context", lambda key: [])
+    monkeypatch.setattr(server, "_set_session_context", lambda key, cwd=None: [])
     monkeypatch.setattr(server, "_clear_session_context", lambda tokens: None)
     monkeypatch.setattr(server, "_init_session", fake_init_session)
     monkeypatch.setattr(server, "_transfer_db_to_agent", lambda *args: False)