cpee 2.1.125 → 2.1.126

data/cockpit/llm.html

@@ -261,17 +261,44 @@
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
-          <div id="modelling">
+          <ui-part id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
               <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
-          </div>
-          <div id='status'></div>
-          <div id='prompt_container' class="max">
-            <div id='prompt' contenteditable="true" title="Please enter your modelling instructions here..." placeholder="Please enter your modelling instructions here..."></div>
-            <div id='prompt_submit_container' class="single"><button id='prompt_submit_button' title="CTRL-ENTER to Submit"  class="llm_button small">➤</button><button id='prompt_reset_button' title="Reset Context"  class="llm_button small">🗲</button></div>
-          </div>
+          </ui-part>
+          <ui-resizehandle class='hidden'>drag to resize</ui-resizehandle>
+          <ui-part id='input'>
+            <div id='status'></div>
+            <div id='prompt_container' class="max">
+              <div id='prompt' contenteditable="true" title="Please enter your modelling instructions here..." placeholder="Please enter your modelling instructions here..."></div>
+              <div id='prompt_submit_container' class="single">
+                <select name="generation" id="generation" class='hidden'>
+                  <option value="model">Only Model</option>
+                  <option value="dataflow" selected="selected">Model and Dataflow</option>
+                </select>
+                <select name="mode" id="mode" class='hidden'>
+                  <option value="noendpoints" selected="selected">Generate/Adapt from Scratch</option>
+                  <option value="endpoints">Generate/Adapt with Endpoint Knowledge</option>
+                </select>
+                <button id='prompt_submit_button' title="CTRL-ENTER to Submit" class="llm_button small">➤</button>
+                <button id='prompt_reset_button' title="Reset Context" class="llm_button small">🗲</button>
+                <button id='prompt_prop_button' title="Properties" class="llm_button small">⚙</button>
+                <select name="llms" id="llms" class='hidden'>
+                  <option value="gemini-3.1-flash-lite" selected="selected">gemini 3.1 Flash Lite</option>
+                  <option value="gemini-3.1-flash">gemini 3.1 Flash</option>
+                  <option value="gemini-3.1-pro">gemini 3.1 Pro</option>
+                  <option value="gpt-4o">gpt 4o</option>
+                  <option value="gpt-4o-mini">gpt 4o mini</option>
+                  <option value="gpt-5.4-nano-2026-03-17">gpt 5.4 nano</option>
+                  <option value="mistralai/Ministral-3-14B-Reasoning-2512"> Morp. Ministral 3</option>
+                  <option value="google/gemma-4-31B-it">Morp. Gemma 4</option>
+                  <option value="Qwen/Qwen3.6-35B-A3B">Morp. Qwen 3.6</option>
+                  <option value="qwen-35-35b-coding">Morp. Qwen 35B Coding</option>
+                </select>
+              </div>
+            </div>
+          </ui-part>
         </ui-area>
         <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>
         <ui-area data-belongs-to-tab="details" id="detailcolumn">

data/cockpit/only_llm.html

@@ -215,19 +215,26 @@
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
           <div id='prompt_container' class="stand_alone">
-            <div id='prompt' contenteditable="true" title="Please enter your modelling instructions here... CTRL-ENTER or press '➤' to submit ..." placeholder="Please enter your modelling instructions here... CTRL-ENTER or press '➤' to submit ..."></div>
+            <div id='prompt' contenteditable="true" title="CTRL-ENTER or press '➤' to submit ..." placeholder="Please enter your modelling instructions here..."></div>
           </div>
           <div id='status'></div>
           <div id='llm_params' class="multi">
-            <label id="llmlabel" for="llms">Choose LLM:</label>
+             <select name="generation" id="generation" class='hidden'>
+               <option value="model" selected="selected">Only Model</option>
+               <option value="dataflow">Model and Dataflow</option>
+               <option value="endpointsfirst">Model and Dataflow Alternative</option>
+            </select>
+            <select name="mode" id="mode" class='hidden'>
+              <option value="noendpoints" selected="selected">Generate/Adapt from Scratch</option>
+              <option value="endpoints">Generate/Adapt with Endpoint Knowledge</option>
+            </select>
             <select name="llms" id="llms">
