From 51cc3a7afcc6dc55cf8e76943e28c460cb0ed227 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 18 Oct 2019 17:07:14 +0200
Subject: [PATCH] Simplify working with SessionToken, drop a supefluous step.

---
 ...s.mps.coderules.typechecking.ui.plugin.mps |   2 +
 ...ins.mps.coderules.typechecking.service.mps | 587 ++++++------------
 .../models/service.mps                        |  95 +--
 .../models/service.mps                        |   1 +
 4 files changed, 251 insertions(+), 434 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 5a282889..2f11ed8b 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -1602,6 +1602,7 @@
               <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
+          <node concept="10Nm6u" id="5gVsyvERlHX" role="37wK5m" />
         </node>
         <node concept="3clFbF" id="7Mte5SKkuX2" role="3cqZAp">
           <node concept="37vLTI" id="7Mte5SKkwQa" role="3clFbG">
@@ -3140,6 +3141,7 @@
                       <node concept="37vLTw" id="7WKNeR8TiOp" role="37wK5m">
                         <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                       </node>
+                      <node concept="10Nm6u" id="5gVsyvFbxl6" role="37wK5m" />
                     </node>
                   </node>
                   <node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 9f7feb75..5518fa00 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -2732,8 +2732,8 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="6$gg4k_VlG0" role="jymVt" />
     <node concept="3Tm1VV" id="6QH_LDtcxh4" role="1B3o_S" />
+    <node concept="2tJIrI" id="6$gg4k_VlG0" role="jymVt" />
     <node concept="312cEu" id="2zU3cYq$91A" role="jymVt">
       <property role="TrG5h" value="TypesModelOwner" />
       <node concept="2tJIrI" id="2zU3cYq$93r" role="jymVt" />
@@ -4100,14 +4100,23 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="5gVsyvEOdiN" role="3clF46">
+        <property role="TrG5h" value="sessionToken" />
+        <node concept="3uibUv" id="5gVsyvEOdRb" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="3KN3A4vHiEK" role="3clF45" />
       <node concept="3Tm1VV" id="3KN3A4vHiEL" role="1B3o_S" />
       <node concept="3clFbS" id="3KN3A4vHiEM" role="3clF47">
         <node concept="XkiVB" id="3KN3A4vHiEN" role="3cqZAp">
-          <ref role="37wK5l" node="51a$_pPOrYx" resolve="EvaluateRulesWithSessionTokenStep" />
+          <ref role="37wK5l" to="1yqb:1pPth$lHpLU" resolve="EvaluateRulesStep" />
           <node concept="37vLTw" id="3KN3A4vHiEO" role="37wK5m">
             <ref role="3cqZAo" node="3KN3A4vHiEG" resolve="repository" />
           </node>
+          <node concept="37vLTw" id="5gVsyvEO$FN" role="37wK5m">
+            <ref role="3cqZAo" node="5gVsyvEOdiN" resolve="sessionToken" />
+          </node>
         </node>
       </node>
     </node>
@@ -4148,7 +4157,7 @@
         <node concept="3clFbF" id="6BMBBPCV0UX" role="3cqZAp">
           <node concept="2OqwBi" id="6BMBBPCVc6S" role="3clFbG">
             <node concept="3nyPlj" id="6BMBBPCV0UV" role="2Oq$k0">
-              <ref role="37wK5l" node="6BMBBPCWe1U" resolve="schedule" />
+              <ref role="37wK5l" to="1yqb:55Q$YFtJK$_" resolve="schedule" />
               <node concept="2OqwBi" id="RZQG98YQlc" role="37wK5m">
                 <node concept="37vLTw" id="RZQG98YPYO" role="2Oq$k0">
                   <ref role="3cqZAo" node="RZQG98YN6i" resolve="input" />
@@ -4595,8 +4604,8 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="NKt6yn81z_" role="1B3o_S" />
-    <node concept="3uibUv" id="6ZWLiIcuZH2" role="1zkMxy">
-      <ref role="3uigEE" node="51a$_pPMR3Z" resolve="EvaluateRulesWithSessionTokenStep" />
+    <node concept="3uibUv" id="5gVsyvERbQR" role="1zkMxy">
+      <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
     </node>
   </node>
   <node concept="312cEu" id="1FOQehxypKu">
