From 99c823d4f7af8f9fba2b9ab8c3de5254b2314b2e Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Fri, 25 Sep 2020 15:43:50 +0300
Subject: [PATCH] Integrate tmpl trace in ApplyTemplatesStep with
 TypecheckingOptions

Introduce TraceReport object for passing program results
(traces+report items) instead of using tuples.
---
 ...s.mps.coderules.typechecking.ui.plugin.mps | 136 ++++-
 ...ains.mps.coderules.typechecking.plugin.mps | 161 ++++-
 ...ins.mps.coderules.typechecking.service.mps | 177 ++++--
 .../jetbrains.mps.coderules/models/plugin.mps | 192 ++++++
 .../models/service.mps                        | 571 ++++++++++++++----
 .../models/plugin.mps                         |  30 +-
 6 files changed, 1038 insertions(+), 229 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 6e093bbe..761a0bfd 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
@@ -1756,6 +1756,28 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbF" id="1_AnebxCwHo" role="3cqZAp">
+                    <node concept="37vLTI" id="1_AnebxC$nH" role="3clFbG">
+                      <node concept="2OqwBi" id="1_AnebxCxzH" role="37vLTJ">
+                        <node concept="Xjq3P" id="1_AnebxCwHm" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="1_AnebxCyTt" role="2OqNvi">
+                          <ref role="2Oxat5" node="1_AnebxCruV" resolve="templateTraceData" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="799SgOKhC5e" role="37vLTx">
+                        <node concept="37vLTw" id="799SgOKhBut" role="2Oq$k0">
+                          <ref role="3cqZAo" node="51ek2rQQCB8" resolve="inEff" />
+                        </node>
+                        <node concept="liA8E" id="799SgOKhDcD" role="2OqNvi">
+                          <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                          <node concept="10M0yZ" id="799SgOKcPlW" role="37wK5m">
+                            <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
+                            <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3clFbF" id="51ek2rQQCBl" role="3cqZAp">
                     <node concept="37vLTI" id="51ek2rQQCBm" role="3clFbG">
                       <node concept="2ShNRf" id="51ek2rQQCBn" role="37vLTx">
@@ -1794,6 +1816,7 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="799SgOKcIVS" role="3cqZAp" />
                   <node concept="3clFbF" id="51ek2rQQCBA" role="3cqZAp">
                     <node concept="2YIFZM" id="51ek2rQQCBB" role="3clFbG">
                       <ref role="1Pybhc" to="1yqb:2daneBOWXQd" resolve="Effect" />
@@ -1801,7 +1824,7 @@
                       <node concept="2OqwBi" id="51ek2rQQCBC" role="37wK5m">
                         <node concept="10M0yZ" id="51ek2rQQCBD" role="2Oq$k0">
                           <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                          <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
+                          <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE_EVAL" />
                         </node>
                         <node concept="liA8E" id="51ek2rQQCBE" role="2OqNvi">
                           <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
@@ -1964,6 +1987,79 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="3clFbH" id="1_AnebxCesi" role="3cqZAp" />
+                  <node concept="3cpWs8" id="4tC1JBndpEq" role="3cqZAp">
+                    <node concept="3cpWsn" id="4tC1JBndpEr" role="3cpWs9">
+                      <property role="TrG5h" value="templateTrace" />
+                      <node concept="3uibUv" id="4tC1JBnmz7Y" role="1tU5fm">
+                        <ref role="3uigEE" to="o35r:4tC1JBneFOU" resolve="TemplateTraceComponent" />
+                      </node>
+                      <node concept="2YIFZM" id="4tC1JBndpEt" role="33vP2m">
+                        <ref role="37wK5l" to="o35r:4tC1JBneFOW" resolve="get" />
+                        <ref role="1Pybhc" to="o35r:4tC1JBneFOU" resolve="TemplateTraceComponent" />
+                        <node concept="37vLTw" id="4tC1JBndpEu" role="37wK5m">
+                          <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="4tC1JBndpEv" role="3cqZAp">
+                    <node concept="3clFbS" id="4tC1JBndpEw" role="3clFbx">
+                      <node concept="3cpWs8" id="4tC1JBndpEx" role="3cqZAp">
+                        <node concept="3cpWsn" id="4tC1JBndpEy" role="3cpWs9">
+                          <property role="TrG5h" value="openedTab" />
+                          <node concept="3uibUv" id="4tC1JBnm$vl" role="1tU5fm">
+                            <ref role="3uigEE" to="o35r:4tC1JBneLqk" resolve="TemplateTraceTab" />
+                          </node>
+                          <node concept="2OqwBi" id="4tC1JBndpE$" role="33vP2m">
+                            <node concept="37vLTw" id="4tC1JBndpE_" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4tC1JBndpEr" resolve="templateTrace" />
+                            </node>
+                            <node concept="liA8E" id="4tC1JBndpEA" role="2OqNvi">
+                              <ref role="37wK5l" to="o35r:4tC1JBneFQE" resolve="openTab" />
+                              <node concept="2OqwBi" id="4tC1JBndpEB" role="37wK5m">
+                                <node concept="37vLTw" id="1_AnebxCfyj" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2daneBOT6rC" resolve="traceEvents" />
+                                </node>
+                                <node concept="liA8E" id="4tC1JBndpED" role="2OqNvi">
+                                  <ref role="37wK5l" to="31yc:2daneBOTzUn" resolve="name" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="1_AnebxCHJa" role="37wK5m">
+                                <ref role="3cqZAo" node="1_AnebxCruV" resolve="templateTraceData" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1Wc70l" id="4tC1JBndpEW" role="3clFbw">
+                      <node concept="1Wc70l" id="799SgOKhO44" role="3uHU7B">
+                        <node concept="3y3z36" id="799SgOKhQN9" role="3uHU7w">
+                          <node concept="10M0yZ" id="799SgOKhTpu" role="3uHU7w">
+                            <ref role="3cqZAo" to="hano:39eNUjlX_RD" resolve="NULL" />
+                            <ref role="1PxDUh" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                          </node>
+                          <node concept="37vLTw" id="799SgOKhPGM" role="3uHU7B">
+                            <ref role="3cqZAo" node="1_AnebxCruV" resolve="templateTraceData" />
+                          </node>
+                        </node>
+                        <node concept="3y3z36" id="4tC1JBndpEX" role="3uHU7B">
+                          <node concept="37vLTw" id="1_AnebxCFpF" role="3uHU7B">
+                            <ref role="3cqZAo" node="1_AnebxCruV" resolve="templateTraceData" />
+                          </node>
+                          <node concept="10Nm6u" id="4tC1JBndpEY" role="3uHU7w" />
+                        </node>
+                      </node>
+                      <node concept="3y3z36" id="4tC1JBndpF0" role="3uHU7w">
+                        <node concept="10Nm6u" id="4tC1JBndpF1" role="3uHU7w" />
+                        <node concept="37vLTw" id="4tC1JBndpF2" role="3uHU7B">
+                          <ref role="3cqZAo" node="4tC1JBndpEr" resolve="templateTrace" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="1_AnebxCet0" role="3cqZAp" />
                 </node>
               </node>
             </node>
@@ -1997,6 +2093,13 @@
         <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
       </node>
     </node>
+    <node concept="312cEg" id="1_AnebxCruV" role="jymVt">
+      <property role="TrG5h" value="templateTraceData" />
+      <node concept="3Tm6S6" id="1_AnebxCruW" role="1B3o_S" />
+      <node concept="3uibUv" id="1_AnebxCruY" role="1tU5fm">
+        <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
     <node concept="3uibUv" id="NKt6yn8c2j" role="1zkMxy">
       <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
@@ -3253,6 +3356,23 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="2j1FRbwV8JT" role="3cqZAp">
+            <node concept="2OqwBi" id="2j1FRbwVaoF" role="3clFbG">
+              <node concept="37vLTw" id="2j1FRbwV8JR" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="2j1FRbwVbRl" role="2OqNvi">
+                <node concept="2ShNRf" id="2j1FRbwVc6W" role="25WWJ7">
+                  <node concept="1pGfFk" id="2j1FRbwVdcq" role="2ShVmc">
+                    <ref role="37wK5l" to="1yqb:799SgOKgMym" resolve="ConfigureEvalStep" />
+                    <node concept="37vLTw" id="799SgOKhcWa" role="37wK5m">
+                      <ref role="3cqZAo" node="6hqFpWnjd0A" resolve="trace" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
               <node concept="37vLTw" id="7WKNeR8TcX$" role="2Oq$k0">
@@ -3293,20 +3413,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="2j1FRbwV8JT" role="3cqZAp">
-            <node concept="2OqwBi" id="2j1FRbwVaoF" role="3clFbG">
-              <node concept="37vLTw" id="2j1FRbwV8JR" role="2Oq$k0">
-                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
-              </node>
-              <node concept="TSZUe" id="2j1FRbwVbRl" role="2OqNvi">
-                <node concept="2ShNRf" id="2j1FRbwVc6W" role="25WWJ7">
-                  <node concept="1pGfFk" id="2j1FRbwVdcq" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:RZQG98V8sL" resolve="ConfigureEvalStep" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3cpWs8" id="5tAk4yVTBui" role="3cqZAp">
             <node concept="3cpWsn" id="5tAk4yVTBuj" role="3cpWs9">
               <property role="TrG5h" value="tcStep" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 51a842e9..f758581d 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -5339,6 +5339,16 @@
       <node concept="3cqZAl" id="7DmawKu60xI" role="3clF45" />
       <node concept="3Tmbuc" id="7DmawKu64TO" role="1B3o_S" />
       <node concept="3clFbS" id="7DmawKu60xK" role="3clF47">
+        <node concept="3clFbF" id="1_Anebx$J8W" role="3cqZAp">
+          <node concept="2YIFZM" id="1_Anebx$JAD" role="3clFbG">
+            <ref role="37wK5l" to="31yc:1_Anebx$sLm" resolve="registerDefaultProviders" />
+            <ref role="1Pybhc" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+            <node concept="37vLTw" id="1_Anebx$K2H" role="37wK5m">
+              <ref role="3cqZAo" node="2tFDlV2dY_r" resolve="config" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1_Anebx$K69" role="3cqZAp" />
         <node concept="3clFbF" id="7DmawKu61ZL" role="3cqZAp">
           <node concept="2OqwBi" id="7DmawKu61ZM" role="3clFbG">
             <node concept="37vLTw" id="2tFDlV2dZnV" role="2Oq$k0">
@@ -5574,6 +5584,15 @@
       <node concept="3cqZAl" id="7DmawKu66Fl" role="3clF45" />
       <node concept="3Tmbuc" id="7DmawKu67I9" role="1B3o_S" />
       <node concept="3clFbS" id="7DmawKu66Fn" role="3clF47">
