Use context parameter for the parentNode

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -334,7 +334,6 @@ class LoggedInFlowNode(
                     }
                 }
                 homeEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callback,
                 )
@@ -391,7 +390,6 @@ class LoggedInFlowNode(
                     }
                 }
                 userProfileEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = UserProfileEntryPoint.Params(userId = navTarget.userId),
                     callback = callback,
@@ -421,7 +419,6 @@ class LoggedInFlowNode(
                 }
                 val inputs = PreferencesEntryPoint.Params(navTarget.initialElement)
                 preferencesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = inputs,
                     callback = callback,
@@ -439,14 +436,12 @@ class LoggedInFlowNode(
                 }
 
                 startChatEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callback,
                 )
             }
             is NavTarget.SecureBackup -> {
                 secureBackupEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement),
                     callback = object : SecureBackupEntryPoint.Callback {
@@ -457,11 +452,10 @@ class LoggedInFlowNode(
                 )
             }
             NavTarget.Ftue -> {
-                ftueEntryPoint.createNode(this, buildContext)
+                ftueEntryPoint.createNode(buildContext)
             }
             NavTarget.RoomDirectory -> {
                 roomDirectoryEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = object : RoomDirectoryEntryPoint.Callback {
                         override fun navigateToRoom(roomDescription: RoomDescription) {
@@ -478,7 +472,6 @@ class LoggedInFlowNode(
             }
             is NavTarget.IncomingShare -> {
                 shareEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = ShareEntryPoint.Params(intent = navTarget.intent),
                     callback = object : ShareEntryPoint.Callback {
@@ -493,7 +486,6 @@ class LoggedInFlowNode(
             }
             is NavTarget.IncomingVerificationRequest -> {
                 incomingVerificationEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = IncomingVerificationEntryPoint.Params(navTarget.data),
                     callback = object : IncomingVerificationEntryPoint.Callback {

appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt

@@ -84,7 +84,6 @@ class NotLoggedInFlowNode(
                     }
                 }
                 loginEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = LoginEntryPoint.Params(
                         accountProvider = inputs.loginParams?.accountProvider,

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

@@ -250,7 +250,6 @@ class RootFlowNode(
             }
             is NavTarget.SignedOutFlow -> {
                 signedOutEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = SignedOutEntryPoint.Params(
                         sessionId = navTarget.sessionId,
@@ -265,7 +264,6 @@ class RootFlowNode(
                     }
                 }
                 bugReportEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callback,
                 )
@@ -294,7 +292,6 @@ class RootFlowNode(
                     }
                 }
                 accountSelectEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callback,
                 )

appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt

@@ -181,7 +181,6 @@ class RoomFlowNode(
                 }
                 val params = Params(navTarget.roomAlias)
                 roomAliasResolverEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,
@@ -195,7 +194,7 @@ class RoomFlowNode(
                     serverNames = navTarget.serverNames,
                     trigger = navTarget.trigger,
                 )
-                joinRoomEntryPoint.createNode(this, buildContext, inputs)
+                joinRoomEntryPoint.createNode(buildContext, inputs)
             }
             is NavTarget.JoinedRoom -> {
                 val roomFlowNodeCallback = plugins<JoinedRoomLoadedFlowNode.Callback>()
@@ -208,7 +207,6 @@ class RoomFlowNode(
             is NavTarget.JoinedSpace -> {
                 val spaceCallback = plugins<SpaceEntryPoint.Callback>().single()
                 spaceEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     inputs = SpaceEntryPoint.Inputs(roomId = navTarget.spaceId),
                     callback = spaceCallback,

appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt

@@ -141,7 +141,6 @@ class JoinedRoomLoadedFlowNode(
             }
         }
         return roomDetailsEntryPoint.createNode(
-            parentNode = this,
             buildContext = buildContext,
             params = RoomDetailsEntryPoint.Params(initialTarget),
             callback = callback,
@@ -180,7 +179,6 @@ class JoinedRoomLoadedFlowNode(
                     }
                 }
                 forwardEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,
@@ -204,7 +202,6 @@ class JoinedRoomLoadedFlowNode(
             }
         }
         return spaceEntryPoint.createNode(
-            parentNode = this,
             buildContext = buildContext,
             inputs = SpaceEntryPoint.Inputs(roomId = inputs.room.roomId),
             callback = callback,
@@ -240,7 +237,6 @@ class JoinedRoomLoadedFlowNode(
             MessagesEntryPoint.InitialTarget.Messages(navTarget.focusedEventId)
         )
         return messagesEntryPoint.createNode(
-            parentNode = this,
             buildContext = buildContext,
             params = params,
             callback = callback,

appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt

@@ -54,8 +54,8 @@ class JoinedRoomLoadedFlowNodeTest {
         var parameters: MessagesEntryPoint.Params? = null
         var callback: MessagesEntryPoint.Callback? = null
 
+        context(parentNode: Node)
         override fun createNode(
-            parentNode: Node,
             buildContext: BuildContext,
             params: MessagesEntryPoint.Params,
             callback: MessagesEntryPoint.Callback,
@@ -77,8 +77,8 @@ class JoinedRoomLoadedFlowNodeTest {
     private class FakeRoomDetailsEntryPoint : RoomDetailsEntryPoint {
         var nodeId: String? = null
 
+        context(parentNode: Node)
         override fun createNode(
-            parentNode: Node,
             buildContext: BuildContext,
             params: RoomDetailsEntryPoint.Params,
             callback: RoomDetailsEntryPoint.Callback,
@@ -90,8 +90,8 @@ class JoinedRoomLoadedFlowNodeTest {
     private class FakeSpaceEntryPoint : SpaceEntryPoint {
         var nodeId: String? = null
 
+        context(parentNode: Node)
         override fun createNode(
-            parentNode: Node,
             buildContext: BuildContext,
             inputs: SpaceEntryPoint.Inputs,
             callback: SpaceEntryPoint.Callback,
@@ -101,8 +101,8 @@ class JoinedRoomLoadedFlowNodeTest {
     }
 
     private class FakeForwardEntryPoint : ForwardEntryPoint {
+        context(parentNode: Node)
         override fun createNode(
-            parentNode: Node,
             buildContext: BuildContext,
             params: ForwardEntryPoint.Params,
             callback: ForwardEntryPoint.Callback,

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultAnalyticsEntryPoint : AnalyticsEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<AnalyticsOptInNode>(buildContext)
     }
 }

features/analytics/impl/src/test/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPointTest.kt

@@ -33,7 +33,9 @@ class DefaultAnalyticsEntryPointTest {
                 )
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(AnalyticsOptInNode::class.java)
     }
 }

features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroes/api/ChangeRoomMemberRolesEntryPoint.kt

@@ -15,8 +15,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 fun interface ChangeRoomMemberRolesEntryPoint : FeatureEntryPoint {
+    context(parentNode: Node)
     fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         room: JoinedRoom,
         listType: ChangeRoomMemberRolesListType,

features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt

@@ -18,8 +18,8 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @ContributesBinding(SessionScope::class)
 class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         room: JoinedRoom,
         listType: ChangeRoomMemberRolesListType,

features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt

@@ -31,12 +31,13 @@ class DefaultChangeRoomMemberRolesEntyPointTest {
         }
         val room = FakeJoinedRoom()
         val listType = ChangeRoomMemberRolesListType.Admins
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            room = FakeJoinedRoom(),
+                room = FakeJoinedRoom(),
-            listType = listType,
+                listType = listType,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(ChangeRoomMemberRolesRootNode::class.java)
         // Search for the Inputs plugin
         val input = result.plugins.filterIsInstance<ChangeRoomMemberRolesRootNode.Inputs>().single()

features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt

@@ -14,7 +14,8 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface CreateRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onRoomCreated(roomId: RoomId)

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: CreateRoomEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, callback: CreateRoomEntryPoint.Callback): Node {
         return parentNode.createNode<CreateRoomFlowNode>(buildContext, listOf(callback))
     }
 }

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt

@@ -38,11 +38,12 @@ class DefaultCreateRoomEntryPointTest {
         val callback = object : CreateRoomEntryPoint.Callback {
             override fun onRoomCreated(roomId: RoomId) = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result.plugins).contains(callback)
     }
 }

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<AccountDeactivationNode>(buildContext)
     }
 }

features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultAccountDeactivationEntryPointTest.kt

@@ -28,7 +28,9 @@ class DefaultAccountDeactivationEntryPointTest {
                 presenter = createPresenter(),
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(AccountDeactivationNode::class.java)
     }
 }

features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt

@@ -26,5 +26,6 @@ interface ForwardEntryPoint : FeatureEntryPoint {
         val timelineProvider: TimelineProvider,
     ) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 }

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultForwardEntryPoint : ForwardEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: ForwardEntryPoint.Params, callback: ForwardEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: ForwardEntryPoint.Params, callback: ForwardEntryPoint.Callback): Node {
         return parentNode.createNode<ForwardMessagesNode>(
             buildContext = buildContext,
             plugins = listOf(

features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt

@@ -71,7 +71,6 @@ class ForwardMessagesNode(
         }
 
         return roomSelectEntryPoint.createNode(
-            parentNode = this,
             buildContext = buildContext,
             params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward),
             callback = callback,

features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt

@@ -39,8 +39,8 @@ class DefaultForwardEntryPointTest {
                 plugins = plugins,
                 presenterFactory = { _, _ -> createForwardMessagesPresenter() },
                 roomSelectEntryPoint = object : RoomSelectEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: RoomSelectEntryPoint.Params,
                         callback: RoomSelectEntryPoint.Callback,
@@ -55,12 +55,13 @@ class DefaultForwardEntryPointTest {
             eventId = AN_EVENT_ID,
             timelineProvider = FakeTimelineProvider(),
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(ForwardMessagesNode::class.java)
         assertThat(result.plugins).contains(
             ForwardMessagesNode.Inputs(

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultFtueEntryPoint : FtueEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<FtueFlowNode>(buildContext)
     }
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt

@@ -102,7 +102,7 @@ class FtueFlowNode(
                 createNode<NotificationsOptInNode>(buildContext, listOf(callback))
             }
             NavTarget.AnalyticsOptIn -> {
-                analyticsEntryPoint.createNode(this, buildContext)
+                analyticsEntryPoint.createNode(buildContext)
             }
             NavTarget.LockScreenSetup -> {
                 val callback = object : LockScreenEntryPoint.Callback {
@@ -111,7 +111,6 @@ class FtueFlowNode(
                     }
                 }
                 lockScreenEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     navTarget = LockScreenEntryPoint.Target.Setup,
                     callback = callback,

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt

@@ -104,7 +104,6 @@ class FtueSessionVerificationFlowNode(
             }
             is NavTarget.UseAnotherDevice -> {
                 outgoingVerificationEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = OutgoingVerificationEntryPoint.Params(
                         showDeviceVerifiedScreen = true,
@@ -128,7 +127,6 @@ class FtueSessionVerificationFlowNode(
             }
             is NavTarget.EnterRecoveryKey -> {
                 secureBackupEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey),
                     callback = secureBackupEntryPointCallback
@@ -136,7 +134,6 @@ class FtueSessionVerificationFlowNode(
             }
             is NavTarget.ResetIdentity -> {
                 secureBackupEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity),
                     callback = object : SecureBackupEntryPoint.Callback {

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt

@@ -35,11 +35,11 @@ class DefaultFtueEntryPointTest {
             FtueFlowNode(
                 buildContext = buildContext,
                 plugins = plugins,
-                analyticsEntryPoint = { _, _ -> lambdaError() },
+                analyticsEntryPoint = { _ -> lambdaError() },
                 defaultFtueService = createDefaultFtueService(),
                 lockScreenEntryPoint = object : LockScreenEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         navTarget: LockScreenEntryPoint.Target,
                         callback: LockScreenEntryPoint.Callback,
@@ -51,7 +51,9 @@ class DefaultFtueEntryPointTest {
                 },
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(FtueFlowNode::class.java)
     }
 }

features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt

@@ -14,7 +14,8 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface HomeEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun navigateToRoom(roomId: RoomId)

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultHomeEntryPoint : HomeEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: HomeEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, callback: HomeEntryPoint.Callback): Node {
         return parentNode.createNode<HomeFlowNode>(buildContext, listOf(callback))
     }
 }

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt

@@ -186,12 +186,11 @@ class HomeFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            is NavTarget.ReportRoom -> reportRoomEntryPoint.createNode(this, buildContext, navTarget.roomId)
+            is NavTarget.ReportRoom -> reportRoomEntryPoint.createNode(buildContext, navTarget.roomId)
-            is NavTarget.DeclineInviteAndBlockUser -> declineInviteAndBlockUserEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.DeclineInviteAndBlockUser -> declineInviteAndBlockUserEntryPoint.createNode(buildContext, navTarget.inviteData)
             is NavTarget.SelectNewOwnersWhenLeavingRoom -> {
                 val room = runBlocking { matrixClient.getJoinedRoom(navTarget.roomId) } ?: error("Room ${navTarget.roomId} not found")
                 changeRoomMemberRolesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     room = room,
                     listType = ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving,

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt

@@ -34,9 +34,9 @@ class DefaultHomeEntryPointTest {
                 analyticsService = FakeAnalyticsService(),
                 acceptDeclineInviteView = { _, _, _, _ -> lambdaError() },
                 directLogoutView = { _ -> lambdaError() },
-                reportRoomEntryPoint = { _, _, _ -> lambdaError() },
+                reportRoomEntryPoint = { _, _ -> lambdaError() },
-                declineInviteAndBlockUserEntryPoint = { _, _, _ -> lambdaError() },
+                declineInviteAndBlockUserEntryPoint = { _, _ -> lambdaError() },
-                changeRoomMemberRolesEntryPoint = { _, _, _, _ -> lambdaError() },
+                changeRoomMemberRolesEntryPoint = { _, _, _ -> lambdaError() },
                 leaveRoomRenderer = { _, _, _ -> lambdaError() },
             )
         }
@@ -49,11 +49,12 @@ class DefaultHomeEntryPointTest {
             override fun navigateToRoomSettings(roomId: RoomId) = lambdaError()
             override fun navigateToBugReport() = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(HomeFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt

@@ -13,5 +13,6 @@ import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 fun interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, inviteData: InviteData): Node
 }

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt

@@ -17,7 +17,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultDeclineAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, inviteData: InviteData): Node {
         val inputs = DeclineAndBlockNode.Inputs(inviteData)
         return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))
     }

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt

@@ -30,11 +30,12 @@ class DefaultDeclineAndBlockEntryPointTest {
             )
         }
         val inviteData = anInviteData()
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            inviteData = inviteData
+                inviteData = inviteData
-        )
+            )
+        }
         assertThat(result).isInstanceOf(DeclineAndBlockNode::class.java)
         assertThat(result.plugins).contains(DeclineAndBlockNode.Inputs(inviteData))
     }

features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt

@@ -18,7 +18,8 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import java.util.Optional
 
 interface JoinRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, inputs: Inputs): Node
 
     data class Inputs(
         val roomId: RoomId,

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultJoinRoomEntryPoint : JoinRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
         return parentNode.createNode<JoinRoomFlowNode>(
             buildContext = buildContext,
             plugins = listOf(inputs)

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt

@@ -64,7 +64,7 @@ class JoinRoomFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(buildContext, navTarget.inviteData)
             NavTarget.Root -> rootNode(buildContext)
         }
     }

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt

@@ -41,7 +41,8 @@ class DefaultJoinRoomEntryPointTest {
                 presenterFactory = { _, _, _, _, _ -> createJoinRoomPresenter() },
                 acceptDeclineInviteView = { _, _, _, _ -> lambdaError() },
                 declineAndBlockEntryPoint = object : DeclineInviteAndBlockEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext, inviteData: InviteData) = lambdaError()
                 }
             )
         }
@@ -52,7 +53,9 @@ class DefaultJoinRoomEntryPointTest {
             serverNames = emptyList(),
             trigger = JoinedRoom.Trigger.RoomDirectory,
         )
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null), inputs)
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null), inputs)
+        }
         assertThat(result).isInstanceOf(JoinRoomFlowNode::class.java)
         assertThat(result.plugins).contains(inputs)
     }

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultKnockRequestsListEntryPoint : KnockRequestsListEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<KnockRequestsListNode>(buildContext)
     }
 }