@@ -6361,6 +6370,60 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="5gVsyvERvbR" role="3cqZAp" />
+        <node concept="3clFbH" id="5gVsyvERIWv" role="3cqZAp" />
+        <node concept="3cpWs8" id="5gVsyvENNtc" role="3cqZAp">
+          <node concept="3cpWsn" id="5gVsyvENNtd" role="3cpWs9">
+            <property role="TrG5h" value="sessionToken" />
+            <node concept="3uibUv" id="5gVsyvENLKh" role="1tU5fm">
+              <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+            </node>
+            <node concept="10Nm6u" id="5gVsyvESozq" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5gVsyvES0rF" role="3cqZAp">
+          <node concept="3clFbS" id="5gVsyvES0rH" role="3clFbx">
+            <node concept="3clFbF" id="5gVsyvEROTh" role="3cqZAp">
+              <node concept="37vLTI" id="5gVsyvEROTj" role="3clFbG">
+                <node concept="2OqwBi" id="5gVsyvENNte" role="37vLTx">
+                  <node concept="2YIFZM" id="5gVsyvENNtf" role="2Oq$k0">
+                    <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+                    <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                    <node concept="37vLTw" id="5gVsyvENNtg" role="37wK5m">
+                      <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5gVsyvENNth" role="2OqNvi">
+                    <ref role="37wK5l" node="51a$_pPNGYr" resolve="cachedSessionToken" />
+                    <node concept="2OqwBi" id="5gVsyvER2fS" role="37wK5m">
+                      <node concept="37vLTw" id="5gVsyvENNti" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7eK3DxvmvIz" resolve="unit" />
+                      </node>
+                      <node concept="iZEcu" id="5gVsyvER2Nl" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTw" id="5gVsyvEROTn" role="37vLTJ">
+                  <ref role="3cqZAo" node="5gVsyvENNtd" resolve="sessionToken" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="5gVsyvES8bB" role="3clFbw">
+            <node concept="10M0yZ" id="5gVsyvES9$E" role="2Oq$k0">
+              <ref role="3cqZAo" to="qox2:7iCybvT_b52" resolve="TYPECHECKING_INCREMENTAL" />
+              <ref role="1PxDUh" to="qox2:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+            </node>
+            <node concept="liA8E" id="5gVsyvESa8b" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+              <node concept="2YIFZM" id="5gVsyvESeYn" role="37wK5m">
+                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="5gVsyvENyGv" role="3cqZAp" />
         <node concept="3cpWs8" id="3IIf9O_qVtZ" role="3cqZAp">
           <node concept="3cpWsn" id="3IIf9O_qVu0" role="3cpWs9">
             <property role="TrG5h" value="helpers" />
@@ -6374,6 +6437,9 @@
               <node concept="37vLTw" id="3KN3A4vGkWL" role="37wK5m">
                 <ref role="3cqZAo" node="7eK3DxvmvIz" resolve="unit" />
               </node>
+              <node concept="37vLTw" id="5gVsyvEOcCC" role="37wK5m">
+                <ref role="3cqZAo" node="5gVsyvENNtd" resolve="sessionToken" />
+              </node>
               <node concept="10M0yZ" id="5fMWD6HI34t" role="37wK5m">
                 <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
                 <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
@@ -6407,10 +6473,19 @@
                 </node>
                 <node concept="3clFbF" id="2mhJggj$k83" role="3cqZAp">
                   <node concept="1rXfSq" id="2mhJggj$k81" role="3clFbG">
-                    <ref role="37wK5l" node="2mhJggjzPZ$" resolve="processEffect" />
+                    <ref role="37wK5l" node="5gVsyvEQ4iq" resolve="processEffect" />
                     <node concept="37vLTw" id="2mhJggj$lO7" role="37wK5m">
                       <ref role="3cqZAo" node="2daneBPBGIr" resolve="effect" />
                     </node>
