Merge branch 'feature/room-combination-change-in-progress-lockout' of https://github.com/PepperDash/Essentials into feature/room-combination-change-in-progress-lockout

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

README.md

@@ -54,6 +54,38 @@ Utilization of Essentials Framework falls into the following categories:
 
 For detailed documentation, see the [Wiki](https://github.com/PepperDash/EssentialsFramework/wiki).
 
+## Room Combiner Operation Lifecycle
+
+Essentials room combiner now exposes an operation lifecycle that clients can use to show progress and terminal status during scenario changes.
+
+Lifecycle states:
+- Idle
+- InProgress
+- Completed
+- Failed
+- TimedOut
+
+The lifecycle is exposed on room combiners that implement the operation-status extension and is included in app server combiner messages under the combinationOperation payload.
+
+Configuration:
+- combinationOperationTimeoutSeconds (optional): timeout in seconds for an in-progress operation.
+- Default when omitted: 300 seconds.
+- Values less than or equal to 0 are treated as invalid and fall back to the default.
+
+Example room combiner properties:
+
+```json
+{
+	"defaultToManualMode": false,
+	"defaultScenarioKey": "divided",
+	"combinationOperationTimeoutSeconds": 30,
+	"roomKeys": ["roomA", "roomB"]
+}
+```
+
+Operational note:
+- When an operation reaches a terminal state (Completed, Failed, TimedOut), the operation timeout timer is stopped.
+
 ## Support
 
 * Check out our [Discord Server](https://discord.gg/rWyeRH3K)

src/Directory.Build.props

@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
-    <Version>2.42.1-local</Version>
+    <Version>2.29.0-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>
     <Product>PepperDash Essentials</Product>
-    <Copyright>Copyright © 2026</Copyright>
+    <Copyright>Copyright ©  2025</Copyright>
     <RepositoryUrl>https://github.com/PepperDash/Essentials</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>Crestron; 4series</PackageTags>
@@ -20,7 +20,4 @@
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath=""/>
     <None Include="..\..\README.md" Pack="true" PackagePath=""/>
   </ItemGroup>
-  <ItemGroup>
-    <AssemblyMetadata Include="PackageId" Value="$(PackageId)" />
-  </ItemGroup>
 </Project>

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -151,8 +151,6 @@ namespace PepperDash.Core
         // Thread-safety lock for state changes
         private readonly object _stateLock = new object();
 
-        private volatile bool _isProgramStopping;
-
         private bool disconnectLogged = false;
 
         /// <summary>
@@ -209,9 +207,11 @@ namespace PepperDash.Core
         {
             if (programEventType == eProgramStatusEventType.Stopping)
             {
-                _isProgramStopping = true;
-                this.LogDebug("Program stopping. Closing connection");
-                Disconnect();
+                if (client != null)
+                {
+                    this.LogDebug("Program stopping. Closing connection");
+                    Disconnect();
+                }
             }
         }
 
@@ -228,12 +228,6 @@ namespace PepperDash.Core
                 return;
             }
 
-            if (_isProgramStopping)
-            {
-                this.LogDebug("Skipping connect because program is stopping");
-                return;
-            }
-
             ConnectEnabled = true;
 
             try
@@ -293,7 +287,13 @@ namespace PepperDash.Core
                     }
                     catch (SshConnectionException e)
                     {
-                        var ie = e.InnerException; // The details are inside, when present - remote can close the connection with no inner exception at all
+                        var ie = e.InnerException; // The details are inside!!
+
+                        if (ie is SocketException)
+                        {
+                            this.LogError("CONNECTION failure: Cannot reach host");
+                            this.LogVerbose(ie, "Exception details: ");
+                        }
 
                         if (ie is System.Net.Sockets.SocketException socketException)
                         {
@@ -301,20 +301,20 @@ namespace PepperDash.Core
                                 Hostname, Port);
                             this.LogVerbose(socketException, "SocketException details: ");
                         }
-                        else if (ie is SshAuthenticationException)
+                        if (ie is SshAuthenticationException)
                         {
                             this.LogError("Authentication failure for username {userName}", Username);
                             this.LogVerbose(ie, "AuthenticationException details: ");
                         }
                         else
                         {
-                            this.LogError("Error on connect: {error}", ie?.Message ?? e.Message);
-                            this.LogVerbose(ie ?? e, "Exception details: ");
+                            this.LogError("Error on connect: {error}", ie.Message);
+                            this.LogVerbose(ie, "Exception details: ");
                         }
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -326,7 +326,7 @@ namespace PepperDash.Core
 
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -338,7 +338,7 @@ namespace PepperDash.Core
                         this.LogVerbose(e, "Exception details: ");
                         disconnectLogged = true;
                         KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                        if (AutoReconnect)
                         {
                             this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                             StartReconnectTimer();
@@ -473,7 +473,7 @@ namespace PepperDash.Core
                 {
                     connectLock.Release();
                 }
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
+                if (AutoReconnect && ConnectEnabled)
                 {
                     this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
                     StartReconnectTimer();
@@ -516,10 +516,7 @@ namespace PepperDash.Core
                 this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
-                {
-                    StartReconnectTimer();
-                }
+                StartReconnectTimer();
             }
             catch (Exception ex)
             {
@@ -552,10 +549,7 @@ namespace PepperDash.Core
                 this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
                 KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                if (AutoReconnect && ConnectEnabled && !_isProgramStopping)
-                {
-                    StartReconnectTimer();
-                }
+                StartReconnectTimer();
             }
             catch (Exception ex)
             {

src/PepperDash.Core/PepperDash.Core.csproj

@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />

src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs

@@ -39,8 +39,6 @@ namespace PepperDash.Essentials.Core
 
         ICec Port;
 
-        bool _cecSubscribed;
-
         /// <summary>
         /// Constructor
         /// </summary>
@@ -56,7 +54,7 @@ namespace PepperDash.Essentials.Core
             {
                 Port = postActivationFunc(config);
 
-                TryEnsureCecSubscription();
+                Port.StreamCec.CecChange += StreamCec_CecChange;
             });
         }
 
@@ -70,29 +68,7 @@ namespace PepperDash.Essentials.Core
         {
             Port = port;
 
-            TryEnsureCecSubscription();
-        }
-
-        /// <summary>
-        /// Subscribes to the CEC change event once <see cref="ICec.StreamCec"/> is available.
-        /// Safe to call repeatedly; the subscription is only wired a single time.
-        /// If StreamCec is null during construction, this is retried when send methods invoke
-        /// this method later.
-        /// </summary>
-        void TryEnsureCecSubscription()
-        {
-            if (_cecSubscribed)
-                return;
-
-            if (Port?.StreamCec == null)
-            {
-                Debug.LogMessage(LogEventLevel.Warning, this, "StreamCec is not available; CEC feedback is deferred until the device is ready");
-                return;
-            }
-
             Port.StreamCec.CecChange += new CecChangeEventHandler(StreamCec_CecChange);
-            _cecSubscribed = true;
-            Debug.LogMessage(LogEventLevel.Information, this, "Subscribed to CEC feedback");
         }
 
         void StreamCec_CecChange(Cec cecDevice, CecEventArgs args)
@@ -128,9 +104,8 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public void SendText(string text)
         {
-            if (Port?.StreamCec == null)
+            if (Port == null)
                 return;
-            TryEnsureCecSubscription();
             this.PrintSentText(text);
             Port.StreamCec.Send.StringValue = text;
         }
@@ -140,9 +115,8 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         public void SendBytes(byte[] bytes)
         {
-            if (Port?.StreamCec == null)
+            if (Port == null)
                 return;
-            TryEnsureCecSubscription();
             var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
             this.PrintSentBytes(bytes);
             Debug.LogMessage(LogEventLevel.Information, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));

src/PepperDash.Essentials.Core/Config/Essentials/ConfigReader.cs

