@burgan-tech/morph-touch-runtime 0.0.2 → 0.0.4

package/{touch → morph-touch}/Workflows/src/CancelAbsenceEntryForRezervationMapping.csx

@@ -26,7 +26,7 @@ public class CancelAbsenceEntryForRezervationMapping : ScriptBase, IMapping
             });
         }
 
-        triggerTask.SetDomain("touch");
+        triggerTask.SetDomain("morph-touch");
         triggerTask.SetFlow("absence-entry");
         triggerTask.SetKey(absenceEntryKey);
         triggerTask.SetTransitionName("cancel");

package/{touch → morph-touch}/Workflows/src/CancelAbsenceForRandevuUpdateMapping.csx

@@ -25,7 +25,7 @@ public class CancelAbsenceForRandevuUpdateMapping : ScriptBase, IMapping
             });
         }
 
-        triggerTask.SetDomain("touch");
+        triggerTask.SetDomain("morph-touch");
         triggerTask.SetFlow("absence-entry");
         triggerTask.SetKey(absenceEntryKey);
         triggerTask.SetTransitionName("cancel");

package/{touch → morph-touch}/Workflows/src/ChatRoomRemoveMapping.csx

@@ -75,13 +75,16 @@ public class ChatRoomRemoveMapping : ScriptBase, IMapping
             }
         }
 
+        var memberWithoutArray = BuildMemberWithoutArray(members);
+
         result.Data = new
         {
             user,
             advisorType,
             advisorId,
             chatIntegration = new { roomId },
-            members = members
+            members = members,
+            memberWithoutArray = memberWithoutArray
         };
 
         return Task.FromResult(result);
@@ -101,4 +104,22 @@ public class ChatRoomRemoveMapping : ScriptBase, IMapping
         catch { }
         return null;
     }
+
+    private static Dictionary<string, string> BuildMemberWithoutArray(IEnumerable<object> members)
+    {
+        var map = new Dictionary<string, string>();
+        if (members == null) return map;
+        foreach (dynamic m in members)
+        {
+            try
+            {
+                if (m == null) continue;
+                var mid = m.memberId?.ToString() ?? m.advisorId?.ToString();
+                if (string.IsNullOrWhiteSpace(mid)) continue;
+                map[mid] = m.role?.ToString() ?? "";
+            }
+            catch { }
+        }
+        return map;
+    }
 }

package/{touch → morph-touch}/Workflows/src/ChatRoomTransferInviteMapping.csx

@@ -79,6 +79,8 @@ public class ChatRoomTransferInviteMapping : ScriptBase, IMapping
             }
         }
 
+        var memberWithoutArray = BuildMemberWithoutArray(members);
+
         result.Data = new
         {
             user,
@@ -86,6 +88,7 @@ public class ChatRoomTransferInviteMapping : ScriptBase, IMapping
             advisorId = !string.IsNullOrWhiteSpace(newAdvisorId) ? newAdvisorId.Trim() : oldAdvisorId,
             chatIntegration = new { roomId },
             members = members,
+            memberWithoutArray = memberWithoutArray,
             pendingJoinUserId = newAdvisorId
         };
 
@@ -106,4 +109,22 @@ public class ChatRoomTransferInviteMapping : ScriptBase, IMapping
         catch { }
         return null;
     }
+
+    private static Dictionary<string, string> BuildMemberWithoutArray(IEnumerable<object> members)
+    {
+        var map = new Dictionary<string, string>();
+        if (members == null) return map;
+        foreach (dynamic m in members)
+        {
+            try
+            {
+                if (m == null) continue;
+                var mid = m.memberId?.ToString() ?? m.advisorId?.ToString();
+                if (string.IsNullOrWhiteSpace(mid)) continue;
+                map[mid] = m.role?.ToString() ?? "";
+            }
+            catch { }
+        }
+        return map;
+    }
 }

package/{touch → morph-touch}/Workflows/src/ChatRoomUpdateMapping.csx

