refactor(core): collapse project-index batch-store Protocols to concrete

ProjectIndexMoveBatchStore and ProjectIndexDeleteBatchStore each had exactly
one implementation — RepositoryProjectIndexMaintenanceStore — which cloud uses
too (apps/cloud/services/index/project_runtime.py passes the same concrete as
both move_store and delete_store). Neither was a local/cloud seam; they were
pure test-injection indirection for the batch-orchestration functions.

Retype StoreProjectIndexMaintenanceRunner, run_project_index_move_batches,
run_project_index_delete_batches, and ProjectIndexRuntime's move_store/
delete_store fields to the concrete store, and delete both Protocols. The
orchestration tests that used recording batch-store doubles now inject the real
concrete and monkeypatch its single SQL batch method to return canned results,
preserving accumulation/progress coverage without a database.

Part of the protocol-surface reduction from the local/cloud interface audit.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: phernandez <paul@basicmachines.co>

Author: phernandez

src/basic_memory/indexing/project_index_maintenance.py

@@ -58,24 +58,6 @@ async def refresh_moved_entities(self, entity_ids: Sequence[int]) -> None:
         """Refresh search rows for moved entity ids."""
 
 
-class ProjectIndexMoveBatchStore(Protocol):
-    """Capability that applies one project-index move-maintenance batch."""
-
-    async def apply_project_index_move_batch(
-        self,
-        move_batch: ProjectIndexMoveBatch,
-    ) -> ProjectIndexMoveBatchResult: ...
-
-
-class ProjectIndexDeleteBatchStore(Protocol):
-    """Capability that applies one project-index delete-maintenance batch."""
-
-    async def apply_project_index_delete_batch(
-        self,
-        delete_batch: ProjectIndexDeleteBatch,
-    ) -> ProjectIndexDeleteBatchResult: ...
-
-
 @dataclass(frozen=True, slots=True)
 class ProjectIndexMovedFile:
     """One indexed file move that may need storage-backed metadata repair."""