features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/DefaultKnockRequestsListEntryPointTest.kt

@@ -30,7 +30,9 @@ class DefaultKnockRequestsListEntryPointTest {
                 presenter = createKnockRequestsListPresenter(),
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(KnockRequestsListNode::class.java)
     }
 }

features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultOpenSourcesLicensesEntryPoint : OpenSourceLicensesEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<DependenciesFlowNode>(buildContext)
     }
 }

features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt

@@ -31,7 +31,9 @@ class DefaultOpenSourcesLicensesEntryPointTest {
                 plugins = plugins,
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(DependenciesFlowNode::class.java)
     }
 }

features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt

@@ -18,8 +18,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
  * Allows a user to share a location message within a room.
  */
 interface SendLocationEntryPoint : FeatureEntryPoint {
+    context(parentNode: Node)
     fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         timelineMode: Timeline.Mode,
     ): Node

features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt

@@ -15,5 +15,6 @@ import io.element.android.libraries.architecture.NodeInputs
 interface ShowLocationEntryPoint : FeatureEntryPoint {
     data class Inputs(val location: Location, val description: String?) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, inputs: Inputs): Node
 }

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt

@@ -17,8 +17,8 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 
 @ContributesBinding(AppScope::class)
 class DefaultSendLocationEntryPoint : SendLocationEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         timelineMode: Timeline.Mode,
     ): Node {

features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultShowLocationEntryPoint : ShowLocationEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
         return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
     }
 }

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt

@@ -47,11 +47,12 @@ class DefaultSendLocationEntryPointTest {
             )
         }
         val timelineMode = Timeline.Mode.Live
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            timelineMode = timelineMode,
+                timelineMode = timelineMode,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(SendLocationNode::class.java)
         assertThat(result.plugins).contains(SendLocationNode.Inputs(timelineMode))
     }

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt

@@ -47,11 +47,12 @@ class DefaultShowLocationEntryPointTest {
             location = Location(37.4219983, -122.084, 10f),
             description = "My location",
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode,
+            entryPoint.createNode(
-            BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            inputs = inputs,
+                inputs = inputs,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(ShowLocationNode::class.java)
         assertThat(result.plugins).contains(inputs)
     }

features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt

@@ -15,7 +15,9 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface LockScreenEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, navTarget: Target, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, navTarget: Target, callback: Callback): Node
+
     fun pinUnlockIntent(context: Context): Intent
 
     interface Callback : Plugin {

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt

@@ -19,8 +19,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultLockScreenEntryPoint : LockScreenEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         navTarget: LockScreenEntryPoint.Target,
         callback: LockScreenEntryPoint.Callback,

features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt

@@ -37,12 +37,13 @@ class DefaultLockScreenEntryPointTest {
             override fun onSetupDone() = lambdaError()
         }
         val navTarget = LockScreenEntryPoint.Target.Setup
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            navTarget = navTarget,
+                navTarget = navTarget,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
         assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Setup))
         assertThat(result.plugins).contains(callback)
