refactor: extract TopBar out of MainWindow.xaml — Phase 2, Commit 14

TopBar.xaml(.cs) takes the Row 0 top controls: logo/About button, REC/ON-AIR
pills + status signs, avatar, Sign In/Start/End buttons. The avatar fetch
(AvatarHttp/_loadedAvatarUrl/LoadAvatarImage/ShowAvatarFallback) moved into the
control with async semantics preserved; the window grabs the control via
FindName in its ctor and calls _topBar.RefreshAvatar() when IsConnected or
AccountAvatarUrl changes (previously OnViewModelPropertyChanged -> LoadAvatarImage).
AccountLight is pure binding (never touched by code-behind) so it moved with the XAML.

Zero behavior change; build 0 warnings; 246 pass, only the 2 known failures.
Also dropped the now-unused System.IO using from MainWindow.xaml.cs.
Docs: ViewModels/index.md Phase 2 tracker updated in the same commit.

Controls/BottomBar.xaml

@@ -0,0 +1,64 @@
+<UserControl x:Class="ytLive.Controls.BottomBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Border Background="#0f3460" Padding="16,4">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Gear icon: far left -->
+            <Button Grid.Column="0" ToolTip="Menu" Style="{StaticResource IconButton}"
+                    VerticalAlignment="Center" Click="GearButton_Click">
+                <Button.ContextMenu>
+                    <ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
+                        <MenuItem Header="App Settings" Command="{Binding OpenSettingsCommand}"/>
+                        <Separator/>
+                        <MenuItem Header="Report Bug" Command="{Binding OpenBugCommand}"/>
+                        <MenuItem Header="Feature Request" Command="{Binding OpenFeatureCommand}"/>
+                        <MenuItem Header="About" Command="{Binding OpenAboutCommand}"/>
+                    </ContextMenu>
+                </Button.ContextMenu>
+                <Path Data="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"
+                      Fill="#d0d0d0" Width="16" Height="16" Stretch="Uniform"/>
+            </Button>
+
+            <!-- Stream stats: centered under the preview pane -->
+            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock Text="Bitrate:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
+                <TextBlock Style="{StaticResource YtLabel}"
+                           Foreground="White" Margin="0,0,20,0">
+                    <Run Text="{Binding CurrentHealth.CurrentBitrate, Mode=OneWay}"/>
+                    <Run Text=" Mbps"/>
+                </TextBlock>
+
+                <TextBlock Text="FPS:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
+                <TextBlock Style="{StaticResource YtLabel}"
+                           Foreground="White" Margin="0,0,24,0">
+                    <Run Text="{Binding CurrentHealth.FPS, Mode=OneWay, StringFormat={}{0:0}}"/>
+                </TextBlock>
+
+                <TextBlock Text="Dropped:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
+                <TextBlock Text="{Binding CurrentHealth.DroppedFrames}" Style="{StaticResource YtLabel}"
+                           Foreground="White" Margin="0,0,20,0"/>
+
+                <TextBlock Text="Duration:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
+                <TextBlock Text="{Binding CurrentHealth.StreamDuration}" Style="{StaticResource YtLabel}"
+                           Foreground="White"/>
+
+                <TextBlock Text="{Binding CurrentHealth.HealthMessage}" Style="{StaticResource YtLabel}"
+                           Foreground="#e94560" Margin="20,0,0,0"/>
+            </StackPanel>
+
+            <!-- Resolution dropdown: far right -->
+            <ComboBox Grid.Column="2" Style="{StaticResource YtComboBox}" MinWidth="150"
+                      ItemsSource="{Binding QualityOptions}"
+                      SelectedItem="{Binding SelectedQuality}"
+                      DisplayMemberPath="Label"
+                      ToolTip="{Binding ResolutionHelp}"
+                      IsEnabled="{Binding IsOffline}"/>
+        </Grid>
+    </Border>
+</UserControl>

Controls/BottomBar.xaml.cs

@@ -0,0 +1,22 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace ytLive.Controls;
+
+public partial class BottomBar : UserControl
+{
+    public BottomBar()
+    {
+        InitializeComponent();
+    }
+
+    private void GearButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button { ContextMenu: { } menu } button)
+        {
+            menu.PlacementTarget = button;
+            menu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
+            menu.IsOpen = true;
+        }
+    }
+}

Controls/HealthBanner.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="ytLive.Controls.HealthBanner"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- YouTube health banner (TASK 5 item 3): report-by-exception — visible
+         ONLY while a warning/error configuration issue exists. Amber for
+         warning, darker red for error (HealthIssueBackground). -->
+    <Border Background="{Binding HealthIssueBackground}"
+            Visibility="{Binding HealthIssueBanner, Converter={StaticResource NotNullToVis}}">
+        <TextBlock Text="{Binding HealthIssueBanner}" Foreground="White" FontSize="13"
+                   FontWeight="SemiBold" Margin="16,8" TextTrimming="CharacterEllipsis"/>
+    </Border>
+</UserControl>

Controls/HealthBanner.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace ytLive.Controls;
+
+public partial class HealthBanner : UserControl
+{
+    public HealthBanner()
+    {
+        InitializeComponent();
+    }
+}

Controls/TopBar.xaml

@@ -0,0 +1,118 @@
+<UserControl x:Class="ytLive.Controls.TopBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Name="TopBarRoot">
+    <!-- LOGO / BRAND — clicking opens the in-app About overlay -->
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- Logo / Brand — clicking opens the in-app About overlay -->
+        <Button Grid.Column="0" Background="Transparent" BorderThickness="0" Cursor="Hand"
+                VerticalAlignment="Center" Margin="0,0,24,0" ToolTip="About LlamaCasty"
+                Command="{Binding OpenAboutCommand}">
+            <Button.Template>
+                <ControlTemplate TargetType="Button">
+                    <ContentPresenter/>
+                </ControlTemplate>
+            </Button.Template>
+            <TextBlock FontSize="22" FontWeight="Bold">
+                <Run Text="LlamaCas" Foreground="#e0e0e0"/><Run Text="ty" Foreground="#e94560"/>
+            </TextBlock>
+        </Button>
+
+        <!-- REC / ON-AIR pills (intent) + status signs (reality) -->
+        <StackPanel Grid.Column="1" Orientation="Horizontal"
+                    HorizontalAlignment="Center" VerticalAlignment="Center">
+            <!-- REC pill: local recording needs no sign-in -->
+            <TextBlock Text="REC" Foreground="#e94560" FontWeight="Bold" FontSize="12"
+                       VerticalAlignment="Center" Margin="0,0,6,0"/>
+            <ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
+                          IsChecked="{Binding RecordPillOn}"/>
+            <!-- ON-AIR pill: greyed out until signed in -->
+            <TextBlock Text="ON-AIR" Foreground="#e94560" FontWeight="Bold" FontSize="12"
+                       VerticalAlignment="Center" Margin="16,0,6,0"/>
+            <ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
+                          IsChecked="{Binding OnAirPillOn}"
+                          IsEnabled="{Binding CanToggleOnAir}"
+                          ToolTip="{Binding AccountStatusLightToolTip}"/>
+            <!-- Status signs: REC dot + ON-AIR dot -->
+            <Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
+                     Fill="{Binding RecDotBrush}" Opacity="{Binding RecDotOpacity}"/>
+            <TextBlock Text="REC" Style="{StaticResource StatusSignText}"/>
+            <!-- ON-AIR sign: gray offline, red public, green private -->
+            <Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
+                     Fill="{Binding OnAirBrush}"/>
+            <TextBlock Text="ON-AIR" Style="{StaticResource StatusSignText}"/>
+            <Border Background="#8f1f1f" CornerRadius="3" Padding="6,1" Margin="8,0,0,0"
+                    VerticalAlignment="Center"
+                    Visibility="{Binding IsLivePrivate, Converter={StaticResource BoolToVis}}">
+                <TextBlock Text="PRIVATE" FontSize="11" FontWeight="Bold" Foreground="White"/>
+            </Border>
+            <TextBlock Text="{Binding LiveElapsedText}" Foreground="White" FontSize="14"
+                       FontFamily="Consolas" VerticalAlignment="Center" Margin="14,0,0,0"
+                       Visibility="{Binding IsLive, Converter={StaticResource BoolToVis}}"/>
+        </StackPanel>
+
+        <!-- Three-state top bar: logged-out / idle / live -->
+        <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
+            <!-- Status light -->
+            <Ellipse Width="8" Height="8" Margin="0,0,8,0" VerticalAlignment="Center"
+                     ToolTip="{Binding AccountStatusLightToolTip}">
+                <Ellipse.Style>
+                    <Style TargetType="Ellipse">
+                        <Setter Property="Fill" Value="#ef4444"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsConnected}" Value="True">
+                                <Setter Property="Fill" Value="#22c55e"/>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding IsLive}" Value="True">
+                                <Setter Property="Fill" Value="#e94560"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Ellipse.Style>
+            </Ellipse>
+            <!-- Avatar (connected only); shows the channel initial when
+                 the profile image is missing or fails to download -->
+            <Border Width="26" Height="26" CornerRadius="13" Background="#16213e" ClipToBounds="True"
+                    Margin="0,0,8,0" VerticalAlignment="Center"
+                    ToolTip="{Binding AccountDisplayName}"
+                    Visibility="{Binding IsConnected, Converter={StaticResource BoolToVis}}">
+                <Grid>
+                    <Image x:Name="AvatarImage" Stretch="UniformToFill"/>
+                    <TextBlock x:Name="AvatarInitial" Foreground="#e0e0e0" FontSize="13"
+                               FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"
+                               Visibility="Collapsed"/>
+                </Grid>
+            </Border>
+            <!-- Sign In button (disconnected + offline) -->
+            <Button Content="Sign In" Style="{StaticResource YtButton}"
+                    Margin="0,0,12,0"
+                    Command="{Binding StartStreamCommand}"
+                    Visibility="{Binding ShowLogInButton, Converter={StaticResource BoolToVis}}"/>
+            <!-- Primary Start button (offline): dynamic label from the pills -->
+            <Button Content="Start" Style="{StaticResource YtButton}"
+                    Command="{Binding StartStreamCommand}"
+                    Visibility="{Binding ShowPrimaryStartButton, Converter={StaticResource BoolToVis}}">
+                <Button.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Header="Choose Record Folder" Command="{Binding ChooseRecordFolderCommand}"/>
+                        <Separator/>
+                        <MenuItem Header="Change Account" Command="{Binding ChangeAccountCommand}"/>
+                        <Separator/>
+                        <MenuItem Header="Logout" Command="{Binding LogoutCommand}"/>
+                    </ContextMenu>
+                </Button.ContextMenu>
+            </Button>
+            <!-- End button (live OR recording) — the only button whose
+                 label changes; "Stop Recording" while recording -->
+            <Button Content="{Binding EndButtonText}" Style="{StaticResource YtButton}"
+                    Background="#333" Command="{Binding EndStreamCommand}"
+                    Visibility="{Binding ShowEndStreamButton, Converter={StaticResource BoolToVis}}"/>
+        </StackPanel>
+    </Grid>
+</UserControl>