+                    <node concept="37vLTw" id="5gVsyvEQ0LV" role="37wK5m">
+                      <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                    </node>
+                    <node concept="2OqwBi" id="5gVsyvER4MD" role="37wK5m">
+                      <node concept="37vLTw" id="5gVsyvEQ2Kb" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7eK3DxvmvIz" resolve="unit" />
+                      </node>
+                      <node concept="iZEcu" id="5gVsyvER4V3" role="2OqNvi" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbH" id="2mhJggj$n4j" role="3cqZAp" />
@@ -6990,6 +7065,110 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="5gVsyvEQcx9" role="jymVt" />
+    <node concept="3clFb_" id="5gVsyvEQ4iq" role="jymVt">
+      <property role="TrG5h" value="processEffect" />
+      <node concept="37vLTG" id="5gVsyvEQ4ir" role="3clF46">
+        <property role="TrG5h" value="effect" />
+        <node concept="3uibUv" id="5gVsyvEQ4is" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5gVsyvEQkQ5" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="5gVsyvEQotg" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5gVsyvEQu19" role="3clF46">
+        <property role="TrG5h" value="unit" />
+        <node concept="2sp9CU" id="5gVsyvEQ_ET" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="5gVsyvEQ4it" role="3clF45" />
+      <node concept="3Tm6S6" id="5gVsyvEQ4iu" role="1B3o_S" />
+      <node concept="3clFbS" id="5gVsyvEQ4iv" role="3clF47">
+        <node concept="3clFbF" id="5gVsyvEQGIM" role="3cqZAp">
+          <node concept="1rXfSq" id="5gVsyvEQGIK" role="3clFbG">
+            <ref role="37wK5l" node="2mhJggjzPZ$" resolve="processEffect" />
+            <node concept="37vLTw" id="5gVsyvEQICK" role="37wK5m">
+              <ref role="3cqZAo" node="5gVsyvEQ4ir" resolve="effect" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="5gVsyvEQ4iV" role="3cqZAp">
+          <node concept="3cpWsn" id="5gVsyvEQ4iW" role="3cpWs9">
+            <property role="TrG5h" value="sessionToken" />
+            <node concept="3uibUv" id="5gVsyvEQ4iX" role="1tU5fm">
+              <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+            </node>
+            <node concept="2OqwBi" id="5gVsyvEQ4iY" role="33vP2m">
+              <node concept="37vLTw" id="5gVsyvEQ4iZ" role="2Oq$k0">
+                <ref role="3cqZAo" node="5gVsyvEQ4ir" resolve="effect" />
+              </node>
+              <node concept="liA8E" id="5gVsyvEQ4j0" role="2OqNvi">
+                <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                <node concept="10M0yZ" id="5gVsyvEQ4j1" role="37wK5m">
+                  <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
+                  <ref role="1PxDUh" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="5gVsyvEQ4j2" role="3cqZAp">
+          <node concept="3clFbS" id="5gVsyvEQ4j3" role="3clFbx">
+            <node concept="3clFbF" id="5gVsyvEQMF3" role="3cqZAp">
+              <node concept="2OqwBi" id="5gVsyvEQPi3" role="3clFbG">
+                <node concept="2YIFZM" id="5gVsyvEQN8q" role="2Oq$k0">
+                  <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+                  <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                  <node concept="37vLTw" id="5gVsyvEQNo5" role="37wK5m">
+                    <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="5gVsyvEQRdM" role="2OqNvi">
+                  <ref role="37wK5l" node="51a$_pPNS8S" resolve="setSessionToken" />
+                  <node concept="37vLTw" id="5gVsyvEQRmV" role="37wK5m">
+                    <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
+                  </node>
+                  <node concept="37vLTw" id="5gVsyvEQT6C" role="37wK5m">
+                    <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="5gVsyvEQTic" role="3cqZAp" />
+          </node>
+          <node concept="3y3z36" id="5gVsyvEQ4j4" role="3clFbw">
+            <node concept="10Nm6u" id="5gVsyvEQ4j5" role="3uHU7w" />
+            <node concept="37vLTw" id="5gVsyvEQ4j6" role="3uHU7B">
+              <ref role="3cqZAo" node="5gVsyvEQ4iW" resolve="sessionToken" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="5gVsyvEQTfR" role="9aQIa">
+            <node concept="3clFbS" id="5gVsyvEQTfS" role="9aQI4">
+              <node concept="3clFbF" id="5gVsyvEQTpy" role="3cqZAp">
+                <node concept="2OqwBi" id="5gVsyvEQTpz" role="3clFbG">
+                  <node concept="2YIFZM" id="5gVsyvEQTp$" role="2Oq$k0">
+                    <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
+                    <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
+                    <node concept="37vLTw" id="5gVsyvEQTp_" role="37wK5m">
+                      <ref role="3cqZAo" node="5gVsyvEQkQ5" resolve="repository" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="5gVsyvEQTpA" role="2OqNvi">
+                    <ref role="37wK5l" node="7wSJS_gAr4b" resolve="clearSessionToken" />
+                    <node concept="37vLTw" id="5gVsyvEQTpB" role="37wK5m">
+                      <ref role="3cqZAo" node="5gVsyvEQu19" resolve="unit" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="2mhJggjzKzX" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxnBew" role="jymVt">
       <property role="TrG5h" value="helpers" />
@@ -7003,6 +7182,12 @@
         <property role="TrG5h" value="unit" />
         <node concept="3Tqbb2" id="3KN3A4vF5Uh" role="1tU5fm" />
       </node>
+      <node concept="37vLTG" id="5gVsyvENZuh" role="3clF46">
+        <property role="TrG5h" value="sessionToken" />
+        <node concept="3uibUv" id="5gVsyvEO5VE" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
       <node concept="37vLTG" id="1FOQehxnBeo" role="3clF46">
         <property role="TrG5h" value="queryKind" />
         <node concept="3uibUv" id="1FOQehxnBep" role="1tU5fm">
@@ -7150,6 +7335,9 @@
                     <node concept="37vLTw" id="1FOQehxnBet" role="37wK5m">
                       <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                     </node>
+                    <node concept="37vLTw" id="5gVsyvEPfdf" role="37wK5m">
+                      <ref role="3cqZAo" node="5gVsyvENZuh" resolve="sessionToken" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -7354,6 +7542,7 @@
                     <node concept="37vLTw" id="3KN3A4vEXnU" role="37wK5m">
                       <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                     </node>
+                    <node concept="10Nm6u" id="5gVsyvESpCJ" role="37wK5m" />
                   </node>
                 </node>
               </node>
@@ -9380,392 +9569,6 @@
       <ref role="3uigEE" to="w1kc:~MPSModuleOwner" resolve="MPSModuleOwner" />
     </node>
   </node>
