From f453c50b6fa0b341080ff99074c9e57b9a071da5 Mon Sep 17 00:00:00 2001
From: Teknium <127238744+teknium1@users.noreply.github.com>
Date: Wed, 22 Jul 2026 05:45:15 -0700
Subject: [PATCH] =?UTF-8?q?test(memory):=20behavioral=20check=20=E2=80=94?=
 =?UTF-8?q?=20memory=20tool=20handler=20works=20with=20skip=5Fmemory=3DTru?=
 =?UTF-8?q?e,=20provider=20stays=20skipped?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up for salvaged PR #65453: extend the regression test to dispatch a
real memory_tool add through the store the tool executor wires in, assert the
write persists to memories/MEMORY.md, and assert the external memory provider
(MemoryManager) is still skipped under skip_memory=True. Also map the
contributor email for attribution CI.

Fixes #65429.
---
 contributors/emails/ella@cincin.mesh        |  1 +
 tests/agent/test_skip_memory_store_65429.py | 44 +++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 contributors/emails/ella@cincin.mesh

diff --git a/contributors/emails/ella@cincin.mesh b/contributors/emails/ella@cincin.mesh
new file mode 100644
index 0000000000..f5d1fcb899
--- /dev/null
+++ b/contributors/emails/ella@cincin.mesh
@@ -0,0 +1 @@
+dsitmilis
diff --git a/tests/agent/test_skip_memory_store_65429.py b/tests/agent/test_skip_memory_store_65429.py
index d0972447f4..b1bfac066f 100644
--- a/tests/agent/test_skip_memory_store_65429.py
+++ b/tests/agent/test_skip_memory_store_65429.py
@@ -63,3 +63,47 @@ def test_memory_toolset_without_skip_memory_creates_store(monkeypatch, tmp_path)
     monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hm"))
     agent = _make_agent(monkeypatch, enabled_toolsets=["memory"], skip_memory=False)
     assert agent._memory_store is not None
+
+
+def test_skip_memory_memory_tool_handler_works_and_provider_skipped(
+    monkeypatch, tmp_path
+):
+    """End-to-end behavioral check for #65429.
+
+    The memory tool handler must actually WORK (not return the
+    "Memory is not available" store=None error) on a skip_memory=True agent
+    with the memory toolset enabled, while the external memory provider
+    sync/prefetch stays skipped (no MemoryManager is created).
+    """
+    import json
+
+    monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hm"))
+    agent = _make_agent(monkeypatch, enabled_toolsets=["memory"], skip_memory=True)
+
+    # Provider sync/prefetch must remain skipped: skip_memory still gates the
+    # external memory provider block.
+    assert agent._memory_manager is None, (
+        "skip_memory=True must still skip the external memory provider"
+    )
+
+    # Dispatch through the same entry point the tool executor uses
+    # (agent/tool_executor.py wires store=agent._memory_store).
+    from tools.memory_tool import memory_tool
+
+    raw = memory_tool(
+        action="add",
+        target="memory",
+        content="User prefers concise answers.",
+        store=agent._memory_store,
+    )
+    result = json.loads(raw)
+    assert result.get("success") is True, (
+        f"memory tool handler must work with skip_memory=True + memory "
+        f"toolset (#65429), got: {raw}"
+    )
+    assert "Memory is not available" not in raw
+
+    # The write must actually persist to the profile-scoped memories dir.
+    memory_md = tmp_path / "hm" / "memories" / "MEMORY.md"
+    assert memory_md.exists()
+    assert "User prefers concise answers." in memory_md.read_text()