Controls/TopBar.xaml.cs

@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Windows.Controls;
+using System.Windows.Media.Imaging;
+using ytLive.Helpers;
+using ytLive.ViewModels;
+
+namespace ytLive.Controls;
+
+public partial class TopBar : UserControl
+{
+    private static readonly HttpClient AvatarHttp = new() { Timeout = TimeSpan.FromSeconds(15) };
+    private string? _loadedAvatarUrl;
+
+    public TopBar()
+    {
+        InitializeComponent();
+        AvatarImage.Source = null;
+        AvatarInitial.Visibility = System.Windows.Visibility.Collapsed;
+    }
+
+    public void RefreshAvatar()
+    {
+        _ = LoadAvatarImageAsync();
+    }
+
+    private async System.Threading.Tasks.Task LoadAvatarImageAsync()
+    {
+        var vm = DataContext as MainViewModel;
+        var url = vm?.AccountAvatarUrl;
+        if (vm is not { IsConnected: true })
+        {
+            ShowAvatarFallback(null);
+            return;
+        }
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            AppLog.Write("Avatar: connected but no profile image URL on the session");
+            ShowAvatarFallback(null);
+            return;
+        }
+        if (url == _loadedAvatarUrl && AvatarImage.Source != null) return;
+        try
+        {
+            var bytes = await AvatarHttp.GetByteArrayAsync(url);
+            using var ms = new MemoryStream(bytes);
+            var bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.CacheOption = BitmapCacheOption.OnLoad;
+            bitmap.StreamSource = ms;
+            bitmap.EndInit();
+            bitmap.Freeze();
+            _loadedAvatarUrl = url;
+            AvatarImage.Source = bitmap;
+            AvatarInitial.Visibility = System.Windows.Visibility.Collapsed;
+        }
+        catch (Exception ex)
+        {
+            AppLog.Write($"Avatar load failed ({url}): {ex.Message}");
+            ShowAvatarFallback(vm?.AccountDisplayName);
+        }
+    }
+
+    private void ShowAvatarFallback(string? name)
+    {
+        _loadedAvatarUrl = null;
+        AvatarImage.Source = null;
+        AvatarInitial.Text = string.IsNullOrWhiteSpace(name) ? "?" : name.Substring(0, 1).ToUpperInvariant();
+        AvatarInitial.Visibility = System.Windows.Visibility.Visible;
+    }
+}

HANDOFF.md

@@ -2,62 +2,87 @@
 
 ## Branch / Commit State
 
-**`main`**, working tree is **CLEAN** — all changes committed and pushed.
+**`main`**, working tree is **CLEAN**.
 
-No feature branches pre-1.0: all work lands on `main` per work unit.
+Commits `46978b8` (AGENTS push policy), `fc33022` (HANDOFF), and refactor
+commits `0–5` through `e286719` are **pushed** (incl. `refactor-commit-0..5`).
+Refactor commits **6–11 are LOCAL ONLY** (policy 2026-08-30: no per-commit
+push; `git push --tags` only at a user-agreed milestone / "push it"):
 
-**Latest commit:** `e286719` — Commit 5/12 of the MainViewModel refactor (Webcam partial, tag `refactor-commit-5`).
+| Commit | Hash | Tag | Partial | Lines |
+|--------|------|-----|---------|-------|
+| 6 Audio | `c1126a5` | `refactor-commit-6` | `MainViewModel.Audio.cs` | 408 |
+| 7 Trax | `535a501` | `refactor-commit-7` | `MainViewModel.Trax.cs` | 132 |
+| 8 Socials | `c41ff7f` | `refactor-commit-8` | `MainViewModel.Socials.cs` | 161 |
+| 9 Streaming | `e1006a0` | `refactor-commit-9` | `MainViewModel.Streaming.cs` | 787 |
+| 10 Chat | `3b77a13` | `refactor-commit-10` | `MainViewModel.Chat.cs` | 194 |
+| 11 Overlays | `1efde5a` | `refactor-commit-11` | `MainViewModel.Overlays.cs` | 194 |
+
+Nightly summary: **Phase 1 complete.** The plan was 11 partials + scaffold;
+all live in `ViewModels/`. Core `MainViewModel.cs` shrank 1,890 → **758
+lines**. Every change: clean build (0 warnings), `scripts/verify.sh` (246
+passed + 2 known failures only), `scripts/scope-check.sh` with explicit file
+args, `ViewModels/index.md` updated in the SAME commit, tagged
+`refactor-commit-N`, no per-commit push.
 
 ## What's In Flight
 
-**MainViewModel partial split (Phase 1):** 5 of 12 refactor commits landed and pushed.
-Tags `refactor-commit-0…5` = scaffold, Account, License, Scenes, Background, Webcam.
-Latest head `e286719`. Working tree clean.
+Nothing code-in-flight — working tree clean, Phase 1 done.
 
-Remaining partials in order: `Audio` (Commit 6), `Trax` (7), `Socials` (8), `Streaming` (9),
-`Chat` (10), `Overlays` (11). Each lands the same way: cut → build 0 warnings →
-`./scripts/verify.sh` + `./scripts/scope-check.sh "file1" …` → commit titled
-`refactor: split <Area> out of MainViewModel — Commit N/12 (tag refactor-commit-N)`
-with the `ViewModels/index.md` progress update in the SAME commit → `git tag refactor-commit-N`.
-**Do NOT push per commit (policy 2026-08-30):** commits land locally; `git push` only at
-a user-agreed sub-milestone/milestone ("push it"). Tags ride along on that push.
+**Next (queued, not started): Phase 2 — split `MainWindow.xaml` (1,681 lines)
+into UserControls.** Same rules: one work unit per control, docs in the same
+commit, verify + scope-check, commit locally, `git push` only on user go.
 
-Known partial-usings list (grep-verified):
-`Scenes` = ObjectModel+Specialized+ComponentModel+`ytLive`+Models+Services;
-`Background` = ObjectModel+IO+Windows+Input+Media+Media.Imaging+Helpers+Models+Services;
-`Webcam` = Windows+Input+Media.Imaging+`ytLive`+Models+Services.
-`INotificationService.Info/Warning/Error/Success` are default interface methods → any
-partial calling `_notifications.X` needs `using ytLive.Services;`.
+**Push pending:** refactor commits 6–11 + their tags are local. The Session-1
+push checkpoint was never reached because the user directive was to run the
+series to completion; Phase 1 completion is the natural milestone to push on
+explicit user confirmation.
 
 ## Landmines
 
-- **TextBox.Mode=OneWay** is required for `RecordFolderDisplay` binding (get-only computed property).
-- **Pre-existing test failures (do not chase):** `AudioPipelineTests.Mix_HonorsProviderGains…` +
-  `RoundClipInteractionTests.Round_Clip_Corner_Is_Grabbable…`.
+- **Pre-existing test failures (do not chase):**
+  `AudioPipelineTests.Mix_HonorsProviderGains_AndGameMute_KillsTheLoopback` +
+  `RoundClipInteractionTests.Round_Clip_Corner_Is_Grabbable_And_Shape_Is_Circle`.
+- **Tests occasionally abort early (236/237)** — known flake, accepted by `verify.sh`.
 - **App running locks `ytLive.exe`** → build fails MSB3027. Kill PID before building.