@@ -655,8 +637,8 @@ async def apply_project_index_delete_batch(
 class StoreProjectIndexMaintenanceRunner(ProjectIndexMaintenanceRunner):
     """Run project-index maintenance through explicit move/delete batch stores."""
 
-    move_store: ProjectIndexMoveBatchStore
-    delete_store: ProjectIndexDeleteBatchStore
+    move_store: RepositoryProjectIndexMaintenanceStore
+    delete_store: RepositoryProjectIndexMaintenanceStore
 
     async def run_move_batches(
         self,
@@ -768,7 +750,7 @@ async def run_project_index_move_batches(
     *,
     moved_files: Mapping[str, str],
     batch_size: int,
-    move_store: ProjectIndexMoveBatchStore,
+    move_store: RepositoryProjectIndexMaintenanceStore,
 ) -> ProjectIndexMoveRun:
     """Apply project-index move maintenance through a storage adapter."""
     move_plan = build_project_index_move_batch_plan(
@@ -821,7 +803,7 @@ async def run_project_index_delete_batches(
     *,
     deleted_paths: Sequence[str],
     batch_size: int,
-    delete_store: ProjectIndexDeleteBatchStore,
+    delete_store: RepositoryProjectIndexMaintenanceStore,
 ) -> ProjectIndexDeleteRun:
     """Apply project-index delete maintenance through a storage adapter."""
     delete_plan = build_project_index_delete_batch_plan(

src/basic_memory/indexing/project_index_runtime.py

@@ -30,9 +30,7 @@
 )
 from basic_memory.indexing.progress import VectorSyncProgress
 from basic_memory.indexing.project_index_maintenance import (
-    ProjectIndexDeleteBatchStore,
     ProjectIndexDeleteRun,
-    ProjectIndexMoveBatchStore,
     ProjectIndexMoveRun,
     RepositoryProjectIndexMaintenanceStore,
     run_project_index_delete_batches,
@@ -108,8 +106,8 @@ class ProjectIndexRuntime:
     project_id: ProjectId
     vector_sync: VectorSyncExecutor
     vector_entity_source: VectorSyncEntitySource
-    move_store: ProjectIndexMoveBatchStore
-    delete_store: ProjectIndexDeleteBatchStore
+    move_store: RepositoryProjectIndexMaintenanceStore
+    delete_store: RepositoryProjectIndexMaintenanceStore
     forward_reference_relation_source: ForwardReferenceRelationSource
     forward_reference_resolution_runtime: ForwardReferenceResolutionRuntime
     forward_reference_entity_refresher: ForwardReferenceEntityRefreshRuntime

tests/indexing/test_project_index_maintenance.py

@@ -31,30 +31,63 @@
 )
 
 
-@dataclass(slots=True)
-class RecordingMoveBatchStore:
-    results: list[ProjectIndexMoveBatchResult]
-    batches: list[ProjectIndexMoveBatch] = field(default_factory=list)
-
-    async def apply_project_index_move_batch(
-        self,
+def _stub_move_store(
+    monkeypatch: pytest.MonkeyPatch,
+    *,
+    results: list[ProjectIndexMoveBatchResult],
+    recorded: list[ProjectIndexMoveBatch],
+) -> RepositoryProjectIndexMaintenanceStore:
+    """Build a real store whose move-batch apply returns canned results.
+
+    The orchestration under test only cares that each batch produces a result and
+    is recorded in order, so we monkeypatch the single SQL method rather than drive
+    a real database — the store is otherwise the same concrete used in production.
+    """
+    result_iter = iter(results)
+
+    async def fake_apply_move_batch(
+        _self: RepositoryProjectIndexMaintenanceStore,
         move_batch: ProjectIndexMoveBatch,
     ) -> ProjectIndexMoveBatchResult:
-        self.batches.append(move_batch)
-        return self.results.pop(0)
+        recorded.append(move_batch)
+        return next(result_iter)
 
+    monkeypatch.setattr(
+        RepositoryProjectIndexMaintenanceStore,
+        "apply_project_index_move_batch",
+        fake_apply_move_batch,
+    )
+    return RepositoryProjectIndexMaintenanceStore(
+        session_maker=cast(async_sessionmaker[AsyncSession], object()),
+        project_id=1,
+    )
 
-@dataclass(slots=True)
-class RecordingDeleteBatchStore:
-    results: list[ProjectIndexDeleteBatchResult]
-    batches: list[ProjectIndexDeleteBatch] = field(default_factory=list)
 
-    async def apply_project_index_delete_batch(
-        self,
+def _stub_delete_store(
+    monkeypatch: pytest.MonkeyPatch,
+    *,
+    results: list[ProjectIndexDeleteBatchResult],
+    recorded: list[ProjectIndexDeleteBatch],
+) -> RepositoryProjectIndexMaintenanceStore:
+    """Build a real store whose delete-batch apply returns canned results."""
+    result_iter = iter(results)
+
+    async def fake_apply_delete_batch(
+        _self: RepositoryProjectIndexMaintenanceStore,
         delete_batch: ProjectIndexDeleteBatch,
     ) -> ProjectIndexDeleteBatchResult:
-        self.batches.append(delete_batch)
-        return self.results.pop(0)
+        recorded.append(delete_batch)
+        return next(result_iter)
+
+    monkeypatch.setattr(
+        RepositoryProjectIndexMaintenanceStore,
+        "apply_project_index_delete_batch",
+        fake_apply_delete_batch,
+    )
+    return RepositoryProjectIndexMaintenanceStore(
+        session_maker=cast(async_sessionmaker[AsyncSession], object()),
+        project_id=1,
+    )
 
 
 class FakeProjectIndexScalarResult:
@@ -232,8 +265,12 @@ def test_project_index_maintenance_batch_plans_require_positive_batch_size() ->
 
 
 @pytest.mark.asyncio
-async def test_project_index_move_runner_applies_batches_and_reports_progress() -> None:
-    store = RecordingMoveBatchStore(
+async def test_project_index_move_runner_applies_batches_and_reports_progress(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    recorded_batches: list[ProjectIndexMoveBatch] = []
+    store = _stub_move_store(
+        monkeypatch,
         results=[
             ProjectIndexMoveBatchResult(
                 updated_files=1,
@@ -246,7 +283,8 @@ async def test_project_index_move_runner_applies_batches_and_reports_progress()
                 updated_files=1,
                 moved_entity_ids=frozenset({11}),
             ),
-        ]
+        ],
+        recorded=recorded_batches,
     )
 
     run = await run_project_index_move_batches(
@@ -259,7 +297,7 @@ async def test_project_index_move_runner_applies_batches_and_reports_progress()
         move_store=store,
     )
 
-    assert store.batches == [
+    assert recorded_batches == [
         ProjectIndexMoveBatch(
             completed_batches=1,
             targets=(
@@ -284,8 +322,12 @@ async def test_project_index_move_runner_applies_batches_and_reports_progress()
 
 
 @pytest.mark.asyncio
-async def test_project_index_delete_runner_applies_batches_and_reports_progress() -> None:
-    store = RecordingDeleteBatchStore(
+async def test_project_index_delete_runner_applies_batches_and_reports_progress(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    recorded_batches: list[ProjectIndexDeleteBatch] = []
+    store = _stub_delete_store(
+        monkeypatch,
         results=[
             ProjectIndexDeleteBatchResult(
                 deleted_entities=1,
@@ -296,7 +338,8 @@ async def test_project_index_delete_runner_applies_batches_and_reports_progress(
                 deleted_entities=0,
                 missing_paths=("notes/c.md",),
             ),
-        ]
+        ],
+        recorded=recorded_batches,
     )
 
     run = await run_project_index_delete_batches(
@@ -305,7 +348,7 @@ async def test_project_index_delete_runner_applies_batches_and_reports_progress(
         delete_store=store,
     )
 
-    assert store.batches == [
+    assert recorded_batches == [
         ProjectIndexDeleteBatch(
             completed_batches=1,
             paths=("notes/a.md", "notes/b.md"),
@@ -326,15 +369,25 @@ async def test_project_index_delete_runner_applies_batches_and_reports_progress(
 
 
 @pytest.mark.asyncio
-async def test_store_project_index_maintenance_runner_delegates_to_batch_stores() -> None:
-    move_store = RecordingMoveBatchStore(results=[ProjectIndexMoveBatchResult(updated_files=1)])
-    delete_store = RecordingDeleteBatchStore(
+async def test_store_project_index_maintenance_runner_delegates_to_batch_stores(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    recorded_move_batches: list[ProjectIndexMoveBatch] = []
+    recorded_delete_batches: list[ProjectIndexDeleteBatch] = []
+    move_store = _stub_move_store(
+        monkeypatch,
+        results=[ProjectIndexMoveBatchResult(updated_files=1)],
+        recorded=recorded_move_batches,
+    )
+    delete_store = _stub_delete_store(
+        monkeypatch,
         results=[
             ProjectIndexDeleteBatchResult(
                 deleted_entities=1,
                 relation_cleanup_entity_ids=frozenset({99}),
             )
-        ]
+        ],
+        recorded=recorded_delete_batches,
     )
     runner = StoreProjectIndexMaintenanceRunner(
         move_store=move_store,
@@ -351,15 +404,15 @@ async def test_store_project_index_maintenance_runner_delegates_to_batch_stores(
     )
 
     assert move_run.total_updated_files == 1
-    assert move_store.batches == [
+    assert recorded_move_batches == [
         ProjectIndexMoveBatch(
             completed_batches=1,
             targets=(ProjectIndexMoveTarget("notes/a.md", "archive/a.md"),),
         )
     ]
     assert delete_run.total_deleted_entities == 1
     assert delete_run.relation_cleanup_entity_ids == frozenset({99})
-    assert delete_store.batches == [
+    assert recorded_delete_batches == [
         ProjectIndexDeleteBatch(
             completed_batches=1,
             paths=("notes/deleted.md",),