@@ -77,6 +77,8 @@ public class ChatRoomUpdateMapping : ScriptBase, IMapping
         if (!string.IsNullOrWhiteSpace(newMemberId))
             members.Add(new { memberId = newMemberId, role = "member" });
 
+        var memberWithoutArray = BuildMemberWithoutArray(members);
+
         result.Data = new
         {
             user,
@@ -84,6 +86,7 @@ public class ChatRoomUpdateMapping : ScriptBase, IMapping
             advisorId,
             chatIntegration = new { roomId },
             members = members,
+            memberWithoutArray = memberWithoutArray,
             pendingJoinUserId = newMemberId
         };
 
@@ -104,4 +107,22 @@ public class ChatRoomUpdateMapping : ScriptBase, IMapping
         catch { }
         return null;
     }
+
+    private static Dictionary<string, string> BuildMemberWithoutArray(IEnumerable<object> members)
+    {
+        var map = new Dictionary<string, string>();
+        if (members == null) return map;
+        foreach (dynamic m in members)
+        {
+            try
+            {
+                if (m == null) continue;
+                var mid = m.memberId?.ToString() ?? m.advisorId?.ToString();
+                if (string.IsNullOrWhiteSpace(mid)) continue;
+                map[mid] = m.role?.ToString() ?? "";
+            }
+            catch { }
+        }
+        return map;
+    }
 }

package/{touch → morph-touch}/Workflows/src/CreateAbsenceEntryForRezervationMapping.csx

@@ -39,7 +39,7 @@ public class CreateAbsenceEntryForRezervationMapping : ScriptBase, IMapping
         var endNorm = NormalizeDateTimeForKey(endDateTime);
         var absenceEntryKey = $"rezervation-{advisorId}-{startNorm}-{endNorm}";
 
-        startTask.SetDomain("touch");
+        startTask.SetDomain("morph-touch");
         startTask.SetFlow("absence-entry");
         startTask.SetKey(absenceEntryKey);
         startTask.SetBody(new

package/{touch → morph-touch}/Workflows/src/CreateAbsenceForRandevuUpdateMapping.csx

@@ -31,7 +31,7 @@ public class CreateAbsenceForRandevuUpdateMapping : ScriptBase, IMapping
         var endNorm = NormalizeDateTimeForKey(endDateTime);
         var absenceEntryKey = $"rezervation-{advisorId}-{startNorm}-{endNorm}";
 
-        startTask.SetDomain("touch");
+        startTask.SetDomain("morph-touch");
         startTask.SetFlow("absence-entry");
         startTask.SetKey(absenceEntryKey);
         startTask.SetBody(new

package/{touch → morph-touch}/Workflows/src/CreateChatRoomForRezervationMapping.csx

@@ -29,8 +29,9 @@ public class CreateChatRoomForRezervationMapping : ScriptBase, IMapping
         var user = data?.user?.ToString();
         var advisorId = data?.advisor?.ToString();
 
-        var prefixedName = $"{instanceKey}";
-        var aliasName = $"{instanceKey}";
+        var normalizedRoomName = NormalizeRoomName(instanceKey);
+        var prefixedName = normalizedRoomName;
+        var aliasName = normalizedRoomName;
         var topic = $"Room created by {user}";
 
         var inviteList = new List<string>();
@@ -119,4 +120,13 @@ public class CreateChatRoomForRezervationMapping : ScriptBase, IMapping
         catch { }
         return null;
     }
+
+    private string NormalizeRoomName(string raw)
+    {
+        if (string.IsNullOrWhiteSpace(raw)) return string.Empty;
+        return raw.Trim()
+            .Replace("-", string.Empty)
+            .Replace(".", string.Empty)
+            .Replace(":", string.Empty);
+    }
 }

package/{touch → morph-touch}/Workflows/src/CreatePermanentChatRoomMapping.csx