+        <node concept="3clFbF" id="1_Anebx$McM" role="3cqZAp">
+          <node concept="2YIFZM" id="1_Anebx$MDc" role="3clFbG">
+            <ref role="37wK5l" to="31yc:1_Anebx$FrT" resolve="clearDefaultProviders" />
+            <ref role="1Pybhc" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+            <node concept="37vLTw" id="1_Anebx$N5k" role="37wK5m">
+              <ref role="3cqZAo" node="2tFDlV2e2or" resolve="config" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7DmawKu6aiU" role="3cqZAp">
           <node concept="2OqwBi" id="7DmawKu6aiV" role="3clFbG">
             <node concept="37vLTw" id="2tFDlV2e2Va" role="2Oq$k0">
@@ -5942,6 +5961,7 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbH" id="1_Anebx$VWw" role="3cqZAp" />
                     </node>
                     <node concept="3y3z36" id="5gVsyvEZfAo" role="3clFbw">
                       <node concept="10Nm6u" id="5gVsyvEZfEJ" role="3uHU7w" />
@@ -5959,6 +5979,124 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="1_Anebx_roc" role="3cqZAp" />
+        <node concept="3clFbF" id="1_Anebx$O1o" role="3cqZAp">
+          <node concept="2OqwBi" id="1_Anebx$O1p" role="3clFbG">
+            <node concept="37vLTw" id="1_Anebx$O1q" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiq_U$" resolve="config" />
+            </node>
+            <node concept="liA8E" id="1_Anebx$O1r" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
+              <node concept="Rm8GO" id="1_Anebx$O1s" role="37wK5m">
+                <ref role="1Px2BO" to="31yc:7iCybvToD3Z" resolve="Config.Level" />
+                <ref role="Rm8GQ" to="31yc:7iCybvToIZc" resolve="UI" />
+              </node>
+              <node concept="10M0yZ" id="1_Anebx$S6f" role="37wK5m">
+                <ref role="3cqZAo" to="31yc:1_Anebx$$SU" resolve="PREFIX" />
+                <ref role="1PxDUh" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+              </node>
+              <node concept="1bVj0M" id="1_Anebx$O1t" role="37wK5m">
+                <node concept="37vLTG" id="1_Anebx$O1u" role="1bW2Oz">
+                  <property role="TrG5h" value="key" />
+                  <node concept="17QB3L" id="1_Anebx$O1v" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="1_Anebx$O1w" role="1bW5cS">
+                  <node concept="3clFbH" id="1_Anebx$O1x" role="3cqZAp" />
+                  <node concept="3cpWs8" id="1_Anebx$O1y" role="3cqZAp">
+                    <node concept="3cpWsn" id="1_Anebx$O1z" role="3cpWs9">
+                      <property role="TrG5h" value="pref" />
+                      <node concept="34_ZPX" id="1_Anebx$O1$" role="1tU5fm">
+                        <ref role="34A7Nh" node="uB9WAZagv8" resolve="Typechecking" />
+                      </node>
+                      <node concept="10QFUN" id="1_Anebx$O1_" role="33vP2m">
+                        <node concept="2EnYce" id="1_Anebx$O1A" role="10QFUP">
+                          <node concept="37vLTw" id="1_Anebx$O1B" role="2Oq$k0">
+                            <ref role="3cqZAo" node="7iCybvTyDYC" resolve="project" />
+                          </node>
+                          <node concept="LR4Ub" id="1_Anebx$O1C" role="2OqNvi">
+                            <ref role="LR4Ua" node="uB9WAZagv8" resolve="Typechecking" />
+                          </node>
+                        </node>
+                        <node concept="34_ZPX" id="1_Anebx$O1D" role="10QFUM">
+                          <ref role="34A7Nh" node="uB9WAZagv8" resolve="Typechecking" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbJ" id="1_Anebx$O1E" role="3cqZAp">
+                    <node concept="3clFbS" id="1_Anebx$O1F" role="3clFbx">
+                      <node concept="3clFbH" id="1_Anebx$U7z" role="3cqZAp" />
+                      <node concept="3clFbJ" id="1_Anebx$O2C" role="3cqZAp">
+                        <node concept="3clFbS" id="1_Anebx$O2D" role="3clFbx">
+                          <node concept="3SKdUt" id="1_Anebx$O2E" role="3cqZAp">
+                            <node concept="1PaTwC" id="1_Anebx$O2F" role="1aUNEU">
+                              <node concept="3oM_SD" id="1_Anebx$O2G" role="1PaTwD">
+                                <property role="3oM_SC" value="template" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2H" role="1PaTwD">
+                                <property role="3oM_SC" value="trace" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2I" role="1PaTwD">
+                                <property role="3oM_SC" value="is" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2J" role="1PaTwD">
+                                <property role="3oM_SC" value="enabled" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2K" role="1PaTwD">
+                                <property role="3oM_SC" value="together" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2L" role="1PaTwD">
+                                <property role="3oM_SC" value="with" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2M" role="1PaTwD">
+                                <property role="3oM_SC" value="eval" />
+                              </node>
+                              <node concept="3oM_SD" id="1_Anebx$O2N" role="1PaTwD">
+                                <property role="3oM_SC" value="trace" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3cpWs6" id="1_Anebx$O2O" role="3cqZAp">
+                            <node concept="2OqwBi" id="1_Anebx$O2P" role="3cqZAk">
+                              <node concept="37vLTw" id="1_Anebx$O2Q" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1_Anebx$O1z" resolve="pref" />
+                              </node>
+                              <node concept="34pFcN" id="1_Anebx$O2R" role="2OqNvi">
+                                <ref role="2WH_rO" node="7iCybvTnn8F" resolve="traceEnabled" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="1_Anebx$O2S" role="3clFbw">
+                          <node concept="37vLTw" id="1_Anebx$O3w" role="2Oq$k0">
+                            <ref role="3cqZAo" to="31yc:39eNUjm3NmX" resolve="OPTION_TEMPLATE_APPLICATION_TRACE" />
+                          </node>
+                          <node concept="liA8E" id="1_Anebx$O2T" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                            <node concept="37vLTw" id="1_Anebx$O2U" role="37wK5m">
+                              <ref role="3cqZAo" node="1_Anebx$O1u" resolve="key" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="1_Anebx$TIi" role="3cqZAp" />
+                    </node>
+                    <node concept="3y3z36" id="1_Anebx$O2W" role="3clFbw">
+                      <node concept="10Nm6u" id="1_Anebx$O2X" role="3uHU7w" />
+                      <node concept="37vLTw" id="1_Anebx$O2Y" role="3uHU7B">
+                        <ref role="3cqZAo" node="1_Anebx$O1z" resolve="pref" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="1_Anebx$O30" role="3cqZAp">
+                    <node concept="10Nm6u" id="1_Anebx$O31" role="3clFbG" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1_Anebx$NF4" role="3cqZAp" />
       </node>
     </node>
     <node concept="2tJIrI" id="7prluhlIdif" role="jymVt" />
@@ -5978,7 +6116,25 @@
                 <ref role="Rm8GQ" to="31yc:7iCybvToIZc" resolve="UI" />
                 <ref role="1Px2BO" to="31yc:7iCybvToD3Z" resolve="Config.Level" />
               </node>
-              <node concept="37vLTw" id="7prluhlIJ_z" role="37wK5m">
+              <node concept="10M0yZ" id="1_Anebx_A1o" role="37wK5m">
+                <ref role="3cqZAo" to="31yc:1_Anebx$$SU" resolve="PREFIX" />
+                <ref role="1PxDUh" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1_Anebx_$H3" role="3cqZAp">
+          <node concept="2OqwBi" id="1_Anebx_$H4" role="3clFbG">
+            <node concept="37vLTw" id="1_Anebx_$H5" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiqC4I" resolve="config" />
+            </node>
+            <node concept="liA8E" id="1_Anebx_$H6" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7prluhlHqSp" resolve="clearProvider" />
+              <node concept="Rm8GO" id="1_Anebx_$H7" role="37wK5m">
+                <ref role="1Px2BO" to="31yc:7iCybvToD3Z" resolve="Config.Level" />
+                <ref role="Rm8GQ" to="31yc:7iCybvToIZc" resolve="UI" />
+              </node>
+              <node concept="37vLTw" id="1_Anebx_$Ha" role="37wK5m">
                 <ref role="3cqZAo" node="7iCybvTzJGv" resolve="PREFIX" />
               </node>
             </node>
@@ -6009,6 +6165,9 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7iCybvTyHA6" role="jymVt" />
+    <node concept="3uibUv" id="39eNUjm3VE3" role="1zkMxy">
+      <ref role="3uigEE" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+    </node>
   </node>
   <node concept="2uRRBy" id="7iCybvTzg9q">
     <property role="TrG5h" value="TypecheckingOptionsLifecycle" />
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 7599e388..81b5860a 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
@@ -5266,7 +5266,7 @@
                               <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
                               <node concept="10M0yZ" id="51ek2rQxWHT" role="37wK5m">
                                 <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
+                                <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE_EVAL" />
                               </node>
                             </node>
                           </node>
@@ -5359,7 +5359,7 @@
                             <node concept="2OqwBi" id="51ek2rQPCrL" role="37wK5m">
                               <node concept="10M0yZ" id="51ek2rQPCrM" role="2Oq$k0">
                                 <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
+                                <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE_EVAL" />
                               </node>
                               <node concept="liA8E" id="51ek2rQPCrN" role="2OqNvi">
                                 <ref role="37wK5l" to="1yqb:6BMBBPCRIcz" resolve="is" />
@@ -6599,21 +6599,7 @@
       </node>
       <node concept="2tJIrI" id="1z4$59iEa73" role="jymVt" />
       <node concept="3clFb_" id="1z4$59iuh0T" role="jymVt">
-        <property role="TrG5h" value="addTraceEvents" />
-        <node concept="37vLTG" id="1z4$59iuh0U" role="3clF46">
-          <property role="TrG5h" value="traceEvents" />
-          <node concept="3uibUv" id="1z4$59iuh0V" role="1tU5fm">
-            <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-          </node>
-        </node>
-        <node concept="37vLTG" id="1z4$59iuh0W" role="3clF46">
-          <property role="TrG5h" value="reportItems" />
-          <node concept="3vKaQO" id="1z4$59iuh0X" role="1tU5fm">
-            <node concept="3uibUv" id="1z4$59iuh0Y" role="3O5elw">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
-        </node>
+        <property role="TrG5h" value="addTrace" />
         <node concept="3cqZAl" id="1z4$59iuh0Z" role="3clF45" />
         <node concept="3clFbS" id="1z4$59iuh10" role="3clF47">
           <node concept="3clFbJ" id="1z4$59iuh11" role="3cqZAp">