@@ -135,14 +135,12 @@ namespace PepperDash.Essentials.Core.Config
                     {
                         var parsedConfig = JObject.Parse(fs.ReadToEnd());
 
-                        // A config is v1 if it has separate "system" and "template" nodes that
-                        // need to be merged. A v2 config is already merged by the Portal API and
-                        // will not have "system"/"template" nodes. This is independent of whether
-                        // a "versions" node is present, which only carries version metadata and
-                        // can appear on either a v1 or v2 config.
-                        var isV1Config = parsedConfig["system"] != null && parsedConfig["template"] != null;
+                        // Check if it's a v2 config (check for "version" node)
+                        // this means it's already merged by the Portal API
+                        // from the v2 config tool
+                        var isV2Config = parsedConfig["versions"] != null;
                         
-                        if (!isV1Config)
+                        if (isV2Config)
                         {
                             Debug.LogMessage(LogEventLevel.Information, "Config file is a v2 format, no merge necessary.");
                             ConfigObject = parsedConfig.ToObject<EssentialsConfig>();
@@ -150,8 +148,6 @@ namespace PepperDash.Essentials.Core.Config
                             return true;
                         }
 
-                        Debug.LogMessage(LogEventLevel.Information, "Config file is a v1 format, merging system and template.");
-
                         // Extract SystemUrl and TemplateUrl into final config output
                         ConfigObject = PortalConfigReader.MergeConfigs(parsedConfig).ToObject<EssentialsConfig>();
 
@@ -164,13 +160,6 @@ namespace PepperDash.Essentials.Core.Config
                         {
                             ConfigObject.TemplateUrl = parsedConfig["template_url"].Value<string>();
                         }
-
-                        // MergeConfigs does not carry the "versions" node forward, so it must be
-                        // applied separately to ensure it's preserved in the merged config.
-                        if (parsedConfig["versions"] != null)
-                        {
-                            ConfigObject.Versions = parsedConfig["versions"].ToObject<VersionData>();
-                        }
                     }
 
                     Debug.LogMessage(LogEventLevel.Information, "Successfully Loaded Merged Config");

src/PepperDash.Essentials.Core/Config/Essentials/EssentialsConfig.cs

@@ -105,7 +105,6 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Gets or sets the Versions
         /// </summary>
-        [JsonProperty("versions")]
         public VersionData Versions { get; set; }
 
         /// <summary>
@@ -135,25 +134,12 @@ namespace PepperDash.Essentials.Core.Config
         [JsonProperty("packages")]
         public List<NugetVersion> Packages { get; set; }
 
-        /// <summary>
-        /// Gets or sets the touchpanel wrapper app version
-        /// </summary>
-        [JsonProperty("touchpanelWrapperApp")]
-        public NugetVersion TouchpanelWrapperApp { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of user interface packages
-        /// </summary>
-        [JsonProperty("userInterfaces")]
-        public List<NugetVersion> UserInterfaces { get; set; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="VersionData"/> class.
         /// </summary>
         public VersionData()
         {
             Packages = new List<NugetVersion>();
-            UserInterfaces = new List<NugetVersion>();
         }
     }
 
@@ -171,20 +157,8 @@ namespace PepperDash.Essentials.Core.Config
         /// <summary>
         /// Gets or sets the PackageId
         /// </summary>
-        [JsonProperty("packageId", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("packageId")]
         public string PackageId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the RepoUrl
-        /// </summary>
-        [JsonProperty("repoUrl", NullValueHandling = NullValueHandling.Ignore)]
-        public string RepoUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the human-readable name
-        /// </summary>
-        [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
-        public string Name { get; set; }
     }
 
     /// <summary>

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasWirelessSharing.cs

@@ -1,5 +1,5 @@
 using System;
-
+using PepperDash.Core;
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
     /// <summary>

src/PepperDash.Essentials.Core/DeviceTypeInterfaces/INetworkSwitchControl.cs

@@ -80,7 +80,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
     }
 
     /// <summary>
-    /// Enumeration of network switch port state change event types (e.g. VLAN changes or PoE state changes).
+    /// Event arguments for port state changes on a network switch, such as VLAN changes or PoE state changes.
     /// </summary>
     public enum NetworkSwitchPortEventType
     {
@@ -95,7 +95,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         VlanChangeInProgress,
 
         /// <summary>
-        /// Indicates that the access VLAN on a port has changed, either through a successful call to SetPortVlan or an external change detected by polling.
+        /// Indicates that the access VLAN on a port has changed, either through a successful call to SetPortVlan
         /// </summary>
         VlanChanged,
 
@@ -105,7 +105,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         PoeDisableInProgress,
 
         /// <summary>
-        /// Indicates that PoE has been disabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
+        /// Indicates that the PoE state on a port has changed, either through a successful call to SetPortPoeState
         /// </summary>
         PoEDisabled,
 
@@ -115,7 +115,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
         PoeEnableInProgress,
 
         /// <summary>
-        /// Indicates that PoE has been enabled on the port, either through a successful call to SetPortPoeState or an external change detected by polling.
+        /// Indicates that the PoE state on a port has changed, either through a successful call to SetPortPoeState
         /// </summary>
         PoEEnabled
     }

src/PepperDash.Essentials.Core/Devices/IHasDspPresetSave.cs

@@ -1,14 +0,0 @@
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Defines the contract for IHasDspPresetSave
-    /// </summary>
-    public interface IHasDspPresetSave : IDspPresets
-    {
-        /// <summary>
-        /// Saves the preset by key
-        /// </summary>
-        /// <param name="key">key of preset to save</param>
-        void SavePreset(string key);
-    }
-}

src/PepperDash.Essentials.Core/PartitionSensor/EssentialsPartitionController.cs