@@ -12,6 +12,11 @@ using BBT.Workflow.Definitions;
 /// </summary>
 public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
 {
+    private  readonly HashSet<string> AllowedHistoryVisibility = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
+    {
+        "shared", "invited", "joined", "world_readable"
+    };
+
     public async Task<ScriptResponse> InputHandler(WorkflowTask task, ScriptContext context)
     {
         var httpTask = task as HttpTask;
@@ -26,12 +31,20 @@ public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
 
         var instanceKey = context.Instance?.Key;
         var data = context.Instance?.Data;
-        var user = data?.user?.ToString();
-        var advisorType = data?.advisorType?.ToString() ?? "pm";
-        var advisorId = data?.advisorId?.ToString();
-
-        var prefixedName = $"{instanceKey}";
-        var aliasName = $"{instanceKey}";
+        var user = GetString(data, "user");
+        var roomType = GetString(data, "roomType");
+        var randevuKey = GetString(data, "randevuKey");
+        var advisorType = GetString(data, "advisorType") ?? "pm";
+        var advisorId = GetString(data, "advisorId");
+        var historyVisibility = NormalizeHistoryVisibility(GetString(data, "historyVisibility")) ?? "invited";
+
+        var roomName = string.Equals(roomType, "rezervation", StringComparison.OrdinalIgnoreCase) &&
+                       !string.IsNullOrWhiteSpace(randevuKey)
+            ? randevuKey.Trim()
+            : (instanceKey ?? string.Empty);
+        var normalizedRoomName = NormalizeRoomName(roomName);
+        var prefixedName = normalizedRoomName;
+        var aliasName = normalizedRoomName;
         var topic = $"Room created by {user}";
 
         var inviteList = new List<string>();
@@ -53,9 +66,10 @@ public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
             topic = topic,
             preset = "private_chat",
             visibility = "private",
-            initial_state = new[]
+            initial_state = new object[]
             {
-                new { type = "m.room.join_rules", state_key = "", content = new { join_rule = "invite" } }
+                new { type = "m.room.join_rules", state_key = "", content = new { join_rule = "invite" } },
+                new { type = "m.room.history_visibility", state_key = "", content = new { history_visibility = historyVisibility } }
             },
             invite = inviteList
         };
@@ -100,7 +114,14 @@ public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
             if (!string.IsNullOrWhiteSpace(advisorId))
                 members.Add(new { memberId = advisorId, role = "advisor" });
 
+            var memberWithoutArray = new Dictionary<string, string>();
+            if (!string.IsNullOrWhiteSpace(user))
+                memberWithoutArray[user] = "owner";
+            if (!string.IsNullOrWhiteSpace(advisorId))
+                memberWithoutArray[advisorId] = "advisor";
+
             string roomType = GetString(instanceData, "roomType");
+            string randevuKey = GetString(instanceData, "randevuKey");
             string startDateTime = GetString(instanceData, "startDateTime");
             string endDateTime = GetString(instanceData, "endDateTime");
 
@@ -113,10 +134,13 @@ public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
                     errorCode = (string)null
                 },
                 roomType,
+                randevuKey,
                 startDateTime,
                 endDateTime,
                 members = members,
-                pendingJoinUserId = advisorId
+                memberWithoutArray = memberWithoutArray,
+                pendingJoinUserId = advisorId,
+                bodyData=bodyData
             };
         }
 
@@ -137,4 +161,21 @@ public class CreatePermanentChatRoomMapping : ScriptBase, IMapping
         catch { }
         return null;
     }
+
+    private  string NormalizeHistoryVisibility(string raw)
+    {
+        if (string.IsNullOrWhiteSpace(raw)) return null;
+        var lower = raw.Trim().ToLowerInvariant();
+        if (!AllowedHistoryVisibility.Contains(lower)) return null;
+        return lower;
+    }
+
+    private string NormalizeRoomName(string raw)
+    {
+        if (string.IsNullOrWhiteSpace(raw)) return string.Empty;
+        return raw.Trim()
+            .Replace("-", string.Empty)
+            .Replace(".", string.Empty)
+            .Replace(":", string.Empty);
+    }
 }

package/morph-touch/Workflows/src/DeactivatePermanentChatRoomFromTransferMapping.csx