@@ -6625,11 +6611,8 @@
                   </node>
                   <node concept="liA8E" id="1z4$59iuh16" role="2OqNvi">
                     <ref role="37wK5l" to="1yqb:19OC90hM6d" resolve="addTrace" />
-                    <node concept="37vLTw" id="1z4$59iuh17" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59iuh0U" resolve="traceEvents" />
-                    </node>
-                    <node concept="37vLTw" id="1z4$59iuh18" role="37wK5m">
-                      <ref role="3cqZAo" node="1z4$59iuh0W" resolve="reportItems" />
+                    <node concept="37vLTw" id="4tC1JBnbtgP" role="37wK5m">
+                      <ref role="3cqZAo" node="4tC1JBnboNv" resolve="report" />
                     </node>
                   </node>
                 </node>
@@ -6644,6 +6627,12 @@
           </node>
         </node>
         <node concept="3Tmbuc" id="1z4$59iuh1c" role="1B3o_S" />
+        <node concept="37vLTG" id="4tC1JBnboNv" role="3clF46">
+          <property role="TrG5h" value="report" />
+          <node concept="3uibUv" id="4tC1JBnboNu" role="1tU5fm">
+            <ref role="3uigEE" to="1yqb:4tC1JBnb14k" resolve="TraceReport" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="1z4$59i_yY7" role="jymVt" />
       <node concept="3clFb_" id="1z4$59i_qJE" role="jymVt">
@@ -13751,14 +13740,14 @@
                   <ref role="3cqZAo" node="61G6TdBXWuD" resolve="repository" />
                 </node>
                 <node concept="2OqwBi" id="61G6TdBY3nj" role="37wK5m">
+                  <node concept="liA8E" id="61G6TdBY3nl" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                  </node>
                   <node concept="2JrnkZ" id="3DPJ8QIpIIF" role="2Oq$k0">
                     <node concept="37vLTw" id="3DPJ8QIpHIb" role="2JrQYb">
                       <ref role="3cqZAo" node="4Z$O9mrQJ_R" resolve="unit" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="61G6TdBY3nl" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -13854,14 +13843,14 @@
                   <ref role="3cqZAo" node="61G6TdBXXtN" resolve="repository" />
                 </node>
                 <node concept="2OqwBi" id="5Qx6_65_i4l" role="37wK5m">
+                  <node concept="liA8E" id="5Qx6_65_i4n" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
+                  </node>
                   <node concept="2JrnkZ" id="3DPJ8QIpLfh" role="2Oq$k0">
                     <node concept="37vLTw" id="3DPJ8QIpKNu" role="2JrQYb">
                       <ref role="3cqZAo" node="4Z$O9mrQJ_R" resolve="unit" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="5Qx6_65_i4n" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
-                  </node>
                 </node>
               </node>
             </node>
@@ -14198,15 +14187,15 @@
               </node>
             </node>
             <node concept="2OqwBi" id="357z3MCoyL_" role="3clFbw">
-              <node concept="37vLTw" id="3DPJ8QIl3fJ" role="2Oq$k0">
-                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
-              </node>
               <node concept="liA8E" id="357z3MCoz2x" role="2OqNvi">
                 <ref role="37wK5l" to="ksgm:357z3MCdcHk" resolve="isRelevant" />
                 <node concept="37vLTw" id="357z3MCozcZ" role="37wK5m">
                   <ref role="3cqZAo" node="3u5wJtdK2z" resolve="event" />
                 </node>
               </node>
+              <node concept="37vLTw" id="3DPJ8QIl3fJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
+              </node>
             </node>
           </node>
         </node>
@@ -14240,15 +14229,15 @@
               </node>
             </node>
             <node concept="2OqwBi" id="357z3MCozxX" role="3clFbw">
-              <node concept="37vLTw" id="3DPJ8QIl3BB" role="2Oq$k0">
-                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
-              </node>
               <node concept="liA8E" id="357z3MCozxZ" role="2OqNvi">
                 <ref role="37wK5l" to="ksgm:357z3MCdcHw" resolve="isRelevant" />
                 <node concept="37vLTw" id="357z3MCozy0" role="37wK5m">
                   <ref role="3cqZAo" node="3u5wJtdK2J" resolve="event" />
                 </node>
               </node>
+              <node concept="37vLTw" id="3DPJ8QIl3BB" role="2Oq$k0">
+                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
+              </node>
             </node>
           </node>
         </node>
@@ -14282,15 +14271,15 @@
               </node>
             </node>
             <node concept="2OqwBi" id="357z3MCozZ5" role="3clFbw">
-              <node concept="37vLTw" id="3DPJ8QIl3YX" role="2Oq$k0">
-                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
-              </node>
               <node concept="liA8E" id="357z3MCozZ7" role="2OqNvi">
                 <ref role="37wK5l" to="ksgm:357z3MCdcHG" resolve="isRelevant" />
                 <node concept="37vLTw" id="357z3MCozZ8" role="37wK5m">
                   <ref role="3cqZAo" node="3u5wJtdK2V" resolve="event" />
                 </node>
               </node>
+              <node concept="37vLTw" id="3DPJ8QIl3YX" role="2Oq$k0">
+                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
+              </node>
             </node>
           </node>
         </node>
@@ -14324,15 +14313,15 @@
               </node>
             </node>
             <node concept="2OqwBi" id="357z3MCo$s6" role="3clFbw">
-              <node concept="37vLTw" id="3DPJ8QIl4mr" role="2Oq$k0">
-                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
-              </node>
               <node concept="liA8E" id="357z3MCo$s8" role="2OqNvi">
                 <ref role="37wK5l" to="ksgm:357z3MCdcHX" resolve="isRelevant" />
                 <node concept="37vLTw" id="357z3MCo$s9" role="37wK5m">
                   <ref role="3cqZAo" node="3u5wJtdK37" resolve="event" />
                 </node>
               </node>
+              <node concept="37vLTw" id="3DPJ8QIl4mr" role="2Oq$k0">
+                <ref role="3cqZAo" node="3Q0j2bxvJDw" resolve="relevantNodesMonitor" />
+              </node>
             </node>
           </node>
         </node>
@@ -15146,7 +15135,7 @@
         <node concept="3clFbS" id="5Qx6_65qdzO" role="3clF47">
           <node concept="3cpWs8" id="q1hCiycet8" role="3cqZAp">
             <node concept="3cpWsn" id="q1hCiycetb" role="3cpWs9">
-              <property role="TrG5h" value="allReporttems" />
+              <property role="TrG5h" value="allReportItems" />
               <node concept="_YKpA" id="q1hCiycet4" role="1tU5fm">
                 <node concept="3uibUv" id="q1hCiycfJj" role="_ZDj9">
                   <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
@@ -15177,7 +15166,7 @@
                     <node concept="3clFbF" id="5Qx6_65rzB1" role="3cqZAp">
                       <node concept="2OqwBi" id="5Qx6_65r$ER" role="3clFbG">
                         <node concept="37vLTw" id="q1hCiychWN" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
+                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
                         </node>
                         <node concept="X8dFx" id="5Qx6_65r_bb" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_iZdO" role="25WWJ7">
@@ -15216,7 +15205,7 @@
                     <node concept="3clFbF" id="5iJsa3_j036" role="3cqZAp">
                       <node concept="2OqwBi" id="5iJsa3_j037" role="3clFbG">
                         <node concept="37vLTw" id="q1hCiycj0O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
+                          <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
                         </node>
                         <node concept="X8dFx" id="5iJsa3_j039" role="2OqNvi">
                           <node concept="37vLTw" id="5iJsa3_j03a" role="25WWJ7">
@@ -15252,18 +15241,46 @@
                 </node>
                 <node concept="1bVj0M" id="5iJsa3_j6h6" role="37wK5m">
                   <node concept="3clFbS" id="5iJsa3_j6h7" role="1bW5cS">
+                    <node concept="3cpWs8" id="4tC1JBnbLb$" role="3cqZAp">
+                      <node concept="3cpWsn" id="4tC1JBnbLb_" role="3cpWs9">
+                        <property role="TrG5h" value="tmplTrace" />
+                        <node concept="3uibUv" id="4tC1JBnbLbA" role="1tU5fm">
+                          <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                        </node>
+                        <node concept="2OqwBi" id="4tC1JBnbMiJ" role="33vP2m">
+                          <node concept="37vLTw" id="4tC1JBnbLFm" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5Qx6_65qv$R" resolve="effect" />
+                          </node>
+                          <node concept="liA8E" id="4tC1JBnbMT$" role="2OqNvi">
+                            <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                            <node concept="10M0yZ" id="4tC1JBnbNzA" role="37wK5m">
+                              <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
+                              <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3clFbF" id="5Qx6_65qARC" role="3cqZAp">
                       <node concept="2OqwBi" id="61G6TdCoUlf" role="3clFbG">
                         <node concept="37vLTw" id="61G6TdCoWZA" role="2Oq$k0">
                           <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
                         </node>
                         <node concept="liA8E" id="61G6TdCoUli" role="2OqNvi">
-                          <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTraceEvents" />
-                          <node concept="37vLTw" id="5iJsa3_joa6" role="37wK5m">
-                            <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
-                          </node>
-                          <node concept="37vLTw" id="q1hCiyckuj" role="37wK5m">
-                            <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
+                          <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
+                          <node concept="2ShNRf" id="4tC1JBnbT90" role="37wK5m">
+                            <node concept="1pGfFk" id="4tC1JBnc78J" role="2ShVmc">
+                              <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
+                              <node concept="37vLTw" id="4tC1JBnc7U1" role="37wK5m">
+                                <ref role="3cqZAo" node="4tC1JBnbLb_" resolve="tmplTrace" />
+                              </node>
+                              <node concept="37vLTw" id="4tC1JBnc8Dr" role="37wK5m">
+                                <ref role="3cqZAo" node="5iJsa3_j6he" resolve="traceEvents" />
+                              </node>
+                              <node concept="37vLTw" id="4tC1JBnc8XG" role="37wK5m">
+                                <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
@@ -15287,7 +15304,7 @@
               </node>
               <node concept="X8dFx" id="q1hCiycze9" role="2OqNvi">
                 <node concept="37vLTw" id="q1hCiyczGD" role="25WWJ7">
-                  <ref role="3cqZAo" node="q1hCiycetb" resolve="allReporttems" />
+                  <ref role="3cqZAo" node="q1hCiycetb" resolve="allReportItems" />
                 </node>
               </node>
             </node>
@@ -16768,6 +16785,16 @@
                             <node concept="37vLTw" id="6nFpYlvssm5" role="37wK5m">
                               <ref role="3cqZAo" node="7i3KM7gP3A_" resolve="unit" />
                             </node>
