fix: deploy managed MCP on connect/disconnect instead

Signed-off-by: Jan Pokorný <[email protected]>

Author: JanPokorny

apps/agentstack-server/src/agentstack_server/service_layer/services/connector.py

@@ -81,8 +81,6 @@ async def create_connector(
             auth=Authorization(client_id=client_id, client_secret=client_secret) if client_id else None,
             metadata=metadata,
         )
-        if preset and preset.url.scheme == "mcp+stdio":
-            await self._managed_mcp.deploy(connector=connector)
         async with self._uow() as uow:
             await uow.connectors.create(connector=connector)
             await uow.commit()
@@ -97,9 +95,6 @@ async def delete_connector(self, *, connector_id: UUID, user: User | None = None
             connector = await uow.connectors.get(connector_id=connector_id, user_id=user.id if user else None)
             await self._external_mcp.revoke_token(connector=connector)
 
-            if self._managed_mcp.is_managed(connector=connector):
-                await self._managed_mcp.undeploy(connector=connector)
-
             await uow.connectors.delete(connector_id=connector_id, user_id=user.id if user else None)
             await uow.commit()
 
@@ -113,6 +108,9 @@ async def connect_connector(
         async with self._uow() as uow:
             connector = await uow.connectors.get(connector_id=connector_id, user_id=user.id if user else None)
 
+        if self._managed_mcp.is_managed(connector=connector):
+            await self._managed_mcp.deploy(connector=connector)
+
         try:
             await self.probe_connector(connector=connector)
             connector.state = ConnectorState.connected
@@ -161,17 +159,17 @@ async def disconnect_connector(self, *, connector_id: UUID, user: User | None =
 
         await self._external_mcp.revoke_token(connector=connector)
 
+        if connector.auth:
+            connector.auth.flow = None
+        connector.state = ConnectorState.disconnected
+        connector.disconnect_reason = "Client request"
+
         if self._managed_mcp.is_managed(connector=connector):
             try:
                 await self._managed_mcp.undeploy(connector=connector)
             except Exception:
                 logger.warning("Failed to delete managed MCP server deployment during disconnect", exc_info=True)
 
-        if connector.auth:
-            connector.auth.flow = None
-        connector.state = ConnectorState.disconnected
-        connector.disconnect_reason = "Client request"
-
         async with self._uow() as uow:
             await uow.connectors.update(connector=connector)
             await uow.commit()

apps/agentstack-server/tests/e2e/routes/test_connectors.py

@@ -56,7 +56,7 @@ async def test_stdio_connector_happy_path(test_configuration):
         logger.info("Connector created: connector_id=%s state=%s", connector_id, connector_data["state"])
 
         assert connector_data["url"] == "mcp+stdio://test"
-        assert connector_data["state"] in ["created", "connected"]
+        assert connector_data["state"] == "created"
         assert connector_data["metadata"]["name"] == "Test MCP Server"
 
         logger.info("Connecting to connector: connector_id=%s", connector_id)