-  <node concept="312cEu" id="51a$_pPMR3Z">
-    <property role="3GE5qa" value="launch.step" />
-    <property role="TrG5h" value="EvaluateRulesWithSessionTokenStep" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="51a$_pPN489" role="jymVt" />
-    <node concept="3clFbW" id="51a$_pPOrYh" role="jymVt">
-      <node concept="37vLTG" id="51a$_pPOrYi" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="51a$_pPOrYj" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="51a$_pPOrYk" role="3clF46">
-        <property role="TrG5h" value="unitRef" />
-        <node concept="2sp9CU" id="51a$_pPOrYl" role="1tU5fm" />
-      </node>
-      <node concept="3cqZAl" id="51a$_pPOrYm" role="3clF45" />
-      <node concept="3Tm1VV" id="51a$_pPOrYn" role="1B3o_S" />
-      <node concept="3clFbS" id="51a$_pPOrYo" role="3clF47">
-        <node concept="XkiVB" id="51a$_pPOrYp" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:1pPth$lHpLU" resolve="EvaluateRulesStep" />
-          <node concept="37vLTw" id="51a$_pPOrYq" role="37wK5m">
-            <ref role="3cqZAo" node="51a$_pPOrYi" resolve="repository" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="51a$_pPOrYr" role="3cqZAp">
-          <node concept="37vLTI" id="51a$_pPOrYs" role="3clFbG">
-            <node concept="2OqwBi" id="51a$_pPOrYt" role="37vLTJ">
-              <node concept="Xjq3P" id="51a$_pPOrYu" role="2Oq$k0" />
-              <node concept="2OwXpG" id="51a$_pPN3yt" role="2OqNvi">
-                <ref role="2Oxat5" node="51a$_pPN3el" resolve="unitRef" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="51a$_pPOrYv" role="37vLTx">
-              <ref role="3cqZAo" node="51a$_pPOrYk" resolve="unitRef" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="51a$_pPOrYw" role="jymVt" />
-    <node concept="3clFbW" id="51a$_pPOrYx" role="jymVt">
-      <node concept="37vLTG" id="51a$_pPOrYy" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="51a$_pPOrYz" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="51a$_pPOrY$" role="3clF45" />
-      <node concept="3Tm1VV" id="51a$_pPOrY_" role="1B3o_S" />
-      <node concept="3clFbS" id="51a$_pPOrYA" role="3clF47">
-        <node concept="XkiVB" id="51a$_pPOrYB" role="3cqZAp">
-          <ref role="37wK5l" to="1yqb:1pPth$lHpLU" resolve="EvaluateRulesStep" />
-          <node concept="37vLTw" id="51a$_pPOrYC" role="37wK5m">
-            <ref role="3cqZAo" node="51a$_pPOrYy" resolve="repository" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="51a$_pPOrYD" role="3cqZAp">
-          <node concept="37vLTI" id="51a$_pPOrYE" role="3clFbG">
-            <node concept="2OqwBi" id="51a$_pPOrYF" role="37vLTJ">
-              <node concept="Xjq3P" id="51a$_pPOrYG" role="2Oq$k0" />
-              <node concept="2OwXpG" id="51a$_pPN3N8" role="2OqNvi">
-                <ref role="2Oxat5" node="51a$_pPN3el" resolve="unitRef" />
-              </node>
-            </node>
-            <node concept="10Nm6u" id="51a$_pPOrYH" role="37vLTx" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="51a$_pPN452" role="jymVt" />
-    <node concept="3clFb_" id="6BMBBPCWe1U" role="jymVt">
-      <property role="TrG5h" value="schedule" />
-      <node concept="37vLTG" id="6BMBBPCWe1V" role="3clF46">
-        <property role="TrG5h" value="input" />
-        <node concept="3uibUv" id="6BMBBPCWe1W" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="6BMBBPCWe1X" role="11_B2D">
-            <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="6BMBBPCWe20" role="3clF46">
-        <property role="TrG5h" value="subscribeScheduler" />
-        <node concept="3uibUv" id="6BMBBPCWe21" role="1tU5fm">
-          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="6BMBBPCWe25" role="1B3o_S" />
-      <node concept="2AHcQZ" id="6BMBBPCWe7E" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-      <node concept="3clFbS" id="6BMBBPCWe7F" role="3clF47">
-        <node concept="3clFbH" id="6BMBBPCWmmO" role="3cqZAp" />
-        <node concept="3clFbF" id="6BMBBPCWe7K" role="3cqZAp">
-          <node concept="2OqwBi" id="2j1FRbwZrPb" role="3clFbG">
-            <node concept="3nyPlj" id="6BMBBPCWe7J" role="2Oq$k0">
-              <ref role="37wK5l" to="1yqb:55Q$YFtJK$_" resolve="schedule" />
-              <node concept="2OqwBi" id="6BMBBPCWfUv" role="37wK5m">
-                <node concept="37vLTw" id="6BMBBPCWe7G" role="2Oq$k0">
-                  <ref role="3cqZAo" node="6BMBBPCWe1V" resolve="input" />
-                </node>
-                <node concept="liA8E" id="6BMBBPCWh5N" role="2OqNvi">
-                  <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
-                  <node concept="1bVj0M" id="6BMBBPCWi72" role="37wK5m">
-                    <node concept="37vLTG" id="6BMBBPCWiFE" role="1bW2Oz">
-                      <property role="TrG5h" value="inEff" />
-                      <node concept="3uibUv" id="6BMBBPCWjPU" role="1tU5fm">
-                        <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                      </node>
-                    </node>
-                    <node concept="3clFbS" id="6BMBBPCWi73" role="1bW5cS">
-                      <node concept="3clFbH" id="6BMBBPCWlNM" role="3cqZAp" />
-                      <node concept="3cpWs8" id="2j1FRbwZQnH" role="3cqZAp">
-                        <node concept="3cpWsn" id="2j1FRbwZQnI" role="3cpWs9">
-                          <property role="TrG5h" value="config" />
-                          <node concept="3uibUv" id="4Wn$Hm2opzZ" role="1tU5fm">
-                            <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
-                          </node>
-                          <node concept="2OqwBi" id="2j1FRbwZQnJ" role="33vP2m">
-                            <node concept="37vLTw" id="2j1FRbwZQnK" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6BMBBPCWiFE" resolve="inEff" />
-                            </node>
-                            <node concept="liA8E" id="2j1FRbwZQnL" role="2OqNvi">
-                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                              <node concept="10M0yZ" id="2j1FRbwZQnM" role="37wK5m">
-                                <ref role="3cqZAo" to="1yqb:2j1FRbwXq5L" resolve="CONFIG" />
-                                <ref role="1PxDUh" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3cpWs8" id="6BMBBPCWmnp" role="3cqZAp">
-                        <node concept="3cpWsn" id="6BMBBPCWmnq" role="3cpWs9">
-                          <property role="TrG5h" value="withSessionToken" />
-                          <node concept="10P_77" id="6BMBBPCWmnr" role="1tU5fm" />
-                          <node concept="1Wc70l" id="6BMBBPCWmns" role="33vP2m">
-                            <node concept="1Wc70l" id="6BMBBPCWmnz" role="3uHU7B">
-                              <node concept="3y3z36" id="6BMBBPCWmn$" role="3uHU7B">
-                                <node concept="37vLTw" id="6BMBBPCWmn_" role="3uHU7B">
-                                  <ref role="3cqZAo" node="51a$_pPN3el" resolve="unitRef" />
-                                </node>
-                                <node concept="10Nm6u" id="6BMBBPCWmnA" role="3uHU7w" />
-                              </node>
-                              <node concept="3y3z36" id="6BMBBPCWmnB" role="3uHU7w">
-                                <node concept="37vLTw" id="2j1FRbwZSA0" role="3uHU7B">
-                                  <ref role="3cqZAo" node="2j1FRbwZQnI" resolve="config" />
-                                </node>
-                                <node concept="10Nm6u" id="6BMBBPCWmnD" role="3uHU7w" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="4Wn$Hm2ouLi" role="3uHU7w">
-                              <node concept="10M0yZ" id="4Wn$Hm2otCD" role="2Oq$k0">
-                                <ref role="3cqZAo" to="qox2:7iCybvT_b52" resolve="TYPECHECKING_INCREMENTAL" />
-                                <ref role="1PxDUh" to="qox2:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                              </node>
-                              <node concept="liA8E" id="4Wn$Hm2ovPt" role="2OqNvi">
-                                <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
-                                <node concept="37vLTw" id="4Wn$Hm2owQ2" role="37wK5m">
-                                  <ref role="3cqZAo" node="2j1FRbwZQnI" resolve="config" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="2j1FRbwZ5Y4" role="3cqZAp" />
-                      <node concept="3clFbJ" id="6BMBBPCWmnS" role="3cqZAp">
-                        <node concept="3clFbS" id="6BMBBPCWmnT" role="3clFbx">
-                          <node concept="3cpWs8" id="6BMBBPCWmnU" role="3cqZAp">
-                            <node concept="3cpWsn" id="6BMBBPCWmnV" role="3cpWs9">
-                              <property role="TrG5h" value="st" />
-                              <node concept="3uibUv" id="6BMBBPCWmnW" role="1tU5fm">
-                                <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
-                              </node>
-                              <node concept="2OqwBi" id="6BMBBPCWmnX" role="33vP2m">
-                                <node concept="2YIFZM" id="6BMBBPCWmnY" role="2Oq$k0">
-                                  <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                                  <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
-                                  <node concept="37vLTw" id="6BMBBPCWmnZ" role="37wK5m">
-                                    <ref role="3cqZAo" to="1yqb:443LGHBSt7P" resolve="repository" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="6BMBBPCWmo0" role="2OqNvi">
-                                  <ref role="37wK5l" node="51a$_pPNGYr" resolve="cachedSessionToken" />
-                                  <node concept="37vLTw" id="6BMBBPCWmo1" role="37wK5m">
-                                    <ref role="3cqZAo" node="51a$_pPN3el" resolve="unitRef" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3cpWs6" id="2j1FRbx0aQQ" role="3cqZAp">
-                            <node concept="2OqwBi" id="2j1FRbx0aQR" role="3cqZAk">
-                              <node concept="37vLTw" id="2j1FRbx0aQS" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6BMBBPCWiFE" resolve="inEff" />
-                              </node>
-                              <node concept="liA8E" id="2j1FRbx0aQT" role="2OqNvi">
-                                <ref role="37wK5l" to="1yqb:2daneBOX0cV" resolve="combine" />
-                                <node concept="2YIFZM" id="2j1FRbx0aQU" role="37wK5m">
-                                  <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
-                                  <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                                  <node concept="2OqwBi" id="2j1FRbx0aQV" role="37wK5m">
-                                    <node concept="10M0yZ" id="2j1FRbx0aQW" role="2Oq$k0">
-                                      <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                                      <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                    </node>
-                                    <node concept="liA8E" id="2j1FRbx0aQX" role="2OqNvi">
-                                      <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
-                                      <node concept="37vLTw" id="2j1FRbx0aQY" role="37wK5m">
-                                        <ref role="3cqZAo" node="6BMBBPCWmnV" resolve="st" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3clFbH" id="2j1FRbx0gwK" role="3cqZAp" />
-                        </node>
-                        <node concept="37vLTw" id="6BMBBPCWmo5" role="3clFbw">
-                          <ref role="3cqZAo" node="6BMBBPCWmnq" resolve="withSessionToken" />
-                        </node>
-                        <node concept="9aQIb" id="2j1FRbx0duS" role="9aQIa">
-                          <node concept="3clFbS" id="2j1FRbx0duT" role="9aQI4">
-                            <node concept="3cpWs6" id="2j1FRbx0fdU" role="3cqZAp">
-                              <node concept="37vLTw" id="2j1FRbx0fdV" role="3cqZAk">
-                                <ref role="3cqZAo" node="6BMBBPCWiFE" resolve="inEff" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="2j1FRbx0hN1" role="3cqZAp" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="37vLTw" id="6BMBBPCWe7I" role="37wK5m">
-                <ref role="3cqZAo" node="6BMBBPCWe20" resolve="subscribeScheduler" />
-              </node>
-            </node>
-            <node concept="liA8E" id="2j1FRbwZub_" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
-              <node concept="1bVj0M" id="2j1FRbwZuVV" role="37wK5m">
-                <node concept="37vLTG" id="2j1FRbwZDQw" role="1bW2Oz">
-                  <property role="TrG5h" value="inEff" />
-                  <node concept="3uibUv" id="2j1FRbwZECg" role="1tU5fm">
-                    <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="2j1FRbwZuVW" role="1bW5cS">
-                  <node concept="3clFbH" id="2j1FRbwZw7J" role="3cqZAp" />
-                  <node concept="3cpWs8" id="2j1FRbx0kxy" role="3cqZAp">
-                    <node concept="3cpWsn" id="2j1FRbx0kxz" role="3cpWs9">
-                      <property role="TrG5h" value="config" />
-                      <node concept="3uibUv" id="4Wn$Hm2oyEI" role="1tU5fm">
-                        <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
-                      </node>
-                      <node concept="2OqwBi" id="2j1FRbx0kxB" role="33vP2m">
-                        <node concept="37vLTw" id="2j1FRbx0kxC" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2j1FRbwZDQw" resolve="inEff" />
-                        </node>
-                        <node concept="liA8E" id="2j1FRbx0kxD" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                          <node concept="37vLTw" id="2j1FRbx0kxT" role="37wK5m">
-                            <ref role="3cqZAo" to="1yqb:2j1FRbwXq5L" resolve="CONFIG" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs8" id="2j1FRbx0kxV" role="3cqZAp">
-                    <node concept="3cpWsn" id="2j1FRbx0kxW" role="3cpWs9">
-                      <property role="TrG5h" value="withSessionToken" />
-                      <node concept="10P_77" id="2j1FRbx0kxX" role="1tU5fm" />
-                      <node concept="1Wc70l" id="2j1FRbx0kxY" role="33vP2m">
-                        <node concept="1Wc70l" id="2j1FRbx0ky4" role="3uHU7B">
-                          <node concept="3y3z36" id="2j1FRbx0ky5" role="3uHU7B">
-                            <node concept="37vLTw" id="2j1FRbx0ky6" role="3uHU7B">
-                              <ref role="3cqZAo" node="51a$_pPN3el" resolve="unitRef" />
-                            </node>
-                            <node concept="10Nm6u" id="2j1FRbx0ky7" role="3uHU7w" />
-                          </node>
-                          <node concept="3y3z36" id="2j1FRbx0ky8" role="3uHU7w">
-                            <node concept="37vLTw" id="2j1FRbx0ky9" role="3uHU7B">
-                              <ref role="3cqZAo" node="2j1FRbx0kxz" resolve="config" />
-                            </node>
-                            <node concept="10Nm6u" id="2j1FRbx0kya" role="3uHU7w" />
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="4Wn$Hm2o$Nc" role="3uHU7w">
-                          <node concept="10M0yZ" id="4Wn$Hm2o$Nd" role="2Oq$k0">
-                            <ref role="1PxDUh" to="qox2:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <ref role="3cqZAo" to="qox2:7iCybvT_b52" resolve="TYPECHECKING_INCREMENTAL" />
-                          </node>
-                          <node concept="liA8E" id="4Wn$Hm2o$Ne" role="2OqNvi">
-                            <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
-                            <node concept="37vLTw" id="4Wn$Hm2o$Nf" role="37wK5m">
-                              <ref role="3cqZAo" node="2j1FRbx0kxz" resolve="config" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2j1FRbwZw7L" role="3cqZAp" />
-                  <node concept="3clFbJ" id="2j1FRbwZBLe" role="3cqZAp">
-                    <node concept="3clFbS" id="2j1FRbwZBLf" role="3clFbx">
-                      <node concept="3cpWs8" id="2j1FRbwZBLg" role="3cqZAp">
-                        <node concept="3cpWsn" id="2j1FRbwZBLh" role="3cpWs9">
-                          <property role="TrG5h" value="st" />
-                          <node concept="3uibUv" id="2j1FRbwZBLi" role="1tU5fm">
-                            <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
-                          </node>
-                          <node concept="2OqwBi" id="2j1FRbwZBLj" role="33vP2m">
-                            <node concept="37vLTw" id="2j1FRbwZLdX" role="2Oq$k0">
-                              <ref role="3cqZAo" node="2j1FRbwZDQw" resolve="inEff" />
-                            </node>
-                            <node concept="liA8E" id="2j1FRbwZBLl" role="2OqNvi">
-                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                              <node concept="10M0yZ" id="2j1FRbwZBLm" role="37wK5m">
-                                <ref role="3cqZAo" to="1yqb:2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                                <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="2j1FRbwZBLn" role="3cqZAp">
-                        <node concept="2OqwBi" id="2j1FRbwZBLo" role="3clFbG">
-                          <node concept="2YIFZM" id="2j1FRbwZBLp" role="2Oq$k0">
-                            <ref role="37wK5l" node="4Z$O9mrQIG1" resolve="get" />
-                            <ref role="1Pybhc" node="4Z$O9mrQIzY" resolve="TypecheckingCache" />
-                            <node concept="37vLTw" id="2j1FRbwZBLq" role="37wK5m">
-                              <ref role="3cqZAo" to="1yqb:443LGHBSt7P" resolve="repository" />
-                            </node>
-                          </node>
-                          <node concept="liA8E" id="2j1FRbwZBLr" role="2OqNvi">
-                            <ref role="37wK5l" node="51a$_pPNS8S" resolve="setSessionToken" />
-                            <node concept="37vLTw" id="2j1FRbwZBLs" role="37wK5m">
-                              <ref role="3cqZAo" node="51a$_pPN3el" resolve="unitRef" />
-                            </node>
-                            <node concept="37vLTw" id="2j1FRbwZBLt" role="37wK5m">
-                              <ref role="3cqZAo" node="2j1FRbwZBLh" resolve="st" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2j1FRbx0mB3" role="3clFbw">
-                      <ref role="3cqZAo" node="2j1FRbx0kxW" resolve="withSessionToken" />
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2j1FRbwZw7O" role="3cqZAp" />
-                  <node concept="3clFbF" id="2j1FRbwZGZF" role="3cqZAp">
-                    <node concept="37vLTw" id="2j1FRbwZGZD" role="3clFbG">
-                      <ref role="3cqZAo" node="2j1FRbwZDQw" resolve="inEff" />
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="2j1FRbwZIJy" role="3cqZAp" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3uibUv" id="6BMBBPCYNoN" role="3clF45">
-        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-        <node concept="3uibUv" id="6BMBBPCYNoO" role="11_B2D">
-          <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="51a$_pPN45B" role="jymVt" />
-    <node concept="312cEg" id="51a$_pPN3el" role="jymVt">
-      <property role="TrG5h" value="unitRef" />
-      <node concept="3Tm6S6" id="51a$_pPN39a" role="1B3o_S" />
-      <node concept="2sp9CU" id="51a$_pPN3dC" role="1tU5fm" />
-    </node>
-    <node concept="3Tm1VV" id="51a$_pPMR40" role="1B3o_S" />
-    <node concept="3uibUv" id="51a$_pPMR9_" role="1zkMxy">
-      <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
-    </node>
-  </node>
   <node concept="312cEu" id="4Z$O9mrQJw7">
     <property role="2bfB8j" value="false" />
     <property role="TrG5h" value="UnitTypecheckingCacheHolder" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 8a46d3e1..0c734ad5 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -1385,6 +1385,24 @@
     <property role="3GE5qa" value="launch.step" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="1s7XnIW6yS4" role="jymVt" />
