Fix reader and Go Live validation regressions

Author: KSemenenko

AGENTS.md

@@ -320,6 +320,8 @@ Repo-specific design rules:
 - App-shell logo navigation MUST always lead to the main home/library screen; it must not deep-link into Go Live, Teleprompter, or another feature-specific route.
 - Learn rehearsal speed MUST default to about 250 WPM and stay user-adjustable upward from that baseline; shipping a 300 WPM startup default is too aggressive.
 - Go Live `ON AIR` badges and preview live dots MUST appear only while recording or streaming is actually active; idle selected or armed sources must stay visually non-live.
+- Go Live chrome MUST stay operational and generic; do not surface the loaded script title or script preview subtitle in the Go Live header/session bar just because a script is open.
+- Go Live back navigation MUST return to the actual previous in-app screen when known, and only fall back to library when there is no valid in-app return target; it must never hardcode teleprompter as the back target.
 - Learn and Teleprompter are separate screens with separate style ownership; do not bundle RSVP and teleprompter reader feature styles into one shared screen stylesheet or let one page inherit the other page's visual treatment.
 - User preferences persistence MUST sit behind a platform-agnostic user-settings abstraction, with browser storage implemented via local storage and room for other platform-specific implementations; theme, teleprompter layout preferences, camera/scene preferences, and similar saved settings belong there instead of ad-hoc feature stores.
 - Streaming destination/platform configuration MUST be user-defined and persisted in settings; Settings and Go Live must not ship hardcoded platform instances, seeded destination accounts, or fixed fake provider rows beyond real runtime capabilities.

docs/Architecture.md

@@ -173,6 +173,7 @@ flowchart LR
 - `BrowserThemeService` is the first concrete remote consumer and keeps shell appearance aligned across tabs without reload.
 - `GoLiveSessionService` is the current publisher and consumer for active `Go Live` session snapshots, including startup catch-up requests.
 - `MainLayout` consumes `GoLiveSessionService` and renders the global shell `Go Live` status for every screen.
+- `AppShellService` owns the current in-app route and the last valid non-`Go Live` return target so the `Go Live` back control can return to the actual previous screen instead of a hardcoded reader route.
 - The contract must stay message-based; tabs do not share live .NET memory.
 
 ## Library Contracts

src/PrompterOne.Shared/AppShell/Layout/MainLayout.razor.cs

@@ -51,7 +51,6 @@ public partial class MainLayout : LayoutComponentBase, IDisposable
     private string HeaderSubtitle => ShellState.Screen switch
     {
         AppShellScreen.Teleprompter => ShellState.Subtitle,
-        AppShellScreen.GoLive => ShellState.Title,
         AppShellScreen.Learn => ShellState.Subtitle,
         _ => string.Empty
     };
@@ -131,6 +130,7 @@ protected override void OnInitialized()
         Navigation.LocationChanged += HandleLocationChanged;
         Shell.StateChanged += HandleShellStateChanged;
         GoLiveSession.StateChanged += HandleGoLiveSessionChanged;
+        Shell.TrackNavigation(Navigation.Uri);
         SyncShellStateWithCurrentRoute(Navigation.Uri);
     }
 
@@ -154,6 +154,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     private void HandleLocationChanged(object? sender, LocationChangedEventArgs e)
     {
         Logger.LogInformation(RouteChangedLogTemplate, e.Location);
+        Shell.TrackNavigation(e.Location);
         SyncShellStateWithCurrentRoute(e.Location);
         StateHasChanged();
     }
@@ -182,7 +183,7 @@ private void SyncShellStateWithCurrentRoute(string uri)
                 Shell.ShowTeleprompter(ShellState.Title, ShellState.Subtitle, currentScriptId);
                 break;
             case AppRoutes.GoLive:
-                Shell.ShowGoLive(ShellState.Title, ShellState.Subtitle, currentScriptId);
+                Shell.ShowGoLive(currentScriptId);
                 break;
             case AppRoutes.Settings:
                 Shell.ShowSettings();

src/PrompterOne.Shared/AppShell/Services/AppShellService.cs

@@ -1,9 +1,16 @@
 using PrompterOne.Shared.Contracts;
