Merge branch 'effective-node-types' into agent-coordination-reliability

# Conflicts:
#	tests/test_mcp_e2e_index_shard.py

tests/test_mcp_e2e_index_shard.py

@@ -52,18 +52,18 @@ def unlock(mod, secret=None):
     cache_secret(mod, secret or memory_secret())
 
 
-def plain_node(name, minute, content=None):
+def plain_node(name, minute, content=None, folder="/notes"):
     stamp = f"2026-09-01T12:{minute:02d}:00Z"
     return {
-        "id": name, "project_id": PROJECT, "full_path": f"/notes/{name}", "folder_path": "/notes",
+        "id": name, "project_id": PROJECT, "full_path": f"{folder}/{name}", "folder_path": folder,
         "name": name, "type": "note", "metadata": {}, "tags": [], "aliases": [], "links": [],
         "content_text": content if content is not None else name, "updated_at": stamp, "archived_at": None,
     }
 
 
-def e2e_node(mod, name, minute, content, metadata=None, secret=None, archived=False):
+def e2e_node(mod, name, minute, content, metadata=None, secret=None, archived=False, folder="/notes"):
     secret = secret or memory_secret()
-    node = plain_node(name, minute)
+    node = plain_node(name, minute, folder=folder)
     context = {"full_path": node["full_path"]}
     node.update({
         "content_text": "", "metadata": {}, "encryption_state": "encrypted",
@@ -229,6 +229,22 @@ def test_e2e_body_term_is_findable_with_snippet_while_unlocked(env):
     assert not discovered.get("warnings")
 
 
+def test_e2e_shard_hits_filter_on_effective_type(env):
+    mod, provider, _ = env
+    provider.put(e2e_node(mod, "legacyplan", 1, BODY, folder="/plans"), "node_created")
+    provider.put(e2e_node(mod, "scratchnote", 2, BODY), "node_created")
+    assert mod.reindex_project({})["e2e_index"]["status"] == "applied"
+
+    # Bodies are only in the shard, so these hits come from the E2E path.
+    plans = mod.search_local_index({"q": BODY_TERM, "limit": 10, "type": "plan"})
+    assert hit_ids(plans) == ["legacyplan"]
+    assert plans["items"][0]["search_source"] == "local_e2e"
+    assert (plans["items"][0]["type"], plans["items"][0]["effective_type"]) == ("note", "plan")
+    notes = mod.search_local_index({"q": BODY_TERM, "limit": 10, "type": "note"})
+    assert hit_ids(notes) == ["scratchnote"]
+    assert notes["items"][0]["search_source"] == "local_e2e"
+
+
 def test_unprovisioned_secret_yields_no_e2e_hits_and_an_explicit_warning(env):
     mod, provider, _ = env
     seed(mod, provider)