Clear index state after MCP server shutdown

Author: vishal-bala

redisvl/mcp/server.py

@@ -87,7 +87,9 @@ async def shutdown(self) -> None:
                 self._vectorizer = None
         finally:
             if self._index is not None:
-                await self._index.disconnect()
+                index = self._index
+                self._index = None
+                await index.disconnect()
 
     async def get_index(self) -> AsyncSearchIndex:
         """Return the initialized async index or fail if startup has not run."""

tests/integration/test_mcp/test_server_startup.py

@@ -199,6 +199,26 @@ async def test_server_shutdown_disconnects_owned_client(
     assert index.client is None
 
 
+@pytest.mark.asyncio
+async def test_server_get_index_fails_after_shutdown(
+    monkeypatch, mcp_config_path, worker_id
+):
+    monkeypatch.setattr(
+        "redisvl.mcp.server.resolve_vectorizer_class",
+        lambda class_name: FakeVectorizer,
+    )
+    settings = MCPSettings(
+        config=mcp_config_path(index_name=f"mcp-get-index-after-shutdown-{worker_id}")
+    )
+    server = RedisVLMCPServer(settings)
+
+    await server.startup()
+    await server.shutdown()
+
+    with pytest.raises(RuntimeError, match="has not been started"):
+        await server.get_index()
+
+
 @pytest.mark.asyncio
 async def test_server_shutdown_disconnects_index_when_vectorizer_close_fails(
     monkeypatch, mcp_config_path, worker_id