+                            <node concept="1LlUBW" id="6nFpYlvgaP7" role="1pMfVU">
+                              <node concept="3uibUv" id="6nFpYlvgaP8" role="1Lm7xW">
+                                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
+                              </node>
+                              <node concept="3vKaQO" id="6nFpYlvgaP9" role="1Lm7xW">
+                                <node concept="3uibUv" id="6nFpYlvgaPa" role="3O5elw">
+                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                                </node>
+                              </node>
+                            </node>
                             <node concept="2OqwBi" id="3DPJ8QIm1pP" role="37wK5m">
                               <node concept="liA8E" id="3DPJ8QIm1pQ" role="2OqNvi">
                                 <ref role="37wK5l" node="3Q0j2bxwHX7" resolve="getRelevantNodesMonitor" />
@@ -16788,16 +16815,6 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="1LlUBW" id="6nFpYlvgaP7" role="1pMfVU">
-                              <node concept="3uibUv" id="6nFpYlvgaP8" role="1Lm7xW">
-                                <ref role="3uigEE" to="i348:1ffsG7bW_V4" resolve="RuleTemplate" />
-                              </node>
-                              <node concept="3vKaQO" id="6nFpYlvgaP9" role="1Lm7xW">
-                                <node concept="3uibUv" id="6nFpYlvgaPa" role="3O5elw">
-                                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                </node>
-                              </node>
-                            </node>
                           </node>
                         </node>
                       </node>
@@ -17411,18 +17428,46 @@
                   <node concept="3clFbS" id="5iJsa3_bmCs" role="1bW5cS">
                     <node concept="3clFbJ" id="5Qx6_65sjVN" role="3cqZAp">
                       <node concept="3clFbS" id="5Qx6_65sjVO" role="3clFbx">
+                        <node concept="3cpWs8" id="4tC1JBnccGG" role="3cqZAp">
+                          <node concept="3cpWsn" id="4tC1JBnccGH" role="3cpWs9">
+                            <property role="TrG5h" value="tmplTrace" />
+                            <node concept="3uibUv" id="4tC1JBnccGI" role="1tU5fm">
+                              <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                            </node>
+                            <node concept="2OqwBi" id="4tC1JBnccGJ" role="33vP2m">
+                              <node concept="37vLTw" id="4tC1JBnccGK" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5Qx6_65s9rs" resolve="effect" />
+                              </node>
+                              <node concept="liA8E" id="4tC1JBnccGL" role="2OqNvi">
+                                <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                                <node concept="10M0yZ" id="4tC1JBnccGM" role="37wK5m">
+                                  <ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
+                                  <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                         <node concept="3clFbF" id="5Qx6_65sjVP" role="3cqZAp">
                           <node concept="2OqwBi" id="61G6TdCqb3z" role="3clFbG">
                             <node concept="37vLTw" id="61G6TdCqdN_" role="2Oq$k0">
                               <ref role="3cqZAo" node="61G6TdCj0F7" resolve="request" />
                             </node>
                             <node concept="liA8E" id="61G6TdCqb3A" role="2OqNvi">
-                              <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTraceEvents" />
-                              <node concept="37vLTw" id="5iJsa3_bwNV" role="37wK5m">
-                                <ref role="3cqZAo" node="5iJsa3_bmFG" resolve="traceEvents" />
-                              </node>
-                              <node concept="37vLTw" id="q1hCiybXlG" role="37wK5m">
-                                <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
+                              <ref role="37wK5l" node="1z4$59iuh0T" resolve="addTrace" />
+                              <node concept="2ShNRf" id="4tC1JBnccHl" role="37wK5m">
+                                <node concept="1pGfFk" id="4tC1JBnccHm" role="2ShVmc">
+                                  <ref role="37wK5l" to="1yqb:4tC1JBnbbB$" resolve="TraceReport" />
+                                  <node concept="37vLTw" id="4tC1JBnccHn" role="37wK5m">
+                                    <ref role="3cqZAo" node="4tC1JBnccGH" resolve="tmplTrace" />
+                                  </node>
+                                  <node concept="37vLTw" id="4tC1JBnccHo" role="37wK5m">
+                                    <ref role="3cqZAo" node="5iJsa3_bmFG" resolve="traceEvents" />
+                                  </node>
+                                  <node concept="37vLTw" id="4tC1JBnccHp" role="37wK5m">
+                                    <ref role="3cqZAo" node="q1hCiybRQq" resolve="allReportItems" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index f6026a7e..43110f28 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -283,6 +283,7 @@
       <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
@@ -8254,5 +8255,196 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="39eNUjm3TK$">
+    <property role="TrG5h" value="CoderulesOptions" />
+    <node concept="Wx3nA" id="1_Anebx$$SU" role="jymVt">
+      <property role="TrG5h" value="PREFIX" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm1VV" id="1_Anebx$zmA" role="1B3o_S" />
+      <node concept="17QB3L" id="1_Anebx$$Qm" role="1tU5fm" />
+      <node concept="Xl_RD" id="1_Anebx$AyO" role="33vP2m">
+        <property role="Xl_RC" value="mps.coderules." />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1_Anebx$AJ3" role="jymVt" />
+    <node concept="Wx3nA" id="39eNUjm3NmX" role="jymVt">
+      <property role="TrG5h" value="OPTION_TEMPLATE_APPLICATION_TRACE" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3Tm1VV" id="39eNUjm3NmY" role="1B3o_S" />
+      <node concept="17QB3L" id="39eNUjm3MI0" role="1tU5fm" />
+      <node concept="Xl_RD" id="39eNUjm3QGL" role="33vP2m">
+        <property role="Xl_RC" value="mps.coderules.template.trace" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="39eNUjm3XhU" role="jymVt" />
+    <node concept="Wx3nA" id="7iCybvT_hbE" role="jymVt">
+      <property role="TrG5h" value="TEMPLATE_TRACE" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="7iCybvT_hbF" role="1tU5fm">
+        <ref role="3uigEE" node="7iCybvT$$S3" resolve="Config.Option" />
+        <node concept="3uibUv" id="7iCybvT_hbG" role="11_B2D">
+          <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7iCybvT_hbH" role="1B3o_S" />
+      <node concept="2ShNRf" id="7iCybvT_hbI" role="33vP2m">
+        <node concept="YeOm9" id="7iCybvT_hbJ" role="2ShVmc">
+          <node concept="1Y3b0j" id="7iCybvT_hbK" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="1Y3XeK" node="7iCybvT$$S3" resolve="Config.Option" />
+            <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+            <node concept="3Tm1VV" id="7iCybvT_hbL" role="1B3o_S" />
+            <node concept="3clFb_" id="7iCybvT_hbM" role="jymVt">
+              <property role="TrG5h" value="get" />
+              <node concept="37vLTG" id="7iCybvT_hbN" role="3clF46">
+                <property role="TrG5h" value="config" />
+                <node concept="3uibUv" id="7iCybvT_hbO" role="1tU5fm">
+                  <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="7iCybvT_hbP" role="3clF45">
+                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+              </node>
+              <node concept="3Tm1VV" id="7iCybvT_hbQ" role="1B3o_S" />
+              <node concept="3clFbS" id="7iCybvT_hbR" role="3clF47">
+                <node concept="3clFbF" id="5dfEAcSrgrR" role="3cqZAp">
+                  <node concept="10QFUN" id="5dfEAcSrgrS" role="3clFbG">
+                    <node concept="3uibUv" id="5dfEAcSrgrT" role="10QFUM">
+                      <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+                    </node>
+                    <node concept="2OqwBi" id="5dfEAcSrhjT" role="10QFUP">
+                      <node concept="37vLTw" id="7DmawKu6gMj" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7iCybvT_hbN" resolve="config" />
+                      </node>
+                      <node concept="liA8E" id="5dfEAcSrhjV" role="2OqNvi">
+                        <ref role="37wK5l" node="7iCybvToiWV" resolve="getOption" />
+                        <node concept="10M0yZ" id="39eNUjm3ZVk" role="37wK5m">
+                          <ref role="3cqZAo" node="39eNUjm3NmX" resolve="OPTION_TEMPLATE_APPLICATION_TRACE" />
+                          <ref role="1PxDUh" node="39eNUjm3TK$" resolve="CoderulesOptions" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="7iCybvT_hbZ" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+            </node>
+            <node concept="3uibUv" id="7iCybvT_hc0" role="2Ghqu4">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="39eNUjm3Xi0" role="jymVt" />
+    <node concept="2YIFZL" id="1_Anebx$sLm" role="jymVt">
+      <property role="TrG5h" value="registerDefaultProviders" />
+      <node concept="37vLTG" id="1_Anebx$u9p" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="1_Anebx$ugg" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1_Anebx$sLp" role="3clF47">
+        <node concept="3clFbF" id="1_Anebx$kIS" role="3cqZAp">
+          <node concept="2OqwBi" id="1_Anebx$lo4" role="3clFbG">
+            <node concept="37vLTw" id="1_Anebx$kIQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="1_Anebx$u9p" resolve="config" />
+            </node>
+            <node concept="liA8E" id="1_Anebx$lVc" role="2OqNvi">
+              <ref role="37wK5l" node="7iCybvTszk9" resolve="registerProvider" />
+              <node concept="Rm8GO" id="1_Anebx$nmY" role="37wK5m">
+                <ref role="1Px2BO" node="7iCybvToD3Z" resolve="Config.Level" />
+                <ref role="Rm8GQ" node="7iCybvToHsq" resolve="USER" />
+              </node>
+              <node concept="37vLTw" id="1_Anebx_52p" role="37wK5m">
+                <ref role="3cqZAo" node="1_Anebx$$SU" resolve="PREFIX" />
+              </node>
+              <node concept="1bVj0M" id="1_Anebx$uNz" role="37wK5m">
+                <node concept="37vLTG" id="1_Anebx$uSy" role="1bW2Oz">
+                  <property role="TrG5h" value="key" />
+                  <node concept="17QB3L" id="1_Anebx$uZj" role="1tU5fm" />
+                </node>
+                <node concept="3clFbS" id="1_Anebx$uN_" role="1bW5cS">
+                  <node concept="3clFbH" id="1_Anebx$Fok" role="3cqZAp" />
+                  <node concept="3clFbJ" id="39eNUjm4csn" role="3cqZAp">
+                    <node concept="3clFbS" id="39eNUjm4cso" role="3clFbx">
+                      <node concept="3cpWs6" id="39eNUjm4csp" role="3cqZAp">
+                        <node concept="2YIFZM" id="39eNUjm4csq" role="3cqZAk">
+                          <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
+                          <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
+                          <node concept="2YIFZM" id="39eNUjm4csr" role="37wK5m">
+                            <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
+                            <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
+                            <node concept="37vLTw" id="1_Anebx$wmi" role="37wK5m">
+                              <ref role="3cqZAo" node="39eNUjm3NmX" resolve="OPTION_TEMPLATE_APPLICATION_TRACE" />
+                            </node>
+                            <node concept="Xl_RD" id="39eNUjm4css" role="37wK5m">
+                              <property role="Xl_RC" value="false" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="39eNUjm4cst" role="3cqZAp" />
+                    </node>
+                    <node concept="2OqwBi" id="39eNUjm4csu" role="3clFbw">
+                      <node concept="37vLTw" id="1_Anebx$wmm" role="2Oq$k0">
+                        <ref role="3cqZAo" node="39eNUjm3NmX" resolve="OPTION_TEMPLATE_APPLICATION_TRACE" />
+                      </node>
+                      <node concept="liA8E" id="39eNUjm4csv" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="39eNUjm4csw" role="37wK5m">
+                          <ref role="3cqZAo" node="1_Anebx$uSy" resolve="key" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="1_Anebx$wZP" role="3cqZAp">
+                    <node concept="10Nm6u" id="1_Anebx$wZQ" role="3cqZAk" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="1_Anebx$rBx" role="1B3o_S" />
+      <node concept="3cqZAl" id="1_Anebx$sIS" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="1_Anebx$BZs" role="jymVt" />
+    <node concept="2YIFZL" id="1_Anebx$FrT" role="jymVt">
+      <property role="TrG5h" value="clearDefaultProviders" />
+      <node concept="37vLTG" id="1_Anebx$H5X" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="1_Anebx$HcU" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="1_Anebx$FrW" role="3clF47">
+        <node concept="3clFbF" id="1_Anebx$H$u" role="3cqZAp">
+          <node concept="2OqwBi" id="1_Anebx$HEt" role="3clFbG">
+            <node concept="37vLTw" id="1_Anebx$H$s" role="2Oq$k0">
+              <ref role="3cqZAo" node="1_Anebx$H5X" resolve="config" />
+            </node>
+            <node concept="liA8E" id="1_Anebx$HMH" role="2OqNvi">
+              <ref role="37wK5l" node="7prluhlHqSp" resolve="clearProvider" />
+              <node concept="Rm8GO" id="1_Anebx$HWV" role="37wK5m">
+                <ref role="Rm8GQ" node="7iCybvToHsq" resolve="USER" />
+                <ref role="1Px2BO" node="7iCybvToD3Z" resolve="Config.Level" />
+              </node>
+              <node concept="37vLTw" id="1_Anebx$I8I" role="37wK5m">
+                <ref role="3cqZAo" node="1_Anebx$$SU" resolve="PREFIX" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="1_Anebx$Dyv" role="1B3o_S" />
+      <node concept="3cqZAl" id="1_Anebx$Fkp" role="3clF45" />
+    </node>
+    <node concept="3Tm1VV" id="39eNUjm3TK_" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 4db207ca..53d2cd27 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -42,18 +42,6 @@
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.predicate)" />
   </imports>
   <registry>