-              <!--<option value="gemini-2.0-flash" selected>gemini 2 Flash</option>-->
-              <option value="gemini-2.5-flash-lite" selected>gemini 2.5 Flash Lite</option>
-              <option value="gemini-2.5-flash">gemini 2.5 Flash</option>
-              <option value="gemini-2.5-pro">gemini 2.5 Pro</option>
-              <option value="gpt-4">gpt 4</option>
+              <option value="gemini-3.1-flash-lite" selected="selected">gemini 3.1 Flash Lite</option>
+              <option value="gemini-3.1-flash">gemini 3.1 Flash</option>
+              <option value="gemini-3.1-pro">gemini 3.1 Pro</option>
               <option value="gpt-4o">gpt 4o</option>
               <option value="gpt-4o-mini">gpt 4o mini</option>
+              <option value="gpt-5.4-nano-2026-03-17">gpt 5.4 nano</option>
               <option value="mistralai/Ministral-3-14B-Reasoning-2512"> Morp. Ministral 3</option>
               <option value="google/gemma-4-31B-it">Morp. Gemma 4</option>
               <option value="Qwen/Qwen3.6-35B-A3B">Morp. Qwen 3.6</option>
@@ -240,6 +247,7 @@
           <div><input id="loadtxt" accept=".txt" type="file"/></div>
           <div id='prompt_submit_container' class="multi">
             <button id='prompt_undo_button' class='llm_button' title='undo (reset to state before your last submit)'>&#10554;</button>
+            <button id='prompt_reset_button' title="Reset Context" class="llm_button">🗲</button>
             <button id='prompt_attach_button' class='llm_button' title='load text from (txt) file'>&#128206;</button>
             <button id='prompt_submit_button' class='llm_button' title='submit'>&#x27A4;</button>
           </div>

data/cockpit/rngs/requirements.rng

@@ -0,0 +1,8 @@
+<element rngui:version="1.2" name="requirements" ns="http://cpee.org/ns/properties/2.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <zeroOrMore rngui:label="Create Requirement">
+    <element rngui:label='name'>
+      <anyName/>
+      <data type="string" rngui:label="value"/>
+    </element>
+  </zeroOrMore>
+</element>

data/cockpit/themes/base.js