@@ -61,12 +62,13 @@ class DefaultLockScreenEntryPointTest {
             override fun onSetupDone() = lambdaError()
         }
         val navTarget = LockScreenEntryPoint.Target.Settings
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            navTarget = navTarget,
+                navTarget = navTarget,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
         assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Settings))
         assertThat(result.plugins).contains(callback)

features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt

@@ -22,5 +22,6 @@ interface LoginEntryPoint : FeatureEntryPoint {
         fun navigateToBugReport()
     }
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultLoginEntryPoint : LoginEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: LoginEntryPoint.Params, callback: LoginEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: LoginEntryPoint.Params, callback: LoginEntryPoint.Callback): Node {
         return parentNode.createNode<LoginFlowNode>(
             buildContext = buildContext,
             plugins = listOf(

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt

@@ -45,12 +45,13 @@ class DefaultLoginEntryPointTest {
             accountProvider = "ac",
             loginHint = "lh",
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(LoginFlowNode::class.java)
         assertThat(result.plugins).contains(LoginFlowNode.Params(params.accountProvider, params.loginHint))
         assertThat(result.plugins).contains(callback)

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt

@@ -13,7 +13,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface LogoutEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun navigateToSecureBackup()

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultLogoutEntryPoint : LogoutEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: LogoutEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, callback: LogoutEntryPoint.Callback): Node {
         return parentNode.createNode<LogoutNode>(buildContext, listOf(callback))
     }
 }

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/DefaultLogoutEntryPointTest.kt

@@ -34,11 +34,12 @@ class DefaultLogoutEntryPointTest {
         val callback = object : LogoutEntryPoint.Callback {
             override fun navigateToSecureBackup() = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(LogoutNode::class.java)
         assertThat(result.plugins).contains(callback)
     }

features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt

@@ -41,7 +41,8 @@ interface MessagesEntryPoint : FeatureEntryPoint {
 
     data class Params(val initialTarget: InitialTarget) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 }
 
 interface MessagesEntryPointNode {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultMessagesEntryPoint : MessagesEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: MessagesEntryPoint.Params, callback: MessagesEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: MessagesEntryPoint.Params, callback: MessagesEntryPoint.Callback): Node {
         return parentNode.createNode<MessagesFlowNode>(buildContext, listOf(params, callback))
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt

@@ -321,7 +321,6 @@ class MessagesFlowNode(
                     }
                 }
                 mediaViewerEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback
@@ -337,7 +336,7 @@ class MessagesFlowNode(
             }
             is NavTarget.LocationViewer -> {
                 val inputs = ShowLocationEntryPoint.Inputs(navTarget.location, navTarget.description)
-                showLocationEntryPoint.createNode(this, buildContext, inputs)
+                showLocationEntryPoint.createNode(buildContext, inputs)
             }
             is NavTarget.EventDebugInfo -> {
                 val inputs = EventDebugInfoNode.Inputs(navTarget.eventId, navTarget.debugInfo)
@@ -359,7 +358,6 @@ class MessagesFlowNode(
                     }
                 }
                 forwardEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,
@@ -371,14 +369,12 @@ class MessagesFlowNode(
             }
             is NavTarget.SendLocation -> {
                 sendLocationEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     timelineMode = navTarget.timelineMode,
                 )
             }
             is NavTarget.CreatePoll -> {
                 createPollEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = CreatePollEntryPoint.Params(
                         timelineMode = navTarget.timelineMode,
@@ -388,7 +384,6 @@ class MessagesFlowNode(
             }
             is NavTarget.EditPoll -> {
                 createPollEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = CreatePollEntryPoint.Params(
                         timelineMode = navTarget.timelineMode,
@@ -428,7 +423,7 @@ class MessagesFlowNode(
                 createNode<PinnedMessagesListNode>(buildContext, plugins = listOf(callback))
             }
             NavTarget.KnockRequestsList -> {
-                knockRequestsListEntryPoint.createNode(this, buildContext)
+                knockRequestsListEntryPoint.createNode(buildContext)
             }
             is NavTarget.Thread -> {
                 val inputs = ThreadedMessagesNode.Inputs(

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt

@@ -66,18 +66,19 @@ class DefaultMessagesEntryPointTest {
                 roomListService = FakeRoomListService(),
                 sessionId = A_SESSION_ID,
                 sendLocationEntryPoint = object : SendLocationEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         timelineMode: Timeline.Mode,
                     ) = lambdaError()
                 },
                 showLocationEntryPoint = object : ShowLocationEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs) = lambdaError()
                 },
                 createPollEntryPoint = object : CreatePollEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: Params,
                     ) = lambdaError()
@@ -99,16 +100,16 @@ class DefaultMessagesEntryPointTest {
                 },
                 mediaViewerEntryPoint = object : MediaViewerEntryPoint {
                     override fun createParamsForAvatar(filename: String, avatarUrl: String) = lambdaError()
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: MediaViewerEntryPoint.Params,
                         callback: MediaViewerEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 forwardEntryPoint = object : ForwardEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: ForwardEntryPoint.Params,
                         callback: ForwardEntryPoint.Callback,
@@ -129,7 +130,8 @@ class DefaultMessagesEntryPointTest {
                 pinnedEventsTimelineProvider = createPinnedEventsTimelineProvider(),
                 timelineController = createTimelineController(),
                 knockRequestsListEntryPoint = object : KnockRequestsListEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext) = lambdaError()
                 },
                 dateFormatter = FakeDateFormatter(),
                 coroutineDispatchers = testCoroutineDispatchers(),
@@ -144,12 +146,13 @@ class DefaultMessagesEntryPointTest {
         }
         val initialTarget = MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID)
         val params = MessagesEntryPoint.Params(initialTarget)
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(MessagesFlowNode::class.java)
         assertThat(result.plugins).contains(MessagesEntryPoint.Params(initialTarget))
         assertThat(result.plugins).contains(callback)

features/poll/api/src/main/kotlin/io/element/android/features/poll/api/create/CreatePollEntryPoint.kt

@@ -18,5 +18,6 @@ interface CreatePollEntryPoint : FeatureEntryPoint {
         val mode: CreatePollMode,
     )
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params): Node
 }

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultCreatePollEntryPoint : CreatePollEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: CreatePollEntryPoint.Params): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: CreatePollEntryPoint.Params): Node {
         return parentNode.createNode<CreatePollNode>(
             buildContext = buildContext,
             plugins = listOf(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultPollHistoryEntryPoint : PollHistoryEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext): Node {
         return parentNode.createNode<PollHistoryFlowNode>(buildContext)
     }
 }

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryFlowNode.kt

@@ -54,7 +54,6 @@ class PollHistoryFlowNode(
         return when (navTarget) {
             is NavTarget.EditPoll -> {
                 createPollEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = CreatePollEntryPoint.Params(
                         timelineMode = Timeline.Mode.Live,

features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/DefaultCreatePollEntryPointTest.kt

@@ -53,11 +53,12 @@ class DefaultCreatePollEntryPointTest {
             timelineMode = Timeline.Mode.Live,
             mode = CreatePollMode.NewPoll,
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(CreatePollNode::class.java)
         assertThat(result.plugins).contains(CreatePollNode.Inputs(timelineMode = params.timelineMode, mode = params.mode))
     }

features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/DefaultPollHistoryEntryPointTest.kt

@@ -34,15 +34,17 @@ class DefaultPollHistoryEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 createPollEntryPoint = object : CreatePollEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: CreatePollEntryPoint.Params,
                     ) = lambdaError()
                 }
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null))
+        }
         assertThat(result).isInstanceOf(PollHistoryFlowNode::class.java)
     }
 }