+    <node concept="Wx3nA" id="2daneBP_Jiy" role="jymVt">
+      <property role="TrG5h" value="SESSION_TOKEN" />
+      <node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
+      <node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <node concept="3uibUv" id="1s7XnIW6KB_" role="11_B2D">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="2j1FRbwZppD" role="33vP2m">
+        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
+        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3VsKOn" id="2j1FRbwZppE" role="37wK5m">
+          <ref role="3VsUkX" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="5gVsyvEPHRE" role="jymVt" />
     <node concept="3clFbW" id="1pPth$lHpLU" role="jymVt">
       <node concept="3cqZAl" id="1pPth$lHpLW" role="3clF45" />
       <node concept="3Tm1VV" id="6kREIVkRwNu" role="1B3o_S" />
@@ -1402,6 +1420,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="5gVsyvEOU2c" role="3cqZAp">
+          <node concept="37vLTI" id="5gVsyvEOU2e" role="3clFbG">
+            <node concept="2OqwBi" id="5gVsyvEOWTH" role="37vLTJ">
+              <node concept="Xjq3P" id="5gVsyvEOWY5" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5gVsyvEOWTK" role="2OqNvi">
+                <ref role="2Oxat5" node="5gVsyvEOU28" resolve="sessionToken" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5gVsyvEOU2i" role="37vLTx">
+              <ref role="3cqZAo" node="5gVsyvEOQha" resolve="sessionToken" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="443LGHBSqoh" role="3clF46">
         <property role="TrG5h" value="repository" />
