From 25fb1097e0d7a6d54656a65a2fee7ff20915e89b Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 24 Feb 2026 01:21:44 +0200
Subject: [PATCH 01/15] hotrealod

---
 src/Try.Core/CompilationService.cs            | 11 +--
 src/Try.Core/CompileToAssemblyResult.cs       |  2 +
 src/TryMudBlazor.Client/App.razor             |  3 +-
 .../Models/TryConstants.cs                    |  1 +
 src/TryMudBlazor.Client/Pages/Repl.razor.cs   | 20 +-----
 .../Pages/UserMainPage.razor                  | 71 +++++++++++++++++++
 .../wwwroot/editor/main.js                    | 32 ++++++++-
 7 files changed, 109 insertions(+), 31 deletions(-)
 create mode 100644 src/TryMudBlazor.Client/Pages/UserMainPage.razor

diff --git a/src/Try.Core/CompilationService.cs b/src/Try.Core/CompilationService.cs
index 171b884a..7c66bdf5 100644
--- a/src/Try.Core/CompilationService.cs
+++ b/src/Try.Core/CompilationService.cs
@@ -38,12 +38,6 @@ public class CompilationService
             "@using MudBlazor"
         ];
 
-        private const string MudBlazorServices = @"
-<MudDialogProvider FullWidth=""true"" MaxWidth=""MaxWidth.ExtraSmall"" />
-<MudSnackbarProvider/>
-
-";
-
         // Creating the initial compilation + reading references is on the order of 250ms without caching
         // so making sure it doesn't happen for each run.
         private static CSharpCompilation _baseCompilation;
@@ -129,6 +123,7 @@ public async Task<CompileToAssemblyResult> CompileToAssemblyAsync(
             var codeHash = ComputeCodeHash(codeFiles);
             if (_cachedResult != null && _lastCodeHash == codeHash)
             {
+                _cachedResult.IsFromCache = true;
                 return _cachedResult;
             }
 
@@ -258,9 +253,7 @@ private async Task<IReadOnlyList<CompileToCSharpResult>> CompileToCSharpAsync(
             {
                 if (codeFile.Type == CodeFileType.Razor)
                 {
-                    var fileContent = index == 0 ? MudBlazorServices : string.Empty;
-                    fileContent += codeFile.Content;
-                    var projectItem = CreateRazorProjectItem(codeFile.Path, fileContent);
+                    var projectItem = CreateRazorProjectItem(codeFile.Path, codeFile.Content);
 
                     var codeDocument = projectEngine.ProcessDeclarationOnly(projectItem);
                     var cSharpDocument = codeDocument.GetCSharpDocument();
diff --git a/src/Try.Core/CompileToAssemblyResult.cs b/src/Try.Core/CompileToAssemblyResult.cs
index e1cbe298..a5379d21 100644
--- a/src/Try.Core/CompileToAssemblyResult.cs
+++ b/src/Try.Core/CompileToAssemblyResult.cs
@@ -10,5 +10,7 @@ public class CompileToAssemblyResult
         public IEnumerable<CompilationDiagnostic> Diagnostics { get; set; } = [];
 
         public byte[] AssemblyBytes { get; set; }
+
+        public bool IsFromCache { get; set; }
     }
 }
diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index 36693d37..4dc1a187 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -1,5 +1,4 @@
-<Router AppAssembly="@typeof(Program).Assembly"
-        AdditionalAssemblies="@(new List<System.Reflection.Assembly> { typeof(Try.UserComponents.__Main).Assembly })">
+<Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(EmptyLayout)" />
     </Found>
diff --git a/src/TryMudBlazor.Client/Models/TryConstants.cs b/src/TryMudBlazor.Client/Models/TryConstants.cs
index 44218526..4dd073a3 100644
--- a/src/TryMudBlazor.Client/Models/TryConstants.cs
+++ b/src/TryMudBlazor.Client/Models/TryConstants.cs
@@ -20,6 +20,7 @@ public static class Editor
         public static class CodeExecution
         {
             public const string UpdateUserComponentsDll = "Try.CodeExecution.updateUserComponentsDll";
+            public const string HotReloadIframe = "Try.CodeExecution.hotReloadIframe";
         }
     }
 }
diff --git a/src/TryMudBlazor.Client/Pages/Repl.razor.cs b/src/TryMudBlazor.Client/Pages/Repl.razor.cs
index 04d5521b..647ce1a4 100644
--- a/src/TryMudBlazor.Client/Pages/Repl.razor.cs
+++ b/src/TryMudBlazor.Client/Pages/Repl.razor.cs
@@ -18,7 +18,6 @@ public partial class Repl : IDisposable
     {
         [Inject] private LayoutService LayoutService { get; set; }
 
-        private const string MainComponentCodePrefix = "@page \"/__main\"\n";
         private const string MainUserPagePath = "/__main";
 
         private DotNetObjectReference<Repl> dotNetInstance;
@@ -166,19 +165,10 @@ private async Task CompileAsync()
             await Task.Yield();
 
             CompileToAssemblyResult compilationResult = null;
-            CodeFile mainComponent = null;
-            string originalMainComponentContent = null;
             try
             {
                 this.UpdateActiveCodeFileContent();
 
-                // Add the necessary main component code prefix and store the original content so we can revert right after compilation.
-                if (this.CodeFiles.TryGetValue(CoreConstants.MainComponentFilePath, out mainComponent))
-                {
-                    originalMainComponentContent = mainComponent.Content;
-                    mainComponent.Content = MainComponentCodePrefix + originalMainComponentContent.Replace(MainComponentCodePrefix, "");
-                }
-
                 compilationResult = await this.CompilationService.CompileToAssemblyAsync(
                     this.CodeFiles.Values,
                     this.UpdateLoaderTextAsync);
@@ -193,21 +183,13 @@ private async Task CompileAsync()
             }
             finally
             {
-                if (mainComponent != null)
-                {
-                    mainComponent.Content = originalMainComponentContent;
-                }
-
                 this.Loading = false;
             }
 
             if (compilationResult?.AssemblyBytes?.Length > 0)
             {
-                // Make sure the DLL is updated before reloading the user page
                 this.JsRuntime.InvokeVoid(Try.CodeExecution.UpdateUserComponentsDll, compilationResult.AssemblyBytes);
-
-                // TODO: Add error page in iframe
-                this.JsRuntime.InvokeVoid(Try.ReloadIframe, "user-page-window", MainUserPagePath);
+                this.JsRuntime.InvokeVoid(Try.CodeExecution.HotReloadIframe, "user-page-window", MainUserPagePath);
             }
         }
 
diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
new file mode 100644
index 00000000..14192b18
--- /dev/null
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -0,0 +1,71 @@
+@page "/__main"
+@using Microsoft.AspNetCore.Components
+@using Microsoft.JSInterop
+@using System.Runtime.Loader
+@using Try.UserComponents
+@inject IJSRuntime JSRuntime
+@implements IDisposable
+
+<MudDialogProvider FullWidth="true" MaxWidth="MaxWidth.ExtraSmall" />
+<MudSnackbarProvider />
+
+<DynamicComponent Type="@_type" />
+
+@code {
+    private Type _type = typeof(__Main);
+    private DotNetObjectReference<UserMainPage> _ref;
+    private AssemblyLoadContext _loadContext;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _ref = DotNetObjectReference.Create(this);
+            await JSRuntime.InvokeVoidAsync("Try.registerHotReload", _ref);
+        }
+    }
+
+    [JSInvokable]
+    public async Task HotReload()
+    {
+        try
+        {
+            var base64 = await JSRuntime.InvokeAsync<string>("sessionStorage.getItem", "TryMudBlazor.UserComponentsDllBase64");
+            if (base64 == null) return;
+
+            var bytes = Convert.FromBase64String(base64);
+
+            // Swap to a fresh collectible context; previous one becomes eligible for GC
+            // once Blazor disposes the old component instance below.
+            var previousContext = _loadContext;
+            _loadContext = new AssemblyLoadContext(name: null, isCollectible: true);
+            var assembly = _loadContext.LoadFromStream(new MemoryStream(bytes));
+            previousContext?.Unload();
+
+            // UserStartup requires DI re-registration — fall back to full iframe reload
+            if (assembly.GetType("UserStartup") != null ||
+                assembly.GetType("Try.UserComponents.UserStartup") != null)
+            {
+                await JSRuntime.InvokeVoidAsync("Try.requestFullReload", "/__main");
+                return;
+            }
+
+            var newType = assembly.GetType("Try.UserComponents.__Main");
+            if (newType != null)
+            {
+                _type = newType;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+        catch
+        {
+            await JSRuntime.InvokeVoidAsync("Try.requestFullReload", "/__main");
+        }
+    }
+
+    public void Dispose()
+    {
+        _ref?.Dispose();
+        _loadContext?.Unload();
+    }
+}
diff --git a/src/TryMudBlazor.Client/wwwroot/editor/main.js b/src/TryMudBlazor.Client/wwwroot/editor/main.js
index d1376f65..b3320832 100644
--- a/src/TryMudBlazor.Client/wwwroot/editor/main.js
+++ b/src/TryMudBlazor.Client/wwwroot/editor/main.js
@@ -70,6 +70,16 @@ function throttle(func, timeFrame, id) {
     }
 }
 