@@ -14,6 +14,7 @@ function WFAdaptorManifestationBase(adaptor) {
   this.source = function(base,opts) {
     if (base[0].namespaceURI == "http://relaxng.org/ns/structure/1.0") {
       $('#relaxngworker').empty();
+      self.adaptor.description.reset_used_id_list();
       var rngw = new RelaxNGui(base,$('#relaxngworker'),self.adaptor.description.context_eval);
       var nnew = $(rngw.save().documentElement);
       return(nnew);

data/cockpit/themes/control/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/control/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/dataflow/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/dataflow/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/default/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/default/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/extended/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/extended/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/packed/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/packed/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/preset/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/preset/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/presetaltid/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/presetaltid/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/presetid/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/presetid/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cockpit/themes/reduced/rngs/choose.rng

@@ -12,9 +12,16 @@
     <data type="string" rngui:label="Label"/>
   </attribute>
   <element rngui:ignore="true" name="alternative">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
     <attribute name="condition">
       <data type="string"/>
     </attribute>
   </element>
-  <element rngui:ignore="true" name="otherwise"/>
+  <element rngui:ignore="true" name="otherwise">
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
+    </attribute>
+  </element>
 </element>

data/cockpit/themes/reduced/rngs/parallel.rng

@@ -12,19 +12,13 @@
     </choice>
   </attribute>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
   <element rngui:ignore="true" name="parallel_branch">
-    <attribute name="pass">
-      <data type="string"/>
-    </attribute>
-    <attribute name="local">
-      <data type="string"/>
+    <attribute name="eid" rngui:label="ID" rngui:default="javascript:get_free_id('e','eid')">
+      <data type="string" rngui:readonly="true"/>
     </attribute>
   </element>
 </element>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.125"
+  s.version          = "2.1.126"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/server/executionhandlers/ruby/connection.rb

@@ -299,7 +299,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
-    if @anno[:_context_data_analysis] && @anno[:_context_data_analysis][:probes] && @anno[:_context_data_analysis][:probes].find{ |p| p.dig(:probe,:extractor_type) == 'extrinsic' }
+    if @anno && @anno[:_context_data_analysis] && @anno[:_context_data_analysis][:probes] && @anno[:_context_data_analysis][:probes].find{ |p| p.dig(:probe,:extractor_type) == 'extrinsic' }
       @controller.notify("task/probe", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :data => dataelements, :probes => @anno[:_context_data_analysis]&.[](:probes))
     end
 
@@ -434,7 +434,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     __struct = if status >= 200 && status < 300
       ret.empty? ? nil : JSON::parse(ret[0].value.read)
     else
-      code_error_handling ret, 'Condition ' + code, WEEL::Signal::Error
+      code_error_handling ret, 'Condition ' + __code, WEEL::Signal::Error
     end
     __struct = 'false' unless __struct
     __struct = (__struct == 'false' || __struct == 'null' || __struct == 'nil' || __struct == false ? false : true)

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -531,7 +531,7 @@
           </xsl:for-each>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:for-each select="@*[not(name()='language' or name()='condition' or name()='svg-label')]">
+      <xsl:for-each select="@*[not(name()='language' or name()='condition' or name()='eid' or name()='svg-label')]">
         <xsl:if test="position() &gt;1">, </xsl:if>
         <xsl:text>:</xsl:text>
         <xsl:value-of select="name(.)"/>
@@ -596,7 +596,8 @@
   </xsl:template>
   <xsl:template match="d:parameters">
     <xsl:apply-templates select="d:label" mode="parameter"/>
-    <xsl:apply-templates select="d:*[not(name()='label') and not(name()='color')]" mode="parameter"/>
+    <xsl:apply-templates select="d:method" mode="parameter"/>
+    <xsl:apply-templates select="d:*[not(name()='label') and not(name()='color') and not(name()='method')]" mode="parameter"/>
     <xsl:if test="count(*) &gt; 0">, </xsl:if>
     <xsl:apply-templates select="../d:annotations" mode="annotations"/>
   </xsl:template>
@@ -607,6 +608,22 @@
     <xsl:value-of select="str:replace(str:replace(text(),'\','\\'),'&quot;','\&quot;')"/>
     <xsl:text>"</xsl:text>
   </xsl:template>
+  <xsl:template match="d:method" mode="parameter">
+    <xsl:if test="string-length(text()) > 0">
+      <xsl:text>, :</xsl:text>
+      <xsl:value-of select="name()"/>
+      <xsl:text> =&gt; </xsl:text>
+      <xsl:choose>
+        <xsl:when test="substring(text(),1,1) = ':'">
+          <xsl:value-of select="str:replace(str:replace(text(),'\','\\'),'&quot;','\&quot;')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>:</xsl:text>
+          <xsl:value-of select="str:replace(str:replace(text(),'\','\\'),'&quot;','\&quot;')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:if>
+  </xsl:template>
   <xsl:template match="d:annotations" mode="annotations">
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>
@@ -615,7 +632,7 @@
     <xsl:apply-templates select="d:*" mode="simplemulti"/>
     <xsl:text> }</xsl:text>
   </xsl:template>
-  <xsl:template match="d:*[not(name()='label')]" mode="parameter">
+  <xsl:template match="d:*[not(name()='label') and not(name()='color') and not(name()='method')]" mode="parameter">
     <xsl:if test="count(preceding-sibling::*) &gt; 0">, </xsl:if>
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>

data/server/routing/persist.rb

@@ -100,11 +100,7 @@ Daemonite.new do |opts|
               mess.dig('content','changed')&.each_with_index do |c,i|
                 unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
                   multi.zadd("instance:#{instance}/#{topic}",max + 1 + i,c,nx: true)
-                  if what =~ /event:\d+:dataelements\/change/
-                    multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)))
-                  else
-                    multi.set("instance:#{instance}/#{topic}/#{c}",mess.dig('content','values',c))
-                  end
+                  multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)))
                 end
               end
               mess.dig('content','deleted')&.to_a&.each do |c|