-    <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
-      <concept id="1238852151516" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleType" flags="in" index="1LlUBW">
-        <child id="1238852204892" name="componentType" index="1Lm7xW" />
-      </concept>
-      <concept id="1238853782547" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleLiteral" flags="nn" index="1Ls8ON">
-        <child id="1238853845806" name="component" index="1Lso8e" />
-      </concept>
-      <concept id="1238857743184" name="jetbrains.mps.baseLanguage.tuples.structure.IndexedTupleMemberAccessExpression" flags="nn" index="1LFfDK">
-        <child id="1238857764950" name="tuple" index="1LFl5Q" />
-        <child id="1238857834412" name="index" index="1LF_Uc" />
-      </concept>
-    </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1219920932475" name="jetbrains.mps.baseLanguage.structure.VariableArityType" flags="in" index="8X2XB">
@@ -287,6 +275,7 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
         <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
@@ -311,10 +300,19 @@
         <child id="2546654756694997556" name="reference" index="92FcQ" />
         <child id="3106559687488913694" name="line" index="2XjZqd" />
       </concept>
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
+        <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -496,6 +494,7 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="39eNUjlYwif" role="jymVt" />
     <node concept="2tJIrI" id="5iJsa3_dpkl" role="jymVt" />
     <node concept="3clFbW" id="7kTeLbPt4na" role="jymVt">
       <node concept="3cqZAl" id="7kTeLbPt4nb" role="3clF45" />
@@ -836,11 +835,17 @@
       <node concept="3clFbS" id="51ek2rQF9E2" role="3clF47">
         <node concept="3clFbF" id="51ek2rQH5e7" role="3cqZAp">
           <node concept="1rXfSq" id="51ek2rQH5e5" role="3clFbG">
-            <ref role="37wK5l" node="51ek2rQGEzN" resolve="composeEffect" />
+            <ref role="37wK5l" node="51ek2rQHvJ1" resolve="composeEffect" />
             <node concept="37vLTw" id="51ek2rQHecV" role="37wK5m">
               <ref role="3cqZAo" node="51ek2rQF9Dy" resolve="input" />
             </node>
             <node concept="1bVj0M" id="51ek2rQH73y" role="37wK5m">
+              <node concept="37vLTG" id="39eNUjm1cag" role="1bW2Oz">
+                <property role="TrG5h" value="inEff" />
+                <node concept="3uibUv" id="39eNUjm1dRG" role="1tU5fm">
+                  <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
               <node concept="3clFbS" id="51ek2rQH73z" role="1bW5cS">
                 <node concept="3clFbH" id="51ek2rQH779" role="3cqZAp" />
                 <node concept="3cpWs8" id="Hg6Enc4WaR" role="3cqZAp">
@@ -864,7 +869,6 @@
                     <node concept="10Nm6u" id="3bpBM3Qdf2P" role="33vP2m" />
                   </node>
                 </node>
-                <node concept="3clFbH" id="3bpBM3Qd0IJ" role="3cqZAp" />
                 <node concept="3cpWs8" id="5iJsa3_e_Uv" role="3cqZAp">
                   <node concept="3cpWsn" id="5iJsa3_e_Uy" role="3cpWs9">
                     <property role="TrG5h" value="reportItems" />
@@ -1027,6 +1031,28 @@
                           </node>
                         </node>
                       </node>
+                      <node concept="3clFbF" id="39eNUjm38wx" role="3cqZAp">
+                        <node concept="2OqwBi" id="39eNUjm39Pz" role="3clFbG">
+                          <node concept="37vLTw" id="39eNUjm38wv" role="2Oq$k0">
+                            <ref role="3cqZAo" node="3bpBM3Qd2l0" resolve="programProducer" />
+                          </node>
+                          <node concept="liA8E" id="39eNUjm3aW$" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:39eNUjlYQzk" resolve="setTrace" />
+                            <node concept="2OqwBi" id="799SgOKccWw" role="37wK5m">
+                              <node concept="37vLTw" id="799SgOKccd$" role="2Oq$k0">
+                                <ref role="3cqZAo" node="39eNUjm1cag" resolve="inEff" />
+                              </node>
+                              <node concept="liA8E" id="799SgOKcdND" role="2OqNvi">
+                                <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                                <node concept="10M0yZ" id="799SgOKchri" role="37wK5m">
+                                  <ref role="3cqZAo" node="39eNUjlXwas" resolve="TRACE_TMPL" />
+                                  <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                       <node concept="3clFbF" id="6nFpYluZ8e2" role="3cqZAp">
                         <node concept="1rXfSq" id="6nFpYluZ8e0" role="3clFbG">
                           <ref role="37wK5l" node="6nFpYluWG8P" resolve="configureProgram" />
@@ -1209,12 +1235,6 @@
     <node concept="2tJIrI" id="51ek2rQFc76" role="jymVt" />
     <node concept="3clFb_" id="6nFpYluWG8P" role="jymVt">
       <property role="TrG5h" value="configureProgram" />
-      <node concept="37vLTG" id="6nFpYluWKou" role="3clF46">
-        <property role="TrG5h" value="programProducer" />
-        <node concept="3uibUv" id="6nFpYluWL8U" role="1tU5fm">
-          <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
-        </node>
-      </node>
       <node concept="3cqZAl" id="6nFpYluWG8R" role="3clF45" />
       <node concept="3Tmbuc" id="6nFpYluWGVX" role="1B3o_S" />
       <node concept="3clFbS" id="6nFpYluWG8T" role="3clF47">
@@ -1249,6 +1269,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6nFpYluWKou" role="3clF46">
+        <property role="TrG5h" value="programProducer" />
+        <node concept="3uibUv" id="6nFpYluWL8U" role="1tU5fm">
+          <ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="6nFpYluVVXi" role="jymVt" />
     <node concept="3clFb_" id="6nFpYluVUvm" role="jymVt">
@@ -1312,9 +1338,8 @@
     <node concept="2tJIrI" id="7WKNeR9kCIM" role="jymVt" />
     <node concept="3uibUv" id="1pPth$lACR_" role="1zkMxy">
       <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-      <node concept="3uibUv" id="2j1FRbwX4ll" role="11_B2D">
-        <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-        <node concept="3qTvmN" id="2j1FRbwX8jV" role="11_B2D" />
+      <node concept="3uibUv" id="799SgOKe$yP" role="11_B2D">
+        <ref role="3uigEE" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
       </node>
     </node>
     <node concept="312cEg" id="6nFpYluo50r" role="jymVt">
@@ -1938,7 +1963,7 @@
                       <node concept="liA8E" id="RZQG98Wtu5" role="2OqNvi">
                         <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
                         <node concept="10M0yZ" id="RZQG98WvvX" role="37wK5m">
-                          <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE" />
+                          <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
                           <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
                         </node>
                       </node>
@@ -7416,8 +7441,25 @@
     <property role="3GE5qa" value="launch.step" />
     <property role="TrG5h" value="ConfigureEvalStep" />
     <node concept="2tJIrI" id="RZQG98VeW_" role="jymVt" />
+    <node concept="Wx3nA" id="39eNUjlXwas" role="jymVt">
+      <property role="TrG5h" value="TRACE_TMPL" />
+      <node concept="3Tm1VV" id="39eNUjlXwat" role="1B3o_S" />
+      <node concept="3uibUv" id="39eNUjlXwau" role="1tU5fm">
+        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
+        <node concept="3uibUv" id="39eNUjlXxQx" role="11_B2D">
+          <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+        </node>
+      </node>
+      <node concept="2YIFZM" id="39eNUjlXwaw" role="33vP2m">
+        <ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
+        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+        <node concept="3VsKOn" id="39eNUjlXwax" role="37wK5m">
+          <ref role="3VsUkX" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+        </node>
+      </node>
+    </node>
     <node concept="Wx3nA" id="RZQG98Ve3Q" role="jymVt">
-      <property role="TrG5h" value="TRACE" />
+      <property role="TrG5h" value="TRACE_EVAL" />
       <node concept="3Tm1VV" id="RZQG98Ve3R" role="1B3o_S" />
       <node concept="3uibUv" id="RZQG98Ve3S" role="1tU5fm">
         <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