@@ -30,7 +30,7 @@ namespace PepperDash.Essentials.Core
             {
                 if (IsInAutoMode)
                 {
-                    return _partitionSensor.PartitionPresentFeedback.BoolValue;
+                    return _partitionSensor?.PartitionPresentFeedback?.BoolValue ?? _partitionPresent;
                 }
 
                 return _partitionPresent;

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -25,7 +25,7 @@
     <DocumentationFile>bin\$(Configuration)\PepperDash_Essentials_Core.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombiner.cs

@@ -5,6 +5,7 @@ using Serilog.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -17,7 +18,7 @@ namespace PepperDash.Essentials.Core
     /// combinations  based on partition states and predefined scenarios. It supports both automatic and manual modes 
     /// for managing room combinations. In automatic mode, the device determines the current room  combination scenario
     /// based on partition sensor states. In manual mode, scenarios can be set  explicitly by the user.</remarks>
-    public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombiner
+    public class EssentialsRoomCombiner : EssentialsDevice, IEssentialsRoomCombinerWithOperationStatus
     {
         private EssentialsRoomCombinerPropertiesConfig _propertiesConfig;
 
@@ -75,10 +76,29 @@ namespace PepperDash.Essentials.Core
 
         private CTimer _scenarioChangeDebounceTimer;
 
+        private CTimer _combinationOperationTimeoutTimer;
+
         private int _scenarioChangeDebounceTimeSeconds = 10; // default to 10s
 
+        private const int DefaultCombinationOperationTimeoutSeconds = 300;
+
+        private int _combinationOperationTimeoutSeconds = DefaultCombinationOperationTimeoutSeconds;
+
         private Mutex _scenarioChange = new Mutex();
 
+        private readonly object _combinationOperationLock = new object();
+
+        private readonly List<IKeyed> _operationStatusProviderDevices = new List<IKeyed>();
+
+        private string _pendingCompletionOperationId;
+
+        private string _pendingCompletionScenarioKey;
+
+        private CombinationOperationStatus _combinationOperation = new CombinationOperationStatus
+        {
+            State = CombinationOperationState.Idle
+        };
+
         /// <summary>
         /// Initializes a new instance of the <see cref="EssentialsRoomCombiner"/> class, which manages room combination
         /// scenarios and partition states.
@@ -105,6 +125,12 @@ namespace PepperDash.Essentials.Core
                 _scenarioChangeDebounceTimeSeconds = _propertiesConfig.ScenarioChangeDebounceTimeSeconds;
             }
 
+            if (_propertiesConfig.CombinationOperationTimeoutSeconds.HasValue
+                && _propertiesConfig.CombinationOperationTimeoutSeconds.Value > 0)
+            {
+                _combinationOperationTimeoutSeconds = _propertiesConfig.CombinationOperationTimeoutSeconds.Value;
+            }
+
             IsInAutoModeFeedback = new BoolFeedback(() => _isInAutoMode);
 
             // default to auto mode
@@ -133,6 +159,8 @@ namespace PepperDash.Essentials.Core
             // connected and initialized
             DeviceManager.AllDevicesInitialized += (o, a) =>
             {
+                InitializeOperationStatusProviders();
+
                 if (IsInAutoMode)
                 {
                     DetermineRoomCombinationScenario();
@@ -256,13 +284,19 @@ namespace PepperDash.Essentials.Core
 
         private async Task ChangeScenario(IRoomCombinationScenario newScenario)
         {
+            if (newScenario == _currentScenario)
+            {
+                return;
+            }
 
+            var operationId = SetCombinationOperationStatus(
+                CombinationOperationState.InProgress,
+                newScenario != null ? newScenario.Key : null,
+                null,
+                true);
 
-                if (newScenario == _currentScenario)
-                {
-                    return;
-                }
-
+            try
+            {
                 // Deactivate the old scenario first
                 if (_currentScenario != null)
                 {
@@ -281,7 +315,20 @@ namespace PepperDash.Essentials.Core
 
                 RoomCombinationScenarioChanged?.Invoke(this, new EventArgs());
 
+                TryCompleteCombinationOperationIfReady(
+                    operationId,
+                    _currentScenario != null ? _currentScenario.Key : null);
+            }
+            catch (Exception ex)
+            {
+                this.LogException(ex, "Error changing room combination scenario");
 
+                TrySetCombinationOperationTerminalStatus(
+                    operationId,
+                    CombinationOperationState.Failed,
+                    newScenario != null ? newScenario.Key : null,
+                    "Combination operation failed");
+            }
         }
 
         #region IEssentialsRoomCombiner Members
@@ -293,6 +340,11 @@ namespace PepperDash.Essentials.Core
         /// changes. Subscribers can use this event to update their logic or UI based on the new scenario.</remarks>
         public event EventHandler<EventArgs> RoomCombinationScenarioChanged;
 
+        /// <summary>
+        /// Occurs when the room combination operation status changes.
+        /// </summary>
+        public event EventHandler<EventArgs> CombinationOperationStatusChanged;
+
         /// <summary>
         /// Gets the current room combination scenario.
         /// </summary>
@@ -304,6 +356,20 @@ namespace PepperDash.Essentials.Core
             }
         }
 
+        /// <summary>
+        /// Gets the current room combination operation status.
+        /// </summary>
+        public CombinationOperationStatus CombinationOperation
+        {
+            get
+            {
+                lock (_combinationOperationLock)
+                {
+                    return CloneCombinationOperationStatus(_combinationOperation);
+                }
+            }
+        }
+
         /// <summary>
         /// Gets or sets the IsInAutoModeFeedback
         /// </summary>
@@ -455,6 +521,299 @@ namespace PepperDash.Essentials.Core
         }
 
         #endregion
+
+        private string SetCombinationOperationStatus(
+            CombinationOperationState state,
+            string scenarioKey,
+            string message,
+            bool resetStartedUtc)
+        {
+            string operationId;
+
+            lock (_combinationOperationLock)
+            {
+                if (resetStartedUtc)
+                {
+                    _combinationOperation = new CombinationOperationStatus
+                    {
+                        OperationId = Guid.NewGuid().ToString(),
+                        ScenarioKey = scenarioKey,
+                        StartedUtc = DateTime.UtcNow.ToString("o"),
+                        State = state,
+                        Message = message
+                    };
+                }
+                else
+                {
+                    _combinationOperation.ScenarioKey = scenarioKey ?? _combinationOperation.ScenarioKey;
+                    _combinationOperation.State = state;
+                    _combinationOperation.Message = message;
+                }
+
+                if (state == CombinationOperationState.InProgress)
+                {
+                    _pendingCompletionOperationId = null;
+                    _pendingCompletionScenarioKey = null;
+                }
+
+                operationId = _combinationOperation.OperationId;
+            }
+
+            if (state == CombinationOperationState.InProgress)
+            {
+                StartCombinationOperationTimeout(operationId);
+            }
+            else if (state == CombinationOperationState.Completed
+                || state == CombinationOperationState.Failed
+                || state == CombinationOperationState.TimedOut
+                || state == CombinationOperationState.Idle)
+            {
+                StopCombinationOperationTimeout();
+            }
+
+            CombinationOperationStatusChanged?.Invoke(this, EventArgs.Empty);
+
+            return operationId;
+        }
+
+        private void TrySetCombinationOperationTerminalStatus(
+            string operationId,
+            CombinationOperationState state,
+            string scenarioKey,
+            string message)
+        {
+            var statusUpdated = false;
+
+            lock (_combinationOperationLock)
+            {
+                if (_combinationOperation == null
+                    || !string.Equals(_combinationOperation.OperationId, operationId, StringComparison.Ordinal)
+                    || _combinationOperation.State != CombinationOperationState.InProgress)
+                {
+                    return;
+                }
+
+                _combinationOperation.ScenarioKey = scenarioKey ?? _combinationOperation.ScenarioKey;
+                _combinationOperation.State = state;
+                _combinationOperation.Message = message;
+                _pendingCompletionOperationId = null;
+                _pendingCompletionScenarioKey = null;
+                statusUpdated = true;
+            }
+
+            if (!statusUpdated)
+            {
+                return;
+            }
+
+            StopCombinationOperationTimeout();
+            CombinationOperationStatusChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void StartCombinationOperationTimeout(string operationId)
+        {
+            StopCombinationOperationTimeout();
+
+            if (_combinationOperationTimeoutSeconds <= 0 || string.IsNullOrEmpty(operationId))
+            {
+                return;
+            }
+
+            _combinationOperationTimeoutTimer = new CTimer(
+                _ => HandleCombinationOperationTimeout(operationId),
+                _combinationOperationTimeoutSeconds * 1000);
+        }
+
+        private void StopCombinationOperationTimeout()
+        {
+            if (_combinationOperationTimeoutTimer == null)
+            {
+                return;
+            }
+
+            _combinationOperationTimeoutTimer.Dispose();
+            _combinationOperationTimeoutTimer = null;
+        }
+
+        private void HandleCombinationOperationTimeout(string operationId)
+        {
+            TrySetCombinationOperationTerminalStatus(
+                operationId,
+                CombinationOperationState.TimedOut,
+                null,
+                "Combination operation timed out");
+        }
+
+        private void InitializeOperationStatusProviders()
+        {
+            _operationStatusProviderDevices.Clear();
+
+            foreach (var device in DeviceManager.AllDevices)
+            {
+                if (IsOperationStatusProviderDevice(device))
+                {
+                    _operationStatusProviderDevices.Add(device);
+                    SubscribeToOperationStatusProviderChanged(device);
+                }
+            }
+
+            this.LogDebug("Room combiner {combinerKey} found {providerCount} post-combination status provider(s)", Key, _operationStatusProviderDevices.Count);
+        }
+
+        private static bool IsOperationStatusProviderDevice(object device)
+        {
+            if (device == null)
+            {
+                return false;
+            }
+
+            var type = device.GetType();
+
+            var roomCombinerKeyProperty = type.GetProperty("RoomCombinerKey", BindingFlags.Instance | BindingFlags.Public);
+            var scenarioReconciledProperty = type.GetProperty("ScenarioReconciled", BindingFlags.Instance | BindingFlags.Public);
+            var scenarioReconciledScenarioKeyProperty = type.GetProperty("ScenarioReconciledScenarioKey", BindingFlags.Instance | BindingFlags.Public);
+
+            return roomCombinerKeyProperty != null
+                && roomCombinerKeyProperty.PropertyType == typeof(string)
+                && roomCombinerKeyProperty.CanRead
+                && scenarioReconciledProperty != null
+                && scenarioReconciledProperty.PropertyType == typeof(bool)
+                && scenarioReconciledProperty.CanRead
+                && scenarioReconciledScenarioKeyProperty != null
+                && scenarioReconciledScenarioKeyProperty.PropertyType == typeof(string)
+                && scenarioReconciledScenarioKeyProperty.CanRead;
+        }
+
+        private void SubscribeToOperationStatusProviderChanged(object device)
+        {
+            var eventInfo = device.GetType().GetEvent("ScenarioReconciledChanged", BindingFlags.Instance | BindingFlags.Public);
+            if (eventInfo == null)
+            {
+                return;
+            }
+
+            if (eventInfo.EventHandlerType != typeof(EventHandler<EventArgs>))
+            {
+                this.LogDebug("Room combiner {combinerKey} skipping provider event subscription for {providerType}: unsupported event type {eventType}", Key, device.GetType().Name, eventInfo.EventHandlerType);
+                return;
+            }
+
+            eventInfo.AddEventHandler(device, new EventHandler<EventArgs>(OperationStatusProvider_ScenarioReconciledChanged));
+        }
+
+        private void OperationStatusProvider_ScenarioReconciledChanged(object sender, EventArgs e)
+        {
+            TryCompletePendingCombinationOperation();
+        }
+
+        private void TryCompletePendingCombinationOperation()
+        {
+            string operationId;
+            string scenarioKey;
+
+            lock (_combinationOperationLock)
+            {
+                operationId = _pendingCompletionOperationId;
+                scenarioKey = _pendingCompletionScenarioKey;
+            }
+
+            if (string.IsNullOrEmpty(operationId))
+            {
+                return;
+            }
+
+            TryCompleteCombinationOperationIfReady(operationId, scenarioKey);
+        }
+
+        private void TryCompleteCombinationOperationIfReady(string operationId, string scenarioKey)
+        {
+            if (string.IsNullOrEmpty(operationId))
+            {
+                return;
+            }
+
+            if (!AreOperationStatusProvidersSatisfied(scenarioKey))
+            {
+                lock (_combinationOperationLock)
+                {
+                    if (_combinationOperation != null
+                        && string.Equals(_combinationOperation.OperationId, operationId, StringComparison.Ordinal)
+                        && _combinationOperation.State == CombinationOperationState.InProgress)
+                    {
+                        _pendingCompletionOperationId = operationId;
+                        _pendingCompletionScenarioKey = scenarioKey;
+                    }
+                }
+
+                return;
+            }
+
+            TrySetCombinationOperationTerminalStatus(
+                operationId,
+                CombinationOperationState.Completed,
+                scenarioKey,
+                null);
+        }
+
+        private bool AreOperationStatusProvidersSatisfied(string scenarioKey)
+        {
+            var matchingProviders = _operationStatusProviderDevices
+                .Where(d => string.Equals(GetStringPropertyValue(d, "RoomCombinerKey"), Key, StringComparison.OrdinalIgnoreCase))
+                .ToList();
+
+            if (!matchingProviders.Any())
+            {
+                return true;
+            }
+
+            foreach (var provider in matchingProviders)
+            {
+                var providerScenarioReconciled = GetBoolPropertyValue(provider, "ScenarioReconciled");
+                var providerScenarioKey = GetStringPropertyValue(provider, "ScenarioReconciledScenarioKey");
+
+                if (!providerScenarioReconciled
+                    || !string.Equals(providerScenarioKey, scenarioKey, StringComparison.OrdinalIgnoreCase))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static string GetStringPropertyValue(object target, string propertyName)
+        {
+            var propertyInfo = target.GetType().GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public);
+            return propertyInfo != null ? propertyInfo.GetValue(target, null) as string : null;
+        }
+
+        private static bool GetBoolPropertyValue(object target, string propertyName)
+        {
+            var propertyInfo = target.GetType().GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public);
+            if (propertyInfo == null || propertyInfo.PropertyType != typeof(bool))
+            {
+                return false;
+            }
+
+            return (bool)propertyInfo.GetValue(target, null);
+        }
+
+        private static CombinationOperationStatus CloneCombinationOperationStatus(CombinationOperationStatus status)
+        {
+            if (status == null)
+            {
+                return null;
+            }
+
+            return new CombinationOperationStatus
+            {
+                OperationId = status.OperationId,
+                ScenarioKey = status.ScenarioKey,
+                StartedUtc = status.StartedUtc,
+                State = status.State,
+                Message = status.Message
+            };
+        }
     }
 
     /// <summary>

src/PepperDash.Essentials.Core/Room/Combining/EssentialsRoomCombinerPropertiesConfig.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials.Core
     {
         /// <summary>
         /// Gets or sets a value indicating whether the system operates in automatic mode.
-        /// <remarks>Some systems don't have partitions sensors, and show shouldn't allow auto mode to be turned on. When this is true in the configuration, 
+        /// <remarks>Some systems don't have partitions sensors, and shouldn't allow auto mode to be turned on. When this is true in the configuration, 
         /// auto mode won't be allowed to be turned on.</remarks>
         /// </summary>
         [JsonProperty("disableAutoMode")]
@@ -54,6 +54,13 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         [JsonProperty("scenarioChangeDebounceTimeSeconds")]
         public int ScenarioChangeDebounceTimeSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timeout, in seconds, for room combination operations.
+        /// When null or less than or equal to zero, the default timeout is used.
+        /// </summary>
+        [JsonProperty("combinationOperationTimeoutSeconds", NullValueHandling = NullValueHandling.Ignore)]
+        public int? CombinationOperationTimeoutSeconds { get; set; }
     }
 
     /// <summary>

src/PepperDash.Essentials.Core/Room/Combining/IEssentialsRoomCombiner.cs

@@ -16,12 +16,14 @@ namespace PepperDash.Essentials.Core
         /// </summary>
         event EventHandler<EventArgs> RoomCombinationScenarioChanged;
 
+
         /// <summary>
         /// The current room combination scenario
         /// </summary>
         [JsonProperty("currentScenario")]
         IRoomCombinationScenario CurrentScenario { get; }
 
+
         /// <summary>
         /// When true, indicates the current mode is auto mode
         /// </summary>
@@ -85,6 +87,56 @@ namespace PepperDash.Essentials.Core
         void SetRoomCombinationScenario(string scenarioKey);
     }
 