+// Listen for hot-reload signals when running inside the preview iframe
+if (window.frameElement) {
+    window.addEventListener('message', function (e) {
+        if (e.origin !== window.location.origin) return;
+        if (e.data?.type === 'hotReload' && window._hotReloadRef) {
+            window._hotReloadRef.invokeMethodAsync('HotReload');
+        }
+    });
+}
+
 window.Try = {
     initialize: function (dotNetInstance) {
         _dotNetInstance = dotNetInstance;
@@ -101,7 +111,14 @@ window.Try = {
     dispose: function () {
         _dotNetInstance = null;
         window.removeEventListener('keydown', onKeyDown);
-    }
+    },
+    registerHotReload: function (dotNetRef) {
+        window._hotReloadRef = dotNetRef;
+        window._hotReloadReady = true;
+    },
+    requestFullReload: function (src) {
+        window.parent.Try.reloadIframe('user-page-window', src);
+    },
 }
 
 window.Try.Editor = window.Try.Editor || (function () {
@@ -181,6 +198,19 @@ window.Try.CodeExecution = window.Try.CodeExecution || (function () {
     const USER_COMPONENTS_DLL_STORAGE_KEY = 'TryMudBlazor.UserComponentsDllBase64';
 
     return {
+        hotReloadIframe: function (id, fallbackSrc) {
+            const iFrame = document.getElementById(id);
+            if (!iFrame) return;
+
+            const iframeWindow = iFrame.contentWindow;
+            if (iframeWindow && iframeWindow._hotReloadReady) {
+                // Iframe is live — signal it to hot-reload from sessionStorage
+                iframeWindow.postMessage({ type: 'hotReload' }, window.location.origin);
+            } else {
+                // Iframe not yet ready (first run) — fall back to full navigation
+                Try.reloadIframe(id, fallbackSrc);
+            }
+        },
         updateUserComponentsDll: function (dllData) {
             if (!dllData) return;
 

From 5cc9d07d5c83e2433d4b27855dfc8f149fc1184a Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 24 Feb 2026 22:21:57 +0200
Subject: [PATCH 02/15] nit

---
 .../Pages/UserMainPage.razor                  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
index 14192b18..e53b989a 100644
--- a/src/TryMudBlazor.Client/Pages/UserMainPage.razor
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -1,5 +1,4 @@
 @page "/__main"
-@using Microsoft.AspNetCore.Components
 @using Microsoft.JSInterop
 @using System.Runtime.Loader
 @using Try.UserComponents
@@ -13,15 +12,19 @@
 
 @code {
     private Type _type = typeof(__Main);
-    private DotNetObjectReference<UserMainPage> _ref;
     private AssemblyLoadContext _loadContext;
+    private readonly Lazy<DotNetObjectReference<UserMainPage>> _ref;
+
+    public UserMainPage()
+    {
+        _ref = new Lazy<DotNetObjectReference<UserMainPage>>(CreateDotNetObject());
+    }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
-            _ref = DotNetObjectReference.Create(this);
-            await JSRuntime.InvokeVoidAsync("Try.registerHotReload", _ref);
+            await JSRuntime.InvokeVoidAsync("Try.registerHotReload", _ref.Value);
         }
     }
 
@@ -43,15 +46,15 @@
             previousContext?.Unload();
 
             // UserStartup requires DI re-registration — fall back to full iframe reload
-            if (assembly.GetType("UserStartup") != null ||
-                assembly.GetType("Try.UserComponents.UserStartup") != null)
+            if (assembly.GetType("UserStartup") is not null ||
+                assembly.GetType("Try.UserComponents.UserStartup") is not null)
             {
                 await JSRuntime.InvokeVoidAsync("Try.requestFullReload", "/__main");
                 return;
             }
 
             var newType = assembly.GetType("Try.UserComponents.__Main");
-            if (newType != null)
+            if (newType is not null)
             {
                 _type = newType;
                 await InvokeAsync(StateHasChanged);
@@ -65,7 +68,12 @@
 
     public void Dispose()
     {
-        _ref?.Dispose();
+        if (_ref.IsValueCreated)
+        {
+            _ref.Value.Dispose();
+        }
         _loadContext?.Unload();
     }
+
+    private DotNetObjectReference<UserMainPage> CreateDotNetObject() => DotNetObjectReference.Create(this);
 }

From de128025ee4563015b34ba6907cf523da496637f Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 10:25:16 +0200
Subject: [PATCH 03/15] Use fingerprint for blazor.webassembly.js

---
 src/TryMudBlazor.Client/TryMudBlazor.Client.csproj | 1 +
 src/TryMudBlazor.Client/wwwroot/index.html         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/TryMudBlazor.Client/TryMudBlazor.Client.csproj b/src/TryMudBlazor.Client/TryMudBlazor.Client.csproj
index d90f063e..0a38a313 100644
--- a/src/TryMudBlazor.Client/TryMudBlazor.Client.csproj
+++ b/src/TryMudBlazor.Client/TryMudBlazor.Client.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <PublishTrimmed>false</PublishTrimmed>
     <WasmEnableWebcil>true</WasmEnableWebcil>
+    <OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/TryMudBlazor.Client/wwwroot/index.html b/src/TryMudBlazor.Client/wwwroot/index.html
index 3f0ac12c..6bd2efe7 100644
--- a/src/TryMudBlazor.Client/wwwroot/index.html
+++ b/src/TryMudBlazor.Client/wwwroot/index.html
@@ -42,6 +42,7 @@
 
         gtag('config', 'G-33J60J6E14');
     </script>
+    <script type="importmap"></script>
 </head>
 
 <body class="mud-height-full">
@@ -57,7 +58,7 @@
         <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
-    <script src="_framework/blazor.webassembly.js" autostart="false"></script>
+    <script src="_framework/blazor.webassembly#[.{fingerprint}].js" autostart="false"></script>
     <script src="_content/MudBlazor/MudBlazor.min.js?v=#{CACHE_TOKEN}#"></script>
     <script src="editor/main.js?v=#{CACHE_TOKEN}#"></script>
     <script type="text/javascript">

From 85f2ba4ed1556e6c2c703ae0a02381bad630ed44 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:15:21 +0200
Subject: [PATCH 04/15] Fix NavigationManager

---
 src/TryMudBlazor.Client/App.razor             | 29 ++++++++++++++++++-
 .../Pages/UserMainPage.razor                  |  5 ++++
 src/TryMudBlazor.Client/Program.cs            |  1 +
 .../Services/UserComponentsAssemblyService.cs | 21 ++++++++++++++
 src/UserComponents/__Main.razor               |  4 +--
 5 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs

diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index 4dc1a187..416fb2f8 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -1,4 +1,10 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+@using System.Reflection
+@using TryMudBlazor.Client.Services
+@inject UserComponentsAssemblyService AssemblyService
+@implements IDisposable
+
+<Router AppAssembly="@typeof(Program).Assembly"
+        AdditionalAssemblies="@_additionalAssemblies">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(EmptyLayout)" />
     </Found>
@@ -8,3 +14,24 @@
         </LayoutView>
     </NotFound>
 </Router>
+
+@code {
+    private Assembly[] _additionalAssemblies = [];
+
+    protected override void OnInitialized()
+    {
+        _additionalAssemblies = [AssemblyService.Assembly];
+        AssemblyService.OnAssemblyChanged += HandleAssemblyChanged;
+    }
+
+    private void HandleAssemblyChanged()
+    {
+        _additionalAssemblies = [AssemblyService.Assembly];
+        InvokeAsync(StateHasChanged);
+    }
+
+    public void Dispose()
+    {
+        AssemblyService.OnAssemblyChanged -= HandleAssemblyChanged;
+    }
+}
diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
index e53b989a..cac98ca7 100644
--- a/src/TryMudBlazor.Client/Pages/UserMainPage.razor
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -2,7 +2,9 @@
 @using Microsoft.JSInterop
 @using System.Runtime.Loader
 @using Try.UserComponents
+@using TryMudBlazor.Client.Services
 @inject IJSRuntime JSRuntime
+@inject UserComponentsAssemblyService AssemblyService
 @implements IDisposable
 
 <MudDialogProvider FullWidth="true" MaxWidth="MaxWidth.ExtraSmall" />
@@ -56,6 +58,9 @@
             var newType = assembly.GetType("Try.UserComponents.__Main");
             if (newType is not null)
             {
+                // Update the Router's AdditionalAssemblies before rendering the new __Main
+                // so that any NavigateTo calls inside it can resolve user-defined @page routes.
+                AssemblyService.UpdateAssembly(assembly);
                 _type = newType;
                 await InvokeAsync(StateHasChanged);
             }
diff --git a/src/TryMudBlazor.Client/Program.cs b/src/TryMudBlazor.Client/Program.cs
index ff92e761..28e1c2e0 100644
--- a/src/TryMudBlazor.Client/Program.cs
+++ b/src/TryMudBlazor.Client/Program.cs
@@ -32,6 +32,7 @@ public static async Task Main(string[] args)
             builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
             builder.Services.AddScoped<SnippetsService>();
             builder.Services.AddSingleton(new CompilationService());
+            builder.Services.AddSingleton<UserComponentsAssemblyService>();
 
             builder.Services
                 .AddOptions<SnippetsOptions>()
diff --git a/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
new file mode 100644
index 00000000..365f3065
--- /dev/null
+++ b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
@@ -0,0 +1,21 @@
+namespace TryMudBlazor.Client.Services
+{
+    using System;
+    using System.Reflection;
+    using Try.UserComponents;
+
+    public class UserComponentsAssemblyService
+    {
+        private Assembly _assembly = typeof(__Main).Assembly;
+
+        public event Action OnAssemblyChanged;
+
+        public Assembly Assembly => _assembly;
+
+        public void UpdateAssembly(Assembly assembly)
+        {
+            _assembly = assembly;
+            OnAssemblyChanged?.Invoke();
+        }
+    }
+}
diff --git a/src/UserComponents/__Main.razor b/src/UserComponents/__Main.razor
index 0b8592f4..d2fe18d5 100644
--- a/src/UserComponents/__Main.razor
+++ b/src/UserComponents/__Main.razor
@@ -1,4 +1,2 @@
-@page "/__main"
-
-@namespace Try.UserComponents
+@namespace Try.UserComponents
 @*This serves as a stub, which is then replaced with the user's components on the fly*@
\ No newline at end of file

From c28dfe0d83e0b21198d9f2476e7488256a617bd9 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:19:49 +0200
Subject: [PATCH 05/15] nit

---
 src/TryMudBlazor.Client/App.razor             | 17 +++++++----
 .../Services/UserComponentsAssemblyService.cs | 28 ++++++++-----------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index 416fb2f8..4fc4a598 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -1,6 +1,5 @@
 @using System.Reflection
 @using TryMudBlazor.Client.Services
-@inject UserComponentsAssemblyService AssemblyService
 @implements IDisposable
 
 <Router AppAssembly="@typeof(Program).Assembly"
@@ -16,22 +15,28 @@
 </Router>
 
 @code {
-    private Assembly[] _additionalAssemblies = [];
+    private Assembly[] _additionalAssemblies;
+    private readonly UserComponentsAssemblyService _assemblyService;
+
+    public App(UserComponentsAssemblyService assemblyService)
+    {
+        _assemblyService = assemblyService;
+        assemblyService.OnAssemblyChanged += HandleAssemblyChanged;
+        _additionalAssemblies = [assemblyService.Assembly];
+    }
 
     protected override void OnInitialized()
     {
-        _additionalAssemblies = [AssemblyService.Assembly];
-        AssemblyService.OnAssemblyChanged += HandleAssemblyChanged;
     }
 
     private void HandleAssemblyChanged()
     {
-        _additionalAssemblies = [AssemblyService.Assembly];
+        _additionalAssemblies = [_assemblyService.Assembly];
         InvokeAsync(StateHasChanged);
     }
 
     public void Dispose()
     {
-        AssemblyService.OnAssemblyChanged -= HandleAssemblyChanged;
+        _assemblyService.OnAssemblyChanged -= HandleAssemblyChanged;
     }
 }
diff --git a/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
index 365f3065..9ee31d1c 100644
--- a/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
+++ b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
@@ -1,21 +1,17 @@
-namespace TryMudBlazor.Client.Services
-{
-    using System;
-    using System.Reflection;
-    using Try.UserComponents;
+using System.Reflection;
+using Try.UserComponents;
 
-    public class UserComponentsAssemblyService
-    {
-        private Assembly _assembly = typeof(__Main).Assembly;
+namespace TryMudBlazor.Client.Services;
 
-        public event Action OnAssemblyChanged;
+public class UserComponentsAssemblyService
+{
+    public event Action OnAssemblyChanged;
 
-        public Assembly Assembly => _assembly;
+    public Assembly Assembly { get; private set; } = typeof(__Main).Assembly;
 
-        public void UpdateAssembly(Assembly assembly)
-        {
-            _assembly = assembly;
-            OnAssemblyChanged?.Invoke();
-        }
+    public void UpdateAssembly(Assembly assembly)
+    {
+        Assembly = assembly;
+        OnAssemblyChanged?.Invoke();
     }
-}
+}
\ No newline at end of file

From 8001828061323067f54e453589aea156a570c51b Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:28:27 +0200
Subject: [PATCH 06/15] nit

---
 src/TryMudBlazor.Client/App.razor             | 19 ++++++----------
 .../Pages/UserMainPage.razor                  |  2 +-
 .../Services/UserComponentsAssemblyService.cs | 22 +++++++++++++++----
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index 4fc4a598..f1ce31ff 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -15,28 +15,23 @@
 </Router>
 
 @code {
-    private Assembly[] _additionalAssemblies;
-    private readonly UserComponentsAssemblyService _assemblyService;
+    private readonly Assembly[] _additionalAssemblies;
+    private readonly IDisposable _subscription;
 
     public App(UserComponentsAssemblyService assemblyService)
     {
-        _assemblyService = assemblyService;
-        assemblyService.OnAssemblyChanged += HandleAssemblyChanged;
         _additionalAssemblies = [assemblyService.Assembly];
+        _subscription = assemblyService.Subscribe(HandleAssemblyChanged);
     }
 
-    protected override void OnInitialized()
+    private Task HandleAssemblyChanged(Assembly assembly)
     {
-    }
-
-    private void HandleAssemblyChanged()
-    {
-        _additionalAssemblies = [_assemblyService.Assembly];
-        InvokeAsync(StateHasChanged);
+        _additionalAssemblies[0] = assembly;
+        return InvokeAsync(StateHasChanged);
     }
 
     public void Dispose()
     {
-        _assemblyService.OnAssemblyChanged -= HandleAssemblyChanged;
+        _subscription.Dispose();
     }
 }
diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
index cac98ca7..f69573f9 100644
--- a/src/TryMudBlazor.Client/Pages/UserMainPage.razor
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -60,7 +60,7 @@
             {
                 // Update the Router's AdditionalAssemblies before rendering the new __Main
                 // so that any NavigateTo calls inside it can resolve user-defined @page routes.
-                AssemblyService.UpdateAssembly(assembly);
+                await AssemblyService.UpdateAssemblyAsync(assembly);
                 _type = newType;
                 await InvokeAsync(StateHasChanged);
             }
diff --git a/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
index 9ee31d1c..fd191e59 100644
--- a/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
+++ b/src/TryMudBlazor.Client/Services/UserComponentsAssemblyService.cs
@@ -5,13 +5,27 @@ namespace TryMudBlazor.Client.Services;
 
 public class UserComponentsAssemblyService
 {
-    public event Action OnAssemblyChanged;
+    private readonly List<Func<Assembly, Task>> _callbacks = [];
 
     public Assembly Assembly { get; private set; } = typeof(__Main).Assembly;
 
-    public void UpdateAssembly(Assembly assembly)
+    public IDisposable Subscribe(Func<Assembly, Task> callback)
+    {
+        _callbacks.Add(callback);
+        return new Subscription(() => _callbacks.Remove(callback));
+    }
+
+    public async Task UpdateAssemblyAsync(Assembly assembly)
     {
         Assembly = assembly;
-        OnAssemblyChanged?.Invoke();
+        foreach (var callback in _callbacks)
+        {
+            await callback(assembly);
+        }
+    }
+
+    private sealed class Subscription(Action unsubscribe) : IDisposable
+    {
+        public void Dispose() => unsubscribe();
     }
-}
\ No newline at end of file
+}

From 63d3092ac02e8a8d0b883fbf55f88d9727be0925 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:32:59 +0200
Subject: [PATCH 07/15] Fix NotFound being obsolete

---
 src/TryMudBlazor.Client/App.razor            | 9 +++------
 src/TryMudBlazor.Client/Pages/NotFound.razor | 4 ++++
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 src/TryMudBlazor.Client/Pages/NotFound.razor

diff --git a/src/TryMudBlazor.Client/App.razor b/src/TryMudBlazor.Client/App.razor
index f1ce31ff..2fe6392b 100644
--- a/src/TryMudBlazor.Client/App.razor
+++ b/src/TryMudBlazor.Client/App.razor
@@ -1,17 +1,14 @@
 @using System.Reflection
+@using TryMudBlazor.Client.Pages
 @using TryMudBlazor.Client.Services
 @implements IDisposable
 
 <Router AppAssembly="@typeof(Program).Assembly"
-        AdditionalAssemblies="@_additionalAssemblies">
+        AdditionalAssemblies="@_additionalAssemblies"
+        NotFoundPage="typeof(NotFound)">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(EmptyLayout)" />
     </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(EmptyLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
 </Router>
 
 @code {
diff --git a/src/TryMudBlazor.Client/Pages/NotFound.razor b/src/TryMudBlazor.Client/Pages/NotFound.razor
new file mode 100644
index 00000000..e70ef2ad
--- /dev/null
+++ b/src/TryMudBlazor.Client/Pages/NotFound.razor
@@ -0,0 +1,4 @@
+@page "/not-found"
+@layout EmptyLayout
+
+<p>Sorry, there's nothing at this address.</p>

From 3a99acaa4bff62108ca699844ef9ef98b61b9e92 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:40:08 +0200
Subject: [PATCH 08/15] Fix when navigating to not found, and recompile

---
 src/TryMudBlazor.Client/Pages/UserMainPage.razor | 5 +++--
 src/TryMudBlazor.Client/wwwroot/editor/main.js   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
index f69573f9..1677785b 100644
--- a/src/TryMudBlazor.Client/Pages/UserMainPage.razor
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -5,7 +5,7 @@
 @using TryMudBlazor.Client.Services
 @inject IJSRuntime JSRuntime
 @inject UserComponentsAssemblyService AssemblyService
-@implements IDisposable
+@implements IAsyncDisposable
 
 <MudDialogProvider FullWidth="true" MaxWidth="MaxWidth.ExtraSmall" />
 <MudSnackbarProvider />
@@ -71,10 +71,11 @@
         }
     }
 
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
         if (_ref.IsValueCreated)
         {
+            await JSRuntime.InvokeVoidAsync("Try.unregisterHotReload");
             _ref.Value.Dispose();
         }
         _loadContext?.Unload();
diff --git a/src/TryMudBlazor.Client/wwwroot/editor/main.js b/src/TryMudBlazor.Client/wwwroot/editor/main.js
index b3320832..1e1465b7 100644
--- a/src/TryMudBlazor.Client/wwwroot/editor/main.js
+++ b/src/TryMudBlazor.Client/wwwroot/editor/main.js
@@ -116,6 +116,10 @@ window.Try = {
         window._hotReloadRef = dotNetRef;
         window._hotReloadReady = true;
     },
+    unregisterHotReload: function () {
+        window._hotReloadRef = null;
+        window._hotReloadReady = false;
+    },
     requestFullReload: function (src) {
         window.parent.Try.reloadIframe('user-page-window', src);
     },

From cbc769556f9c51d9bb063a94a9f1868f76971ee5 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 11:46:04 +0200
Subject: [PATCH 09/15] Nit

---
 .../WebAssemblyHostBuilderExtensions.cs       | 32 +++++++++++++++++++
 src/TryMudBlazor.Client/Program.cs            | 19 ++---------
 2 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 src/TryMudBlazor.Client/Extensions/WebAssemblyHostBuilderExtensions.cs

diff --git a/src/TryMudBlazor.Client/Extensions/WebAssemblyHostBuilderExtensions.cs b/src/TryMudBlazor.Client/Extensions/WebAssemblyHostBuilderExtensions.cs
new file mode 100644
index 00000000..7c30b5f2
--- /dev/null
+++ b/src/TryMudBlazor.Client/Extensions/WebAssemblyHostBuilderExtensions.cs
@@ -0,0 +1,32 @@
+using System.Reflection;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Try.UserComponents;
+
+namespace TryMudBlazor.Client.Extensions;
+
+internal static class WebAssemblyHostBuilderExtensions
+{
+    private static readonly MethodInfo ConfigureMethod = ResolveConfigureMethod();
+
+    public static void TryInvokeUserStartup(this WebAssemblyHostBuilder builder)
+        => ConfigureMethod?.Invoke(null, [builder]);
+
+    private static MethodInfo ResolveConfigureMethod()
+    {
+        var assembly = typeof(__Main).Assembly;
+
+        var startupType =
+            assembly.GetType("UserStartup", throwOnError: false, ignoreCase: true) ??
+            assembly.GetType("Try.UserComponents.UserStartup", throwOnError: false, ignoreCase: true);
+
+        var method = startupType?.GetMethod("Configure", BindingFlags.Static | BindingFlags.Public);
+        if (method is null)
+            return null;
+
+        var parameters = method.GetParameters();
+        if (parameters.Length != 1 || parameters[0].ParameterType != typeof(WebAssemblyHostBuilder))
+            return null;
+
+        return method;
+    }
+}
diff --git a/src/TryMudBlazor.Client/Program.cs b/src/TryMudBlazor.Client/Program.cs
index 28e1c2e0..22f200af 100644
--- a/src/TryMudBlazor.Client/Program.cs
+++ b/src/TryMudBlazor.Client/Program.cs
@@ -17,6 +17,7 @@ namespace TryMudBlazor.Client
     using Services.UserPreferences;
     using Try.Core;
     using Try.UserComponents;
+    using TryMudBlazor.Client.Extensions;
     using TryMudBlazor.Client.Models;
     using TryMudBlazor.Client.Services;
 
@@ -47,7 +48,7 @@ public static async Task Main(string[] args)
             var jsRuntime = GetJsRuntime();
             try
             {
-                ExecuteUserDefinedConfiguration(builder);
+                builder.TryInvokeUserStartup();
             }
             catch (Exception exception)
             {
@@ -62,22 +63,6 @@ public static async Task Main(string[] args)
             await builder.Build().RunAsync();
         }
 
-        private static void ExecuteUserDefinedConfiguration(WebAssemblyHostBuilder builder)
-        {
-            var userComponentsAssembly = typeof(__Main).Assembly;
-            var startupType = userComponentsAssembly.GetType("UserStartup", throwOnError: false, ignoreCase: true)
-                              ?? userComponentsAssembly.GetType("Try.UserComponents.UserStartup", throwOnError: false, ignoreCase: true);
-            if (startupType == null)
-                return;
-            var configureMethod = startupType.GetMethod("Configure", BindingFlags.Static | BindingFlags.Public);
-            if (configureMethod == null)
-                return;
-            var configureMethodParams = configureMethod.GetParameters();
-            if (configureMethodParams.Length != 1 || configureMethodParams[0].ParameterType != typeof(WebAssemblyHostBuilder))
-                return;
-            configureMethod.Invoke(obj: null, new object[] { builder });
-        }
-
         private static IJSInProcessRuntime GetJsRuntime()
         {
             const string defaultJsRuntimeTypeName = "DefaultWebAssemblyJSRuntime";

From a765d18b29699cccdd51fbb93f1fa044bd187b92 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Wed, 25 Feb 2026 12:24:06 +0200
Subject: [PATCH 10/15] Remove DefaultUserComponentsAssemblyBytes, it's not
 needed anymore

---
 src/Try.Core/CoreConstants.cs                             | 3 ---
 src/TryMudBlazor.Client/Models/TryConstants.cs            | 1 +
 src/TryMudBlazor.Client/Pages/UserMainPage.razor          | 8 +++++++-
 src/TryMudBlazor.Client/Program.cs                        | 2 +-
 .../HandleCriticalUserComponentExceptionsLogger.cs        | 2 +-
 src/TryMudBlazor.Client/wwwroot/editor/main.js            | 3 +++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Try.Core/CoreConstants.cs b/src/Try.Core/CoreConstants.cs
index 9dcb5d24..f3ec261a 100644
--- a/src/Try.Core/CoreConstants.cs
+++ b/src/Try.Core/CoreConstants.cs
@@ -20,9 +20,6 @@ void ButtonOnClick()
     }
 }";
 
-        public const string DefaultUserComponentsAssemblyBytes =
-            "TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1vZGUuDQ0KJAAAAAAAAABQRQAATAEDAF0sHZkAAAAAAAAAAOAAIiALATAAAAgAAAAGAAAAAAAA9iYAAAAgAAAAQAAAAAAAEAAgAAAAAgAABAAAAAAAAAAEAAAAAAAAAACAAAAAAgAAAAAAAAMAYIUAABAAABAAAAAAEAAAEAAAAAAAABAAAAAAAAAAAAAAAKImAABPAAAAAEAAANQDAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAwAAACoJQAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAACAAAAAAAAAAAAAAACCAAAEgAAAAAAAAAAAAAAC50ZXh0AAAA/AYAAAAgAAAACAAAAAIAAAAAAAAAAAAAAAAAACAAAGAucnNyYwAAANQDAAAAQAAAAAQAAAAKAAAAAAAAAAAAAAAAAABAAABALnJlbG9jAAAMAAAAAGAAAAACAAAADgAAAAAAAAAAAAAAAAAAQAAAQgAAAAAAAAAAAAAAAAAAAADWJgAAAAAAAEgAAAACAAUAXCAAAEwFAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYqHgIoDAAACioAAEJTSkIBAAEAAAAAAAwAAAB2NC4wLjMwMzE5AAAAAAUAbAAAAKQBAAAjfgAAEAIAAEwCAAAjU3RyaW5ncwAAAABcBAAABAAAACNVUwBgBAAAEAAAACNHVUlEAAAAcAQAANwAAAAjQmxvYgAAAAAAAAACAAABRxUAAAkAAAAA+gEzABYAAAEAAAAOAAAAAgAAAAIAAAABAAAADAAAAAsAAAABAAAAAgAAAAAAhQEBAAAAAAAGAOsA6gEGAD0B6gEGADcA1wEPAAoCAAAGACQBowEGALQAowEGAHEAowEGAI4AowEGAAsBowEGAEsAowEGANMA6gEKAGIAGQIKACkAGQIKALUBWwEAAAAAAQAAAAAAAQABAAEAEACcATkCNQABAAEAUCAAAAAAxAAKACcAAQBSIAAAAACGGNEBBgACAAAAAQDHAQkA0QEBABEA0QEGABkA0QEKACkA0QEQADEA0QEQADkA0QEQAEEA0QEQAEkA0QEQAFEA0QEQAFkA0QEBAGEA0QEQAGkA0QEGACcAUwDRAC4ACwAtAC4AEwA2AC4AGwBVAC4AIwBeAC4AKwB2AC4AMwCDAC4AOwCQAC4AQwBeAC4ASwBeAEMAWwDEAASAAAABAAAAAAAAAAAAAAAAADkCAAAJAAAAAAAAAAAAAAAVABoAAAAAAAkAAAAAAAAAAAAAAB4AGQIAAAAAAAAAAAA8TW9kdWxlPgBCdWlsZFJlbmRlclRyZWUAU3lzdGVtLlJ1bnRpbWUAQ29tcG9uZW50QmFzZQBEZWJ1Z2dhYmxlQXR0cmlidXRlAEFzc2VtYmx5VGl0bGVBdHRyaWJ1dGUAUm91dGVBdHRyaWJ1dGUAQXNzZW1ibHlGaWxlVmVyc2lvbkF0dHJpYnV0ZQBBc3NlbWJseUluZm9ybWF0aW9uYWxWZXJzaW9uQXR0cmlidXRlAEFzc2VtYmx5Q29uZmlndXJhdGlvbkF0dHJpYnV0ZQBSZWZTYWZldHlSdWxlc0F0dHJpYnV0ZQBDb21waWxhdGlvblJlbGF4YXRpb25zQXR0cmlidXRlAEFzc2VtYmx5UHJvZHVjdEF0dHJpYnV0ZQBBc3NlbWJseUNvbXBhbnlBdHRyaWJ1dGUAUnVudGltZUNvbXBhdGliaWxpdHlBdHRyaWJ1dGUATWljcm9zb2Z0LkFzcE5ldENvcmUuQ29tcG9uZW50cy5SZW5kZXJpbmcAVHJ5LlVzZXJDb21wb25lbnRzLmRsbABfX01haW4AU3lzdGVtLlJlZmxlY3Rpb24AUmVuZGVyVHJlZUJ1aWxkZXIAX19idWlsZGVyAC5jdG9yAFN5c3RlbS5EaWFnbm9zdGljcwBTeXN0ZW0uUnVudGltZS5Db21waWxlclNlcnZpY2VzAERlYnVnZ2luZ01vZGVzAE1pY3Jvc29mdC5Bc3BOZXRDb3JlLkNvbXBvbmVudHMAVHJ5LlVzZXJDb21wb25lbnRzAAAAAAAdJaLVPNvETL37jSE7YZGLAAQgAQEIAyAAAQUgAQEREQQgAQEOCLA/X38R1Qo6CK25eTgp3a5gBSABARI5CAEACAAAAAAAHgEAAQBU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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==";
-
         public const string DefaultRazorFileContentFormat = "<h1>{0}</h1>";
 
         public static readonly string DefaultCSharpFileContentFormat =
diff --git a/src/TryMudBlazor.Client/Models/TryConstants.cs b/src/TryMudBlazor.Client/Models/TryConstants.cs
index 4dd073a3..16543555 100644
--- a/src/TryMudBlazor.Client/Models/TryConstants.cs
+++ b/src/TryMudBlazor.Client/Models/TryConstants.cs
@@ -20,6 +20,7 @@ public static class Editor
         public static class CodeExecution
         {
             public const string UpdateUserComponentsDll = "Try.CodeExecution.updateUserComponentsDll";
+            public const string ClearUserComponentsDll = "Try.CodeExecution.clearUserComponentsDll";
             public const string HotReloadIframe = "Try.CodeExecution.hotReloadIframe";
         }
     }
diff --git a/src/TryMudBlazor.Client/Pages/UserMainPage.razor b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
index 1677785b..809df2be 100644
--- a/src/TryMudBlazor.Client/Pages/UserMainPage.razor
+++ b/src/TryMudBlazor.Client/Pages/UserMainPage.razor
@@ -36,7 +36,13 @@
         try
         {
             var base64 = await JSRuntime.InvokeAsync<string>("sessionStorage.getItem", "TryMudBlazor.UserComponentsDllBase64");
-            if (base64 == null) return;
+            if (base64 == null)
+            {
+                // sessionStorage was cleared (e.g. crash recovery) — fall back to a full reload
+                // so loadBootResource picks up the safe static DLL.
+                await JSRuntime.InvokeVoidAsync("Try.requestFullReload", "/__main");
+                return;
+            }
 
             var bytes = Convert.FromBase64String(base64);
 
diff --git a/src/TryMudBlazor.Client/Program.cs b/src/TryMudBlazor.Client/Program.cs
index 22f200af..8f9f14c8 100644
--- a/src/TryMudBlazor.Client/Program.cs
+++ b/src/TryMudBlazor.Client/Program.cs
@@ -57,7 +57,7 @@ public static async Task Main(string[] args)
                 var actualException = exception is TargetInvocationException tie ? tie.InnerException : exception;
                 await Console.Error.WriteLineAsync($"Error on app startup: {actualException}");
 
-                jsRuntime.InvokeVoid(Try.CodeExecution.UpdateUserComponentsDll, CoreConstants.DefaultUserComponentsAssemblyBytes);
+                jsRuntime.InvokeVoid(Try.CodeExecution.ClearUserComponentsDll);
             }
 
             await builder.Build().RunAsync();
diff --git a/src/TryMudBlazor.Client/Services/HandleCriticalUserComponentExceptionsLogger.cs b/src/TryMudBlazor.Client/Services/HandleCriticalUserComponentExceptionsLogger.cs
index c0a761cb..a1d4ee93 100644
--- a/src/TryMudBlazor.Client/Services/HandleCriticalUserComponentExceptionsLogger.cs
+++ b/src/TryMudBlazor.Client/Services/HandleCriticalUserComponentExceptionsLogger.cs
@@ -28,7 +28,7 @@ public void Log<TState>(
         {
             if (exception?.ToString()?.Contains(CompilationService.DefaultRootNamespace) ?? false)
             {
-                _jsRuntime.InvokeVoid(Try.CodeExecution.UpdateUserComponentsDll, CoreConstants.DefaultUserComponentsAssemblyBytes);
+                _jsRuntime.InvokeVoid(Try.CodeExecution.ClearUserComponentsDll);
             }
         }
 
diff --git a/src/TryMudBlazor.Client/wwwroot/editor/main.js b/src/TryMudBlazor.Client/wwwroot/editor/main.js
index 1e1465b7..18711b28 100644
--- a/src/TryMudBlazor.Client/wwwroot/editor/main.js
+++ b/src/TryMudBlazor.Client/wwwroot/editor/main.js
@@ -215,6 +215,9 @@ window.Try.CodeExecution = window.Try.CodeExecution || (function () {
                 Try.reloadIframe(id, fallbackSrc);
             }
         },
+        clearUserComponentsDll: function () {
+            window.sessionStorage.removeItem(USER_COMPONENTS_DLL_STORAGE_KEY);
+        },
         updateUserComponentsDll: function (dllData) {
             if (!dllData) return;
 

From 7878033e8684a93d4d302d9900913a25e14c9042 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 10 Mar 2026 20:53:45 +0200
Subject: [PATCH 11/15] Add missing preload

---
 src/TryMudBlazor.Client/wwwroot/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/TryMudBlazor.Client/wwwroot/index.html b/src/TryMudBlazor.Client/wwwroot/index.html
index 6bd2efe7..60e8545d 100644
--- a/src/TryMudBlazor.Client/wwwroot/index.html
+++ b/src/TryMudBlazor.Client/wwwroot/index.html
@@ -24,6 +24,7 @@
     <meta name="twitter:description" content="TryMudBlazor is a fiddle-like platform for writing, compiling, executing and sharing Blazor components entirely in the browser. Perfect for code playground and testing.">
     <meta name="twitter:image" content="https://mudblazor.com/_content/MudBlazor.Docs/images/logo.png">
 
+    <link rel="preload" id="webassembly" />
     <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600" rel="stylesheet">

From a6c5e6db01d29ecc5e4ed126b66896d8f30fe6bd Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 10 Mar 2026 21:27:40 +0200
Subject: [PATCH 12/15] Enable fingerprint

---
 src/TryMudBlazor.Client/wwwroot/index.html | 4 ++--
 src/TryMudBlazor.Server/Program.cs         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/TryMudBlazor.Client/wwwroot/index.html b/src/TryMudBlazor.Client/wwwroot/index.html
index 60e8545d..9bac3c05 100644
--- a/src/TryMudBlazor.Client/wwwroot/index.html
+++ b/src/TryMudBlazor.Client/wwwroot/index.html
@@ -60,8 +60,8 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webassembly#[.{fingerprint}].js" autostart="false"></script>
-    <script src="_content/MudBlazor/MudBlazor.min.js?v=#{CACHE_TOKEN}#"></script>
-    <script src="editor/main.js?v=#{CACHE_TOKEN}#"></script>
+    <script src="_content/MudBlazor/MudBlazor.min#[.{fingerprint}].js"></script>
+    <script src="editor/main#[.{fingerprint}].js"></script>
     <script type="text/javascript">
         const userComponentsDllStorageKey = 'TryMudBlazor.UserComponentsDllBase64';
 
diff --git a/src/TryMudBlazor.Server/Program.cs b/src/TryMudBlazor.Server/Program.cs
index 0aaf1a36..4a26a46b 100644
--- a/src/TryMudBlazor.Server/Program.cs
+++ b/src/TryMudBlazor.Server/Program.cs
@@ -36,9 +36,7 @@ public static void Main(string[] args)
 
         app.UseCors();
 
-        // Needed for wasm project
-        app.UseBlazorFrameworkFiles();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
 
         app.MapControllers();
 

From b81658bb3e7773a9586478678fca7732948b5bc8 Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 10 Mar 2026 21:28:43 +0200
Subject: [PATCH 13/15] Disable hot realod for trymud as it causing disturbance
 when using co-host locally

---
 src/TryMudBlazor.Client/Properties/launchSettings.json | 2 ++
 src/TryMudBlazor.Server/Properties/launchSettings.json | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/TryMudBlazor.Client/Properties/launchSettings.json b/src/TryMudBlazor.Client/Properties/launchSettings.json
index d11c42d0..c21b86f6 100644
--- a/src/TryMudBlazor.Client/Properties/launchSettings.json
+++ b/src/TryMudBlazor.Client/Properties/launchSettings.json
@@ -11,6 +11,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "hotReloadEnabled": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
@@ -19,6 +20,7 @@
     "BlazorRepl": {
       "commandName": "Project",
       "launchBrowser": true,
+      "hotReloadEnabled": false,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
diff --git a/src/TryMudBlazor.Server/Properties/launchSettings.json b/src/TryMudBlazor.Server/Properties/launchSettings.json
index 5ce5a877..95dc53be 100644
--- a/src/TryMudBlazor.Server/Properties/launchSettings.json
+++ b/src/TryMudBlazor.Server/Properties/launchSettings.json
@@ -12,6 +12,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "hotReloadEnabled": false,
       "launchUrl": "",
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "environmentVariables": {
@@ -22,6 +23,7 @@
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,
+      "hotReloadEnabled": false,
       "launchUrl": "",
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:5001;http://localhost:5000",

From 82621bd4cec495beb5c7d70ea92674c5a9b979dd Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Tue, 10 Mar 2026 21:48:42 +0200
Subject: [PATCH 14/15] fonts to css2

---
 src/TryMudBlazor.Client/wwwroot/index.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/TryMudBlazor.Client/wwwroot/index.html b/src/TryMudBlazor.Client/wwwroot/index.html
index 9bac3c05..2935a9b9 100644
--- a/src/TryMudBlazor.Client/wwwroot/index.html
+++ b/src/TryMudBlazor.Client/wwwroot/index.html
@@ -26,9 +26,11 @@
 
     <link rel="preload" id="webassembly" />
     <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Nunito:200,300,400" rel="stylesheet">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;300;400" rel="stylesheet">
     <link href="_content/MudBlazor/MudBlazor.min.css?v=#{CACHE_TOKEN}#" rel="stylesheet" />
     <link href="css/TryMudBlazor.min.css?v=#{CACHE_TOKEN}#" rel="stylesheet" />
     <script src="lib/split.js/split.min.js"></script>

From 5f5e889bd70848d7e410401aedaef8eed12a39ab Mon Sep 17 00:00:00 2001
From: ScarletKuro <artem.melnikov@live.com>
Date: Fri, 10 Apr 2026 23:33:39 +0300
Subject: [PATCH 15/15] Add System.Linq.Queryable support

---
 src/Try.Core/CompilationService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Try.Core/CompilationService.cs b/src/Try.Core/CompilationService.cs
index 7c66bdf5..1c2deba2 100644
--- a/src/Try.Core/CompilationService.cs
+++ b/src/Try.Core/CompilationService.cs
@@ -65,6 +65,7 @@ public static unsafe Task InitAsync()
                 typeof(AssemblyTargetedPatchBandAttribute).Assembly, // System.Private.CoreLib
                 typeof(NavLink).Assembly, // Microsoft.AspNetCore.Components.Web
                 typeof(IQueryable).Assembly, // System.Linq.Expressions
+                typeof(Queryable).Assembly, // System.Linq.Queryable
                 typeof(HttpClientJsonExtensions).Assembly, // System.Net.Http.Json
                 typeof(HttpClient).Assembly, // System.Net.Http
                 typeof(IJSRuntime).Assembly, // Microsoft.JSInterop