features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt

@@ -31,7 +31,8 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
 
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun navigateToAddAccount()

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPoint.kt

@@ -16,8 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultPreferencesEntryPoint : PreferencesEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         params: PreferencesEntryPoint.Params,
         callback: PreferencesEntryPoint.Callback,

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt

@@ -216,7 +216,6 @@ class PreferencesFlowNode(
             }
             NavTarget.TroubleshootNotifications -> {
                 notificationTroubleShootEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = object : NotificationTroubleShootEntryPoint.Callback {
                         override fun onDone() {
@@ -235,9 +234,8 @@ class PreferencesFlowNode(
             }
             NavTarget.PushHistory -> {
                 pushHistoryEntryPoint.createNode(
-                    this,
+                    buildContext = buildContext,
-                    buildContext,
+                    callback = object : PushHistoryEntryPoint.Callback {
-                    object : PushHistoryEntryPoint.Callback {
                         override fun onDone() {
                             if (backstack.canPop()) {
                                 backstack.pop()
@@ -270,7 +268,6 @@ class PreferencesFlowNode(
             }
             NavTarget.LockScreenSettings -> {
                 lockScreenEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     navTarget = LockScreenEntryPoint.Target.Settings,
                     callback = object : LockScreenEntryPoint.Callback {
@@ -290,16 +287,15 @@ class PreferencesFlowNode(
                     }
                 }
                 logoutEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callBack,
                 )
             }
             is NavTarget.OssLicenses -> {
-                openSourceLicensesEntryPoint.createNode(this, buildContext)
+                openSourceLicensesEntryPoint.createNode(buildContext)
             }
             NavTarget.AccountDeactivation -> {
-                accountDeactivationEntryPoint.createNode(this, buildContext)
+                accountDeactivationEntryPoint.createNode(buildContext)
             }
         }
     }

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt

@@ -42,8 +42,8 @@ class DefaultPreferencesEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 lockScreenEntryPoint = object : LockScreenEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         navTarget: LockScreenEntryPoint.Target,
                         callback: LockScreenEntryPoint.Callback,
@@ -52,31 +52,33 @@ class DefaultPreferencesEntryPointTest {
                     override fun pinUnlockIntent(context: Context) = lambdaError()
                 },
                 notificationTroubleShootEntryPoint = object : NotificationTroubleShootEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         callback: NotificationTroubleShootEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 pushHistoryEntryPoint = object : PushHistoryEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         callback: PushHistoryEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 logoutEntryPoint = object : LogoutEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         callback: LogoutEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 openSourceLicensesEntryPoint = object : OpenSourceLicensesEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext) = lambdaError()
                 },
                 accountDeactivationEntryPoint = object : AccountDeactivationEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext) = lambdaError()
                 },
             )
         }