@@ -1409,6 +1440,12 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
+      <node concept="37vLTG" id="5gVsyvEOQha" role="3clF46">
+        <property role="TrG5h" value="sessionToken" />
+        <node concept="3uibUv" id="5gVsyvEOSUH" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="1s7XnIW7iUl" role="jymVt" />
     <node concept="3clFb_" id="55Q$YFtJK$_" role="jymVt">
@@ -1744,32 +1781,17 @@
                           </node>
                           <node concept="liA8E" id="51a$_pPMfN9" role="2OqNvi">
                             <ref role="37wK5l" to="hano:51a$_pPLZra" resolve="setSessionToken" />
-                            <node concept="2OqwBi" id="2j1FRbx0OUX" role="37wK5m">
-                              <node concept="37vLTw" id="2j1FRbx0OUY" role="2Oq$k0">
-                                <ref role="3cqZAo" node="RZQG98W1By" resolve="inEff" />
-                              </node>
-                              <node concept="liA8E" id="2j1FRbx0OUZ" role="2OqNvi">
-                                <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
-                                <node concept="10M0yZ" id="2j1FRbx0OV0" role="37wK5m">
-                                  <ref role="3cqZAo" node="2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                                  <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                </node>
-                              </node>
+                            <node concept="37vLTw" id="5gVsyvEP4Fc" role="37wK5m">
+                              <ref role="3cqZAo" node="5gVsyvEOU28" resolve="sessionToken" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="2j1FRbx0HuQ" role="3clFbw">
-                      <node concept="37vLTw" id="2j1FRbx0HuR" role="2Oq$k0">
-                        <ref role="3cqZAo" node="RZQG98W1By" resolve="inEff" />
-                      </node>
-                      <node concept="liA8E" id="2j1FRbx0HuS" role="2OqNvi">
-                        <ref role="37wK5l" node="2daneBOX9Mp" resolve="hasValue" />
-                        <node concept="10M0yZ" id="2j1FRbx0HuT" role="37wK5m">
-                          <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
-                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="SESSION_TOKEN" />
-                        </node>
+                    <node concept="3y3z36" id="5gVsyvEP1hl" role="3clFbw">
+                      <node concept="10Nm6u" id="5gVsyvEP27U" role="3uHU7w" />
+                      <node concept="37vLTw" id="5gVsyvEOZE8" role="3uHU7B">
+                        <ref role="3cqZAo" node="5gVsyvEOU28" resolve="sessionToken" />
                       </node>
                     </node>
                   </node>
