From e85635bfa596473a576ebd24567a7609c0344ca2 Mon Sep 17 00:00:00 2001
From: 8Dionysus <gerhmangrant@gmail.com>
Date: Mon, 7 Sep 2026 16:31:29 -0600
Subject: [PATCH] Restore isolated search reader failure cleanup and fallback

---
 scripts/aoa_session_memory.py | 29 +++++++++++-------
 tests/test_session_memory.py  | 55 +++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/scripts/aoa_session_memory.py b/scripts/aoa_session_memory.py
index 461d3791..465fa23c 100755
--- a/scripts/aoa_session_memory.py
+++ b/scripts/aoa_session_memory.py
@@ -132795,12 +132795,18 @@ def _search_sessions_with_isolated_generated_reader(
                 payload["cost_profile"]["generated_storage_attempt"] = payload[
                     "generated_storage_attempt"
                 ]
-                return _search_generated_reader_fallback(
+                payload = _search_generated_reader_fallback(
                     payload,
                     search_kwargs,
                     failure_kind="index_unavailable",
                     failure_scope="fts" if query_is_fts else "structured_filter",
                 )
+                if not cleanup.get("verified"):
+                    payload["ok"] = False
+                    payload.setdefault("diagnostics", []).append(
+                        "generated_search_reader_cleanup_unverified"
+                    )
+                return payload
             attempt = {
                 "status": "completed" if cleanup.get("verified") else "cleanup_unverified",
                 "enforcement": "isolated_generated_reader_process",
@@ -132815,14 +132821,14 @@ def _search_sessions_with_isolated_generated_reader(
                 "fallback_independent_of_reader": True,
                 "mutates": False,
             }
-        payload["generated_storage_attempt"] = attempt
-        payload.setdefault("cost_profile", {})["generated_storage_attempt"] = attempt
-        if not cleanup.get("verified"):
-            payload.setdefault("diagnostics", []).append(
-                "generated_search_reader_cleanup_unverified"
-            )
-            payload["ok"] = False
-        return payload
+            payload["generated_storage_attempt"] = attempt
+            payload.setdefault("cost_profile", {})["generated_storage_attempt"] = attempt
+            if not cleanup.get("verified"):
+                payload.setdefault("diagnostics", []).append(
+                    "generated_search_reader_cleanup_unverified"
+                )
+                payload["ok"] = False
+            return payload
 
         cleanup = _stop_search_reader_process(
             process,
@@ -132859,12 +132865,15 @@ def _search_sessions_with_isolated_generated_reader(
         payload["cost_profile"]["generated_storage_attempt"] = payload[
             "generated_storage_attempt"
         ]
-        return _search_generated_reader_fallback(
+        payload = _search_generated_reader_fallback(
             payload,
             search_kwargs,
             failure_kind="index_unavailable",
             failure_scope="fts" if query_is_fts else "structured_filter",
         )
+        if not cleanup.get("verified"):
+            payload["ok"] = False
+        return payload
     finally:
         _remove_search_generated_reader_output(output_path)
 
diff --git a/tests/test_session_memory.py b/tests/test_session_memory.py
index f6099f3b..b8b09c95 100644
--- a/tests/test_session_memory.py
+++ b/tests/test_session_memory.py
@@ -78967,6 +78967,61 @@ def close(self) -> None:
     assert fake_conn.closed is True
 
 
+@pytest.mark.parametrize("failure", ["error", "exit", "invalid_result"])
+@pytest.mark.parametrize("cleanup_verified", [True, False])
+def test_generated_search_reader_failure_reaps_child_and_reaches_fallback(
+    tmp_path: Path,
+    monkeypatch: Any,
+    failure: str,
+    cleanup_verified: bool,
+) -> None:
+    """Every terminal child failure reaches the parent-owned fallback."""
+
+    def failed_reader(**_kwargs: Any) -> Any:
+        if failure == "error":
+            raise RuntimeError("fixture reader failure")
+        if failure == "exit":
+            os._exit(7)
+        return "not a result object"
+
+    fallback_calls: list[dict[str, Any]] = []
+
+    def fallback(payload: dict[str, Any], _kwargs: Any, **route: Any) -> dict[str, Any]:
+        fallback_calls.append(route)
+        if not cleanup_verified:
+            # Even a usable raw fallback cannot hide unverified child cleanup.
+            payload["ok"] = True
+        return payload
+
+    stop_reader = module._stop_search_reader_process
+
+    def stop(*args: Any, **kwargs: Any) -> dict[str, Any]:
+        cleanup = stop_reader(*args, **kwargs)
+        assert cleanup["verified"] is True
+        return {**cleanup, "verified": cleanup_verified}
+
+    monkeypatch.setattr(module, "_search_sessions_in_process", failed_reader)
+    monkeypatch.setattr(module, "_search_generated_reader_fallback", fallback)
+    monkeypatch.setattr(module, "_stop_search_reader_process", stop)
+    payload = module.search_sessions(
+        aoa_root=tmp_path / ".aoa",
+        query="reader failure anchor",
+        query_timeout_ms=1000,
+        include_archived_raw_fallback=False,
+    )
+
+    assert payload["ok"] is False
+    attempt = payload["generated_storage_attempt"]
+    assert attempt["status"] == "failed"
+    assert attempt["cleanup"]["verified"] is cleanup_verified
+    assert attempt["fallback_independent_of_reader"] is True
+    assert fallback_calls == [{"failure_kind": "index_unavailable", "failure_scope": "fts"}]
+    if failure == "error":
+        assert any("RuntimeError:fixture reader failure" in item for item in payload["diagnostics"])
+    if not cleanup_verified:
+        assert "generated_search_reader_cleanup_unverified" in payload["diagnostics"]
+
+
 def test_generated_search_reader_hard_deadline_reaps_noncooperative_reader(
     tmp_path: Path,
     monkeypatch: Any,