@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BBT.Workflow.Scripting;
+using BBT.Workflow.Definitions;
+
+/// <summary>
+/// Mapping for trigger-chat-room-deactivate DirectTriggerTask (Type 12) in the termination transfer loop.
+/// Reads permanentRoomPlan[permanentProcessedIndex] and triggers 'deactivate' on the chat-room instance.
+/// Does NOT increment permanentProcessedIndex — the subsequent StartNewPermanentChatRoomFromTransferMapping handles that.
+/// </summary>
+public class DeactivatePermanentChatRoomFromTransferMapping : ScriptBase, IMapping
+{
+    public Task<ScriptResponse> InputHandler(WorkflowTask task, ScriptContext context)
+    {
+        var triggerTask = task as DirectTriggerTask;
+        if (triggerTask == null)
+            throw new InvalidOperationException("Task must be a DirectTriggerTask");
+
+        var data = context.Instance?.Data;
+        if (data == null)
+            throw new InvalidOperationException("Instance data is required");
+
+        var permanentRoomPlan = data.permanentRoomPlan;
+        if (permanentRoomPlan == null)
+            return Task.FromResult(new ScriptResponse { Data = new { skipped = true, reason = "no-permanentRoomPlan" } });
+
+        int processedIndex = 0;
+        if (HasProperty(data, "permanentProcessedIndex"))
+            int.TryParse(data.permanentProcessedIndex?.ToString() ?? "0", out processedIndex);
+
+        var items = permanentRoomPlan as IEnumerable<object>;
+        if (items == null)
+            return Task.FromResult(new ScriptResponse { Data = new { skipped = true } });
+
+        var itemsList = items.ToList();
+        if (processedIndex >= itemsList.Count)
+            return Task.FromResult(new ScriptResponse { Data = new { skipped = true } });
+
+        dynamic currentItem = itemsList[processedIndex];
+        var chatRoomKey = currentItem?.chatRoomKey?.ToString();
+
+        if (string.IsNullOrEmpty(chatRoomKey))
+            return Task.FromResult(new ScriptResponse { Data = new { skipped = true } });
+
+        triggerTask.SetDomain("morph-touch");
+        triggerTask.SetFlow("chat-room");
+        triggerTask.SetKey(chatRoomKey);
+        triggerTask.SetTransitionName("deactivate");
+        triggerTask.SetBody(new Dictionary<string, object>());
+
+        return Task.FromResult(new ScriptResponse());
+    }
+
+    public Task<ScriptResponse> OutputHandler(ScriptContext context)
+    {
+        var data = context.Instance?.Data;
+        bool success = context.Body?.isSuccess == true;
+
+        var result = new Dictionary<string, object>();
+        CopyIfPresent(result, data, "transferPlan");
+        CopyIfPresent(result, data, "validationResult");
+        CopyIfPresent(result, data, "sourceAdvisorId");
+        CopyIfPresent(result, data, "advisorType");
+        CopyIfPresent(result, data, "startDate");
+        CopyIfPresent(result, data, "endDate");
+        CopyIfPresent(result, data, "transferType");
+        CopyIfPresent(result, data, "enrichedRezervations");
+        CopyIfPresent(result, data, "rezChatRoomPlan");
+        CopyIfPresent(result, data, "permanentRoomPlan");
+        CopyIfPresent(result, data, "permanentChatRooms");
+        CopyIfPresent(result, data, "permanentProcessedIndex");
+
+        result["lastPermanentDeactivateSuccess"] = success;
+
+        string roomId = LookupRoomId(data);
+        if (!string.IsNullOrWhiteSpace(roomId))
+            result["lastDeactivatedRoomId"] = roomId;
+
+        return Task.FromResult(new ScriptResponse { Data = result });
+    }
+
+    private string LookupRoomId(dynamic data)
+    {
+        if (data == null) return null;
+        try
+        {
+            var permanentRoomPlan = data.permanentRoomPlan;
+            if (permanentRoomPlan == null) return null;
+
+            int processedIndex = 0;
+            if (HasProperty(data, "permanentProcessedIndex"))
+                int.TryParse(data.permanentProcessedIndex?.ToString() ?? "0", out processedIndex);
+
+            var items = permanentRoomPlan as IEnumerable<object>;
+            if (items == null) return null;
+
+            var itemsList = items.ToList();
+            if (processedIndex >= itemsList.Count) return null;
+
+            dynamic currentItem = itemsList[processedIndex];
+            var chatRoomKey = currentItem?.chatRoomKey?.ToString();
+            if (string.IsNullOrEmpty(chatRoomKey)) return null;
+
+            if (!HasProperty(data, "permanentChatRooms") || data.permanentChatRooms == null)
+                return null;
+
+            foreach (var room in data.permanentChatRooms)
+            {
+                var key = room?.chatRoomKey?.ToString();
+                if (string.Equals(key, chatRoomKey, StringComparison.OrdinalIgnoreCase))
+                    return room?.roomId?.ToString();
+            }
+        }
+        catch { }
+        return null;
+    }
+
+    private void CopyIfPresent(Dictionary<string, object> target, dynamic source, string name)
+    {
+        if (source == null) return;
+        try
+        {
+            if (HasProperty(source, name))
+            {
+                var v = GetPropertyValue(source, name);
+                if (v != null) target[name] = v;
+            }
+        }
+        catch { }
+    }
+}