-- **Test suite hangs** when running full vstest (WPF `RealAppHost` dispatcher deadlock); individual
-  tests pass in isolation. Use `dotnet test` on individual test classes, not the full suite DLL.
-- **Pre-commit gate:** `./scripts/verify.sh` — clean build (0 warnings) + full tests + scope check.
+- **Implicit usings are SDK-default but partials must still carry their own
+  domain usings** (they do not inherit core's): `ICommand`/`ObservableCollection`/
+  `WriteableBitmap`/`DispatcherTimer` etc. are NOT implicit. Grep-verified usings:
+  - Audio: Input, Media, Threading, `NAudio.CoreAudioApi`, `ytLive`, Helpers, Models, Services, Services.Audio
+  - Trax: IO, Media, `Microsoft.Win32`, Helpers, Models, Services.Audio
+  - Socials: Windows, Input, Media, `ytLive`, Helpers, Models, Services, Services.Compositor
+  - Streaming: ObjectModel, IO, Windows, Input, Threading, `Microsoft.Win32`, Helpers, Models, Services, Services.Encoder
+  - Chat: ObjectModel, Media, Media.Imaging, Threading, Helpers, Models, Services
+  - Overlays: Diagnostics, IO, Input, Helpers
+- **Pre-commit gate:** `scripts/verify.sh` (0-warning build + full tests) and
+  `scripts/scope-check.sh "file1" …` — scope-check REQUIRES explicit file args.
+- Build from WSL with the Windows dotnet host only (see `AGENTS.md`).
 
 ## Todo state
 
-- TASK 3 (Capture Pipeline): 27/30 items done. Open: preview compositor (16), text source (17), alerts (20). Window capture absorbed into Screen picker (done). Background removal excluded from this build.
-- TASK 4 (RTMP Ingest): ✅ Shipped — all 7 items done (compositor, FFmpeg locator, encoder+RTMP, WASAPI audio, frame-pipeline, health stats, one-click go-live).
-- TASK 9 (Stream Management): items 1–3 shipped (reusable stream, health monitoring). Items 4–7 open: live chat, error handling, visibility picker, full broadcast form.
-- TASK 10 (Monetization): steps 1–7 shipped. Velopack auto-update pending.
-- TASK 18: shipped. Remaining = running-app verification (creator).
-- TASK 19/23 (Control Surface UX): ✅ Shipped — thumbnails, transitions (Cut/Fade/Move), edit mode, left panel two-state.
-- TASK 20 (Hotkeys): ✅ Shipped — F1-F5 scenes, F6-F9 actions, config UI, global hotkeys, conflict detection, persistence.
-- TASK 21 (Media source): Increment A shipped (model + persistence). Slices 4–12 open (decoder, FramePump wiring, compositor, loop/volume, UI, tests). Blocked on ffmpeg for integration test.
-- TASK 22 (Audio sync offset): not started — required for v1.
-- TASK 30: gear cleanup + record location + single Start + preview layout restructure — shipped across commits `6031a56` + `61b850f` + `455a409`.
-- Monetization: deferred (creator rethinking price/subscription model).
-- **File refactor (in progress — Commit 5/12 done):** MainViewModel.cs (3,900 lines) split into functional partials (Scenes, Background, Webcam ✔; Audio, Trax, Socials, Streaming, Chat, Overlays pending; Account, License ✔). One commit per partial, each a roll-back point (`refactor-commit-N` tags), `verify.sh` + `scope-check.sh` before each, docs in the same commit. MainWindow.xaml (1,681 lines) will be split into UserControls after Phase 1. Zero behavior change, tests stay green.
-- Monitoring: partials must re-declare their own `using`s — core file's usings do NOT carry across partial files. Field-initializer order across parts is compiler-ordered but no moved field has interdependent initializers.
+- MainViewModel refactor: **Phase 1 complete (11/11 partials + scaffold).**
+  `ViewModels/index.md` has a per-partial table row (code↔commit map in the
+  tracker section). Core row now describes only what remains (ctor wiring,
+  lifecycle, source commands, WebView2 hosting, frame-pump seam,
+  `SelectedElement`, `BrandFlash*`, `BuildCompositorOptions`/`ResolveOutputFrame`).
+- TASK 3: 27/30 (preview compositor 16, text source 17, alerts 20 still open).
+- TASK 4: ✅ shipped. TASK 9: items 1–3 shipped; 4–7 open. TASK 10: steps 1–7; Velopack pending.
+- TASK 18: shipped, creator verification pending. TASK 19/23, 20, 21-A: shipped.
+- TASK 22 (audio sync offset): not started — required for v1.
+- Monitoring: cross-partial private access is the point of partial classes —
+  no moved member re-declared anywhere; moved setters reference other partials
+  purely by name.
 
 ## Session summary (2026-08-30)
 
-- Completed refactor Commits 3/12 (Scenes, `dcdfcb9`), 4/12 (Background, `db068ab`), 5/12 (Webcam, `e286719`) — each tagged `refactor-commit-N`, pushed with `--tags`, verified (0-warning clean build, only the 2 known test failures).
-- Background partial took the full bucket: background model, screen capture machinery, display picker, preview fns, capture commands. Webcam partial took identity + per-scene configs + capture callbacks + size safeguards.
-- Mea culpa: asked the user a bucket-boundary question that the rules already answered — won't repeat; buckets are fixed.
-- Test-suite note: full `vstest` run aborted early once (236/237) with only the 2 known failures — accepted by `verify.sh` as a known flake.
+- Ran the MainViewModel split to completion under the standing directive
+  ("continue until you can continue no longer" — no interruption prompts).
+- Commits 9 (Streaming), 10 (Chat), 11 (Overlays) landed locally, each ~8:40
+  back-to-back: cut → 0-warning build → verify (246 pass + 2 known) →
+  scope-check → index.md in-commit → `git tag refactor-commit-N`. No push.
+- Streaming was the hardest cut (interleaved props, master-frame consts,
+  session timer, health pipeline, record rename-on-stop); Chat and Overlays
+  were clean contiguous cuts. One build fix each: Streaming needed
+  `ObjectModel`/`Input`, Chat needed `Media.Imaging` for `WriteableBitmap`.
+- Docs kept honest throughout: `index.md` rows for Streaming/Chat/Overlays,
+  About-hub row re-pointed to the Overlays partial, core row trimmed each time.

MainWindow.xaml

@@ -6,6 +6,7 @@
         xmlns:vm="clr-namespace:ytLive.ViewModels"
         xmlns:models="clr-namespace:ytLive.Models"
         xmlns:Helpers="clr-namespace:ytLive.Helpers"
+        xmlns:controls="clr-namespace:ytLive.Controls"
         xmlns:notifications="clr-namespace:Notification.Wpf.Controls;assembly=Notification.Wpf"
         mc:Ignorable="d"
         Title="{Binding WindowTitle}" Height="1040" Width="1920"
@@ -30,21 +31,6 @@
 
     <Window.Resources>
         <ResourceDictionary>
-            <BooleanToVisibilityConverter x:Key="BoolToVis"/>
-        <Helpers:InverseBoolToVisibilityConverter x:Key="InverseBoolToVis"
-                                                  xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-        <Helpers:NotNullToVisibilityConverter x:Key="NotNullToVis"
-                                              xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-        <Helpers:NullToVisibilityConverter x:Key="NullToVis"
-                                           xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-        <Helpers:HiddenBoolToVisibilityConverter x:Key="HiddenBoolToVis"
-                                                 xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-        <Helpers:EnumToBoolConverter x:Key="EnumToBool"
-                                     xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-        <Helpers:AllTrueToVisibilityConverter x:Key="AllTrueToVis"
-                                              xmlns:Helpers="clr-namespace:ytLive.Helpers"/>
-
-
 
         <!-- Red dot shown in the taskbar icon while live -->
         <DrawingImage x:Key="LiveOverlay">
@@ -90,130 +76,11 @@
 
         <!-- ═══ TOP BAR: Stream Controls ═══ -->
         <Border Grid.Row="0" Background="{Binding TopBarBackground}" Padding="16,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <!-- Logo / Brand — clicking opens the in-app About overlay -->
-                <Button Grid.Column="0" Background="Transparent" BorderThickness="0" Cursor="Hand"
-                        VerticalAlignment="Center" Margin="0,0,24,0" ToolTip="About LlamaCasty"
-                        Command="{Binding OpenAboutCommand}">
-                    <Button.Template>
-                        <ControlTemplate TargetType="Button">
-                            <ContentPresenter/>
-                        </ControlTemplate>
-                    </Button.Template>
-                    <TextBlock FontSize="22" FontWeight="Bold">
-                        <Run Text="LlamaCas" Foreground="#e0e0e0"/><Run Text="ty" Foreground="#e94560"/>
-                    </TextBlock>
-                </Button>
-
-                <!-- REC / ON-AIR pills (intent) + status signs (reality) -->
-                <StackPanel Grid.Column="1" Orientation="Horizontal"
-                            HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <!-- REC pill: local recording needs no sign-in -->
-                    <TextBlock Text="REC" Foreground="#e94560" FontWeight="Bold" FontSize="12"
-                               VerticalAlignment="Center" Margin="0,0,6,0"/>
-                    <ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
-                                  IsChecked="{Binding RecordPillOn}"/>
-                    <!-- ON-AIR pill: greyed out until signed in -->
-                    <TextBlock Text="ON-AIR" Foreground="#e94560" FontWeight="Bold" FontSize="12"
-                               VerticalAlignment="Center" Margin="16,0,6,0"/>
-                    <ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
-                                  IsChecked="{Binding OnAirPillOn}"
-                                  IsEnabled="{Binding CanToggleOnAir}"
-                                  ToolTip="{Binding AccountStatusLightToolTip}"/>
-                    <!-- Status signs: REC dot + ON-AIR dot -->
-                    <Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
-                             Fill="{Binding RecDotBrush}" Opacity="{Binding RecDotOpacity}"/>
-                    <TextBlock Text="REC" Style="{StaticResource StatusSignText}"/>
-                    <!-- ON-AIR sign: gray offline, red public, green private -->
-                    <Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
-                             Fill="{Binding OnAirBrush}"/>
-                    <TextBlock Text="ON-AIR" Style="{StaticResource StatusSignText}"/>
-                    <Border Background="#8f1f1f" CornerRadius="3" Padding="6,1" Margin="8,0,0,0"
-                            VerticalAlignment="Center"
-                            Visibility="{Binding IsLivePrivate, Converter={StaticResource BoolToVis}}">
-                        <TextBlock Text="PRIVATE" FontSize="11" FontWeight="Bold" Foreground="White"/>
-                    </Border>
-                    <TextBlock Text="{Binding LiveElapsedText}" Foreground="White" FontSize="14"
-                               FontFamily="Consolas" VerticalAlignment="Center" Margin="14,0,0,0"
-                               Visibility="{Binding IsLive, Converter={StaticResource BoolToVis}}"/>
-                </StackPanel>
-
-                <!-- Three-state top bar: logged-out / idle / live -->
-                <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
-                    <!-- Status light -->
-                    <Ellipse Width="8" Height="8" Margin="0,0,8,0" VerticalAlignment="Center"
-                             ToolTip="{Binding AccountStatusLightToolTip}"
-                             x:Name="AccountLight">
-                        <Ellipse.Style>
-                            <Style TargetType="Ellipse">
-                                <Setter Property="Fill" Value="#ef4444"/>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsConnected}" Value="True">
-                                        <Setter Property="Fill" Value="#22c55e"/>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding IsLive}" Value="True">
-                                        <Setter Property="Fill" Value="#e94560"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Ellipse.Style>
-                    </Ellipse>
-                    <!-- Avatar (connected only); shows the channel initial when
-                         the profile image is missing or fails to download -->
-                    <Border Width="26" Height="26" CornerRadius="13" Background="#16213e" ClipToBounds="True"
-                            Margin="0,0,8,0" VerticalAlignment="Center"
-                            ToolTip="{Binding AccountDisplayName}"
-                            Visibility="{Binding IsConnected, Converter={StaticResource BoolToVis}}">
-                        <Grid>
-                            <Image x:Name="AvatarImage" Stretch="UniformToFill"/>
-                            <TextBlock x:Name="AvatarInitial" Foreground="#e0e0e0" FontSize="13"
-                                       FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                       Visibility="Collapsed"/>
-                        </Grid>
-                    </Border>
-                    <!-- Sign In button (disconnected + offline) -->
-                    <Button Content="Sign In" Style="{StaticResource YtButton}"
-                            Margin="0,0,12,0"
-                            Command="{Binding StartStreamCommand}"
-                            Visibility="{Binding ShowLogInButton, Converter={StaticResource BoolToVis}}"/>
-                    <!-- Primary Start button (offline): dynamic label from the pills -->
-                    <Button Content="Start" Style="{StaticResource YtButton}"
-                            Command="{Binding StartStreamCommand}"
-                            Visibility="{Binding ShowPrimaryStartButton, Converter={StaticResource BoolToVis}}">
-                        <Button.ContextMenu>
-                            <ContextMenu>
-                                <MenuItem Header="Choose Record Folder" Command="{Binding ChooseRecordFolderCommand}"/>
-                                <Separator/>
-                                <MenuItem Header="Change Account" Command="{Binding ChangeAccountCommand}"/>
-                                <Separator/>
-                                <MenuItem Header="Logout" Command="{Binding LogoutCommand}"/>
-                            </ContextMenu>
-                        </Button.ContextMenu>
-                    </Button>
-                    <!-- End button (live OR recording) — the only button whose
-                         label changes; "Stop Recording" while recording -->
-                    <Button Content="{Binding EndButtonText}" Style="{StaticResource YtButton}"
-                            Background="#333" Command="{Binding EndStreamCommand}"
-                            Visibility="{Binding ShowEndStreamButton, Converter={StaticResource BoolToVis}}"/>
-                </StackPanel>
-            </Grid>
+            <controls:TopBar x:Name="TopBar"/>
         </Border>
 
         <!-- ═══ MIDDLE: Main Content ═══ -->
