The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(memory): retain caller identity for provider tools
KoNit-Ka6f574bbce02
diff --git a/agent/inline_tool_executors.py b/agent/inline_tool_executors.pyindex 643f3e31603..3223e616467 100644--- a/agent/inline_tool_executors.py+++ b/agent/inline_tool_executors.py@@ -328,7 +328,10 @@ def resolve_invoke_tool_executor(agent, function_name: str) -> Optional[InlineToreturn INLINE_TOOL_EXECUTORS[function_name]memory_manager = agent._memory_managerif memory_manager and memory_manager.has_tool(function_name):- return lambda agent, args, ctx: agent._memory_manager.handle_tool_call(function_name, args)+ return lambda agent, args, ctx: agent._memory_manager.handle_tool_call(+ function_name, args,+ caller_gsk=(getattr(agent, "_gateway_session_key", "") or ""),+ )if function_name == "message_agent":return Nonereturn INLINE_TOOL_EXECUTORS.get(function_name)diff --git a/agent/tool_executor.py b/agent/tool_executor.pyindex 2100ff22d04..e462df0b19a 100644--- a/agent/tool_executor.py+++ b/agent/tool_executor.py@@ -1695,7 +1695,10 @@ def _resolve_sequential_dispatch(agent, ref: _ToolCallRef, messages: list) -> _Sif agent._memory_manager and agent._memory_manager.has_tool(function_name):# Memory-provider tools (hindsight_retain, honcho_search, ...) are not in the registry.return _SequentialDispatch(- execute=lambda next_args: agent._memory_manager.handle_tool_call(function_name, next_args),+ execute=lambda next_args: agent._memory_manager.handle_tool_call(+ function_name, next_args,+ caller_gsk=(getattr(agent, "_gateway_session_key", "") or ""),+ ),spinner=_start_quiet_tool_spinner(agent, function_name, function_args),error_result=lambda e: json.dumps({"error": f"Memory tool '{function_name}' failed: {e}"}),error_log="memory_manager.handle_tool_call raised for %s: %s",diff --git a/tests/agent/test_run_agent.py b/tests/agent/test_run_agent.pyindex 63bc8d1172f..e195571bd32 100644--- a/tests/agent/test_run_agent.py+++ b/tests/agent/test_run_agent.py@@ -1592,6 +1592,41 @@ class TestExecuteToolCalls:assert metadata["tool_call_id"] == "mem-1"assert messages[-1]["tool_call_id"] == "mem-1"+ def test_memory_provider_tool_receives_gateway_session_key(self, agent):+ """Regression for #140058: multiplexed provider calls retain their caller identity."""+ provider_call = MagicMock(return_value="{}")+ agent._gateway_session_key = "agent:profile-a:telegram:dm:42"+ agent._memory_manager = SimpleNamespace(+ has_tool=lambda name: name == "external_memory_tool",+ handle_tool_call=provider_call,+ )+ tc = _mock_tool_call(name="external_memory_tool", arguments="{}", call_id="memory-1")++ agent._execute_tool_calls_sequential(_mock_assistant_msg(content="", tool_calls=[tc]), [], "task-1")++ provider_call.assert_called_once_with(+ "external_memory_tool", {}, caller_gsk="agent:profile-a:telegram:dm:42",+ )++ def test_concurrent_memory_provider_tool_receives_gateway_session_key(self, agent):+ """The concurrent dispatch helper preserves the same provider identity contract."""+ from agent.inline_tool_executors import resolve_invoke_tool_executor++ provider_call = MagicMock(return_value="{}")+ agent._gateway_session_key = "agent:profile-b:discord:dm:7"+ agent._memory_manager = SimpleNamespace(+ has_tool=lambda name: name == "external_memory_tool",+ handle_tool_call=provider_call,+ )++ executor = resolve_invoke_tool_executor(agent, "external_memory_tool")++ assert executor is not None+ executor(agent, {}, SimpleNamespace())+ provider_call.assert_called_once_with(+ "external_memory_tool", {}, caller_gsk="agent:profile-b:discord:dm:7",+ )+def test_interrupt_skips_remaining(self, agent, monkeypatch):tc1 = _mock_tool_call(name="web_search", arguments="{}", call_id="c1")tc2 = _mock_tool_call(name="web_search", arguments="{}", call_id="c2")