@@ -7456,6 +7498,41 @@
       <node concept="3Tm1VV" id="RZQG98V8sO" role="1B3o_S" />
       <node concept="3clFbS" id="RZQG98V8sP" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="799SgOKgLer" role="jymVt" />
+    <node concept="3clFbW" id="799SgOKgMym" role="jymVt">
+      <node concept="3cqZAl" id="799SgOKgMyn" role="3clF45" />
+      <node concept="3Tm1VV" id="799SgOKgMyo" role="1B3o_S" />
+      <node concept="3clFbS" id="799SgOKgMyp" role="3clF47">
+        <node concept="3clFbF" id="799SgOKgQyC" role="3cqZAp">
+          <node concept="37vLTI" id="799SgOKgRwX" role="3clFbG">
+            <node concept="37vLTw" id="799SgOKgRQ0" role="37vLTx">
+              <ref role="3cqZAo" node="799SgOKgPWd" resolve="withTrace" />
+            </node>
+            <node concept="2OqwBi" id="799SgOKgQIy" role="37vLTJ">
+              <node concept="Xjq3P" id="799SgOKgQyB" role="2Oq$k0" />
+              <node concept="2OwXpG" id="799SgOKgQXx" role="2OqNvi">
+                <ref role="2Oxat5" node="799SgOKgJ2W" resolve="withTrace" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="799SgOKgPWd" role="3clF46">
+        <property role="TrG5h" value="withTrace" />
+        <node concept="10P_77" id="799SgOKgPWc" role="1tU5fm" />
+      </node>
+      <node concept="P$JXv" id="799SgOKgRT8" role="lGtFl">
+        <node concept="TZ5HA" id="799SgOKgRT9" role="TZ5H$">
+          <node concept="1dT_AC" id="799SgOKgRTa" role="1dT_Ay" />
+        </node>
+        <node concept="TUZQ0" id="799SgOKgRTb" role="3nqlJM">
+          <property role="TUZQ4" value="overrides trace setting from Config" />
+          <node concept="zr_55" id="799SgOKgRTd" role="zr_5Q">
+            <ref role="zr_51" node="799SgOKgPWd" resolve="withTrace" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="RZQG98V8cf" role="jymVt" />
     <node concept="3Tm1VV" id="RZQG98UNsU" role="1B3o_S" />
     <node concept="3uibUv" id="RZQG98UNN6" role="1zkMxy">
@@ -7492,60 +7569,137 @@
       <node concept="3clFbS" id="51ek2rQG_gz" role="3clF47">
         <node concept="3clFbF" id="51ek2rQGXTI" role="3cqZAp">
           <node concept="1rXfSq" id="51ek2rQGXTH" role="3clFbG">
-            <ref role="37wK5l" node="51ek2rQGEzN" resolve="composeEffect" />
+            <ref role="37wK5l" node="51ek2rQHvJ1" resolve="composeEffect" />
             <node concept="37vLTw" id="51ek2rQH0a7" role="37wK5m">
               <ref role="3cqZAo" node="51ek2rQG_g3" resolve="input" />
             </node>
             <node concept="1bVj0M" id="51ek2rQGYnn" role="37wK5m">
+              <node concept="37vLTG" id="799SgOKeBaS" role="1bW2Oz">
+                <property role="TrG5h" value="inEff" />
+                <node concept="3uibUv" id="799SgOKeBx4" role="1tU5fm">
+                  <ref role="3uigEE" node="2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
               <node concept="3clFbS" id="51ek2rQGYno" role="1bW5cS">
-                <node concept="3clFbF" id="q1hCixUuxf" role="3cqZAp">
-                  <node concept="2OqwBi" id="5tAk4yVORJZ" role="3clFbG">
-                    <node concept="2YIFZM" id="q1hCixUuxh" role="2Oq$k0">
-                      <ref role="37wK5l" node="6BMBBPCQBuH" resolve="of" />
-                      <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-                      <node concept="Xl_RD" id="q1hCixUuxi" role="37wK5m">
-                        <property role="Xl_RC" value="configuring" />
+                <node concept="3clFbH" id="799SgOKeExM" role="3cqZAp" />
+                <node concept="3cpWs8" id="799SgOKblO6" role="3cqZAp">
+                  <node concept="3cpWsn" id="799SgOKblO7" role="3cpWs9">
+                    <property role="TrG5h" value="config" />
+                    <node concept="3uibUv" id="799SgOKblO8" role="1tU5fm">
+                      <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+                    </node>
+                    <node concept="2OqwBi" id="799SgOKblO9" role="33vP2m">
+                      <node concept="37vLTw" id="799SgOKblOa" role="2Oq$k0">
+                        <ref role="3cqZAo" node="799SgOKeBaS" resolve="inEff" />
                       </node>
-                      <node concept="2OqwBi" id="q1hCixUuxj" role="37wK5m">
-                        <node concept="37vLTw" id="q1hCixUuxw" role="2Oq$k0">
-                          <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE" />
+                      <node concept="liA8E" id="799SgOKblOb" role="2OqNvi">
+                        <ref role="37wK5l" node="2daneBOX8cN" resolve="getValue" />
+                        <node concept="37vLTw" id="799SgOKeNx4" role="37wK5m">
+                          <ref role="3cqZAo" node="2j1FRbwXq5L" resolve="CONFIG" />
                         </node>
-                        <node concept="liA8E" id="q1hCixUuxk" role="2OqNvi">
-                          <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                          <node concept="10M0yZ" id="q1hCixUuxl" role="37wK5m">
-                            <ref role="3cqZAo" to="hano:24Vro6cS5rK" resolve="NULL" />
-                            <ref role="1PxDUh" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="799SgOKblOd" role="3cqZAp" />
+                <node concept="3cpWs8" id="799SgOKblO2" role="3cqZAp">
+                  <node concept="3cpWsn" id="799SgOKblO3" role="3cpWs9">
+                    <property role="TrG5h" value="trace" />
+                    <node concept="3uibUv" id="799SgOKblO4" role="1tU5fm">
+                      <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                    </node>
+                    <node concept="10M0yZ" id="799SgOKblO5" role="33vP2m">
+                      <ref role="1PxDUh" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+                      <ref role="3cqZAo" to="hano:39eNUjlX_RD" resolve="NULL" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="799SgOKblPm" role="3cqZAp">
+                  <node concept="3clFbS" id="799SgOKblPn" role="3clFbx">
+                    <node concept="3clFbF" id="799SgOKblPo" role="3cqZAp">
+                      <node concept="37vLTI" id="799SgOKblPp" role="3clFbG">
+                        <node concept="37vLTw" id="799SgOKblPq" role="37vLTJ">
+                          <ref role="3cqZAo" node="799SgOKblO3" resolve="trace" />
+                        </node>
+                        <node concept="2ShNRf" id="799SgOKblPr" role="37vLTx">
+                          <node concept="HV5vD" id="799SgOKblPs" role="2ShVmc">
+                            <ref role="HV5vE" to="hano:39eNUjlSKNI" resolve="TemplateTraceImpl" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="5tAk4yVOSrN" role="2OqNvi">
-                      <ref role="37wK5l" node="51ek2rQD9Pw" resolve="compose" />
-                      <node concept="1bVj0M" id="5tAk4yVOT5b" role="37wK5m">
-                        <node concept="3clFbS" id="5tAk4yVOT5c" role="1bW5cS">
-                          <node concept="3clFbF" id="5tAk4yVOTqE" role="3cqZAp">
-                            <node concept="2YIFZM" id="5tAk4yVOTYi" role="3clFbG">
-                              <ref role="37wK5l" node="6BMBBPCUL2C" resolve="of" />
-                              <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-                              <node concept="2OqwBi" id="5tAk4yVOV2A" role="37wK5m">
-                                <node concept="37vLTw" id="5tAk4yVOUlf" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
-                                </node>
-                                <node concept="liA8E" id="5tAk4yVOVpe" role="2OqNvi">
-                                  <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                                  <node concept="10M0yZ" id="5tAk4yW2kum" role="37wK5m">
-                                    <ref role="3cqZAo" to="av0y:~IncrementalSpec.DefaultSpec" resolve="DefaultSpec" />
-                                    <ref role="1PxDUh" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
+                  </node>
+                  <node concept="22lmx$" id="799SgOKgTUR" role="3clFbw">
+                    <node concept="37vLTw" id="799SgOKgUry" role="3uHU7w">
+                      <ref role="3cqZAo" node="799SgOKgJ2W" resolve="withTrace" />
+                    </node>
+                    <node concept="1Wc70l" id="799SgOKblPt" role="3uHU7B">
+                      <node concept="3y3z36" id="799SgOKblPu" role="3uHU7B">
+                        <node concept="37vLTw" id="799SgOKblPv" role="3uHU7B">
+                          <ref role="3cqZAo" node="799SgOKblO7" resolve="config" />
+                        </node>
+                        <node concept="10Nm6u" id="799SgOKblPw" role="3uHU7w" />
+                      </node>
+                      <node concept="2OqwBi" id="799SgOKblPx" role="3uHU7w">
+                        <node concept="10M0yZ" id="799SgOKblPy" role="2Oq$k0">
+                          <ref role="3cqZAo" to="31yc:7iCybvT_hbE" resolve="TEMPLATE_TRACE" />
+                          <ref role="1PxDUh" to="31yc:39eNUjm3TK$" resolve="CoderulesOptions" />
+                        </node>
+                        <node concept="liA8E" id="799SgOKblPz" role="2OqNvi">
+                          <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+                          <node concept="37vLTw" id="799SgOKblP$" role="37wK5m">
+                            <ref role="3cqZAo" node="799SgOKblO7" resolve="config" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbH" id="799SgOKblQo" role="3cqZAp" />
+                <node concept="3clFbF" id="q1hCixUuxf" role="3cqZAp">
+                  <node concept="2YIFZM" id="q1hCixUuxh" role="3clFbG">
+                    <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
+                    <ref role="37wK5l" node="6BMBBPCQBuH" resolve="of" />
+                    <node concept="Xl_RD" id="q1hCixUuxi" role="37wK5m">
+                      <property role="Xl_RC" value="configuring" />
+                    </node>
+                    <node concept="2OqwBi" id="799SgOKblQD" role="37wK5m">
+                      <node concept="37vLTw" id="799SgOKePfn" role="2Oq$k0">
+                        <ref role="3cqZAo" node="39eNUjlXwas" resolve="TRACE_TMPL" />
+                      </node>
+                      <node concept="liA8E" id="799SgOKblQF" role="2OqNvi">
+                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                        <node concept="37vLTw" id="799SgOKblQG" role="37wK5m">
+                          <ref role="3cqZAo" node="799SgOKblO3" resolve="trace" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="q1hCixUuxj" role="37wK5m">
+                      <node concept="37vLTw" id="39eNUjlYsYR" role="2Oq$k0">
+                        <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
+                      </node>
+                      <node concept="liA8E" id="q1hCixUuxk" role="2OqNvi">
+                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                        <node concept="10M0yZ" id="q1hCixUuxl" role="37wK5m">
+                          <ref role="3cqZAo" to="hano:24Vro6cS5rK" resolve="NULL" />
+                          <ref role="1PxDUh" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="5tAk4yVOV2A" role="37wK5m">
+                      <node concept="37vLTw" id="799SgOKcn3A" role="2Oq$k0">
+                        <ref role="3cqZAo" node="5tAk4yVOMI9" resolve="PROGRAM_SPEC" />
+                      </node>
+                      <node concept="liA8E" id="5tAk4yVOVpe" role="2OqNvi">
+                        <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
+                        <node concept="10M0yZ" id="5tAk4yW2kum" role="37wK5m">
+                          <ref role="3cqZAo" to="av0y:~IncrementalSpec.DefaultSpec" resolve="DefaultSpec" />
+                          <ref role="1PxDUh" to="av0y:~IncrementalSpec" resolve="IncrementalSpec" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -7556,6 +7710,12 @@
       </node>
     </node>
     <node concept="2tJIrI" id="51ek2rQHlPx" role="jymVt" />