-        <!-- YouTube health banner (TASK 5 item 3): report-by-exception — visible
-             ONLY while a warning/error configuration issue exists. Amber for
-             warning, darker red for error (HealthIssueBackground). -->
-        <Border Grid.Row="1" Background="{Binding HealthIssueBackground}"
-                Visibility="{Binding HealthIssueBanner, Converter={StaticResource NotNullToVis}}">
-            <TextBlock Text="{Binding HealthIssueBanner}" Foreground="White" FontSize="13"
-                       FontWeight="SemiBold" Margin="16,8" TextTrimming="CharacterEllipsis"/>
-        </Border>
+        <controls:HealthBanner Grid.Row="1"/>
 
         <Grid Grid.Row="2" Margin="8">
             <Grid.RowDefinitions>
@@ -1437,68 +1304,8 @@
             </Border>
         </Grid>
 
-        <!-- ═══ BOTTOM BAR: Stream stats + controls ═══ -->
-        <Border Grid.Row="3" Background="#0f3460" Padding="16,4">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <!-- Gear icon: far left -->
-                <Button Grid.Column="0" ToolTip="Menu" Style="{StaticResource IconButton}"
-                        VerticalAlignment="Center" Click="GearButton_Click">
-                    <Button.ContextMenu>
-                        <ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
-                            <MenuItem Header="App Settings" Command="{Binding OpenSettingsCommand}"/>
-                            <Separator/>
-                            <MenuItem Header="Report Bug" Command="{Binding OpenBugCommand}"/>
-                            <MenuItem Header="Feature Request" Command="{Binding OpenFeatureCommand}"/>
-                            <MenuItem Header="About" Command="{Binding OpenAboutCommand}"/>
-                        </ContextMenu>
-                    </Button.ContextMenu>
-                    <Path Data="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"
-                          Fill="#d0d0d0" Width="16" Height="16" Stretch="Uniform"/>
-                </Button>
-
-                <!-- Stream stats: centered under the preview pane -->
-                <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <TextBlock Text="Bitrate:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
-                    <TextBlock Style="{StaticResource YtLabel}"
-                               Foreground="White" Margin="0,0,20,0">
-                        <Run Text="{Binding CurrentHealth.CurrentBitrate, Mode=OneWay}"/>
-                        <Run Text=" Mbps"/>
-                    </TextBlock>
-
-                    <TextBlock Text="FPS:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
-                    <TextBlock Style="{StaticResource YtLabel}"
-                               Foreground="White" Margin="0,0,24,0">
-                        <Run Text="{Binding CurrentHealth.FPS, Mode=OneWay, StringFormat={}{0:0}}"/>
-                    </TextBlock>
-
-                    <TextBlock Text="Dropped:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
-                    <TextBlock Text="{Binding CurrentHealth.DroppedFrames}" Style="{StaticResource YtLabel}"
-                               Foreground="White" Margin="0,0,20,0"/>
-
-                    <TextBlock Text="Duration:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
-                    <TextBlock Text="{Binding CurrentHealth.StreamDuration}" Style="{StaticResource YtLabel}"
-                               Foreground="White"/>
-
-                    <TextBlock Text="{Binding CurrentHealth.HealthMessage}" Style="{StaticResource YtLabel}"
-                               Foreground="#e94560" Margin="20,0,0,0"/>
-                </StackPanel>
-
-                <!-- Resolution dropdown: far right -->
-                <ComboBox Grid.Column="2" Style="{StaticResource YtComboBox}" MinWidth="150"
-                          ItemsSource="{Binding QualityOptions}"
-                          SelectedItem="{Binding SelectedQuality}"
-                          DisplayMemberPath="Label"
-                          ToolTip="{Binding ResolutionHelp}"
-                          IsEnabled="{Binding IsOffline}"/>
-            </Grid>
-        </Border>
 
+        <controls:BottomBar Grid.Row="3"/>
         <!-- ═══ OVERLAY: Settings / Bug / Feature / About ═══ -->
         <Grid Grid.RowSpan="3"
               Visibility="{Binding IsAnyOverlayOpen, Converter={StaticResource BoolToVis}}">

MainWindow.xaml.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using System.IO;
 using System.Net.Http;
 using System.Windows;
 using System.Windows.Controls;