@@ -90,12 +92,13 @@ class DefaultPreferencesEntryPointTest {
         val params = PreferencesEntryPoint.Params(
             initialElement = PreferencesEntryPoint.InitialTarget.NotificationSettings,
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(PreferencesFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)

features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/bugreport/BugReportEntryPoint.kt

@@ -13,7 +13,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface BugReportEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onDone()

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportFlowNode.kt

@@ -78,7 +78,6 @@ class BugReportFlowNode(
                     rootPath = navTarget.rootPath,
                 )
                 viewFolderEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultBugReportEntryPoint : BugReportEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: BugReportEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, callback: BugReportEntryPoint.Callback): Node {
         return parentNode.createNode<BugReportFlowNode>(buildContext, listOf(callback))
     }
 }

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/DefaultBugReportEntryPointTest.kt

@@ -35,8 +35,8 @@ class DefaultBugReportEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 viewFolderEntryPoint = object : ViewFolderEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: ViewFolderEntryPoint.Params,
                         callback: ViewFolderEntryPoint.Callback,
@@ -47,11 +47,12 @@ class DefaultBugReportEntryPointTest {
         val callback = object : BugReportEntryPoint.Callback {
             override fun onDone() = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(BugReportFlowNode::class.java)
         assertThat(result.plugins).contains(callback)
     }

features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt

@@ -13,5 +13,6 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 
 fun interface ReportRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, roomId: RoomId): Node
 }

features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt

@@ -17,7 +17,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 @ContributesBinding(AppScope::class)
 class DefaultReportRoomEntryPoint : ReportRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, roomId: RoomId): Node {
         return parentNode.createNode<ReportRoomNode>(buildContext, plugins = listOf(ReportRoomNode.Inputs(roomId)))
     }
 }

features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPointTest.kt

@@ -32,7 +32,9 @@ class DefaultReportRoomEntryPointTest {
                 }
             )
         }
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null), A_ROOM_ID)
+        val result = with(parentNode) {
+            entryPoint.createNode(BuildContext.root(null), A_ROOM_ID)
+        }
         assertThat(result).isInstanceOf(ReportRoomNode::class.java)
         assertThat(result.plugins).contains(ReportRoomNode.Inputs(A_ROOM_ID))
     }

features/roomaliasresolver/api/src/main/kotlin/io/element/android/features/roomaliasesolver/api/RoomAliasResolverEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 
 interface RoomAliasResolverEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onAliasResolved(data: ResolvedRoomAlias)

features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPoint.kt

@@ -16,8 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultRoomAliasResolverEntryPoint : RoomAliasResolverEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         params: RoomAliasResolverEntryPoint.Params,
         callback: RoomAliasResolverEntryPoint.Callback,

features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/DefaultRoomAliasResolverEntryPointTest.kt

@@ -43,12 +43,13 @@ class DefaultRoomAliasResolverEntryPointTest {
         val params = RoomAliasResolverEntryPoint.Params(
             roomAlias = A_ROOM_ALIAS
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(RoomAliasResolverNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)

features/roomdetails/api/src/main/kotlin/io/element/android/features/roomdetails/api/RoomDetailsEntryPoint.kt

@@ -43,5 +43,6 @@ interface RoomDetailsEntryPoint : FeatureEntryPoint {
         fun startForwardEventFlow(eventId: EventId)
     }
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPoint.kt

@@ -18,8 +18,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultRoomDetailsEntryPoint : RoomDetailsEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         params: RoomDetailsEntryPoint.Params,
         callback: RoomDetailsEntryPoint.Callback,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt

@@ -308,14 +308,13 @@ class RoomDetailsFlowNode(
                     avatarUrl = navTarget.avatarUrl,
                 )
                 mediaViewerEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,
                 )
             }
             is NavTarget.PollHistory -> {
-                pollHistoryEntryPoint.createNode(this, buildContext)
+                pollHistoryEntryPoint.createNode(buildContext)
             }
             is NavTarget.MediaGallery -> {
                 val callback = object : MediaGalleryEntryPoint.Callback {
@@ -336,7 +335,6 @@ class RoomDetailsFlowNode(
                     }
                 }
                 mediaGalleryEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     callback = callback,
                 )