+    /// <summary>
+    /// Optional extension for room combiners that provide operation lifecycle status.
+    /// </summary>
+    public interface IEssentialsRoomCombinerWithOperationStatus : IEssentialsRoomCombiner
+    {
+        /// <summary>
+        /// Indicates that the room combination operation status has changed.
+        /// </summary>
+        event EventHandler<EventArgs> CombinationOperationStatusChanged;
+
+        /// <summary>
+        /// Gets the current room combination operation status.
+        /// </summary>
+        [JsonProperty("combinationOperation")]
+        CombinationOperationStatus CombinationOperation { get; }
+    }
+
+    /// <summary>
+    /// Defines lifecycle states for a room combination operation.
+    /// </summary>
+    public enum CombinationOperationState
+    {
+        Idle,
+        InProgress,
+        Completed,
+        Failed,
+        TimedOut
+    }
+
+    /// <summary>
+    /// Represents room combination operation status details.
+    /// </summary>
+    public class CombinationOperationStatus
+    {
+        [JsonProperty("operationId", NullValueHandling = NullValueHandling.Ignore)]
+        public string OperationId { get; set; }
+
+        [JsonProperty("scenarioKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string ScenarioKey { get; set; }
+
+        [JsonProperty("startedUtc", NullValueHandling = NullValueHandling.Ignore)]
+        public string StartedUtc { get; set; }
+
+        [JsonProperty("state")]
+        public CombinationOperationState State { get; set; }
+
+        [JsonProperty("message", NullValueHandling = NullValueHandling.Ignore)]
+        public string Message { get; set; }
+    }
+
     /// <summary>
     /// Represents a scenario for combining rooms, including activation, deactivation, and associated state.
     /// </summary>

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -348,9 +348,9 @@ namespace PepperDash.Essentials.Core
                 var sources = DeviceManager.AllDevices.OfType<IRoutingOutputs>()
                     .Where(d => !(d is IRoutingInputsOutputs)).ToList();
 
-                foreach (var sink in sinks)
+                foreach (var sink in sinks.Where(d => !(d is IRoutingInputsOutputs)))
                 {
-                    foreach (var source in sources)
+                    foreach (var source in sources.Where(d => !(d is IRoutingInputsOutputs)))
                     {
                         foreach (var inputPort in sink.InputPorts)
                         {

src/PepperDash.Essentials.Core/Secrets/SecretsManager.cs

@@ -368,7 +368,6 @@ namespace PepperDash.Essentials.Core
 
             var key = args[1];
 
-            provider.SetSecret(key, "");
             response = provider.SetSecret(key, "")
                 ? $"Secret successfully deleted for {provider.Key}:{key}"
                 : $"Unable to delete secret for {provider.Key}:{key}";

src/PepperDash.Essentials.Core/Web/EssentialsWebApi.cs

@@ -95,11 +95,6 @@ namespace PepperDash.Essentials.Core.Web
                     Name = "ReportVersions",
                     RouteHandler = new ReportVersionsRequestHandler()
                 },
-                new HttpCwsRoute("packageManifest")
-                {
-                    Name = "GetPackageManifest",
-                    RouteHandler = new GetPackageManifestRequestHandler()
-                },
                 new HttpCwsRoute("appdebug")
                 {
                     Name = "AppDebug",

src/PepperDash.Essentials.Core/Web/RequestHandlers/DebugSessionRequestHandler.cs

@@ -187,11 +187,12 @@ namespace PepperDash.Essentials.Core.Web.RequestHandlers
                 _portForwardTimeoutTimer?.Dispose();
                 _portForwardTimeoutTimer = new CTimer(_ =>
                 {
-                    if (Debug.WebsocketSink.HasActiveConnections)
-                    {
-                        Debug.LogMessage(LogEventLevel.Debug, "Debug websocket has active connections; keeping port forward");
-                        return;
-                    }
+					if (Debug.WebsocketSink.HasActiveConnections)
+					{
+						Debug.LogMessage(LogEventLevel.Debug, "Debug websocket has active connections; keeping port forward");
+						StartPortForwardTimeout(port, csIp);
+						return;
+					}
 
                     Debug.LogMessage(LogEventLevel.Information, "No debug websocket connection within 30 seconds; removing port forward for port {0}", port);
 

src/PepperDash.Essentials.Core/Web/RequestHandlers/GetPackageManifestRequestHandler.cs

@@ -1,259 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using Crestron.SimplSharp.WebScripting;
-using Newtonsoft.Json;
-using PepperDash.Core.Web.RequestHandlers;
-using PepperDash.Essentials.Core.Config;
-
-namespace PepperDash.Essentials.Core.Web.RequestHandlers
-{
-	/// <summary>
-	/// Represents a GetPackageManifestRequestHandler
-	/// </summary>
-	public class GetPackageManifestRequestHandler : WebApiBaseRequestHandler
-	{
-		/// <summary>
-		/// Constructor
-		/// </summary>
-		/// <remarks>
-		/// base(true) enables CORS support by default
-		/// </remarks>
-		public GetPackageManifestRequestHandler()
-			: base(true)
-		{
-		}
-
-		/// <summary>
-		/// Handles GET method requests
-		/// </summary>
-		/// <param name="context"></param>
-		protected override void HandleGet(HttpCwsContext context)
-		{
-			try
-			{
-				var result = CloneVersionData(ConfigReader.ConfigObject?.Versions) ?? new VersionData();
-
-				PopulateEssentials(result);
-				PopulatePackages(result);
-
-				var js = JsonConvert.SerializeObject(result, Formatting.Indented);
-
-				context.Response.StatusCode = 200;
-				context.Response.StatusDescription = "OK";
-				context.Response.ContentType = "application/json";
-				context.Response.ContentEncoding = System.Text.Encoding.UTF8;
-				context.Response.Write(js, false);
-				context.Response.End();
-			}
-			catch (Exception ex)
-			{
-				PepperDash.Core.Debug.LogMessage(ex, "Exception handling GET /packageManifest request");
-				context.Response.StatusCode = 500;
-				context.Response.StatusDescription = "Internal Server Error";
-				context.Response.End();
-			}
-		}
-
-		/// <summary>
-		/// Deep-copies the config's VersionData so the live config object is never mutated
-		/// </summary>
-		private static VersionData CloneVersionData(VersionData source)
-		{
-			if (source == null)
-			{
-				return null;
-			}
-
-			var json = JsonConvert.SerializeObject(source);
-			return JsonConvert.DeserializeObject<VersionData>(json);
-		}
-
-		/// <summary>
-		/// Enriches (or creates) the essentials entry from the loaded PepperDash.Essentials.Core assembly
-		/// </summary>
-		private static void PopulateEssentials(VersionData result)
-		{
-			var essentials = result.Essentials ?? new NugetVersion();
-
-			essentials.Version = Global.AssemblyVersion;
-
-			// The main program assembly (PackageId "PepperDashEssentials") is what's actually published
-			// to NuGet, but this handler lives in PepperDash.Essentials.Core, which can't reference that
-			// project's types directly (Essentials -> Core, not the reverse). PluginLoader.EssentialsAssembly.Assembly
-			// is unreliable (often left null - see PluginLoader.SetEssentialsAssembly), so look it up
-			// directly from the loaded AppDomain by its Directory.Build.props-embedded PackageId metadata
-			// (every project's .csproj sets its own PackageId explicitly), falling back to this handler's
-			// own (Core) assembly if it can't be found.
-			var essentialsAssembly = AppDomain.CurrentDomain.GetAssemblies()
-				.FirstOrDefault(a => string.Equals(GetAssemblyMetadataValue(a, "PackageId"), "PepperDashEssentials", StringComparison.OrdinalIgnoreCase))
-				?? typeof(GetPackageManifestRequestHandler).Assembly;
-
-			var repoUrl = TrimTrailingGit(GetAssemblyMetadataValue(essentialsAssembly, "RepositoryUrl"));
-			if (!string.IsNullOrEmpty(repoUrl))
-			{
-				essentials.RepoUrl = repoUrl;
-			}
-
-			var name = GetAssemblyProduct(essentialsAssembly);
-			if (!string.IsNullOrEmpty(name))
-			{
-				essentials.Name = name;
-			}
-
-			// Prefer the PackageId embedded via Directory.Build.props' AssemblyMetadata item (the
-			// authoritative source, matching the actual published PackageId) over any config-supplied
-			// or hardcoded value.
-			var reflectedPackageId = GetAssemblyMetadataValue(essentialsAssembly, "PackageId");
-			if (!string.IsNullOrEmpty(reflectedPackageId))
-			{
-				essentials.PackageId = reflectedPackageId;
-			}
-			else if (string.IsNullOrEmpty(essentials.PackageId))
-			{
-				essentials.PackageId = "PepperDashEssentials";
-			}
-
-			result.Essentials = essentials;
-		}
-
-		/// <summary>
-		/// Merges reflection data from loaded plugin assemblies with the config's packages list
-		/// </summary>
-		private static void PopulatePackages(VersionData result)
-		{
-			// Filter out null entries defensively - the packages list is deserialized from user-editable
-			// config JSON, so a malformed "packages": [null, ...] shouldn't throw and 500 the endpoint.
-			var configPackages = (result.Packages ?? new System.Collections.Generic.List<NugetVersion>())
-				.Where(p => p != null)
-				.ToList();
-			var matchedConfigPackages = new System.Collections.Generic.HashSet<NugetVersion>();
-			var mergedPackages = new System.Collections.Generic.List<NugetVersion>();
-
-			foreach (var loaded in PluginLoader.EssentialsPluginAssemblies.Where(a => a.Assembly != null))
-			{
-				var reflectedVersion = loaded.Version;
-				if (string.IsNullOrEmpty(reflectedVersion))
-				{
-					// Never emit an entry with no version - the extension's parser drops entries
-					// whose version isn't a string.
-					continue;
-				}
-
-				var reflectedRepoUrl = TrimTrailingGit(GetAssemblyMetadataValue(loaded.Assembly, "RepositoryUrl"));
-				var reflectedName = GetAssemblyProduct(loaded.Assembly);
-
-				// Plugins built from a Directory.Build.props that embeds
-				// <AssemblyMetadata Include="PackageId" Value="$(PackageId)" /> carry their PackageId
-				// directly - this is authoritative and should be preferred over the title/name fallback chain.
-				var reflectedPackageId = GetAssemblyMetadataValue(loaded.Assembly, "PackageId");
-
-				var assemblyTitle = GetAssemblyTitle(loaded.Assembly);
-				var assemblyName = loaded.Assembly.GetName().Name;
-				var assemblyNameNoSeriesSuffix = StripTrailingSeriesSuffix(assemblyName);
-
-				var match = configPackages.FirstOrDefault(p =>
-					!matchedConfigPackages.Contains(p) &&
-					!string.IsNullOrEmpty(p.PackageId) &&
-					(string.Equals(p.PackageId, reflectedPackageId, StringComparison.OrdinalIgnoreCase) ||
-					 string.Equals(p.PackageId, assemblyTitle, StringComparison.OrdinalIgnoreCase) ||
-					 string.Equals(p.PackageId, assemblyName, StringComparison.OrdinalIgnoreCase) ||
-					 string.Equals(p.PackageId, assemblyNameNoSeriesSuffix, StringComparison.OrdinalIgnoreCase)));
-
-				if (match != null)
-				{
-					matchedConfigPackages.Add(match);
-
-					mergedPackages.Add(new NugetVersion
-					{
-						Name = !string.IsNullOrEmpty(match.Name) ? match.Name : reflectedName,
-						RepoUrl = !string.IsNullOrEmpty(match.RepoUrl) ? match.RepoUrl : reflectedRepoUrl,
-						PackageId = !string.IsNullOrEmpty(reflectedPackageId) ? reflectedPackageId : match.PackageId,
-						Version = reflectedVersion
-					});
-				}
-				else
-				{
-					// Loaded but not present (or not matched) in config - emit the reflected PackageId
-					// when the assembly carries one, otherwise leave it null as before.
-					mergedPackages.Add(new NugetVersion
-					{
-						Name = reflectedName,
-						RepoUrl = reflectedRepoUrl,
-						PackageId = reflectedPackageId,
-						Version = reflectedVersion,						
-					});
-				}
-			}
-
-			// Configured but not currently loaded - pass through unchanged
-			mergedPackages.AddRange(configPackages.Where(p => !matchedConfigPackages.Contains(p)));
-
-			result.Packages = mergedPackages;
-		}
-
-		private static string GetAssemblyMetadataValue(Assembly assembly, string key)
-		{
-			if (assembly == null)
-			{
-				return null;
-			}
-
-			var match = assembly.GetCustomAttributes(typeof(AssemblyMetadataAttribute), false)
-				.Cast<AssemblyMetadataAttribute>()
-				.FirstOrDefault(a => string.Equals(a.Key, key, StringComparison.OrdinalIgnoreCase));
-
-			return match?.Value;
-		}
-
-		private static string GetAssemblyProduct(Assembly assembly)
-		{
-			if (assembly == null)
-			{
-				return null;
-			}
-
-			var attribute = assembly.GetCustomAttributes(typeof(AssemblyProductAttribute), false)
-				.FirstOrDefault() as AssemblyProductAttribute;
-
-			return attribute?.Product;
-		}
-
-		private static string GetAssemblyTitle(Assembly assembly)
-		{
-			if (assembly == null)
-			{
-				return null;
-			}
-
-			var attribute = assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)
-				.FirstOrDefault() as AssemblyTitleAttribute;
-
-			return attribute?.Title;
-		}
-
-		private static string StripTrailingSeriesSuffix(string assemblyName)
-		{
-			const string suffix = ".4Series";
-
-			if (string.IsNullOrEmpty(assemblyName) || !assemblyName.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
-			{
-				return assemblyName;
-			}
-
-			return assemblyName.Substring(0, assemblyName.Length - suffix.Length);
-		}
-
-		private static string TrimTrailingGit(string repoUrl)
-		{
-			const string suffix = ".git";
-
-			if (string.IsNullOrEmpty(repoUrl) || !repoUrl.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
-			{
-				return repoUrl;
-			}
-
-			return repoUrl.Substring(0, repoUrl.Length - suffix.Length);
-		}
-	}
-}

src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftController.cs

@@ -152,15 +152,6 @@ namespace PepperDash.Essentials.Devices.Common.Shades
 
         private void IsCoolingDownFeedback_OutputChange(object sender, FeedbackEventArgs e)
         {
-            if (Config.DisableAutoRaiseOnPowerOff)
-            {
-                this.LogDebug(
-                    "Auto-raise on power-off disabled for {type}; leaving position unchanged (manual control only)",
-                    Type
-                );
-                return;
-            }
-
             if (
                 !DisplayDevice.IsCoolingDownFeedback.BoolValue
                 && Type == eScreenLiftControlType.lift
@@ -183,15 +174,6 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         {
             if (DisplayDevice.IsWarmingUpFeedback.BoolValue)
             {
-                if (Config.DisableAutoLowerOnPowerOn)
-                {
-                    this.LogDebug(
-                        "Auto-lower on power-on disabled for {type}; leaving position unchanged (manual control only)",
-                        Type
-                    );
-                    return;
-                }
-
                 Lower();
             }
         }

src/PepperDash.Essentials.Devices.Common/Displays/ScreenLiftControllerConfigProperties.cs

@@ -41,23 +41,5 @@ namespace PepperDash.Essentials.Devices.Common.Shades
         /// </summary>
         [JsonProperty("muteOnScreenUp")]
         public bool MuteOnScreenUp { get; set; }
-
-        /// <summary>
-        /// When true, this controller does NOT automatically lower when its assigned display powers on
-        /// (warms up). Manual Raise/Lower still work, and the power-off auto-raise is unaffected. Intended
-        /// for a projector screen that must not auto-drop in a public space for safety, while the projector
-        /// lift (a separate controller) can still drop automatically.
-        /// </summary>
-        [JsonProperty("disableAutoLowerOnPowerOn")]
-        public bool DisableAutoLowerOnPowerOn { get; set; }
-
-        /// <summary>
-        /// When true, this controller does NOT automatically raise when its assigned display powers off
-        /// (cools down). Manual Raise/Lower still work, and the power-on auto-lower is unaffected. The
-        /// companion to <see cref="DisableAutoLowerOnPowerOn"/>; together they make a controller fully
-        /// manual while leaving other controllers (e.g. the lift) on their default automatic behavior.
-        /// </summary>
-        [JsonProperty("disableAutoRaiseOnPowerOff")]
-        public bool DisableAutoRaiseOnPowerOff { get; set; }
     }
 }

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -29,6 +29,6 @@
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
     /// The interfaces implmented by the device sending the messsage
     /// </summary>
     [JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)]
-    [Obsolete("Interfaces are no longer supported and will be removed in a future release. Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
+    [Obsolete("Interfaces is no longer supported and will be removed in a future release.  Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
     public List<string> Interfaces { get; private set; }
 
     /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IEssentialsRoomCombinerMessenger.cs

@@ -21,6 +21,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
     {
         private readonly IEssentialsRoomCombiner _roomCombiner;
 
+        private readonly IEssentialsRoomCombinerWithOperationStatus _roomCombinerWithOperationStatus;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="IEssentialsRoomCombinerMessenger"/> class,  which facilitates
         /// messaging for an <see cref="IEssentialsRoomCombiner"/> instance.
@@ -35,6 +37,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
             : base(key, messagePath, roomCombiner as IKeyName)
         {
             _roomCombiner = roomCombiner;
+            _roomCombinerWithOperationStatus = roomCombiner as IEssentialsRoomCombinerWithOperationStatus;
         }
 
         /// <summary>
@@ -98,6 +101,19 @@ namespace PepperDash.Essentials.AppServer.Messengers
                 SendFullStatus();
             };
 
+            if (_roomCombinerWithOperationStatus != null)
+            {
+                _roomCombinerWithOperationStatus.CombinationOperationStatusChanged += (sender, args) =>
+                {
+                    var message = new
+                    {
+                        combinationOperation = _roomCombinerWithOperationStatus.CombinationOperation
+                    };
+
+                    PostStatusMessage(JToken.FromObject(message));
+                };
+            }
+
             _roomCombiner.IsInAutoModeFeedback.OutputChange += (sender, args) =>
             {
                 var message = new
@@ -138,6 +154,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
                     DisableAutoMode = _roomCombiner.DisableAutoMode,
                     IsInAutoMode = _roomCombiner.IsInAutoMode,
                     CurrentScenario = _roomCombiner.CurrentScenario,
+                    CombinationOperation = _roomCombinerWithOperationStatus != null ? _roomCombinerWithOperationStatus.CombinationOperation : null,
                     Rooms = rooms,
                     RoomCombinationScenarios = _roomCombiner.RoomCombinationScenarios,
                     Partitions = _roomCombiner.Partitions
@@ -194,6 +211,12 @@ namespace PepperDash.Essentials.AppServer.Messengers
         [JsonProperty("currentScenario", NullValueHandling = NullValueHandling.Ignore)]
         public IRoomCombinationScenario CurrentScenario { get; set; }
 
+        /// <summary>
+        /// Gets or sets the room combination operation status.
+        /// </summary>
+        [JsonProperty("combinationOperation", NullValueHandling = NullValueHandling.Ignore)]
+        public CombinationOperationStatus CombinationOperation { get; set; }
+
         /// <summary>
         /// Gets or sets the collection of rooms associated with the entity.
         /// </summary>

src/PepperDash.Essentials.MobileControl.Messengers/PepperDash.Essentials.MobileControl.Messengers.csproj

@@ -33,7 +33,7 @@
     <Compile Remove="Messengers\SIMPLVtcMessenger.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Core\PepperDash.Core.csproj" />

src/PepperDash.Essentials.MobileControl/ConnectedClientVersionInfo.cs

@@ -1,61 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace PepperDash.Essentials
-{
-    /// <summary>
-    /// Represents the version information reported by a connected Mobile Control UI client
-    /// </summary>
-    public class ConnectedClientVersionInfo
-    {
-        /// <summary>
-        /// Gets or sets the client id
-        /// </summary>
-        [JsonProperty("clientId")]
-        public string ClientId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the room key the client joined
-        /// </summary>
-        [JsonProperty("roomKey")]
-        public string RoomKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the touchpanel key the client joined as, if any
-        /// </summary>
-        [JsonProperty("touchpanelKey")]
-        public string TouchpanelKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the app version reported by the client (e.g. the React app's build-time APP_VERSION)
-        /// </summary>
-        [JsonProperty("appVersion")]
-        public string AppVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the expected app version from the system config's versions.touchpanelWrapperApp, if configured
-        /// </summary>
-        [JsonProperty("expectedAppVersion")]
-        public string ExpectedAppVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the UTC time the client last reported this version
-        /// </summary>
-        [JsonProperty("lastSeen")]
-        public DateTime LastSeen { get; set; }
-
-        /// <summary>
-        /// Returns a copy of this instance, safe for callers outside the owning lock to hold/mutate
-        /// without affecting the internally tracked instance
-        /// </summary>
-        public ConnectedClientVersionInfo Clone() => new ConnectedClientVersionInfo
-        {
-            ClientId = ClientId,
-            RoomKey = RoomKey,
-            TouchpanelKey = TouchpanelKey,
-            AppVersion = AppVersion,
-            ExpectedAppVersion = ExpectedAppVersion,
-            LastSeen = LastSeen
-        };
-    }
-}

src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs

@@ -69,32 +69,11 @@ namespace PepperDash.Essentials
         private readonly Dictionary<string, IMobileControlMessenger> _defaultMessengers =
             new Dictionary<string, IMobileControlMessenger>();
 
-        private readonly Dictionary<string, ConnectedClientVersionInfo> _connectedClientVersions =
-            new Dictionary<string, ConnectedClientVersionInfo>(StringComparer.InvariantCultureIgnoreCase);
-
-        private readonly object _connectedClientVersionsLock = new object();
-
         /// <summary>
         /// Get the custom messengers with subscriptions
         /// </summary>
         public ReadOnlyDictionary<string, IMobileControlMessengerWithSubscriptions> Messengers => new ReadOnlyDictionary<string, IMobileControlMessengerWithSubscriptions>(_messengers.Values.OfType<IMobileControlMessengerWithSubscriptions>().ToDictionary(k => k.Key, v => v));
 
-        /// <summary>
-        /// Gets the most recently reported UI app version for each connected client, keyed by clientId
-        /// </summary>
-        public ReadOnlyDictionary<string, ConnectedClientVersionInfo> ConnectedClientVersions
-        {
-            get
-            {
-                lock (_connectedClientVersionsLock)
-                {
-                    return new ReadOnlyDictionary<string, ConnectedClientVersionInfo>(
-                        _connectedClientVersions.ToDictionary(kv => kv.Key, kv => kv.Value.Clone())
-                    );
-                }
-            }
-        }
-
         /// <summary>
         /// Get the default messengers
         /// </summary>
@@ -1803,28 +1782,6 @@ namespace PepperDash.Essentials
                     "    Not Enabled in Config.\r\n"
                 );
             }
-
-            var connectedClientVersions = ConnectedClientVersions;
-
-            if (connectedClientVersions.Count == 0)
-            {
-                CrestronConsole.ConsoleCommandResponse("\r\nUI Client App Versions: None reported yet\r\n");
-            }
-            else
-            {
-                CrestronConsole.ConsoleCommandResponse("\r\nUI Client App Versions:\r\n");
-                foreach (var kv in connectedClientVersions)
-                {
-                    var v = kv.Value;
-                    var match = string.IsNullOrEmpty(v.ExpectedAppVersion) || string.Equals(v.ExpectedAppVersion, v.AppVersion, StringComparison.OrdinalIgnoreCase);
-
-                    CrestronConsole.ConsoleCommandResponse(
-                        $"  Client: {v.ClientId}  Touchpanel: {v.TouchpanelKey}  Room: {v.RoomKey}\r\n" +
-                        $"    Reported: {v.AppVersion}  Expected: {(string.IsNullOrEmpty(v.ExpectedAppVersion) ? "(not configured)" : v.ExpectedAppVersion)}  Match: {(match ? "Yes" : "NO - MISMATCH")}\r\n" +
-                        $"    Last Seen (UTC): {v.LastSeen:yyyy-MM-dd HH:mm:ss}\r\n"
-                    );
-                }
-            }
         }
 
         /// <summary>
@@ -2224,8 +2181,6 @@ namespace PepperDash.Essentials
             var roomKey = content["roomKey"].Value<string>();
             var touchpanelKey = content.SelectToken("touchpanelKey");
 
-            TrackClientAppVersion(clientId, roomKey, touchpanelKey?.Value<string>(), content.SelectToken("appVersion")?.Value<string>());
-
             if (_roomCombiner == null)
             {
                 var message = new MobileControlMessage
@@ -2297,50 +2252,6 @@ namespace PepperDash.Essentials
             SendTouchpanelKey(clientId, touchpanelKey);
         }
 
-        /// <summary>
-        /// Records the app version reported by a connecting UI client (e.g. the mobile control React app's
-        /// build-time APP_VERSION) and compares it against the configured versions.touchpanelWrapperApp version.
-        /// </summary>
-        private void TrackClientAppVersion(string clientId, string roomKey, string touchpanelKey, string appVersion)
-        {
-            if (string.IsNullOrEmpty(appVersion))
-            {
-                return;
-            }
-
-            var expectedVersion = ConfigReader.ConfigObject?.Versions?.TouchpanelWrapperApp?.Version;
-
-            var info = new ConnectedClientVersionInfo
-            {
-                ClientId = clientId,
-                RoomKey = roomKey,
-                TouchpanelKey = touchpanelKey,
-                AppVersion = appVersion,
-                ExpectedAppVersion = expectedVersion,
-                LastSeen = DateTime.UtcNow
-            };
-
-            lock (_connectedClientVersionsLock)
-            {
-                _connectedClientVersions[clientId] = info;
-            }
-
-            if (!string.IsNullOrEmpty(expectedVersion) && !string.Equals(expectedVersion, appVersion, StringComparison.OrdinalIgnoreCase))
-            {
-                this.LogWarning(
-                    "Client {clientId} (touchpanel {touchpanelKey}) reported UI app version {appVersion}, which does not match configured versions.touchpanelWrapperApp version {expectedVersion}",
-                    clientId, touchpanelKey, appVersion, expectedVersion
-                );
-            }
-            else
-            {
-                this.LogVerbose(
-                    "Client {clientId} (touchpanel {touchpanelKey}) reported UI app version {appVersion}",
-                    clientId, touchpanelKey, appVersion
-                );
-            }
-        }
-
         private void SendTouchpanelKey(string clientId, JToken touchpanelKeyToken)
         {
             if (touchpanelKeyToken == null)

src/PepperDash.Essentials.MobileControl/PepperDash.Essentials.MobileControl.csproj

@@ -38,7 +38,7 @@
     <Compile Remove="RoomBridges\SourceDeviceMapDictionary.cs" />
   </ItemGroup>  
   <ItemGroup>    
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>

src/PepperDash.Essentials.MobileControl/Touchpanel/MobileControlTouchpanelController.cs

@@ -25,28 +25,11 @@ namespace PepperDash.Essentials.Touchpanel
     /// Mobile Control touchpanel controller that provides app control, Zoom integration, 
     /// and mobile control functionality for Crestron touchpanels.
     /// </summary>
-    public class MobileControlTouchpanelController : TouchpanelBase, IHasFeedback, ITswAppControl, ITswZoomControl, IDeviceInfoProvider, IMobileControlCrestronTouchpanelController, ITheme, ICommunicationMonitor
+    public class MobileControlTouchpanelController : TouchpanelBase, IHasFeedback, ITswAppControl, ITswZoomControl, IDeviceInfoProvider, IMobileControlCrestronTouchpanelController, ITheme
     {
         private readonly MobileControlTouchpanelProperties localConfig;
         private IMobileControlRoomMessenger _bridge;
 
-        /// <summary>
-        /// Gets the CommunicationMonitor tracking the panel's online/offline state
-        /// </summary>
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        private sealed class NullCommunicationMonitor : StatusMonitorBase
-        {
-            public NullCommunicationMonitor(IKeyed parent) : base(parent, 120000, 300000)
-            {
-                Status = MonitorStatus.InError;
-                Message = "Panel is not initialized";
-            }
-
-            public override void Start() { }
-            public override void Stop() { }
-        }
-
         private string _appUrl;
 
         /// <summary>
@@ -145,11 +128,6 @@ namespace PepperDash.Essentials.Touchpanel
         {
             localConfig = config;
 
-            if (panel != null)
-            {
-                CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, panel, 120000, 300000);
-            }
-
             AddPostActivationAction(SubscribeForMobileControlUpdates);
 
             ThemeFeedback = new StringFeedback($"{Key}-theme", () => Theme);
@@ -388,8 +366,6 @@ namespace PepperDash.Essentials.Touchpanel
         /// </summary>
         public override bool CustomActivate()
         {
-            CommunicationMonitor?.Start();
-
             var appMessenger = new ITswAppControlMessenger($"appControlMessenger-{Key}", $"/device/{Key}", this);
 
             var zoomMessenger = new ITswZoomControlMessenger($"zoomControlMessenger-{Key}", $"/device/{Key}", this);
@@ -417,17 +393,6 @@ namespace PepperDash.Essentials.Touchpanel
             return base.CustomActivate();
         }
 
-        /// <summary>
-        /// Stops the CommunicationMonitor on deactivation.
-        /// </summary>
-        /// <returns>True if deactivation was successful; otherwise, false.</returns>
-        public override bool Deactivate()
-        {
-            CommunicationMonitor?.Stop();
-
-            return base.Deactivate();
-        }
-
         /// <summary>
         /// Handles device extender signal changes for system reserved signals.
         /// </summary>
@@ -554,8 +519,15 @@ namespace PepperDash.Essentials.Touchpanel
                 return false;
             }) ? csIpAddress.ToString() : processorIp;
 
-            // replace the host but preserve whatever scheme (http/https) is already present in the URL
-            var updatedUrl = Regex.Replace(url, @"^(https?)://[^:/]+", $"$1://{ip}");
+            var match = Regex.Match(url, @"^http://([^:/]+):\d+/mc/app\?token=.+$");
+            if (match.Success)
+            {
+                string ipa = match.Groups[1].Value;
+                // ip will be "192.168.1.100"
+            }
+
+            // replace ipa with ip but leave the rest of the string intact
+            var updatedUrl = Regex.Replace(url, @"^http://[^:/]+", $"http://{ip}");
 
             this.LogVerbose("Updated URL: {updatedUrl}", updatedUrl);
 
@@ -768,7 +740,7 @@ namespace PepperDash.Essentials.Touchpanel
         /// </summary>
         public MobileControlTouchpanelControllerFactory()
         {
-            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mctsw1080", "mcts1080", "mcxpanel", "mcdge1000" };
+            TypeNames = new List<string>() { "mccrestronapp", "mctsw550", "mctsw750", "mctsw1050", "mctsw560", "mctsw760", "mctsw1060", "mctsw570", "mctsw770", "mcts770", "mctsw1070", "mcts1070", "mcxpanel", "mcdge1000" };
             MinimumEssentialsFrameworkVersion = "2.0.0";
 
             factories = new Dictionary<string, Func<uint, CrestronControlSystem, string, BasicTriListWithSmartObject>>
@@ -793,8 +765,6 @@ namespace PepperDash.Essentials.Touchpanel
                 {"ts770", (id, controlSystem, projectName) => new Ts770(id, controlSystem)},
                 {"tsw1070", (id, controlSystem, projectName) => new Tsw1070(id, controlSystem)},
                 {"ts1070", (id, controlSystem, projectName) => new Ts1070(id, controlSystem)},
-                {"tsw1080", (id, controlSystem, projectName) => new Tsw1080(id, controlSystem)},
-                {"ts1080", (id, controlSystem, projectName) => new Ts1080(id, controlSystem)},
                 {"dge1000", (id, controlSystem, projectName) => new Dge1000(id, controlSystem)}
             };
         }

src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs

@@ -127,16 +127,6 @@ namespace PepperDash.Essentials.WebSocketServer
         /// </summary>
         public int Port { get; private set; }
 
-        /// <summary>
-        /// Gets the HTTP scheme to use for generated URLs, based on whether the direct server is configured as secure
-        /// </summary>
-        private string HttpScheme => _parent.Config.DirectServer.Secure ? "https" : "http";
-
-        /// <summary>
-        /// Gets the WebSocket scheme to use for generated URLs, based on whether the direct server is configured as secure
-        /// </summary>
-        private string WsScheme => _parent.Config.DirectServer.Secure ? "wss" : "ws";
-
         /// <summary>
         /// Gets the user app URL prefix
         /// </summary>
@@ -144,8 +134,7 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             get
             {
-                return string.Format("{0}://{1}:{2}{3}?token=",
-                    HttpScheme,
+                return string.Format("http://{0}:{1}{2}?token=",
                     CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                     Port,
                     _userAppBaseHref);
@@ -284,7 +273,7 @@ namespace PepperDash.Essentials.WebSocketServer
             {
                 base.Initialize();
 
-                _server = new HttpServer(Port, _parent.Config.DirectServer.Secure);
+                _server = new HttpServer(Port, false);
 
                 _server.OnGet += Server_OnGet;
 
@@ -302,7 +291,7 @@ namespace PepperDash.Essentials.WebSocketServer
                     {
                         ClientCertificateRequired = false,
                         CheckCertificateRevocation = false,
-                        EnabledSslProtocols = SslProtocols.Tls12
+                        EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11
                     };
                 }
 
@@ -414,11 +403,11 @@ namespace PepperDash.Essentials.WebSocketServer
                     ip = csIpAddress.ToString();
                 }
 
-                var appUrl = $"{HttpScheme}://{ip}:{Port}/mc/app?token={touchpanel.Key}";
+                var appUrl = $"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}";
 
                 this.LogVerbose("Sending URL {appUrl} to touchpanel {touchpanelKey}", appUrl, touchpanel.Touchpanel.Key);
 
-                touchpanel.Touchpanel.SetAppUrl(appUrl);
+                touchpanel.Touchpanel.SetAppUrl($"http://{ip}:{_parent.Config.DirectServer.Port}/mc/app?token={touchpanel.Key}");
             }
         }
 
@@ -498,7 +487,7 @@ namespace PepperDash.Essentials.WebSocketServer
             {
                 var config = new MobileControlApplicationConfig
                 {
-                    ApiPath = string.Format("{0}://{1}:{2}/mc/api", HttpScheme, processorIp, Port),
+                    ApiPath = string.Format("http://{0}:{1}/mc/api", processorIp, _parent.Config.DirectServer.Port),
                     GatewayAppPath = "",
                     LogoPath = _parent.Config.ApplicationConfig?.LogoPath ?? "logo/logo.png",
                     EnableDev = _parent.Config.ApplicationConfig?.EnableDev ?? false,
@@ -1109,7 +1098,6 @@ namespace PepperDash.Essentials.WebSocketServer
                     res.StatusCode = 200;
                     res.Close();
 
-                    // remote log collector has no dedicated secure flag; keep it on http regardless of DirectServer.Secure
                     var logRequest = new HttpRequestMessage(HttpMethod.Post, $"http://{_parent.Config.DirectServer.Logging.Host}:{_parent.Config.DirectServer.Logging.Port}/logs")
                     {
                         Content = new StringContent(body, Encoding.UTF8, "application/json"),
@@ -1162,11 +1150,6 @@ namespace PepperDash.Essentials.WebSocketServer
             var qp = req.QueryString;
             var token = qp["token"];
 
-            // Each join mints a single-use clientId; the panel webview must never replay a cached
-            // response, or it reconnects forever with an already-consumed id (1008 loop).
-            res.Headers.Add("Cache-Control", "no-store");
-            res.Headers.Add("Pragma", "no-cache");
-
             this.LogVerbose("Join Room Request with token: {token}", token);
 
             byte[] body;
@@ -1230,7 +1213,8 @@ namespace PepperDash.Essentials.WebSocketServer
             this.LogVerbose("Assigning ClientId: {clientId} for token: {token} at {timestamp}", clientId, token, now);
 
             // Construct WebSocket URL with clientId query parameter
-            var wsUrl = $"{WsScheme}://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{Port}{_wsPath}{token}?clientId={clientId}";
+            var wsProtocol = "ws";
+            var wsUrl = $"{wsProtocol}://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{Port}{_wsPath}{token}?clientId={clientId}";
 
             // Construct the response object
             JoinResponse jRes = new JoinResponse
@@ -1242,8 +1226,7 @@ namespace PepperDash.Essentials.WebSocketServer
                 Config = _parent.GetConfigWithPluginVersion(),
                 CodeExpires = new DateTime().AddYears(1),
                 UserCode = bridge.UserCode,
-                UserAppUrl = string.Format("{0}://{1}:{2}/mc/app",
-                HttpScheme,
+                UserAppUrl = string.Format("http://{0}:{1}/mc/app",
                 CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0),
                 Port),
                 WebSocketUrl = wsUrl,
@@ -1268,8 +1251,6 @@ namespace PepperDash.Essentials.WebSocketServer
         {
             res.StatusCode = 200;
             res.ContentType = "application/json";
-            res.Headers.Add("Cache-Control", "no-store");
-            res.Headers.Add("Pragma", "no-cache");
             var version = new Version() { ServerVersion = _parent.GetConfigWithPluginVersion().RuntimeInfo.PluginVersion };
             var message = JsonConvert.SerializeObject(version);
             this.LogVerbose("{message}", message);

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -48,7 +48,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.274" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
     <PackageReference Include="System.IO.Compression" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>