fix: wing_ prefix + agent filter on diary_read

jphein · claude · jphein · commit 49704af74fb0 · 2026-04-19T08:24:29.000-07:00
Addresses bensig's 2-issue review on this PR.

1. _wing_from_transcript_path() was returning bare project names
   (e.g. "myproject") while all existing wings follow the wing_*
   convention from AAAK_SPEC. Entries landed in wing="myproject"
   while diary_read defaulted to wing="wing_&lt;agent_name&gt;" —
   orphaning every diary entry written by the stop hook. Now
   returns "wing_&lt;project&gt;" and falls back to "wing_sessions".

2. tool_diary_read() did not include agent_name in the ChromaDB
   where filter when a custom wing was provided — any caller with
   a shared wing could read entries written by other agents.
   Add {"agent": agent_name} to the $and clause. Also flagged by
   Qudo and left unresolved until now.

Tests updated to expect the wing_ prefix (6 tests).

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/mempalace/hooks_cli.py b/mempalace/hooks_cli.py
@@ -207,14 +207,17 @@ def _wing_from_transcript_path(transcript_path: str) -> str:
 
     Claude Code stores transcripts at:
         ~/.claude/projects/-home-<user>-Projects-<project>/session.jsonl
-    We extract <project> as the wing name.  Falls back to "sessions".
+    We extract <project> and return ``wing_<project>`` to match the
+    AAAK_SPEC convention (``wing_user``, ``wing_agent``, ``wing_code``,
+    ``wing_<project>``…). Falls back to ``wing_sessions``.
     """
     # Normalize path separators for cross-platform (Windows backslashes)
     normalized = transcript_path.replace("\\", "/")
     match = re.search(r"-Projects-([^/]+?)(?:/|$)", normalized)
     if match:
-        return match.group(1).lower().replace(" ", "_")
-    return "sessions"
+        project = match.group(1).lower().replace(" ", "_")
+        return f"wing_{project}"
+    return "wing_sessions"
 
 
 def hook_stop(data: dict, harness: str):
diff --git a/mempalace/mcp_server.py b/mempalace/mcp_server.py
@@ -1011,7 +1011,13 @@ def tool_diary_read(agent_name: str, last_n: int = 10, wing: str = ""):
 
     try:
         results = col.get(
-            where={"$and": [{"wing": wing}, {"room": "diary"}]},
+            where={
+                "$and": [
+                    {"wing": wing},
+                    {"room": "diary"},
+                    {"agent": agent_name},
+                ]
+            },
             include=["documents", "metadatas"],
             limit=10000,
         )
diff --git a/tests/test_hooks_cli.py b/tests/test_hooks_cli.py
@@ -174,7 +174,7 @@ def test_stop_hook_blocks_at_interval(tmp_path):
     assert result["decision"] == "block"
     assert result["reason"].startswith(STOP_BLOCK_REASON)
     # Default wing when transcript path doesn't match Claude Code pattern
-    assert "wing=sessions" in result["reason"]
+    assert "wing=wing_sessions" in result["reason"]
 
 
 def test_stop_hook_derives_wing_from_transcript_path(tmp_path):
@@ -192,7 +192,7 @@ def test_stop_hook_derives_wing_from_transcript_path(tmp_path):
         state_dir=tmp_path,
     )
     assert result["decision"] == "block"
-    assert "wing=myproject" in result["reason"]
+    assert "wing=wing_myproject" in result["reason"]
 
 
 def test_stop_hook_tracks_save_point(tmp_path):
@@ -241,21 +241,21 @@ def test_precompact_allows(tmp_path):
 
 def test_wing_from_transcript_path_extracts_project():
     path = "/home/jp/.claude/projects/-home-jp-Projects-memorypalace/session.jsonl"
-    assert _wing_from_transcript_path(path) == "memorypalace"
+    assert _wing_from_transcript_path(path) == "wing_memorypalace"
 
 
 def test_wing_from_transcript_path_fallback():
-    assert _wing_from_transcript_path("/some/random/path.jsonl") == "sessions"
+    assert _wing_from_transcript_path("/some/random/path.jsonl") == "wing_sessions"
 
 
 def test_wing_from_transcript_path_windows_backslashes():
     path = "C:\\Users\\jp\\.claude\\projects\\-home-jp-Projects-myapp\\session.jsonl"
-    assert _wing_from_transcript_path(path) == "myapp"
+    assert _wing_from_transcript_path(path) == "wing_myapp"
 
 
 def test_wing_from_transcript_path_lowercases():
     path = "/home/jp/.claude/projects/-home-jp-Projects-MyProject/session.jsonl"
-    assert _wing_from_transcript_path(path) == "myproject"
+    assert _wing_from_transcript_path(path) == "wing_myproject"
 
 
 # --- _log ---