@@ -367,14 +365,13 @@ class RoomDetailsFlowNode(
                     }
                 }
                 return messagesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = callback,
                 )
             }
             NavTarget.KnockRequestsList -> {
-                knockRequestsListEntryPoint.createNode(this, buildContext)
+                knockRequestsListEntryPoint.createNode(buildContext)
             }
             NavTarget.SecurityAndPrivacy -> {
                 createNode<SecurityAndPrivacyFlowNode>(buildContext)
@@ -385,7 +382,6 @@ class RoomDetailsFlowNode(
                     verificationRequest = VerificationRequest.Outgoing.User(userId = navTarget.userId)
                 )
                 outgoingVerificationEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     params = params,
                     callback = object : OutgoingVerificationEntryPoint.Callback {
@@ -404,12 +400,11 @@ class RoomDetailsFlowNode(
                 )
             }
             is NavTarget.ReportRoom -> {
-                reportRoomEntryPoint.createNode(this, buildContext, room.roomId)
+                reportRoomEntryPoint.createNode(buildContext, room.roomId)
             }
 
             is NavTarget.SelectNewOwnersWhenLeaving -> {
                 changeRoomMemberRolesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     room = room,
                     listType = ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsFlowNode.kt

@@ -102,7 +102,6 @@ class RolesAndPermissionsFlowNode(
             }
             is NavTarget.AdminList -> {
                 changeRoomMemberRolesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     room = joinedRoom,
                     listType = ChangeRoomMemberRolesListType.Admins,
@@ -110,7 +109,6 @@ class RolesAndPermissionsFlowNode(
             }
             is NavTarget.ModeratorList -> {
                 changeRoomMemberRolesEntryPoint.createNode(
-                    parentNode = this,
                     buildContext = buildContext,
                     room = joinedRoom,
                     listType = ChangeRoomMemberRolesListType.Moderators,

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt

@@ -53,7 +53,8 @@ class DefaultRoomDetailsEntryPointTest {
                 buildContext = buildContext,
                 plugins = plugins,
                 pollHistoryEntryPoint = object : PollHistoryEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext) = lambdaError()
                 },
                 elementCallEntryPoint = object : ElementCallEntryPoint {
                     override fun startCall(callType: CallType) = lambdaError()
@@ -73,46 +74,49 @@ class DefaultRoomDetailsEntryPointTest {
                 room = FakeJoinedRoom(),
                 analyticsService = FakeAnalyticsService(),
                 messagesEntryPoint = object : MessagesEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: MessagesEntryPoint.Params,
                         callback: MessagesEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 knockRequestsListEntryPoint = object : KnockRequestsListEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext) = lambdaError()
                 },
                 mediaViewerEntryPoint = object : MediaViewerEntryPoint {
                     override fun createParamsForAvatar(filename: String, avatarUrl: String) = lambdaError()
+
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: MediaViewerEntryPoint.Params,
                         callback: MediaViewerEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 mediaGalleryEntryPoint = object : MediaGalleryEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         callback: MediaGalleryEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 outgoingVerificationEntryPoint = object : OutgoingVerificationEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: OutgoingVerificationEntryPoint.Params,
                         callback: OutgoingVerificationEntryPoint.Callback,
                     ) = lambdaError()
                 },
                 reportRoomEntryPoint = object : ReportRoomEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId) = lambdaError()
+                    context(parentNode: Node)
+                    override fun createNode(buildContext: BuildContext, roomId: RoomId) = lambdaError()
                 },
                 changeRoomMemberRolesEntryPoint = object : ChangeRoomMemberRolesEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         room: JoinedRoom,
                         listType: ChangeRoomMemberRolesListType,
@@ -129,12 +133,13 @@ class DefaultRoomDetailsEntryPointTest {
         val params = RoomDetailsEntryPoint.Params(
             initialElement = RoomDetailsEntryPoint.InitialTarget.RoomDetails,
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(RoomDetailsFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)

features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt

@@ -13,7 +13,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
 interface RoomDirectoryEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun navigateToRoom(roomDescription: RoomDescription)

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPoint.kt

@@ -17,7 +17,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultRoomDirectoryEntryPoint : RoomDirectoryEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, callback: RoomDirectoryEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, callback: RoomDirectoryEntryPoint.Callback): Node {
         return parentNode.createNode<RoomDirectoryNode>(buildContext, listOf(callback))
     }
 }

features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/DefaultRoomDirectoryEntryPointTest.kt

@@ -37,11 +37,12 @@ class DefaultRoomDirectoryEntryPointTest {
         val callback = object : RoomDirectoryEntryPoint.Callback {
             override fun navigateToRoom(roomDescription: RoomDescription) = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(RoomDirectoryNode::class.java)
         assertThat(result.plugins).contains(callback)
     }

features/securebackup/api/src/main/kotlin/io/element/android/features/securebackup/api/SecureBackupEntryPoint.kt

@@ -32,7 +32,8 @@ interface SecureBackupEntryPoint : FeatureEntryPoint {
 
     data class Params(val initialElement: InitialTarget) : NodeInputs
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onDone()

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPoint.kt

@@ -16,8 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultSecureBackupEntryPoint : SecureBackupEntryPoint {
+    context(parentNode: Node)
     override fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         params: SecureBackupEntryPoint.Params,
         callback: SecureBackupEntryPoint.Callback,

features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/DefaultSecureBackupEntryPointTest.kt

@@ -37,12 +37,13 @@ class DefaultSecureBackupEntryPointTest {
             override fun onDone() = lambdaError()
         }
         val params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity)
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(SecureBackupFlowNode::class.java)
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)

features/share/api/src/main/kotlin/io/element/android/features/share/api/ShareEntryPoint.kt

@@ -17,7 +17,8 @@ import io.element.android.libraries.matrix.api.core.RoomId
 interface ShareEntryPoint : FeatureEntryPoint {
     data class Params(val intent: Intent)
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onDone(roomIds: List<RoomId>)

features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultShareEntryPoint : ShareEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: ShareEntryPoint.Params, callback: ShareEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: ShareEntryPoint.Params, callback: ShareEntryPoint.Callback): Node {
         return parentNode.createNode<ShareNode>(
             buildContext = buildContext,
             plugins = listOf(

features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt

@@ -67,7 +67,6 @@ class ShareNode(
         }
 
         return roomSelectEntryPoint.createNode(
-            parentNode = this,
             buildContext = buildContext,
             params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Share),
             callback = callback,

features/share/impl/src/test/kotlin/io/element/android/features/share/impl/DefaultShareEntryPointTest.kt

@@ -38,8 +38,8 @@ class DefaultShareEntryPointTest {
                 plugins = plugins,
                 presenterFactory = { createSharePresenter() },
                 roomSelectEntryPoint = object : RoomSelectEntryPoint {
+                    context(parentNode: Node)
                     override fun createNode(
-                        parentNode: Node,
                         buildContext: BuildContext,
                         params: RoomSelectEntryPoint.Params,
                         callback: RoomSelectEntryPoint.Callback,
@@ -53,12 +53,13 @@ class DefaultShareEntryPointTest {
         val params = ShareEntryPoint.Params(
             intent = Intent(),
         )
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(ShareNode::class.java)
         assertThat(result.plugins).contains(ShareNode.Inputs(params.intent))
         assertThat(result.plugins).contains(callback)

features/signedout/api/src/main/kotlin/io/element/android/features/signedout/api/SignedOutEntryPoint.kt

@@ -17,5 +17,6 @@ interface SignedOutEntryPoint : FeatureEntryPoint {
         val sessionId: SessionId,
     )
 
-    fun createNode(parentNode: Node, buildContext: BuildContext, params: Params): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, params: Params): Node
 }

features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.architecture.createNode
 
 @ContributesBinding(AppScope::class)
 class DefaultSignedOutEntryPoint : SignedOutEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, params: SignedOutEntryPoint.Params): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, params: SignedOutEntryPoint.Params): Node {
         return parentNode.createNode<SignedOutNode>(
             buildContext = buildContext,
             plugins = listOf(SignedOutNode.Inputs(params.sessionId))

features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/DefaultSignedOutEntryPointTest.kt

@@ -34,11 +34,12 @@ class DefaultSignedOutEntryPointTest {
             )
         }
         val params = SignedOutEntryPoint.Params(A_SESSION_ID)
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            params = params,
+                params = params,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(SignedOutNode::class.java)
         assertThat(result.plugins).contains(SignedOutNode.Inputs(params.sessionId))
     }

features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt

@@ -15,8 +15,8 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.matrix.api.core.RoomId
 
 interface SpaceEntryPoint : FeatureEntryPoint {
+    context(parentNode: Node)
     fun createNode(
-        parentNode: Node,
         buildContext: BuildContext,
         inputs: Inputs,
         callback: Callback

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPoint.kt

@@ -16,7 +16,8 @@ import io.element.android.libraries.di.SessionScope
 
 @ContributesBinding(SessionScope::class)
 class DefaultSpaceEntryPoint : SpaceEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: SpaceEntryPoint.Inputs, callback: SpaceEntryPoint.Callback): Node {
+    context(parentNode: Node)
+    override fun createNode(buildContext: BuildContext, inputs: SpaceEntryPoint.Inputs, callback: SpaceEntryPoint.Callback): Node {
         return parentNode.createNode<SpaceFlowNode>(
             buildContext = buildContext,
             plugins = listOf(inputs, callback),

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt

@@ -48,12 +48,13 @@ class DefaultSpaceEntryPointTest {
             override fun navigateToRoomDetails() = lambdaError()
             override fun navigateToRoomMemberList() = lambdaError()
         }
-        val result = entryPoint.createNode(
+        val result = with(parentNode) {
-            parentNode = parentNode,
+            entryPoint.createNode(
-            buildContext = BuildContext.root(null),
+                buildContext = BuildContext.root(null),
-            inputs = nodeInputs,
+                inputs = nodeInputs,
-            callback = callback,
+                callback = callback,
-        )
+            )
+        }
         assertThat(result).isInstanceOf(SpaceFlowNode::class.java)
         assertThat(result.plugins).contains(nodeInputs)
         assertThat(result.plugins).contains(callback)

features/startchat/api/src/main/kotlin/io/element/android/features/startchat/api/StartChatEntryPoint.kt

@@ -14,7 +14,8 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 
 interface StartChatEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, callback: Callback): Node
+    context(parentNode: Node)
+    fun createNode(buildContext: BuildContext, callback: Callback): Node
 
     interface Callback : Plugin {
         fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)