@@ -2074,8 +2096,7 @@
                                 <ref role="37wK5l" node="6BMBBPCUL2C" resolve="of" />
                                 <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
                                 <node concept="2OqwBi" id="19OC8ZSz1m" role="37wK5m">
-                                  <node concept="10M0yZ" id="19OC8ZSz1n" role="2Oq$k0">
-                                    <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                  <node concept="37vLTw" id="5gVsyvEPuVi" role="2Oq$k0">
                                     <ref role="3cqZAo" node="2daneBP_Jiy" resolve="SESSION_TOKEN" />
                                   </node>
                                   <node concept="liA8E" id="19OC8ZSz1o" role="2OqNvi">
@@ -2335,6 +2356,8 @@
                     </node>
                   </node>
                   <node concept="3clFbH" id="4jShfh67I32" role="3cqZAp" />
+                  <node concept="3clFbH" id="5gVsyvEP5Lz" role="3cqZAp" />
+                  <node concept="3clFbH" id="5gVsyvEP5R3" role="3cqZAp" />
                   <node concept="3cpWs6" id="19OC8ZSVvj" role="3cqZAp">
                     <node concept="37vLTw" id="19OC8ZSVvk" role="3cqZAk">
                       <ref role="3cqZAo" node="19OC8ZSz1h" resolve="outEff" />