+    <node concept="312cEg" id="799SgOKgJ2W" role="jymVt">
+      <property role="TrG5h" value="withTrace" />
+      <node concept="3Tm6S6" id="799SgOKgGV6" role="1B3o_S" />
+      <node concept="10P_77" id="799SgOKgGYa" role="1tU5fm" />
+      <node concept="3clFbT" id="799SgOKgJ9y" role="33vP2m" />
+    </node>
   </node>
   <node concept="312cEu" id="1G9Y_Qvb1CP">
     <property role="TrG5h" value="TraceObject" />
@@ -7571,30 +7731,17 @@
               <ref role="3cqZAo" node="19OC90hOI8" resolve="traceList" />
             </node>
             <node concept="TSZUe" id="19OC90hT4T" role="2OqNvi">
-              <node concept="1Ls8ON" id="19OC90hUHw" role="25WWJ7">
-                <node concept="37vLTw" id="19OC90hWVM" role="1Lso8e">
-                  <ref role="3cqZAo" node="19OC90hTuz" resolve="events" />
-                </node>
-                <node concept="37vLTw" id="19OC90hXgq" role="1Lso8e">
-                  <ref role="3cqZAo" node="19OC90hV9z" resolve="reportItems" />
-                </node>
+              <node concept="37vLTw" id="4tC1JBncQIX" role="25WWJ7">
+                <ref role="3cqZAo" node="4tC1JBncMea" resolve="traceReport" />
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="19OC90hTuz" role="3clF46">
-        <property role="TrG5h" value="events" />
-        <node concept="3uibUv" id="19OC90hUVL" role="1tU5fm">
-          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="19OC90hV9z" role="3clF46">
-        <property role="TrG5h" value="reportItems" />
-        <node concept="3vKaQO" id="3edyDFO9qVd" role="1tU5fm">
-          <node concept="3uibUv" id="3edyDFO9qVf" role="3O5elw">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
+      <node concept="37vLTG" id="4tC1JBncMea" role="3clF46">
+        <property role="TrG5h" value="traceReport" />
+        <node concept="3uibUv" id="4tC1JBncMe9" role="1tU5fm">
+          <ref role="3uigEE" node="4tC1JBnb14k" resolve="TraceReport" />
         </node>
       </node>
     </node>
@@ -7610,15 +7757,8 @@
         </node>
       </node>
       <node concept="_YKpA" id="19OC90icc1" role="3clF45">
-        <node concept="1LlUBW" id="19OC90icc2" role="_ZDj9">
-          <node concept="3uibUv" id="19OC90icc3" role="1Lm7xW">
-            <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-          </node>
-          <node concept="3vKaQO" id="3edyDFO9ztJ" role="1Lm7xW">
-            <node concept="3uibUv" id="3edyDFO9ztL" role="3O5elw">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
+        <node concept="3uibUv" id="4tC1JBncRmf" role="_ZDj9">
+          <ref role="3uigEE" node="4tC1JBnb14k" resolve="TraceReport" />
         </node>
       </node>
     </node>
@@ -7633,6 +7773,25 @@
       <node concept="3clFbS" id="2mhJggjy$$z" role="3clF47">
         <node concept="3clFbJ" id="2mhJggjzpLj" role="3cqZAp">
           <node concept="3clFbS" id="2mhJggjzpLl" role="3clFbx">
+            <node concept="3cpWs8" id="4tC1JBnd0zU" role="3cqZAp">
+              <node concept="3cpWsn" id="4tC1JBnd0zV" role="3cpWs9">
+                <property role="TrG5h" value="firstEvalTrace" />
+                <node concept="3uibUv" id="4tC1JBnd0zW" role="1tU5fm">
+                  <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
+                </node>
+                <node concept="2OqwBi" id="4tC1JBnd33s" role="33vP2m">
+                  <node concept="2OqwBi" id="4tC1JBnd1Lv" role="2Oq$k0">
+                    <node concept="37vLTw" id="4tC1JBnd0Qa" role="2Oq$k0">
+                      <ref role="3cqZAo" node="19OC90hOI8" resolve="traceList" />
+                    </node>
+                    <node concept="1uHKPH" id="4tC1JBnd2ry" role="2OqNvi" />
+                  </node>
+                  <node concept="liA8E" id="4tC1JBnd3dc" role="2OqNvi">
+                    <ref role="37wK5l" node="4tC1JBnbhKC" resolve="getTraceEvents" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3cpWs6" id="2mhJggjzqnX" role="3cqZAp">
               <node concept="3cpWs3" id="2mhJggjzqnY" role="3cqZAk">
                 <node concept="Xl_RD" id="2mhJggjzqnZ" role="3uHU7w">
@@ -7641,19 +7800,11 @@
                 <node concept="3cpWs3" id="2mhJggjzqo0" role="3uHU7B">
                   <node concept="3cpWs3" id="2mhJggjzqo1" role="3uHU7B">
                     <node concept="3cpWs3" id="2mhJggjzqo2" role="3uHU7B">
-                      <node concept="2OqwBi" id="2mhJggjzqo3" role="3uHU7w">
-                        <node concept="1LFfDK" id="19OC90iU5h" role="2Oq$k0">
-                          <node concept="3cmrfG" id="19OC90iUoo" role="1LF_Uc">
-                            <property role="3cmrfH" value="0" />
-                          </node>
-                          <node concept="2OqwBi" id="5MK8bDyQRV3" role="1LFl5Q">
-                            <node concept="37vLTw" id="19OC90iSR1" role="2Oq$k0">
-                              <ref role="3cqZAo" node="19OC90hOI8" resolve="traceList" />
-                            </node>
-                            <node concept="1uHKPH" id="5MK8bDyQSiP" role="2OqNvi" />
-                          </node>
+                      <node concept="2OqwBi" id="4tC1JBnd3De" role="3uHU7w">
+                        <node concept="37vLTw" id="4tC1JBnd3jd" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4tC1JBnd0zV" resolve="firstEvalTrace" />
                         </node>
-                        <node concept="liA8E" id="2mhJggjzqo5" role="2OqNvi">
+                        <node concept="liA8E" id="4tC1JBnd3Qc" role="2OqNvi">
                           <ref role="37wK5l" to="31yc:2daneBOTzUn" resolve="name" />
                         </node>
                       </node>
@@ -7665,19 +7816,11 @@
                       <property role="Xl_RC" value="\&quot; [" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="2mhJggjzqo8" role="3uHU7w">
-                    <node concept="1LFfDK" id="19OC90iW$9" role="2Oq$k0">
-                      <node concept="3cmrfG" id="19OC90iX1L" role="1LF_Uc">
-                        <property role="3cmrfH" value="0" />
-                      </node>
-                      <node concept="2OqwBi" id="5MK8bDyQSXj" role="1LFl5Q">
-                        <node concept="37vLTw" id="19OC90iVKM" role="2Oq$k0">
-                          <ref role="3cqZAo" node="19OC90hOI8" resolve="traceList" />
-                        </node>
-                        <node concept="1uHKPH" id="5MK8bDyQTw2" role="2OqNvi" />
-                      </node>
+                  <node concept="2OqwBi" id="4tC1JBnd4FJ" role="3uHU7w">
+                    <node concept="37vLTw" id="4tC1JBnd4lv" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4tC1JBnd0zV" resolve="firstEvalTrace" />
                     </node>
-                    <node concept="liA8E" id="2mhJggjzqoa" role="2OqNvi">
+                    <node concept="liA8E" id="4tC1JBnd4Za" role="2OqNvi">
                       <ref role="37wK5l" to="31yc:2mhJggjyLXN" resolve="lastEventId" />
                     </node>
                   </node>
@@ -7708,28 +7851,14 @@
       <property role="TrG5h" value="traceList" />
       <node concept="3Tm6S6" id="19OC90hOI9" role="1B3o_S" />
       <node concept="_YKpA" id="19OC90hPsA" role="1tU5fm">
-        <node concept="1LlUBW" id="19OC90hPsB" role="_ZDj9">
-          <node concept="3uibUv" id="19OC90hPsC" role="1Lm7xW">
-            <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-          </node>
-          <node concept="3vKaQO" id="3edyDFO9zWS" role="1Lm7xW">
-            <node concept="3uibUv" id="3edyDFO9zWU" role="3O5elw">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
+        <node concept="3uibUv" id="4tC1JBncSq8" role="_ZDj9">
+          <ref role="3uigEE" node="4tC1JBnb14k" resolve="TraceReport" />
         </node>
       </node>
       <node concept="2ShNRf" id="19OC90hQ9r" role="33vP2m">
         <node concept="Tc6Ow" id="19OC90hQ4b" role="2ShVmc">
-          <node concept="1LlUBW" id="19OC90hQ4c" role="HW$YZ">
-            <node concept="3uibUv" id="19OC90hQ4d" role="1Lm7xW">
-              <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
-            </node>
-            <node concept="3vKaQO" id="3edyDFO9$wX" role="1Lm7xW">
-              <node concept="3uibUv" id="3edyDFO9$wZ" role="3O5elw">
-                <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-              </node>
-            </node>
+          <node concept="3uibUv" id="4tC1JBncUw8" role="HW$YZ">
+            <ref role="3uigEE" node="4tC1JBnb14k" resolve="TraceReport" />
           </node>
         </node>
       </node>