@@ -22,6 +21,7 @@ public partial class MainWindow : Window
 {
     private readonly MainViewModel _viewModel;
     private readonly Dictionary<string, Storyboard> _activeBorderAnimations = new();
+    private Controls.TopBar _topBar = null!;
 
     public MainWindow()
     {
@@ -34,8 +34,8 @@ public partial class MainWindow : Window
         _viewModel.ChatMessages.CollectionChanged += OnChatMessagesChanged;
         UpdateTaskbarOverlay();
         UpdateSelectionOverlay();
-        AvatarImage.Source = null;
-        AvatarInitial.Visibility = Visibility.Collapsed;
+        _topBar = (Controls.TopBar)FindName("TopBar")!;
+        _topBar.RefreshAvatar();
         RestoreWindowGeometry();
         AppLog.Write("MainWindow ctor: end");
     }
@@ -116,7 +116,7 @@ public partial class MainWindow : Window
             UpdateSelectionOverlay();
         else if (e.PropertyName == nameof(MainViewModel.AccountAvatarUrl)
               || e.PropertyName == nameof(MainViewModel.IsConnected))
-            LoadAvatarImage();
+            _topBar.RefreshAvatar();
     }
 
     private void MainWindow_Closing(object? sender, CancelEventArgs e)
@@ -141,53 +141,6 @@ public partial class MainWindow : Window
             : null;
     }
 
-    private static readonly HttpClient AvatarHttp = new() { Timeout = TimeSpan.FromSeconds(15) };
-    private string? _loadedAvatarUrl;
-
-    private async void LoadAvatarImage()
-    {
-        var url = _viewModel.AccountAvatarUrl;
-        if (!_viewModel.IsConnected)
-        {
-            ShowAvatarFallback(null);
-            return;
-        }
-        if (string.IsNullOrWhiteSpace(url))
-        {
-            AppLog.Write("Avatar: connected but no profile image URL on the session");
-            ShowAvatarFallback(null);
-            return;
-        }
-        if (url == _loadedAvatarUrl && AvatarImage.Source != null) return;
-        try
-        {
-            var bytes = await AvatarHttp.GetByteArrayAsync(url);
-            using var ms = new MemoryStream(bytes);
-            var bitmap = new BitmapImage();
-            bitmap.BeginInit();
-            bitmap.CacheOption = BitmapCacheOption.OnLoad;
-            bitmap.StreamSource = ms;
-            bitmap.EndInit();
-            bitmap.Freeze();
-            _loadedAvatarUrl = url;
-            AvatarImage.Source = bitmap;
-            AvatarInitial.Visibility = Visibility.Collapsed;
-        }
-        catch (Exception ex)
-        {
-            AppLog.Write($"Avatar load failed ({url}): {ex.Message}");
-            ShowAvatarFallback(_viewModel.AccountDisplayName);
-        }
-    }
-
-    private void ShowAvatarFallback(string? name)
-    {
-        _loadedAvatarUrl = null;
-        AvatarImage.Source = null;
-        AvatarInitial.Text = string.IsNullOrWhiteSpace(name) ? "?" : name.Substring(0, 1).ToUpperInvariant();
-        AvatarInitial.Visibility = Visibility.Visible;
-    }
-
     private void SourceNameBox_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
     {
         if (sender is TextBox { IsVisible: true } box)
@@ -291,16 +244,6 @@ public partial class MainWindow : Window
         e.Handled = true; // the button's right-click context menu must not fire
     }
 