@@ -2577,6 +2600,13 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
+    <node concept="312cEg" id="5gVsyvEOU28" role="jymVt">
+      <property role="TrG5h" value="sessionToken" />
+      <node concept="3Tm6S6" id="5gVsyvEOU29" role="1B3o_S" />
+      <node concept="3uibUv" id="5gVsyvEOU2b" role="1tU5fm">
+        <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="2j1FRbx1nfZ" role="jymVt" />
   </node>
   <node concept="312cEu" id="7nPD14NbIif">
@@ -6945,26 +6975,7 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="RZQG98UOEA" role="jymVt" />
-    <node concept="Wx3nA" id="2daneBP_Jiy" role="jymVt">
-      <property role="TrG5h" value="SESSION_TOKEN" />
-      <node concept="3Tm1VV" id="2daneBP_Jiz" role="1B3o_S" />
-      <node concept="3uibUv" id="2daneBP_Ji$" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
-        <node concept="3uibUv" id="1s7XnIW6KB_" role="11_B2D">
-          <ref role="3uigEE" to="w7la:~SessionToken" resolve="SessionToken" />
-        </node>
-      </node>
-      <node concept="2YIFZM" id="2j1FRbwZppD" role="33vP2m">
-        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
-        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-        <node concept="3VsKOn" id="2j1FRbwZppE" role="37wK5m">
-          <ref role="3VsUkX" to="w7la:~SessionToken" resolve="SessionToken" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="2j1FRbwZcsx" role="jymVt" />
-    <node concept="2tJIrI" id="2j1FRbwZctl" role="jymVt" />
     <node concept="3clFbW" id="RZQG98V8sL" role="jymVt">
       <node concept="3cqZAl" id="RZQG98V8sN" role="3clF45" />
       <node concept="3Tm1VV" id="RZQG98V8sO" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index 2e40ed29..f3b99bda 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -372,6 +372,7 @@
           <node concept="37vLTw" id="78H58oeu9ti" role="37wK5m">
             <ref role="3cqZAo" node="78H58oeu6VL" resolve="repository" />
           </node>
+          <node concept="10Nm6u" id="5gVsyvF4Q5p" role="37wK5m" />
         </node>
       </node>
     </node>