@@ -8242,5 +8371,183 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="4tC1JBnb14k">
+    <property role="TrG5h" value="TraceReport" />
+    <node concept="312cEg" id="4tC1JBnbcOX" role="jymVt">
+      <property role="TrG5h" value="templateTrace" />
+      <node concept="3Tm6S6" id="4tC1JBnbcOY" role="1B3o_S" />
+      <node concept="3uibUv" id="4tC1JBnbcP0" role="1tU5fm">
+        <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+      </node>
+    </node>
+    <node concept="312cEg" id="4tC1JBnbcP1" role="jymVt">
+      <property role="TrG5h" value="traceEvents" />
+      <node concept="3Tm6S6" id="4tC1JBnbcP2" role="1B3o_S" />
+      <node concept="3uibUv" id="4tC1JBnbcP4" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
+      </node>
+    </node>
+    <node concept="312cEg" id="4tC1JBnbcP5" role="jymVt">
+      <property role="TrG5h" value="reportItems" />
+      <node concept="3Tm6S6" id="4tC1JBnbcP6" role="1B3o_S" />
+      <node concept="3vKaQO" id="4tC1JBnbcP8" role="1tU5fm">
+        <node concept="3uibUv" id="4tC1JBnbcP9" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4tC1JBnbdSI" role="jymVt" />
+    <node concept="3clFbW" id="4tC1JBnbbB$" role="jymVt">
+      <node concept="37vLTG" id="4tC1JBnbcJ1" role="3clF46">
+        <property role="TrG5h" value="templateTrace" />
+        <node concept="3uibUv" id="4tC1JBnbcM0" role="1tU5fm">
+          <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4tC1JBnbcuP" role="3clF46">
+        <property role="TrG5h" value="traceEvents" />
+        <node concept="3uibUv" id="4tC1JBnbcuQ" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="4tC1JBnbcuR" role="3clF46">
+        <property role="TrG5h" value="reportItems" />
+        <node concept="3vKaQO" id="4tC1JBnbcuS" role="1tU5fm">
+          <node concept="3uibUv" id="4tC1JBnbcuT" role="3O5elw">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="4tC1JBnbbB_" role="3clF45" />
+      <node concept="3clFbS" id="4tC1JBnbbBB" role="3clF47">
+        <node concept="3clFbF" id="4tC1JBnbeMo" role="3cqZAp">
+          <node concept="37vLTI" id="4tC1JBnbfag" role="3clFbG">
+            <node concept="37vLTw" id="4tC1JBnbfgi" role="37vLTx">
+              <ref role="3cqZAo" node="4tC1JBnbcJ1" resolve="templateTrace" />
+            </node>
+            <node concept="2OqwBi" id="4tC1JBnbeRW" role="37vLTJ">
+              <node concept="Xjq3P" id="4tC1JBnbeMn" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4tC1JBnbeY3" role="2OqNvi">
+                <ref role="2Oxat5" node="4tC1JBnbcOX" resolve="templateTrace" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4tC1JBnbfjR" role="3cqZAp">
+          <node concept="37vLTI" id="4tC1JBnbfBB" role="3clFbG">
+            <node concept="37vLTw" id="4tC1JBnbfFp" role="37vLTx">
+              <ref role="3cqZAo" node="4tC1JBnbcuP" resolve="traceEvents" />
+            </node>
+            <node concept="2OqwBi" id="4tC1JBnbfqq" role="37vLTJ">
+              <node concept="Xjq3P" id="4tC1JBnbfjP" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4tC1JBnbfwh" role="2OqNvi">
+                <ref role="2Oxat5" node="4tC1JBnbcP1" resolve="traceEvents" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4tC1JBnbfKw" role="3cqZAp">
+          <node concept="37vLTI" id="4tC1JBnbgyG" role="3clFbG">
+            <node concept="37vLTw" id="4tC1JBnbgA8" role="37vLTx">
+              <ref role="3cqZAo" node="4tC1JBnbcuR" resolve="reportItems" />
+            </node>
+            <node concept="2OqwBi" id="4tC1JBnbfS2" role="37vLTJ">
+              <node concept="Xjq3P" id="4tC1JBnbfKu" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4tC1JBnbfXZ" role="2OqNvi">
+                <ref role="2Oxat5" node="4tC1JBnbcP5" resolve="reportItems" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4tC1JBnbaKg" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="4tC1JBnmJbe" role="jymVt" />
+    <node concept="3clFb_" id="4tC1JBnmJxX" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3clFbS" id="4tC1JBnmJy0" role="3clF47">
+        <node concept="3clFbJ" id="4tC1JBnmKjO" role="3cqZAp">
+          <node concept="3clFbS" id="4tC1JBnmKjQ" role="3clFbx">
+            <node concept="3cpWs6" id="4tC1JBnmKVt" role="3cqZAp">
+              <node concept="2OqwBi" id="4tC1JBnmK3a" role="3cqZAk">
+                <node concept="37vLTw" id="4tC1JBnmJQt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4tC1JBnbcP1" resolve="traceEvents" />
+                </node>
+                <node concept="liA8E" id="4tC1JBnmKbl" role="2OqNvi">
+                  <ref role="37wK5l" to="31yc:2daneBOTzUn" resolve="name" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="4tC1JBnmKA7" role="3clFbw">
+            <node concept="10Nm6u" id="4tC1JBnmKDU" role="3uHU7w" />
+            <node concept="37vLTw" id="4tC1JBnmKpV" role="3uHU7B">
+              <ref role="3cqZAo" node="4tC1JBnbcP1" resolve="traceEvents" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4tC1JBnmLd9" role="3cqZAp">
+          <node concept="Xl_RD" id="4tC1JBnmLlN" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4tC1JBnmJmY" role="1B3o_S" />
+      <node concept="17QB3L" id="4tC1JBnmJxH" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="4tC1JBnbgLc" role="jymVt" />
+    <node concept="3Tm1VV" id="4tC1JBnaX6z" role="1B3o_S" />
+    <node concept="3clFb_" id="4tC1JBnbhKw" role="jymVt">
+      <property role="TrG5h" value="getTemplateTrace" />
+      <node concept="3uibUv" id="4tC1JBnbhKx" role="3clF45">
+        <ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
+      </node>
+      <node concept="3Tm1VV" id="4tC1JBnbhKy" role="1B3o_S" />
+      <node concept="3clFbS" id="4tC1JBnbhKz" role="3clF47">
+        <node concept="3clFbF" id="4tC1JBnbhK$" role="3cqZAp">
+          <node concept="2OqwBi" id="4tC1JBnbhKt" role="3clFbG">
+            <node concept="Xjq3P" id="4tC1JBnbhKu" role="2Oq$k0" />
+            <node concept="2OwXpG" id="4tC1JBnbhKv" role="2OqNvi">
+              <ref role="2Oxat5" node="4tC1JBnbcOX" resolve="templateTrace" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="4tC1JBnbhKC" role="jymVt">
+      <property role="TrG5h" value="getTraceEvents" />
+      <node concept="3uibUv" id="4tC1JBnbhKD" role="3clF45">
+        <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
+      </node>
+      <node concept="3Tm1VV" id="4tC1JBnbhKE" role="1B3o_S" />
+      <node concept="3clFbS" id="4tC1JBnbhKF" role="3clF47">
+        <node concept="3clFbF" id="4tC1JBnbhKG" role="3cqZAp">
+          <node concept="2OqwBi" id="4tC1JBnbhK_" role="3clFbG">
+            <node concept="Xjq3P" id="4tC1JBnbhKA" role="2Oq$k0" />
+            <node concept="2OwXpG" id="4tC1JBnbhKB" role="2OqNvi">
+              <ref role="2Oxat5" node="4tC1JBnbcP1" resolve="traceEvents" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3clFb_" id="4tC1JBnbhKK" role="jymVt">
+      <property role="TrG5h" value="getReportItems" />
+      <node concept="3vKaQO" id="4tC1JBnbhKL" role="3clF45">
+        <node concept="3uibUv" id="4tC1JBnbhKM" role="3O5elw">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4tC1JBnbhKN" role="1B3o_S" />
+      <node concept="3clFbS" id="4tC1JBnbhKO" role="3clF47">
+        <node concept="3clFbF" id="4tC1JBnbhKP" role="3cqZAp">
+          <node concept="2OqwBi" id="4tC1JBnbhKH" role="3clFbG">
+            <node concept="Xjq3P" id="4tC1JBnbhKI" role="2Oq$k0" />
+            <node concept="2OwXpG" id="4tC1JBnbhKJ" role="2OqNvi">
+              <ref role="2Oxat5" node="4tC1JBnbcP5" resolve="reportItems" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index 15b42ba6..60368480 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1068,6 +1068,20 @@
             </node>
           </node>
           <node concept="3clFbH" id="6nFpYluojwy" role="3cqZAp" />
+          <node concept="3clFbF" id="2j1FRbwVfxP" role="3cqZAp">
+            <node concept="2OqwBi" id="2j1FRbwVgAe" role="3clFbG">
+              <node concept="37vLTw" id="2j1FRbwVfxN" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+              </node>
+              <node concept="TSZUe" id="2j1FRbwVi9R" role="2OqNvi">
+                <node concept="2ShNRf" id="2j1FRbwVie7" role="25WWJ7">
+                  <node concept="1pGfFk" id="2j1FRbwViMW" role="2ShVmc">
+                    <ref role="37wK5l" to="1yqb:RZQG98V8sL" resolve="ConfigureEvalStep" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
               <node concept="37vLTw" id="7WKNeR8TcX$" role="2Oq$k0">
@@ -1108,20 +1122,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="2j1FRbwVfxP" role="3cqZAp">
-            <node concept="2OqwBi" id="2j1FRbwVgAe" role="3clFbG">
-              <node concept="37vLTw" id="2j1FRbwVfxN" role="2Oq$k0">
-                <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
-              </node>
-              <node concept="TSZUe" id="2j1FRbwVi9R" role="2OqNvi">
-                <node concept="2ShNRf" id="2j1FRbwVie7" role="25WWJ7">
-                  <node concept="1pGfFk" id="2j1FRbwViMW" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:RZQG98V8sL" resolve="ConfigureEvalStep" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="7WKNeR8TcY8" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8TcY9" role="3clFbG">
               <node concept="37vLTw" id="7WKNeR8TcYa" role="2Oq$k0">
@@ -1734,7 +1734,7 @@
                       <ref role="37wK5l" to="1yqb:6BMBBPCUL2C" resolve="of" />
                       <node concept="2OqwBi" id="51ek2rQR8Ry" role="37wK5m">
                         <node concept="10M0yZ" id="51ek2rQR8Rz" role="2Oq$k0">
-                          <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE" />
+                          <ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE_EVAL" />
                           <ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
                         </node>
                         <node concept="liA8E" id="51ek2rQR8R$" role="2OqNvi">