+using PrompterOne.Shared.GoLive.Models;
 
 namespace PrompterOne.Shared.Services;
 
 public sealed class AppShellService
 {
+    private const string EmptyRoute = "";
+    private const string QuerySeparator = "?";
+
+    private string _currentRoute = AppRoutes.Library;
+    private string _goLiveBackRoute = AppRoutes.Library;
+
     public event Action? StateChanged;
     public event Action<string>? LibrarySearchChanged;
 
@@ -34,8 +41,13 @@ public void ShowLearn(string title, string subtitle, string wpmLabel, string? sc
     public void ShowTeleprompter(string title, string subtitle, string? scriptId) =>
         SetScriptScopedState(AppShellScreen.Teleprompter, title, subtitle, string.Empty, scriptId);
 
-    public void ShowGoLive(string title, string subtitle, string? scriptId) =>
-        SetScriptScopedState(AppShellScreen.GoLive, title, subtitle, string.Empty, scriptId);
+    public void ShowGoLive(string? scriptId) =>
+        SetScriptScopedState(
+            AppShellScreen.GoLive,
+            GoLiveText.Chrome.ScreenTitle,
+            GoLiveText.Chrome.StreamingSubtitle,
+            string.Empty,
+            scriptId);
 
     public void ShowSettings() =>
         SetState(new AppShellState(
@@ -67,6 +79,26 @@ public void UpdateLibrarySearch(string searchText)
 
     public string GetGoLiveRoute() => BuildScriptScopedRoute(AppShellScreen.GoLive);
 
+    public string GetGoLiveBackRoute() => IsValidGoLiveBackTarget(_goLiveBackRoute)
+        ? _goLiveBackRoute
+        : AppRoutes.Library;
+
+    public void TrackNavigation(string uri)
+    {
+        var nextRoute = NormalizeAppRoute(uri);
+        if (string.IsNullOrWhiteSpace(nextRoute) || string.Equals(_currentRoute, nextRoute, StringComparison.Ordinal))
+        {
+            return;
+        }
+
+        if (IsGoLiveRoute(nextRoute) && IsValidGoLiveBackTarget(_currentRoute))
+        {
+            _goLiveBackRoute = _currentRoute;
+        }
+
+        _currentRoute = nextRoute;
+    }
+
     private void SetScriptScopedState(
         AppShellScreen screen,
         string title,
@@ -108,4 +140,54 @@ private string BuildScriptScopedRoute(AppShellScreen screen)
             _ => AppRoutes.Library
         };
     }
+
+    private static bool IsGoLiveRoute(string route)
+    {
+        var querySeparatorIndex = route.IndexOf(QuerySeparator, StringComparison.Ordinal);
+        var routeBase = querySeparatorIndex >= 0
+            ? route[..querySeparatorIndex]
+            : route;
+
+        return string.Equals(routeBase, AppRoutes.GoLive, StringComparison.Ordinal);
+    }
+
+    private static bool IsTrackedRoute(string path) => path switch
+    {
+        AppRoutes.Library => true,
+        AppRoutes.Editor => true,
+        AppRoutes.Learn => true,
+        AppRoutes.Teleprompter => true,
+        AppRoutes.GoLive => true,
+        AppRoutes.Settings => true,
+        _ => false
+    };
+
+    private static bool IsValidGoLiveBackTarget(string route) =>
+        !string.IsNullOrWhiteSpace(route) && !IsGoLiveRoute(route);
+
+    private static string NormalizeAppRoute(string uri)
+    {
+        if (!Uri.TryCreate(uri, UriKind.Absolute, out var parsedUri))
+        {
+            return EmptyRoute;
+        }
+
+        var normalizedPath = NormalizePath(parsedUri.AbsolutePath);
+        if (!IsTrackedRoute(normalizedPath))
+        {
+            return EmptyRoute;
+        }
+
+        return string.IsNullOrWhiteSpace(parsedUri.Query)
+            ? normalizedPath
+            : string.Concat(normalizedPath, parsedUri.Query);
+    }
+
+    private static string NormalizePath(string path)
+    {
+        var trimmedPath = path.TrimEnd('/');
+        return string.IsNullOrWhiteSpace(trimmedPath)
+            ? AppRoutes.Library
+            : trimmedPath;
+    }
 }

src/PrompterOne.Shared/Contracts/UiTestIds.cs

@@ -331,6 +331,9 @@ public static class Settings
 
         public static string SceneMirror(string sourceId) => $"settings-scene-mirror-{sourceId}";
 
+        public static string SelectOption(string triggerTestId, string optionValue) =>
+            $"{triggerTestId}-option-{optionValue}";
+
         public static string StreamingProviderCard(string providerId) => $"settings-streaming-provider-{providerId}";
 
         public static string StreamingProviderSourcePicker(string providerId) => $"settings-streaming-provider-sources-{providerId}";
@@ -377,6 +380,7 @@ public static class GoLive
         public const string ActiveSourceLabel = "go-live-active-source-label";
         public const string AddSource = "go-live-add-source";
         public const string AudioMixer = "go-live-audio-mixer";
+        public const string Back = "go-live-back";
         public const string Bitrate = "go-live-bitrate";
         public const string CreateRoom = "go-live-create-room";
         public const string CustomRtmpKey = "go-live-custom-rtmp-key";
@@ -393,7 +397,7 @@ public static class GoLive
         public const string ModeStudio = "go-live-mode-studio";
         public const string NdiToggle = "go-live-ndi-toggle";
         public const string ObsToggle = "go-live-obs-toggle";
-        public const string OpenHome = "go-live-open-home";
+        public const string OpenHome = Back;
         public const string OpenLearn = "go-live-open-learn";
         public const string OpenRead = "go-live-open-read";
         public const string OpenSettings = "go-live-open-settings";
@@ -418,6 +422,7 @@ public static class GoLive
         public const string StreamTab = "go-live-stream-tab";
         public const string SceneBar = "go-live-scene-bar";
         public const string SceneControls = "go-live-scene-controls";
+        public const string ScreenTitle = "go-live-screen-title";
         public const string SessionBar = "go-live-session-bar";
         public const string SessionTimer = "go-live-session-timer";
         public const string SourceRail = "go-live-source-rail";

src/PrompterOne.Shared/GoLive/Components/GoLiveCameraPreviewCard.razor.css

@@ -65,12 +65,14 @@
     width: 7px;
     height: 7px;
     border-radius: 50%;
-    background: rgba(239, 68, 68, .2);
-    transition: background .3s;
+    background: rgba(255, 245, 224, .18);
+    border: 1px solid rgba(255, 245, 224, .16);
+    transition: background .3s, border-color .3s, box-shadow .3s;
 }
 
 .gl-air-dot.gl-air-dot-live {
     background: #ef4444;
+    border-color: rgba(239, 68, 68, .65);
     box-shadow: 0 0 6px rgba(239, 68, 68, .7);
 }
 

src/PrompterOne.Shared/GoLive/Components/GoLiveProgramFeedCard.razor.css

@@ -4,7 +4,7 @@
     gap: 4px;
     min-width: 0;
     min-height: 0;
-    flex: 1;
+    flex: 0 0 auto;
 }
 
 .gl-monitor-label-top {
@@ -35,7 +35,8 @@
 }
 
 .gl-monitor-program {
-    flex: 1;
+    flex: 0 0 auto;
+    aspect-ratio: 16 / 9;
     min-height: 0;
     border-color: var(--gold-14);
     box-shadow: 0 0 40px rgba(0, 0, 0, .4), inset 0 0 0 1px var(--gold-06);
@@ -44,6 +45,7 @@
 ::deep .gl-monitor-feed {
     flex: 1;
     position: relative;
+    aspect-ratio: 16 / 9;
     min-height: 0;
     overflow: hidden;
     background: #050508;

src/PrompterOne.Shared/GoLive/Models/GoLiveText.cs

@@ -7,6 +7,7 @@ public static class Chrome
         public const string BackLabel = "Back";
         public const string DirectorModeLabel = "Director";
         public const string LivePreviewTitle = "Live";
+        public const string ScreenTitle = "Go Live";
         public const string StreamingSubtitle = "Program routing";
         public const string StudioModeLabel = "Studio";
     }
@@ -84,7 +85,6 @@ public static class Surface
         public const string HostParticipantName = "Host";
         public const string InterviewSceneFallback = "Interview";
         public const string LocalRoomPrefix = "local-";
-        public const string MainSceneFallback = "Camera 1";
         public const string MicrophoneMetricLabel = "Mic";
         public const string NoScriptProgressLabel = "No script loaded";
         public const string PictureInPictureSceneId = "scene-picture-in-picture";

src/PrompterOne.Shared/GoLive/Pages/GoLivePage.Bootstrap.cs

@@ -146,13 +146,13 @@ private async Task EnsureSessionLoadedAsync()
 
     private void UpdateScreenMetadata()
     {
-        _screenTitle = SessionService.State.Title;
-        _screenSubtitle = SessionService.State.PreviewSegments.Count > 0
+        _sessionTitle = SessionService.State.Title;
+        _sessionSubtitle = SessionService.State.PreviewSegments.Count > 0
             ? SessionService.State.PreviewSegments[0].Title
             : GoLiveText.Chrome.StreamingSubtitle;
         SyncGoLiveSessionState();
         EnsureStudioSurfaceState();
-        Shell.ShowGoLive(_screenTitle, _screenSubtitle, SessionService.State.ScriptId);
+        Shell.ShowGoLive(SessionService.State.ScriptId);
     }
 
     private async Task PersistSceneAsync()

src/PrompterOne.Shared/GoLive/Pages/GoLivePage.Runtime.cs

@@ -11,5 +11,5 @@ private GoLiveOutputRuntimeRequest BuildRuntimeRequest(SceneCameraSource? camera
             MediaSceneService.State,
             _studioSettings.Streaming,
             _recordingPreferences,
-            _screenTitle);
+            _sessionTitle);
 }