--- a/mercurial/interfaces/repository.py	Tue Feb 11 22:44:21 2025 -0500
+++ b/mercurial/interfaces/repository.py	Fri Feb 07 23:00:31 2025 +0100
@@ -30,6 +30,11 @@
         ByteString,  # TODO: change to Buffer for 3.14
     )
 
+    from ._basetypes import (
+        UiT as Ui,
+        VfsT as Vfs,
+    )
+
     from . import (
         dirstate as intdirstate,
         matcher,
@@ -39,12 +44,6 @@
     # TODO: make a protocol class for this
     NodeConstants = Any
 
-    # TODO: create a Protocol class, since importing uimod here causes a cycle
-    #  that confuses pytype.
-    Ui = Any
-
-    # TODO: make a protocol class for this
-    Vfs = Any
 
 # Local repository feature string.