package/{touch → morph-touch}/Workflows/src/EnrichRezervationsForTransferMapping.csx

@@ -43,8 +43,8 @@ public class EnrichRezervationsForTransferMapping : ScriptBase, IMapping
                 "{\"currentState\":{\"eq\":\"in-meet\"}}" +
             "]}",
             "{\"status\":{\"eq\":\"A\"}}",
-            "{\"attributes\":{\"startDateTime\":{\"gte\":\"" + startDate + "\"}}}",
-            "{\"attributes\":{\"endDateTime\":{\"lte\":\"" + endDate + "\"}}}"
+            "{\"attributes\":{\"startDateTime\":{\"dgt\":\"" + startDate + "\"}}}",
+            "{\"attributes\":{\"endDateTime\":{\"dlt\":\"" + endDate + "\"}}}"
         };
 
         var filterJson = "{\"and\":[" + string.Join(",", conditions) + "]}";
@@ -226,7 +226,20 @@ public class EnrichRezervationsForTransferMapping : ScriptBase, IMapping
             result["enrichedRezervations"] = enriched;
             result["rezervations"] = new List<object>();
             result["absenceEntries"] = new List<object>();
-            result["allAdvisorKeys"] = new List<string>();
+            // Preserve keys from fetch-advisors-for-transfer (previously cleared, so GET instances always showed []).
+            var preservedAdvisorKeys = new List<string>();
+            var incomingKeys = data?.allAdvisorKeys;
+            if (incomingKeys != null)
+            {
+                foreach (var ak in incomingKeys)
+                {
+                    if (ak == null) continue;
+                    var s = ak.ToString();
+                    if (!string.IsNullOrEmpty(s))
+                        preservedAdvisorKeys.Add(s);
+                }
+            }
+            result["allAdvisorKeys"] = preservedAdvisorKeys;
 
             return Task.FromResult(new ScriptResponse
             {

package/{touch → morph-touch}/Workflows/src/ExecutePermanentChatRoomUpdateMapping.csx

@@ -8,8 +8,7 @@ using BBT.Workflow.Definitions;
 /// <summary>
 /// Mapping for execute-permanent-chatroom-update DirectTriggerTask (Type 12).
 /// Processes one permanent chat room at a time from permanentRoomPlan.
-/// Termination (transferType == "termination") → triggers 'transfer' transition (old advisor out, new in).
-/// Annual Leave (transferType == "annual-leave") → triggers 'update' transition (add new advisor, keep old).
+/// Triggers chat-room 'update' (new advisor + historyVisibility) for both annual-leave and termination.
 /// </summary>
 public class ExecutePermanentChatRoomUpdateMapping : ScriptBase, IMapping
 {
@@ -42,26 +41,16 @@ public class ExecutePermanentChatRoomUpdateMapping : ScriptBase, IMapping
         dynamic currentItem = itemsList[processedIndex];
         var chatRoomKey = currentItem?.chatRoomKey?.ToString();
         var targetAdvisor = currentItem?.targetAdvisor?.ToString();
+        var historyVisibility = NormalizeHistoryVisibility(GetString(currentItem, "historyVisibility"));
 
         if (string.IsNullOrEmpty(chatRoomKey) || string.IsNullOrEmpty(targetAdvisor))
             return Task.FromResult(new ScriptResponse { Data = new { skipped = true } });
 
-        var transferType = GetString(data, "transferType");
-
-        triggerTask.SetDomain("touch");
+        triggerTask.SetDomain("morph-touch");
         triggerTask.SetFlow("chat-room");
         triggerTask.SetKey(chatRoomKey);
-
-        if (transferType == "termination")
-        {
-            triggerTask.SetTransitionName("transfer");
-            triggerTask.SetBody(new { newAdvisorId = targetAdvisor });
-        }
-        else
-        {
-            triggerTask.SetTransitionName("update");
-            triggerTask.SetBody(new { newMemberId = targetAdvisor });
-        }
+        triggerTask.SetTransitionName("update");
+        triggerTask.SetBody(new { newMemberId = targetAdvisor, historyVisibility });
 
         return Task.FromResult(new ScriptResponse());
     }
@@ -69,7 +58,8 @@ public class ExecutePermanentChatRoomUpdateMapping : ScriptBase, IMapping
     public Task<ScriptResponse> OutputHandler(ScriptContext context)
     {
         var data = context.Instance?.Data;
-        var success = context.Body?.isSuccess == true;
+
+        bool success = context.Body?.isSuccess == true;
 
         int processedIndex = 0;
         if (data != null && HasProperty(data, "permanentProcessedIndex"))
@@ -87,12 +77,27 @@ public class ExecutePermanentChatRoomUpdateMapping : ScriptBase, IMapping
         CopyIfPresent(result, data, "rezChatRoomPlan");
         CopyIfPresent(result, data, "permanentRoomPlan");
         CopyIfPresent(result, data, "permanentChatRooms");
-        result["permanentProcessedIndex"] = processedIndex + 1;
+
+        if (success)
+            result["permanentProcessedIndex"] = processedIndex + 1;
+        else
+            CopyIfPresent(result, data, "permanentProcessedIndex");
+
         result["lastPermanentChatRoomSuccess"] = success;
 
         return Task.FromResult(new ScriptResponse { Data = result });
     }
 
+    private static string NormalizeHistoryVisibility(string raw)
+    {
+        if (string.IsNullOrWhiteSpace(raw))
+            return "shared";
+        var lower = raw.Trim().ToLowerInvariant();
+        if (lower == "shared" || lower == "invited" || lower == "joined" || lower == "world_readable")
+            return lower;
+        return "shared";
+    }
+
     private string GetString(dynamic obj, string name)
     {
         if (obj == null) return null;

package/{touch → morph-touch}/Workflows/src/ExecuteRezChatRoomTransferMapping.csx

@@ -44,7 +44,7 @@ public class ExecuteRezChatRoomTransferMapping : ScriptBase, IMapping
         if (string.IsNullOrEmpty(chatRoomKey) || string.IsNullOrEmpty(targetAdvisor))
             return Task.FromResult(new ScriptResponse { Data = new { skipped = true } });
 
-        triggerTask.SetDomain("touch");
+        triggerTask.SetDomain("morph-touch");
         triggerTask.SetFlow("chat-room");
         triggerTask.SetKey(chatRoomKey);
         triggerTask.SetTransitionName("transfer");

package/{touch → morph-touch}/Workflows/src/ExecuteTransferMapping.csx

@@ -8,7 +8,8 @@ using BBT.Workflow.Definitions;
 /// <summary>
 /// Mapping for execute-rezervation-transfer task (StartTask - Type 11).
 /// Processes ONE transfer item at a time using processedIndex counter.
-/// Each invocation starts a rezervation-update subflow instance for a single rezervation.
+/// Each invocation starts an add-participant-to-rezervation subflow for a single rezervation.
+/// transferPlan.targetAdvisor is reused as the invited participant Matrix user id (newUserId).
 /// The self-loop pattern in validating state calls this repeatedly until all items are processed.
 ///
 /// IMPORTANT: processedIndex increment happens in OutputHandler.
@@ -46,22 +47,22 @@ public class ExecuteTransferMapping : ScriptBase, IMapping
 
         dynamic currentItem = itemsList[processedIndex];
         var rezervationKey = currentItem.rezervationKey?.ToString();
-        var targetAdvisor = currentItem.targetAdvisor?.ToString();
+        // Schema field name kept for UI/validation; value is the new participant Matrix user id.
+        var newUserId = currentItem.targetAdvisor?.ToString();
 
-        if (string.IsNullOrEmpty(rezervationKey) || string.IsNullOrEmpty(targetAdvisor))
+        if (string.IsNullOrEmpty(rezervationKey) || string.IsNullOrEmpty(newUserId))
             return Task.FromResult(new ScriptResponse { Data = new { transferSkipped = true } });
 
         var parentKey = context.Instance?.Key ?? DateTime.UtcNow.Ticks.ToString();
         var instanceKey = CreateShortKey(parentKey, rezervationKey);
 
-        startTask.SetDomain("touch");
-        startTask.SetFlow("rezervation-update");
+        startTask.SetDomain("morph-touch");
+        startTask.SetFlow("add-participant-to-rezervation");
         startTask.SetKey(instanceKey);
         startTask.SetBody(new
         {
             randevuKey = rezervationKey,
-            targetAdvisor = targetAdvisor,
-            autoProcess = true
+            newUserId = newUserId
         });
 
         return Task.FromResult(new ScriptResponse
@@ -70,7 +71,8 @@ public class ExecuteTransferMapping : ScriptBase, IMapping
             {
                 processedIndex = processedIndex + 1,
                 currentTransferKey = rezervationKey,
-                currentTargetAdvisor = targetAdvisor
+                currentNewUserId = newUserId,
+                currentTargetAdvisor = newUserId
             }
         });
     }
@@ -88,7 +90,7 @@ public class ExecuteTransferMapping : ScriptBase, IMapping
 
         var transferPlan = data?.transferPlan;
         string currentTransferKey = null;
-        string currentTargetAdvisor = null;
+        string currentNewUserId = null;
 
         if (transferPlan != null)
         {
@@ -100,7 +102,7 @@ public class ExecuteTransferMapping : ScriptBase, IMapping
                 {
                     dynamic currentItem = itemsList[processedIndex];
                     currentTransferKey = currentItem?.rezervationKey?.ToString();
-                    currentTargetAdvisor = currentItem?.targetAdvisor?.ToString();
+                    currentNewUserId = currentItem?.targetAdvisor?.ToString();
                 }
             }
         }
@@ -116,9 +118,10 @@ public class ExecuteTransferMapping : ScriptBase, IMapping
         CopyIfPresent(result, data, "enrichedRezervations");
         result["processedIndex"] = processedIndex + 1;
         result["currentTransferKey"] = currentTransferKey;
-        result["currentTargetAdvisor"] = currentTargetAdvisor;
+        result["currentNewUserId"] = currentNewUserId;
+        result["currentTargetAdvisor"] = currentNewUserId;
         result["lastTransferSuccess"] = success;
-        result["lastTransferError"] = !success ? (context.Body?.errorMessage?.ToString() ?? "Transfer execution failed") : null;
+        result["lastTransferError"] = !success ? (context.Body?.errorMessage?.ToString() ?? "Add participant execution failed") : null;
 
         return Task.FromResult(new ScriptResponse
         {