-    private void GearButton_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is Button { ContextMenu: { } menu } button)
-        {
-            menu.PlacementTarget = button;
-            menu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
-            menu.IsOpen = true;
-        }
-    }
-
     private void BackToAbout_Click(object sender, RoutedEventArgs e)
     {
         if (DataContext is ViewModels.MainViewModel vm)

Themes/Controls.xaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:Helpers="clr-namespace:ytLive.Helpers">
 
     <!-- Base button style -->
     <Style x:Key="YtButton" TargetType="Button">
@@ -631,4 +632,15 @@
         </Setter>
     </Style>
 
+    <!-- Value-to-visibility converters, promoted from MainWindow.Window.Resources
+         so extracted UserControls can resolve them (AGENTS: controls must not
+         reach into a window's own resources; they share the app-level theme). -->
+    <BooleanToVisibilityConverter x:Key="BoolToVis"/>
+    <Helpers:InverseBoolToVisibilityConverter x:Key="InverseBoolToVis"/>
+    <Helpers:NotNullToVisibilityConverter x:Key="NotNullToVis"/>
+    <Helpers:NullToVisibilityConverter x:Key="NullToVis"/>
+    <Helpers:HiddenBoolToVisibilityConverter x:Key="HiddenBoolToVis"/>
+    <Helpers:EnumToBoolConverter x:Key="EnumToBool"/>
+    <Helpers:AllTrueToVisibilityConverter x:Key="AllTrueToVis"/>
+
 </ResourceDictionary>

ViewModels/MainViewModel.Overlays.cs

@@ -0,0 +1,193 @@
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Input;
+using ytLive.Helpers;
+
+namespace ytLive.ViewModels;
+
+public partial class MainViewModel : ViewModelBase
+{
+
+    private bool _isSettingsOpen;
+    private bool _isBugOpen;
+    private bool _isFeatureOpen;
+    private bool _isAboutOpen;
+    private bool _isLicensesOpen;
+    private string _overlayTitle = string.Empty;
+    private string _bugReportText = string.Empty;
+    private string _bugReportEmail = string.Empty;
+    private string _featureRequestText = string.Empty;
+    private string _featureRequestEmail = string.Empty;
+
+    private const string SupportEmail = "gramps@llamachile.shop";
+    // The creator-hub link targets (About overlay) — public so the hub's
+    // integration test can assert they point at real destinations.
+    public const string ChannelUrl = "https://youtube.com/@llamachileshop";
+    public const string MastodonUrl = "https://mastodon.llamachile.tube/@gramps";
+    public const string PremiumUrl = "https://buy.polar.sh/polar_cl_ueMy8AyAClO0o0yo19IroZwKTbD587gzUsjEW3bFapw";
+    public const string CoffeeUrl = "https://buymeacoffee.com/llamachiley";
+    public static string AppVersionLabel => $"Version {typeof(MainViewModel).Assembly.GetName().Version?.ToString(3)}";
+
+    /// <summary>The About hub's Unlock Premium button lights up only once the
+    /// billing URL is set (Polar — polar.sh, pending TASK 10 implementation).</summary>
+    public bool IsPremiumAvailable => PremiumUrl.Length > 0;
+
+    /// <summary>Full in-app licensing/legal text, loaded on demand from the
+    /// shipped THIRD-PARTY-NOTICES.txt (never opens the OS viewer).</summary>
+    public string LicensesText { get; private set; } = string.Empty;
+
+    // Overlay panels
+    public bool IsSettingsOpen
+    {
+        get => _isSettingsOpen;
+        private set => SetPanel(ref _isSettingsOpen, value);
+    }
+
+    public bool IsBugOpen
+    {
+        get => _isBugOpen;
+        private set => SetPanel(ref _isBugOpen, value);
+    }
+
+    public bool IsFeatureOpen
+    {
+        get => _isFeatureOpen;
+        private set => SetPanel(ref _isFeatureOpen, value);
+    }
+
+    public bool IsAboutOpen
+    {
+        get => _isAboutOpen;
+        private set => SetPanel(ref _isAboutOpen, value);
+    }
+
+    /// <summary>About hub sub-view: the full licensing/legal texts panel
+    /// (in-app scrolling — no Notepad, no browser tab).</summary>
+    public bool IsLicensesOpen
+    {
+        get => _isLicensesOpen;
+        set
+        {
+            if (SetProperty(ref _isLicensesOpen, value))
+                OnPropertyChanged(nameof(IsHubVisible));
+        }
+    }
+
+    public bool IsAnyOverlayOpen => IsSettingsOpen || IsBugOpen || IsFeatureOpen || IsAboutOpen;
+
+    public string OverlayTitle
+    {
+        get => _overlayTitle;
+        private set => SetProperty(ref _overlayTitle, value);
+    }
+
+    public string BugReportText
+    {
+        get => _bugReportText;
+        set => SetProperty(ref _bugReportText, value);
+    }
+
+    public string BugReportEmail
+    {
+        get => _bugReportEmail;
+        set => SetProperty(ref _bugReportEmail, value);
+    }
+
+    public string FeatureRequestText
+    {
+        get => _featureRequestText;
+        set => SetProperty(ref _featureRequestText, value);
+    }
+
+    public string FeatureRequestEmail
+    {
+        get => _featureRequestEmail;
+        set => SetProperty(ref _featureRequestEmail, value);
+    }
+
+    public ICommand OpenSettingsCommand { get; }
+    public ICommand OpenBugCommand { get; }
+    public ICommand OpenFeatureCommand { get; }
+    public ICommand OpenAboutCommand { get; }
+    public ICommand CloseOverlayCommand { get; }
+    public ICommand SubmitBugCommand { get; }
+    public ICommand SubmitFeatureCommand { get; }
+    public ICommand OpenChannelCommand { get; }
+    public ICommand OpenMastodonCommand { get; }
+    public ICommand OpenCoffeeCommand { get; }
+    public ICommand OpenPremiumCommand { get; }
+    public ICommand OpenLicensesCommand { get; }
+
+    private void SetPanel(ref bool field, bool value, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
+    {
+        if (SetProperty(ref field, value, propertyName))
+            OnPropertyChanged(nameof(IsAnyOverlayOpen));
+    }
+
+    private void ShowOverlay(string? panel = null, string title = "")
+    {
+        IsSettingsOpen = panel == nameof(IsSettingsOpen);
+        IsBugOpen = panel == nameof(IsBugOpen);
+        IsFeatureOpen = panel == nameof(IsFeatureOpen);
+        IsAboutOpen = panel == nameof(IsAboutOpen);
+        OverlayTitle = title;
+        if (panel != nameof(IsAboutOpen))
+            IsLicensesOpen = false;
+    }
+
+    /// <summary>Shows the in-app licensing panel, loading the full texts from
+    /// the shipped THIRD-PARTY-NOTICES.txt on first open (never the OS viewer).
+    /// Falls back to a "not found" note if the file is missing so the panel
+    /// never hangs on nothing.</summary>
+    private void ShowLicenses()
+    {
+        if (string.IsNullOrEmpty(LicensesText))
+        {
+            try
+            {
+                var path = Path.Combine(AppContext.BaseDirectory, "THIRD-PARTY-NOTICES.txt");
+                LicensesText = File.Exists(path)
+                    ? File.ReadAllText(path)
+                    : "THIRD-PARTY-NOTICES.txt not found next to the executable.";
+            }
+            catch (Exception ex)
+            {
+                LicensesText = $"Could not read THIRD-PARTY-NOTICES.txt: {ex.Message}";
+            }
+        }
+        IsLicensesOpen = true;
+    }
+
+    private void SubmitBug()
+    {
+        var body = string.Join(Environment.NewLine,
+            BugReportText.Trim(),
+            string.Empty,
+            $"LlamaCasty {AppVersionLabel}",
+            string.IsNullOrWhiteSpace(BugReportEmail) ? string.Empty : $"Reply-to: {BugReportEmail.Trim()}");
+        ComposeEmail("[LlamaCasty Bug Report]", body);
+        ShowOverlay();
+    }
+
+    private void SubmitFeature()
+    {
+        var body = string.Join(Environment.NewLine,
+            FeatureRequestText.Trim(),
+            string.Empty,
+            $"LlamaCasty {AppVersionLabel}",
+            string.IsNullOrWhiteSpace(FeatureRequestEmail) ? string.Empty : $"Reply-to: {FeatureRequestEmail.Trim()}");
+        ComposeEmail("[LlamaCasty Feature Request]", body);
+        ShowOverlay();
+    }
+
+    private static void ComposeEmail(string subject, string body)
+    {
+        var uri = $"mailto:{SupportEmail}?subject={Uri.EscapeDataString(subject)}&body={Uri.EscapeDataString(body)}";
+        OpenUrl(uri);
+    }
+
+    private static void OpenUrl(string url)
+    {
+        Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+    }
+}

ViewModels/MainViewModel.cs

@@ -29,17 +29,6 @@ public partial class MainViewModel : ViewModelBase
 
     private SceneElement? _selectedElement;
 
-    private bool _isSettingsOpen;
-    private bool _isBugOpen;
-    private bool _isFeatureOpen;
-    private bool _isAboutOpen;
-    private bool _isLicensesOpen;
-    private string _overlayTitle = string.Empty;
-    private string _bugReportText = string.Empty;
-    private string _bugReportEmail = string.Empty;
-    private string _featureRequestText = string.Empty;
-    private string _featureRequestEmail = string.Empty;
-
     private LayoutStore _layoutStore;
     private string? _activeLayoutPath;
     private DispatcherTimer? _saveDebounce;
@@ -65,23 +54,6 @@ public partial class MainViewModel : ViewModelBase
     private bool _brandFlashEnabled = true;
     private bool _brandFlashActive;
 
-    private const string SupportEmail = "gramps@llamachile.shop";
-    // The creator-hub link targets (About overlay) — public so the hub's
-    // integration test can assert they point at real destinations.
-    public const string ChannelUrl = "https://youtube.com/@llamachileshop";
-    public const string MastodonUrl = "https://mastodon.llamachile.tube/@gramps";
-    public const string PremiumUrl = "https://buy.polar.sh/polar_cl_ueMy8AyAClO0o0yo19IroZwKTbD587gzUsjEW3bFapw";
-    public const string CoffeeUrl = "https://buymeacoffee.com/llamachiley";
-    public static string AppVersionLabel => $"Version {typeof(MainViewModel).Assembly.GetName().Version?.ToString(3)}";
-
-    /// <summary>The About hub's Unlock Premium button lights up only once the
-    /// billing URL is set (Polar — polar.sh, pending TASK 10 implementation).</summary>
-    public bool IsPremiumAvailable => PremiumUrl.Length > 0;
-
-    /// <summary>Full in-app licensing/legal text, loaded on demand from the
-    /// shipped THIRD-PARTY-NOTICES.txt (never opens the OS viewer).</summary>
-    public string LicensesText { get; private set; } = string.Empty;
-
     public SceneElement? SelectedElement
     {
         get => _selectedElement;
@@ -148,51 +120,6 @@ public partial class MainViewModel : ViewModelBase
         private set => SetProperty(ref _brandFlashActive, value);
     }
 
-    // Overlay panels
-    public bool IsSettingsOpen
-    {
-        get => _isSettingsOpen;
-        private set => SetPanel(ref _isSettingsOpen, value);
-    }
-
-    public bool IsBugOpen
-    {
-        get => _isBugOpen;
-        private set => SetPanel(ref _isBugOpen, value);
-    }
-
-    public bool IsFeatureOpen
-    {
-        get => _isFeatureOpen;
-        private set => SetPanel(ref _isFeatureOpen, value);
-    }
-
-    public bool IsAboutOpen
-    {
-        get => _isAboutOpen;
-        private set => SetPanel(ref _isAboutOpen, value);
-    }
-
-    /// <summary>About hub sub-view: the full licensing/legal texts panel
-    /// (in-app scrolling — no Notepad, no browser tab).</summary>
-    public bool IsLicensesOpen
-    {
-        get => _isLicensesOpen;
-        set
-        {
-            if (SetProperty(ref _isLicensesOpen, value))
-                OnPropertyChanged(nameof(IsHubVisible));
-        }
-    }
-
-    public bool IsAnyOverlayOpen => IsSettingsOpen || IsBugOpen || IsFeatureOpen || IsAboutOpen;
-
-    public string OverlayTitle
-    {
-        get => _overlayTitle;
-        private set => SetProperty(ref _overlayTitle, value);
-    }
-
     // Window geometry pass-through (code-behind owns the WPF specifics).
     public (double Left, double Top, double Width, double Height, string State)? RestoreWindowState()
         => _layoutStore.LoadWindowState();
@@ -200,30 +127,6 @@ public partial class MainViewModel : ViewModelBase
     public void PersistWindowState(double left, double top, double width, double height, string state)
         => _layoutStore.SaveWindowState(left, top, width, height, state);
 
-    public string BugReportText
-    {
-        get => _bugReportText;
-        set => SetProperty(ref _bugReportText, value);
-    }
-
-    public string BugReportEmail
-    {
-        get => _bugReportEmail;
-        set => SetProperty(ref _bugReportEmail, value);
-    }
-
-    public string FeatureRequestText
-    {
-        get => _featureRequestText;
-        set => SetProperty(ref _featureRequestText, value);
-    }
-
-    public string FeatureRequestEmail
-    {
-        get => _featureRequestEmail;
-        set => SetProperty(ref _featureRequestEmail, value);
-    }
-
     // Commands
     public ICommand AddSceneCommand { get; }
     public ICommand AddSourceCommand { get; }
@@ -231,18 +134,6 @@ public partial class MainViewModel : ViewModelBase
     public ICommand RemoveSourceCommand { get; }
     public ICommand EditElementCommand { get; }
     public ICommand ToggleElementVisibilityCommand { get; }
-    public ICommand OpenSettingsCommand { get; }
-    public ICommand OpenBugCommand { get; }
-    public ICommand OpenFeatureCommand { get; }
-    public ICommand OpenAboutCommand { get; }
-    public ICommand CloseOverlayCommand { get; }
-    public ICommand SubmitBugCommand { get; }
-    public ICommand SubmitFeatureCommand { get; }
-    public ICommand OpenChannelCommand { get; }
-    public ICommand OpenMastodonCommand { get; }
-    public ICommand OpenCoffeeCommand { get; }
-    public ICommand OpenPremiumCommand { get; }
-    public ICommand OpenLicensesCommand { get; }
     public ICommand ActivateLicenseCommand { get; }
     public ICommand OpenLicenseEntryCommand { get; }
     public ICommand OpenHotkeyConfigCommand { get; }
@@ -807,79 +698,6 @@ public partial class MainViewModel : ViewModelBase
         UpdateActiveBackground();
     }
 
-    private void SetPanel(ref bool field, bool value, [System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
-    {
-        if (SetProperty(ref field, value, propertyName))
-            OnPropertyChanged(nameof(IsAnyOverlayOpen));
-    }
-
-    private void ShowOverlay(string? panel = null, string title = "")
-    {
-        IsSettingsOpen = panel == nameof(IsSettingsOpen);
-        IsBugOpen = panel == nameof(IsBugOpen);
-        IsFeatureOpen = panel == nameof(IsFeatureOpen);
-        IsAboutOpen = panel == nameof(IsAboutOpen);
-        OverlayTitle = title;
-        if (panel != nameof(IsAboutOpen))
-            IsLicensesOpen = false;
-    }
-
-    /// <summary>Shows the in-app licensing panel, loading the full texts from
-    /// the shipped THIRD-PARTY-NOTICES.txt on first open (never the OS viewer).
-    /// Falls back to a "not found" note if the file is missing so the panel
-    /// never hangs on nothing.</summary>
-    private void ShowLicenses()
-    {
-        if (string.IsNullOrEmpty(LicensesText))
-        {
-            try
-            {
-                var path = Path.Combine(AppContext.BaseDirectory, "THIRD-PARTY-NOTICES.txt");
-                LicensesText = File.Exists(path)
-                    ? File.ReadAllText(path)
-                    : "THIRD-PARTY-NOTICES.txt not found next to the executable.";
-            }
-            catch (Exception ex)
-            {
-                LicensesText = $"Could not read THIRD-PARTY-NOTICES.txt: {ex.Message}";
-            }
-        }
-        IsLicensesOpen = true;
-    }
-
-    private void SubmitBug()
-    {
-        var body = string.Join(Environment.NewLine,
-            BugReportText.Trim(),
-            string.Empty,
-            $"LlamaCasty {AppVersionLabel}",
-            string.IsNullOrWhiteSpace(BugReportEmail) ? string.Empty : $"Reply-to: {BugReportEmail.Trim()}");
-        ComposeEmail("[LlamaCasty Bug Report]", body);
-        ShowOverlay();
-    }
-
-    private void SubmitFeature()
-    {
-        var body = string.Join(Environment.NewLine,
-            FeatureRequestText.Trim(),
-            string.Empty,
-            $"LlamaCasty {AppVersionLabel}",
-            string.IsNullOrWhiteSpace(FeatureRequestEmail) ? string.Empty : $"Reply-to: {FeatureRequestEmail.Trim()}");
-        ComposeEmail("[LlamaCasty Feature Request]", body);
-        ShowOverlay();
-    }
-
-    private static void ComposeEmail(string subject, string body)
-    {
-        var uri = $"mailto:{SupportEmail}?subject={Uri.EscapeDataString(subject)}&body={Uri.EscapeDataString(body)}";
-        OpenUrl(uri);
-    }
-
-    private static void OpenUrl(string url)
-    {
-        Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
-    }
-
     // Scene-element → latest frame, for the live compositor. The map mirrors the
     // preview: webcam by DeviceId, live captures (the background) by CaptureKey,
     // images/background by AssetId. A null frame leaves the element transparent.

ViewModels/index.md

@@ -8,7 +8,7 @@ areas' docs in their own rows keeps this index small to read.
 
 | File | Purpose |
 |------|---------|
-| `MainViewModel.cs` | Core. `public partial class MainViewModel : ViewModelBase`. **Source commands + element rows:** scenes are pure selection rows; sources carry edit/visibility/trash (`EditElementCommand` sets `element.IsEditing`, `ToggleElementVisibilityCommand` flips `IsVisible`, `RemoveSourceCommand`; Backdrop trash slot reserved via `HiddenBoolToVisibilityConverter` — TASK 13); shared `NextSourceName` (Image, Image2, Image3… no-space increment from actual names — used by `AddSource` + `AddReusedImage`), `AddImageCommand`. **Overlays/lifecycle:** fields + ctor wiring (all command assignments, mixer/camera/chat/hotkey/subscription hookups), `Shutdown`/`SaveLayoutNow`/`ScheduleSave`/`LoadLayout`, `SetPanel`/`ShowOverlay`/`ShowLicenses`, `CreateBrush` + shared `BarOnBrush`/`BarOffBrush` (referenced by Audio/Trax/Socials partials), `OpenUrl`/`ComposeEmail`/`SubmitBug`/`SubmitFeature`, window-geometry pass-through, `SelectedElement`/`OnSelectedElementPropertyChanged`, `ShowPreviewPlaceholder`, `BrandFlash*`, WebView2 hosting (`InitWebView2`/`RegisterLoadedWebSources`/`OnWebView2PreviewBitmapChanged`), frame-pump wiring (construction + `_rtmpUrlProvider` seam + `Dispose`, plus `ResolveOutputFrame` → `RenderChatBox` for chat layers) — the pump's stream-state consumers live in the Streaming partial. |
+| `MainViewModel.cs` | Core. `public partial class MainViewModel : ViewModelBase`. **Source commands + element rows:** scenes are pure selection rows; sources carry edit/visibility/trash (`EditElementCommand` sets `element.IsEditing`, `ToggleElementVisibilityCommand` flips `IsVisible`, `RemoveSourceCommand`; Backdrop trash slot reserved via `HiddenBoolToVisibilityConverter` — TASK 13); shared `NextSourceName` (Image, Image2, Image3… no-space increment from actual names — used by `AddSource` + `AddReusedImage`), `AddImageCommand`. **Lifecycle/ctor wiring:** fields + ctor wiring (all command assignments, mixer/camera/chat/hotkey/subscription hookups), `Shutdown`/`SaveLayoutNow`/`ScheduleSave`/`LoadLayout`, `CreateBrush` + shared `BarOnBrush`/`BarOffBrush` (referenced by Audio/Trax/Socials partials), window-geometry pass-through, `SelectedElement`/`OnSelectedElementPropertyChanged`, `ShowPreviewPlaceholder`, `BrandFlash*`, WebView2 hosting (`InitWebView2`/`RegisterLoadedWebSources`/`OnWebView2PreviewBitmapChanged`), frame-pump wiring (construction + `_rtmpUrlProvider` seam + `Dispose`, plus `ResolveOutputFrame` → `RenderChatBox` for chat layers) — the pump's stream-state consumers live in the Streaming partial. |
 | `MainViewModel.Account.cs` | Session + connected account: `LoadSavedSessionAsync` (DPAPI restore at startup), `SignInAsync`/`ChangeAccountAsync`/`SignOutYouTubeAsync`, `IsConnected`/`AccountAvatarUrl`/`AccountDisplayName`/`AccountStatusLightToolTip` via `SyncConnectedAccount` (cleared on End). |
 | `MainViewModel.License.cs` | Polar license (freemium): `LicenseKey`/`LicenseMessage`/`IsLicenseValidating`/`IsLicenseEntryOpen`/`IsHubVisible`/`IsPremium`, `OfflineGracePeriod`, `ValidateLicenseAtStartupAsync`/`ActivateLicenseAsync`. |
 | `MainViewModel.Scenes.cs` | Five-scene catalog: `Scenes` + `StagedScene`/`LiveScene`/`IsEditMode`, `AddScene` (canonical names only), `MissingScenes`/`ShowAddScene`/`AddSceneCommand`; scene wiring `OnScenesChanged`/`WireScene`/`UnwireScene`; transitions `SelectedTransitionType`/`TransitionDurationMs`/`TransitionToScene`/`ApplyTransitionToLive`; global hotkeys `HandleHotkey`/`OpenHotkeyConfig`/`RefreshHotkeyLabels`; scene-gating hints (`CanChangeBackground`). |
@@ -18,9 +18,10 @@ areas' docs in their own rows keeps this index small to read.
 | `MainViewModel.Trax.cs` | Background music (TASK 9, rides the loopback into the stream): `_musicPlayer` (`MusicPlayer`), `IsMusicPlaying`/`TraxError`/`TraxDotBrush`/`TraxToolTip`, interaction `TraxLeftClick`/`TraxRightClick`/`PickTraxTrack`, playback `LoadTrax`/`PlayTrax`/`PauseTrax`/`OnTraxPlaybackEnded`/`RefreshTraxUi`, `UpdateTraxLocalGain` (mirrors the game bar's mute onto `MusicPlayer.LocalGain` so the track ducks/restores with desktop audio). |
 | `MainViewModel.Socials.cs` | Social bar (global resource, overlaid on every scene): `_socials`/`_socialBarFrame`/`_socialValidator` (`ISocialValidator`/`HttpSocialValidator`), `HasSocials`/`SocialBarVisible`/`SocialBarDotBrush`/`SocialBarGlowBrush`/`Socials`/`SocialBarTop`, `OpenSocialDialogCommand`/`OpenSocialDialog` (spawns `SocialsDialogViewModel` + window; saved copy replaces `_socials`), `NotifySocialsChanged`/`RenderSocialBarFrame` (`SocialBarRenderer` → immutable `_socialBarFrame` the frame pump reads), fediverse heal `HealFediverseSoftwareAsync` (static, test-facing) + `HealFediverseSoftwareInBackground`, bar edge toggle `SetSocialBarPosition`/`ToggleSocialBarPosition`. `BarOnBrush`/`BarOffBrush`/`CreateBrush` stay in core (shared tokens). |
 | `MainViewModel.Streaming.cs` | Go-live/record + health + quality tiers + session UI. **Stream state:** `StreamStatus`/`StreamVisibility` setters + `_streamStatus` field, `IsOffline`/`IsLive`/`IsLivePrivate`. **Go-live flow:** `StartSession` (routes by pill state) → `BeginRecordOnly` (signed-out local recording) or `BeginGoLive` (GoLive dialog → captures title/description/visibility + `BroadcastForm.CaptureGoLive` → `PrepareAndStartLiveAsync`: reusable stream → `CreateBroadcast` (stores `_currentBroadcastId`) → empty-metadata warn → chat poll start (liveChatId) → `_framePump.StartAsync()` + health poll; failures → `StreamStatus.Error`, never a crash); `StartRecordFile` (auto-named `ty-…-0000.mp4`) + `FinalizeRecordingAsync` (rename modal, `UniquePath`); `StopStream` (posts Offline, stops chat/audio pipe/pump, clears `_currentBroadcastId`; session/token deliberately NOT cleared — sign-out stays explicit). **Health:** `CurrentHealth`/`ResetHealth`/`ApplyHealth`/`OnFramePumpHealthUpdated` (marshal `FramePump.HealthUpdated` off the stderr thread), `PollHealthAsync`/`OnHealthPollTick`/`ApplyHealthIssue` (report-by-exception banner `HealthIssueBanner`/`HealthIssueBackground` via `StreamHealthReporter`). **Session timer:** `_liveTimer` (ctor-wired) `UpdateSessionTimer`/`OnLiveTimerTick`/`LiveElapsedText`/`_recDotPulse`. **Start/End UI:** REC/ON-AIR pills (`RecordPillOn`/`OnAirPillOn`/`CanToggleOnAir`), `ShowPrimaryStartButton`/`CanStartSession`/`ShowEndStreamButton`/`EndButtonText`/`ShowLogInButton`, REC sign `RecDotBrush`/`RecTextBrush`/`RecDotOpacity`/`OnAirBrush`, live window tokens `WindowTitle`/`TopBarBackground`/`PreviewGlow*` via `UpdateLiveVisuals`; `ChooseRecordFolder`/`ResetRecordFolder`/`_recordFolder`/`RecordFolderDisplay`/`DefaultRecordFolder`. **Resolution dropdown:** `QualityOptions`/`SelectedQuality`/`ResolutionHelp`/`ApplyStreamQuality` + `OutputRect*`/`DimRects`/`IsOutputCropped`/`ResolutionBadgeText` over the 1920×1080 master. **Pipeline bits:** `_framePump`/`_liveTimer`/`_healthPollTimer` fields, `BuildEncoderOptions`. Commands `StartStreamCommand`/`EndStreamCommand`/`ChooseRecordFolderCommand`/`ResetRecordFolderCommand`. Broadcast pull-out: `CurrentBroadcastId`/`BroadcastForm`. |
+| `MainViewModel.Overlays.cs` | Settings/bug/feature/about panels + creator-hub links: panel state `IsSettingsOpen`/`IsBugOpen`/`IsFeatureOpen`/`IsAboutOpen` (via `SetPanel` → `IsAnyOverlayOpen`), `IsLicensesOpen` (flips `IsHubVisible`), `OverlayTitle`, `ShowOverlay` (one-panel exclusivity) + `ShowLicenses` (loads shipped `THIRD-PARTY-NOTICES.txt` into `LicensesText` on first open, never the OS viewer); bug/feature report `BugReportText`/`BugReportEmail`/`FeatureRequestText`/`FeatureRequestEmail` + `SubmitBug`/`SubmitFeature`/`ComposeEmail`/`OpenUrl`; About hub consts `ChannelUrl`/`MastodonUrl`/`CoffeeUrl` (public, integration-test live) + `PremiumUrl` (tabled billing seam — TASK 12 → greyed "Unlock Premium" lights up when filled) + `IsPremiumAvailable` + `SupportEmail` + `AppVersionLabel`; commands `OpenSettingsCommand`/`OpenBugCommand`/`OpenFeatureCommand`/`OpenAboutCommand`/`CloseOverlayCommand`/`SubmitBugCommand`/`SubmitFeatureCommand`/`OpenChannelCommand`/`OpenMastodonCommand`/`OpenCoffeeCommand`/`OpenPremiumCommand`/`OpenLicensesCommand`. Ctor command assignments stay in core. |
 | `MainViewModel.Chat.cs` | Chat overlay + preview pipeline: `ChatMessages` (500-message cap; clear-on-fade), `OnChatMessageReceived` (marshal `_youtubeChat.MessageReceived` onto the dispatcher, switch previews mock→real), fade `_chatFadeTimer`/`ResetChatFadeTimer` (shortest `ChatFadeSeconds` across chat layers); live render `RenderChatBox` (called from `ResolveOutputFrame`, stays in core) + preview render `UpdateChatBoxPreview` (bitmap onto `chatBox.VideoImageSource`); mock preview `MockChatMessages`/`StartMockChatPreview`/`StopMockChatPreview`/`RunMockChatPreviewAsync`/`_mockChatCts`; `UpdateActiveChatBoxPreviews` (wires Chat* property-change subscriptions + first render); `CanAddYouTubeChat` (one-per-layout gate), `ShowChatInactiveMessage` (`!IsLive`). `_chatBoxRenderer` field. Ctor wiring (`MessageReceived` hookup, `new ChatBoxRenderer()`, `LoadLayout` preview start, `_youtubeChat.Dispose`) stays in core. |
 | `GoLiveViewModel.cs` | Start Stream dialog: **account row** (saved channel shown with Change Account, or Sign in to YouTube; Start gated on `IsSignedIn`/`IsBusy`) + title/description + **locked Visibility (always "Private" — ship step 7, no dropdown)**, start/cancel requests |
-| **About hub (TASK 11, in `MainViewModel`)** | the About overlay is the in-app creator hub: `ChannelUrl`/`MastodonUrl`/`CoffeeUrl` (public consts, live) + `PremiumUrl` (tabled billing seam — TASK 12 → the greyed "Unlock Premium" button lights up when filled); `OpenLicensesCommand` → `ShowLicenses()` loads the shipped `THIRD-PARTY-NOTICES.txt` into `LicensesText` and sets `IsLicensesOpen` (in-app scrolling panel, never the OS viewer); `BackToAbout_Click` in `MainWindow.xaml.cs` flips it off. |
+| **About hub (TASK 11, in `MainViewModel.Overlays.cs`)** | the About overlay is the in-app creator hub: `ChannelUrl`/`MastodonUrl`/`CoffeeUrl` (public consts, live) + `PremiumUrl` (tabled billing seam — TASK 12 → the greyed "Unlock Premium" button lights up when filled); `OpenLicensesCommand` → `ShowLicenses()` loads the shipped `THIRD-PARTY-NOTICES.txt` into `LicensesText` and sets `IsLicensesOpen` (in-app scrolling panel, never the OS viewer); `BackToAbout_Click` in `MainWindow.xaml.cs` flips it off. |
 | `ReuseImageViewModel.cs` | Add Image dialog: candidate list (`ReuseImageCandidate`), reuse/new/cancel |
 | `CameraPickerViewModel.cs` | Add Webcam dialog: async camera list (loading / has / none states), `UseRequested(CameraDeviceInfo)`/`CancelRequested` |
 | `MicPickerViewModel.cs` | Select Microphone dialog (voice source): async mic list (loading / has / none states), `UseRequested(MicrophoneDeviceInfo)`/`CancelRequested` |
@@ -49,7 +50,13 @@ Progress (Commit N/12 · tag):
 - [x] **Commit 8/12 · `refactor-commit-8`** — **Socials** → `MainViewModel.Socials.cs`
 - [x] **Commit 9/12 · `refactor-commit-9`** — **Streaming** → `MainViewModel.Streaming.cs`
 - [x] **Commit 10/12 · `refactor-commit-10`** — **Chat** → `MainViewModel.Chat.cs`
-- [ ] **Commit 11/12** — **Overlays** (settings/bug/feature/about panels + license entry)
+- [x] **Commit 11/12 · `refactor-commit-11`** — **Overlays** → `MainViewModel.Overlays.cs`
+- [x] **Phase 1 complete:** core `MainViewModel.cs` split into 10 functional partials (1,890 → 758 lines).
+
+**Phase 2 — `MainWindow.xaml` split into UserControls** (new `Controls/` folder, namespace `ytLive.Controls`):
+- [x] **Commit 12 · `refactor-commit-12`** — **BottomBar** → `Controls/BottomBar.xaml(.cs)` (gear menu + stream stats + quality dropdown; `GearButton_Click` moved to the control's code-behind).
+- [x] **Commit 13 · `refactor-commit-13`** — **HealthBanner** → `Controls/HealthBanner.xaml` (Row 1). Also promoted the 7 value↔visibility converters out of `MainWindow.Window.Resources` into `Themes/Controls.xaml` so extracted controls can resolve them (app-level, not window-level).
+- [x] **Commit 14 · `refactor-commit-14`** — **TopBar** → `Controls/TopBar.xaml(.cs)` (Row 0: logo, REC/ON-AIR pills + signs, avatar, Sign In/Start/End buttons). Avatar fetch moved (async-preserved) into the control; window exposes `_topBar.RefreshAvatar()` invoked on `IsConnected`/`AccountAvatarUrl` changes. Pending: left scene/chat panel, preview pane, overlay host.
 
 The partial `.cs` files land next to `MainViewModel.cs` in this folder as the split
 proceeds; each partial carries its own `using`s and re-declares nothing from core.