From d9b3affd881e9d56fed8eb88322df83fbb5f9ea0 Mon Sep 17 00:00:00 2001
From: StuartFerguson <stuart_ferguson1development@outlook.com>
Date: Mon, 20 Jul 2026 11:41:22 +0100
Subject: [PATCH] feat: add shot review phase 2

---
 src/CarryIQ.App/AppHost.cs                    |   1 +
 src/CarryIQ.App/Controls/ShotReviewView.xaml  | 175 +++++++++
 .../Controls/ShotReviewView.xaml.cs           |  11 +
 src/CarryIQ.App/MainWindow.xaml               |   4 +
 src/CarryIQ.App/ShotReviewRowViewModel.cs     |  75 ++++
 src/CarryIQ.App/ShotReviewViewModel.cs        | 358 ++++++++++++++++++
 .../ViewModels/MainWindowViewModel.cs         |  25 +-
 .../App/MainWindowViewModelTests.cs           |   4 +-
 .../App/ShotReviewViewModelTests.cs           | 270 +++++++++++++
 9 files changed, 920 insertions(+), 3 deletions(-)
 create mode 100644 src/CarryIQ.App/Controls/ShotReviewView.xaml
 create mode 100644 src/CarryIQ.App/Controls/ShotReviewView.xaml.cs
 create mode 100644 src/CarryIQ.App/ShotReviewRowViewModel.cs
 create mode 100644 src/CarryIQ.App/ShotReviewViewModel.cs
 create mode 100644 tests/CarryIQ.UnitTests/App/ShotReviewViewModelTests.cs

diff --git a/src/CarryIQ.App/AppHost.cs b/src/CarryIQ.App/AppHost.cs
index e4e991d..85e9299 100644
--- a/src/CarryIQ.App/AppHost.cs
+++ b/src/CarryIQ.App/AppHost.cs
@@ -21,6 +21,7 @@ public static IHost BuildHost()
                 services.AddSingleton<ClubManagerViewModel>();
                 services.AddSingleton<SessionManagerViewModel>();
                 services.AddSingleton<ShotEntryViewModel>();
+                services.AddSingleton<ShotReviewViewModel>();
                 services.AddSingleton<MainWindowViewModel>();
                 services.AddSingleton<MainWindow>();
             })
diff --git a/src/CarryIQ.App/Controls/ShotReviewView.xaml b/src/CarryIQ.App/Controls/ShotReviewView.xaml
new file mode 100644
index 0000000..ad6f617
--- /dev/null
+++ b/src/CarryIQ.App/Controls/ShotReviewView.xaml
@@ -0,0 +1,175 @@
+<UserControl x:Class="CarryIQ.App.ShotReviewView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:CarryIQ.App"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <Style TargetType="{x:Type TextBox}">
+            <Setter Property="Margin" Value="0,4,0,0" />
+            <Setter Property="Padding" Value="12,8" />
+            <Setter Property="BorderBrush" Value="#C9D6E3" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Background" Value="White" />
+        </Style>
+        <Style TargetType="{x:Type ComboBox}">
+            <Setter Property="Margin" Value="0,4,0,0" />
+            <Setter Property="Padding" Value="10,6" />
+            <Setter Property="BorderBrush" Value="#C9D6E3" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Background" Value="White" />
+        </Style>
+    </UserControl.Resources>
+
+    <Border Background="#FFFFFF"
+            BorderBrush="#D9E2EC"
+            BorderThickness="1"
+            CornerRadius="18"
+            Padding="24">
+        <DockPanel>
+            <StackPanel DockPanel.Dock="Top" Margin="0,0,0,16">
+                <TextBlock Text="Shot review"
+                           FontSize="24"
+                           FontWeight="SemiBold"
+                           Foreground="#102A43" />
+                <TextBlock Text="Use the grid to review, select, and bulk-correct recent shots without leaving the keyboard."
+                           Margin="0,6,0,0"
+                           Foreground="#627D98"
+                           TextWrapping="Wrap" />
+
+                <Border Margin="0,16,0,0"
+                        Padding="14"
+                        Background="#F8FAFC"
+                        BorderBrush="#E2E8F0"
+                        BorderThickness="1"
+                        CornerRadius="12">
+                    <TextBlock Text="{Binding StatusMessage}"
+                               Foreground="#334E68"
+                               TextWrapping="Wrap" />
+                </Border>
+
+                <UniformGrid Columns="3" Margin="0,16,0,0">
+                    <StackPanel Margin="0,0,12,12">
+                        <TextBlock Text="Session" Foreground="#334E68" />
+                        <ComboBox ItemsSource="{Binding Sessions}"
+                                  SelectedValue="{Binding SelectedSessionId, Mode=TwoWay}"
+                                  SelectedValuePath="Id">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Foreground="#102A43">
+                                        <Run Text="{Binding SessionDate, StringFormat={}{0:yyyy-MM-dd}}" />
+                                        <Run Text="  " />
+                                        <Run Text="{Binding Name}" />
+                                    </TextBlock>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+
+                    <StackPanel Margin="0,0,12,12">
+                        <TextBlock Text="Search" Foreground="#334E68" />
+                        <TextBox Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
+                    </StackPanel>
+
+                    <StackPanel Margin="0,0,0,12">
+                        <TextBlock Text="Filters" Foreground="#334E68" />
+                        <CheckBox Content="Included only" IsChecked="{Binding IncludedOnly}" Margin="0,8,0,0" />
+                    </StackPanel>
+                </UniformGrid>
+
+                <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
+                    <Button Content="Refresh" Command="{Binding RefreshCommand}" Padding="14,8" Margin="0,0,8,0" />
+                    <Button Content="Include selected" Command="{Binding IncludeSelectedCommand}" Padding="14,8" Margin="0,0,8,0" />
+                    <Button Content="Exclude selected" Command="{Binding ExcludeSelectedCommand}" Padding="14,8" Margin="0,0,8,0" />
+                    <Button Content="Apply club" Command="{Binding ApplyClubCommand}" Padding="14,8" Margin="0,0,8,0" />
+                    <Button Content="Apply swing type" Command="{Binding ApplySwingTypeCommand}" Padding="14,8" />
+                </StackPanel>
+            </StackPanel>
+
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="2.2*" />
+                    <RowDefinition Height="1.3*" />
+                </Grid.RowDefinitions>
+
+                <DataGrid Grid.Row="0"
+                          ItemsSource="{Binding Shots}"
+                          SelectedItem="{Binding SelectedShot, Mode=TwoWay}"
+                          AutoGenerateColumns="False"
+                          CanUserAddRows="False"
+                          CanUserDeleteRows="False"
+                          HeadersVisibility="Column"
+                          SelectionMode="Single"
+                          SelectionUnit="FullRow"
+                          Background="White"
+                          BorderBrush="#D9E2EC"
+                          BorderThickness="1"
+                          GridLinesVisibility="Horizontal"
+                          RowBackground="White"
+                          AlternatingRowBackground="#F8FAFC">
+                    <DataGrid.Columns>
+                        <DataGridTemplateColumn Width="48" Header="">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" HorizontalAlignment="Center" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Header="#" Binding="{Binding ShotSequence}" Width="60" IsReadOnly="True" />
+                        <DataGridTextColumn Header="Recorded" Binding="{Binding RecordedAt, StringFormat={}{0:yyyy-MM-dd HH:mm}}" Width="160" IsReadOnly="True" />
+                        <DataGridTextColumn Header="Club" Binding="{Binding ClubName}" Width="*" IsReadOnly="True" />
+                        <DataGridTextColumn Header="Carry" Binding="{Binding DisplayCarryDistance}" Width="90" IsReadOnly="True" />
+                        <DataGridTextColumn Header="State" Binding="{Binding InclusionState}" Width="100" IsReadOnly="True" />
+                        <DataGridTextColumn Header="Swing" Binding="{Binding SwingType}" Width="120" IsReadOnly="True" />
+                        <DataGridTextColumn Header="Notes" Binding="{Binding Notes}" Width="2*" IsReadOnly="True" />
+                    </DataGrid.Columns>
+                </DataGrid>
+
+                <Border Grid.Row="1"
+                        Margin="0,16,0,0"
+                        Padding="18"
+                        Background="#F8FAFC"
+                        BorderBrush="#E2E8F0"
+                        BorderThickness="1"
+                        CornerRadius="14">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.2*" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+
+                        <StackPanel Margin="0,0,18,0">
+                            <TextBlock Text="Selected shot" FontWeight="SemiBold" Foreground="#102A43" />
+                            <TextBlock Margin="0,8,0,0" Text="{Binding SelectedShot.Notes}" Foreground="#334E68" TextWrapping="Wrap" />
+                            <TextBlock Margin="0,6,0,0" Text="{Binding SelectedShot.RawImportData}" Foreground="#627D98" TextWrapping="Wrap" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="1">
+                            <TextBlock Text="Bulk edit" FontWeight="SemiBold" Foreground="#102A43" />
+                            <StackPanel Margin="0,8,0,0">
+                                <TextBlock Text="Club" Foreground="#334E68" />
+                                <ComboBox ItemsSource="{Binding Clubs}"
+                                          SelectedValue="{Binding SelectedClubId, Mode=TwoWay}"
+                                          SelectedValuePath="Id">
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding Name}" />
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
+                                </ComboBox>
+                            </StackPanel>
+                            <StackPanel Margin="0,10,0,0">
+                                <TextBlock Text="Swing type" Foreground="#334E68" />
+                                <ComboBox ItemsSource="{Binding SwingTypeOptions}"
+                                          DisplayMemberPath="DisplayText"
+                                          SelectedValuePath="Value"
+                                          SelectedValue="{Binding SelectedSwingType, Mode=TwoWay}" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </Grid>
+        </DockPanel>
+    </Border>
+</UserControl>
diff --git a/src/CarryIQ.App/Controls/ShotReviewView.xaml.cs b/src/CarryIQ.App/Controls/ShotReviewView.xaml.cs
new file mode 100644
index 0000000..96e1960
--- /dev/null
+++ b/src/CarryIQ.App/Controls/ShotReviewView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace CarryIQ.App;
+
+public partial class ShotReviewView : UserControl
+{
+    public ShotReviewView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/CarryIQ.App/MainWindow.xaml b/src/CarryIQ.App/MainWindow.xaml
index ce7505b..0ad3e45 100644
--- a/src/CarryIQ.App/MainWindow.xaml
+++ b/src/CarryIQ.App/MainWindow.xaml
@@ -78,6 +78,10 @@
             <local:ShotEntryView />
         </DataTemplate>
 
+        <DataTemplate DataType="{x:Type local:ShotReviewViewModel}">
+            <local:ShotReviewView />
+        </DataTemplate>
+
         <Style x:Key="ShellNavItemStyle" TargetType="{x:Type ListBoxItem}">
             <Setter Property="Foreground" Value="{StaticResource ShellTextBrush}" />
             <Setter Property="Margin" Value="0,0,0,10" />
diff --git a/src/CarryIQ.App/ShotReviewRowViewModel.cs b/src/CarryIQ.App/ShotReviewRowViewModel.cs
new file mode 100644
index 0000000..86585f7
--- /dev/null
+++ b/src/CarryIQ.App/ShotReviewRowViewModel.cs
@@ -0,0 +1,75 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace CarryIQ.App;
+
+public sealed partial class ShotReviewRowViewModel : ObservableObject
+{
+    private bool _isSelected;
+
+    public ShotReviewRowViewModel(Shot shot, string clubName)
+    {
+        Id = shot.Id;
+        PracticeSessionId = shot.PracticeSessionId;
+        ShotSequence = shot.ShotSequence;
+        RecordedAt = shot.RecordedAt;
+        ClubId = shot.ClubId;
+        ClubName = clubName;
+        IsIncluded = shot.IsIncluded;
+        ExclusionReason = shot.ExclusionReason;
+        SwingType = shot.SwingType;
+        Notes = shot.Notes;
+        RawImportData = shot.RawImportData;
+        DisplayCarryDistance = shot.CarryDistance?.Yards;
+    }
+
+    public Guid Id { get; }
+
+    public Guid PracticeSessionId { get; }
+
+    public int ShotSequence { get; }
+
+    public DateTimeOffset RecordedAt { get; }
+
+    public Guid ClubId { get; private set; }
+
+    public string ClubName { get; private set; }
+
+    public bool IsIncluded { get; private set; }
+
+    public string? ExclusionReason { get; private set; }
+
+    public SwingType? SwingType { get; private set; }
+
+    public string? Notes { get; private set; }
+
+    public string? RawImportData { get; private set; }
+
+    public decimal? DisplayCarryDistance { get; }
+
+    public bool IsSelected
+    {
+        get => _isSelected;
+        set => SetProperty(ref _isSelected, value);
+    }
+
+    public string InclusionState => IsIncluded ? "Included" : "Excluded";
+
+    public void ApplyShot(Shot shot, string clubName)
+    {
+        ClubId = shot.ClubId;
+        ClubName = clubName;
+        IsIncluded = shot.IsIncluded;
+        ExclusionReason = shot.ExclusionReason;
+        SwingType = shot.SwingType;
+        Notes = shot.Notes;
+        RawImportData = shot.RawImportData;
+        OnPropertyChanged(nameof(ClubId));
+        OnPropertyChanged(nameof(ClubName));
+        OnPropertyChanged(nameof(IsIncluded));
+        OnPropertyChanged(nameof(ExclusionReason));
+        OnPropertyChanged(nameof(SwingType));
+        OnPropertyChanged(nameof(Notes));
+        OnPropertyChanged(nameof(RawImportData));
+        OnPropertyChanged(nameof(InclusionState));
+    }
+}
diff --git a/src/CarryIQ.App/ShotReviewViewModel.cs b/src/CarryIQ.App/ShotReviewViewModel.cs
new file mode 100644
index 0000000..579dda5
--- /dev/null
+++ b/src/CarryIQ.App/ShotReviewViewModel.cs
@@ -0,0 +1,358 @@
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace CarryIQ.App;
+
+public sealed partial class ShotReviewViewModel : ObservableObject, IShellScreenViewModel
+{
+    private readonly IClubRepository _clubRepository;
+    private readonly IPracticeSessionRepository _sessionRepository;
+    private readonly IShotRepository _shotRepository;
+    private readonly Dictionary<Guid, string> _clubNames = new();
+    private readonly List<Shot> _allShots = [];
+    private Guid? _selectedSessionId;
+    private ShotReviewRowViewModel? _selectedShot;
+    private Guid? _selectedClubId;
+    private SwingType? _selectedSwingType;
+    private string _searchText = string.Empty;
+    private bool _includedOnly;
+    private string? _statusMessage;
+    private bool _isInitialized;
+    private bool _isRefreshing;
+
+    public ShotReviewViewModel(
+        IClubRepository clubRepository,
+        IPracticeSessionRepository sessionRepository,
+        IShotRepository shotRepository)
+    {
+        _clubRepository = clubRepository;
+        _sessionRepository = sessionRepository;
+        _shotRepository = shotRepository;
+
+        RefreshCommand = new AsyncRelayCommand(RefreshAsync, CanRefresh);
+        IncludeSelectedCommand = new AsyncRelayCommand(() => UpdateSelectedShotsAsync(shot => shot with
+        {
+            IsIncluded = true,
+            ExclusionReason = null,
+            UpdatedAt = DateTimeOffset.UtcNow,
+        }), CanUpdateSelectedShots);
+        ExcludeSelectedCommand = new AsyncRelayCommand(() => UpdateSelectedShotsAsync(shot => shot with
+        {
+            IsIncluded = false,
+            ExclusionReason = "Manual review",
+            UpdatedAt = DateTimeOffset.UtcNow,
+        }), CanUpdateSelectedShots);
+        ApplyClubCommand = new AsyncRelayCommand(ApplyClubAsync, CanUpdateSelectedShots);
+        ApplySwingTypeCommand = new AsyncRelayCommand(ApplySwingTypeAsync, CanUpdateSelectedShots);
+    }
+
+    public IReadOnlyList<SelectionOption> SwingTypeOptions { get; } =
+    [
+        new SelectionOption("Keep existing", null),
+        new SelectionOption("Full", SwingType.Full),
+        new SelectionOption("Three quarter", SwingType.ThreeQuarter),
+        new SelectionOption("Half", SwingType.Half),
+        new SelectionOption("Quarter", SwingType.Quarter),
+        new SelectionOption("Pitch", SwingType.Pitch),
+        new SelectionOption("Chip", SwingType.Chip),
+        new SelectionOption("Punch", SwingType.Punch),
+        new SelectionOption("Other", SwingType.Other),
+    ];
+
+    public ObservableCollection<PracticeSessionSummary> Sessions { get; } = [];
+
+    public ObservableCollection<ClubSummary> Clubs { get; } = [];
+
+    public ObservableCollection<ShotReviewRowViewModel> Shots { get; } = [];
+
+    public string Title { get; } = "Shot Review";
+
+    public string Summary { get; } = "Search recent shots, inspect raw data, and bulk-correct the selected rows.";
+
+    public string Footer { get; } = "Use the session picker and search box to narrow the list, then select rows for bulk include, exclude, or edit actions.";
+
+    public Guid? SelectedSessionId
+    {
+        get => _selectedSessionId;
+        set
+        {
+            if (SetProperty(ref _selectedSessionId, value))
+            {
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public ShotReviewRowViewModel? SelectedShot
+    {
+        get => _selectedShot;
+        set
+        {
+            if (SetProperty(ref _selectedShot, value))
+            {
+                if (value is not null)
+                {
+                    if (SelectedClubId is null)
+                    {
+                        SelectedClubId = value.ClubId;
+                    }
+
+                    if (SelectedSwingType is null)
+                    {
+                        SelectedSwingType = value.SwingType;
+                    }
+                }
+
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public Guid? SelectedClubId
+    {
+        get => _selectedClubId;
+        set
+        {
+            if (SetProperty(ref _selectedClubId, value))
+            {
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public SwingType? SelectedSwingType
+    {
+        get => _selectedSwingType;
+        set
+        {
+            if (SetProperty(ref _selectedSwingType, value))
+            {
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public string SearchText
+    {
+        get => _searchText;
+        set
+        {
+            if (SetProperty(ref _searchText, value))
+            {
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public bool IncludedOnly
+    {
+        get => _includedOnly;
+        set
+        {
+            if (SetProperty(ref _includedOnly, value))
+            {
+                NotifyCommandsChanged();
+            }
+        }
+    }
+
+    public string? StatusMessage
+    {
+        get => _statusMessage;
+        private set => SetProperty(ref _statusMessage, value);
+    }
+
+    public IAsyncRelayCommand RefreshCommand { get; }
+
+    public IAsyncRelayCommand IncludeSelectedCommand { get; }
+
+    public IAsyncRelayCommand ExcludeSelectedCommand { get; }
+
+    public IAsyncRelayCommand ApplyClubCommand { get; }
+
+    public IAsyncRelayCommand ApplySwingTypeCommand { get; }
+
+    public async Task InitializeAsync(CancellationToken cancellationToken)
+    {
+        await LoadSupportDataAsync(cancellationToken);
+        SelectedSessionId = Sessions.OrderByDescending(session => session.SessionDate).FirstOrDefault()?.Id;
+        _isInitialized = true;
+        await RefreshAsync(cancellationToken);
+    }
+
+    private async Task LoadSupportDataAsync(CancellationToken cancellationToken)
+    {
+        var sessions = await _sessionRepository.SearchAsync(new SessionSearchCriteria(), cancellationToken);
+        var clubs = await _clubRepository.SearchAsync(new ClubSearchCriteria(ActiveOnly: true), cancellationToken);
+
+        Sessions.Clear();
+        foreach (var session in sessions.OrderByDescending(session => session.SessionDate).ThenBy(session => session.Name))
+        {
+            Sessions.Add(session);
+        }
+
+        Clubs.Clear();
+        _clubNames.Clear();
+        foreach (var club in clubs.OrderBy(club => club.SortOrder).ThenBy(club => club.Name))
+        {
+            Clubs.Add(club);
+            _clubNames[club.Id] = club.Name;
+        }
+    }
+
+    private async Task RefreshAsync(CancellationToken cancellationToken = default)
+    {
+        if (_isRefreshing)
+        {
+            return;
+        }
+
+        _isRefreshing = true;
+        NotifyCommandsChanged();
+        try
+        {
+            if (SelectedSessionId is null)
+            {
+                Shots.Clear();
+                SelectedShot = null;
+                StatusMessage = "Choose a session to review.";
+                return;
+            }
+
+            var shots = await _shotRepository.SearchAsync(
+                new ShotSearchCriteria(PracticeSessionId: SelectedSessionId, IncludedOnly: IncludedOnly ? true : null),
+                cancellationToken);
+
+            _allShots.Clear();
+            _allShots.AddRange(shots.OrderByDescending(shot => shot.RecordedAt).ThenByDescending(shot => shot.ShotSequence));
+            RebuildVisibleShots();
+            StatusMessage = $"{Shots.Count} shots loaded.";
+        }
+        finally
+        {
+            _isRefreshing = false;
+            NotifyCommandsChanged();
+        }
+    }
+
+    private void RebuildVisibleShots()
+    {
+        var previousSelectedId = SelectedShot?.Id;
+        var visibleShots = _allShots.Where(ShotMatchesFilters).ToList();
+
+        Shots.Clear();
+        foreach (var shot in visibleShots)
+        {
+            Shots.Add(new ShotReviewRowViewModel(shot, GetClubName(shot.ClubId)));
+        }
+
+        if (previousSelectedId is Guid selectedId)
+        {
+            SelectedShot = Shots.FirstOrDefault(shot => shot.Id == selectedId) ?? Shots.FirstOrDefault();
+        }
+        else
+        {
+            SelectedShot = Shots.FirstOrDefault();
+        }
+    }
+
+    private bool ShotMatchesFilters(Shot shot)
+    {
+        if (IncludedOnly && !shot.IsIncluded)
+        {
+            return false;
+        }
+
+        if (!string.IsNullOrWhiteSpace(SearchText))
+        {
+            var search = SearchText.Trim().ToLowerInvariant();
+            var clubName = GetClubName(shot.ClubId).ToLowerInvariant();
+            var notes = (shot.Notes ?? string.Empty).ToLowerInvariant();
+            var exclusionReason = (shot.ExclusionReason ?? string.Empty).ToLowerInvariant();
+            var raw = (shot.RawImportData ?? string.Empty).ToLowerInvariant();
+            if (!clubName.Contains(search) && !notes.Contains(search) && !exclusionReason.Contains(search) && !raw.Contains(search))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private string GetClubName(Guid clubId) => _clubNames.TryGetValue(clubId, out var clubName) ? clubName : "Unknown club";
+
+    private async Task UpdateSelectedShotsAsync(Func<Shot, Shot> updater)
+    {
+        var targetRows = GetTargetRows();
+        if (targetRows.Count == 0)
+        {
+            return;
+        }
+
+        foreach (var row in targetRows)
+        {
+            var shot = _allShots.FirstOrDefault(item => item.Id == row.Id);
+            if (shot is null)
+            {
+                continue;
+            }
+
+            var updated = updater(shot with
+            {
+                UpdatedAt = DateTimeOffset.UtcNow,
+            });
+            await _shotRepository.UpdateAsync(updated, CancellationToken.None);
+
+            var index = _allShots.FindIndex(item => item.Id == updated.Id);
+            if (index >= 0)
+            {
+                _allShots[index] = updated;
+            }
+        }
+
+        await RefreshAsync();
+    }
+
+    private async Task ApplyClubAsync()
+    {
+        if (SelectedClubId is not Guid clubId)
+        {
+            return;
+        }
+
+        await UpdateSelectedShotsAsync(shot => shot with
+        {
+            ClubId = clubId,
+            UpdatedAt = DateTimeOffset.UtcNow,
+        });
+    }
+
+    private async Task ApplySwingTypeAsync()
+    {
+        await UpdateSelectedShotsAsync(shot => shot with
+        {
+            SwingType = SelectedSwingType,
+            UpdatedAt = DateTimeOffset.UtcNow,
+        });
+    }
+
+    private List<ShotReviewRowViewModel> GetTargetRows()
+    {
+        var selected = Shots.Where(shot => shot.IsSelected).ToList();
+        return selected.Count > 0 ? selected : (SelectedShot is null ? [] : [SelectedShot]);
+    }
+
+    private bool CanRefresh() => _isInitialized && !_isRefreshing;
+
+    private bool CanUpdateSelectedShots() => _isInitialized && GetTargetRows().Count > 0;
+
+    private void NotifyCommandsChanged()
+    {
+        RefreshCommand.NotifyCanExecuteChanged();
+        IncludeSelectedCommand.NotifyCanExecuteChanged();
+        ExcludeSelectedCommand.NotifyCanExecuteChanged();
+        ApplyClubCommand.NotifyCanExecuteChanged();
+        ApplySwingTypeCommand.NotifyCanExecuteChanged();
+    }
+}
diff --git a/src/CarryIQ.App/ViewModels/MainWindowViewModel.cs b/src/CarryIQ.App/ViewModels/MainWindowViewModel.cs
index 1881f5d..4487856 100644
--- a/src/CarryIQ.App/ViewModels/MainWindowViewModel.cs
+++ b/src/CarryIQ.App/ViewModels/MainWindowViewModel.cs
@@ -9,16 +9,19 @@ public sealed partial class MainWindowViewModel : ObservableObject
     private readonly ClubManagerViewModel? _clubManager;
     private readonly SessionManagerViewModel? _sessionManager;
     private readonly ShotEntryViewModel? _shotEntry;
+    private readonly ShotReviewViewModel? _shotReview;
 
     public MainWindowViewModel(
         IApplicationPaths applicationPaths,
         ClubManagerViewModel? clubManager = null,
         SessionManagerViewModel? sessionManager = null,
-        ShotEntryViewModel? shotEntry = null)
+        ShotEntryViewModel? shotEntry = null,
+        ShotReviewViewModel? shotReview = null)
     {
         _clubManager = clubManager;
         _sessionManager = sessionManager;
         _shotEntry = shotEntry;
+        _shotReview = shotReview;
         ApplicationTitle = "CarryIQ";
         Subtitle = "Local golf analysis foundation";
         DatabasePath = applicationPaths.DatabasePath;
@@ -68,6 +71,21 @@ shotEntry is null
                         ],
                         "This screen will support the manual shot workflow.")
                     : shotEntry),
+            CreateNavigationItem(
+                "Shot Review",
+                "Review and correct",
+                "Inspect recent shots, fix mistakes, and bulk-apply corrections.",
+                shotReview is null
+                    ? new PlaceholderScreenViewModel(
+                        "Shot Review",
+                        "Inspect recent shots, fix mistakes, and bulk-apply corrections.",
+                        [
+                            "Show a searchable list of recent shots in a master-detail layout.",
+                            "Allow bulk include, exclude, club, and swing-type corrections.",
+                            "Keep raw import payloads visible for traceability.",
+                        ],
+                        "This review workspace supports phase 2 of the shot workflow.")
+                    : shotReview),
             CreateNavigationItem(
                 "Imports",
                 "Bring data in",
@@ -217,6 +235,11 @@ public async Task InitializeAsync(CancellationToken cancellationToken)
         {
             await _shotEntry.InitializeAsync(cancellationToken);
         }
+
+        if (_shotReview is not null)
+        {
+            await _shotReview.InitializeAsync(cancellationToken);
+        }
     }
 
     private static ShellNavigationItemViewModel CreateNavigationItem(
diff --git a/tests/CarryIQ.UnitTests/App/MainWindowViewModelTests.cs b/tests/CarryIQ.UnitTests/App/MainWindowViewModelTests.cs
index de22c84..2085ea1 100644
--- a/tests/CarryIQ.UnitTests/App/MainWindowViewModelTests.cs
+++ b/tests/CarryIQ.UnitTests/App/MainWindowViewModelTests.cs
@@ -13,7 +13,7 @@ public void InitializesWithDashboardSelected()
         Assert.Equal("CarryIQ", viewModel.ApplicationTitle);
         Assert.Equal("Dashboard", viewModel.SelectedNavigationItem?.Title);
         Assert.Equal("Dashboard", viewModel.CurrentScreen?.Title);
-        Assert.Equal(11, viewModel.NavigationItems.Count);
+        Assert.Equal(12, viewModel.NavigationItems.Count);
     }
 
     [Fact]
@@ -21,7 +21,7 @@ public void ChangingSelectionUpdatesTheCurrentScreen()
     {
         var viewModel = new MainWindowViewModel(new TestApplicationPaths());
 
-        viewModel.SelectedNavigationItem = viewModel.NavigationItems[4];
+        viewModel.SelectedNavigationItem = viewModel.NavigationItems[5];
 
         Assert.Equal("Club Gapping", viewModel.SelectedNavigationItem?.Title);
         Assert.Equal("Club Gapping", viewModel.CurrentScreen?.Title);
diff --git a/tests/CarryIQ.UnitTests/App/ShotReviewViewModelTests.cs b/tests/CarryIQ.UnitTests/App/ShotReviewViewModelTests.cs
new file mode 100644
index 0000000..3c2a7e3
--- /dev/null
+++ b/tests/CarryIQ.UnitTests/App/ShotReviewViewModelTests.cs
@@ -0,0 +1,270 @@
+using System.Collections.ObjectModel;
+using System.Globalization;
+using CarryIQ.App;
+
+namespace CarryIQ.UnitTests.App;
+
+public class ShotReviewViewModelTests
+{
+    [Fact]
+    public async Task InitializeAsyncLoadsLatestSessionAndSelectsMostRecentShot()
+    {
+        var sessionOld = CreateSessionSummary(DateOnly.Parse("2026-07-18", CultureInfo.InvariantCulture), "Old range");
+        var sessionNew = CreateSessionSummary(DateOnly.Parse("2026-07-19", CultureInfo.InvariantCulture), "New range");
+        var club = CreateClubSummary("7 Iron", 1);
+        var shots = new[]
+        {
+            CreateShot(sessionOld.Id, club.Id, 1, "old note"),
+            CreateShot(sessionNew.Id, club.Id, 1, "first new note"),
+            CreateShot(sessionNew.Id, club.Id, 2, "latest new note"),
+        };
+
+        var viewModel = CreateViewModel([club], [sessionOld, sessionNew], shots);
+
+        await viewModel.InitializeAsync(CancellationToken.None);
+
+        Assert.Equal(sessionNew.Id, viewModel.SelectedSessionId);
+        Assert.Equal(2, viewModel.Shots[0].ShotSequence);
+        Assert.Equal("latest new note", viewModel.SelectedShot?.Notes);
+        Assert.Equal("{\"source\":\"manual\"}", viewModel.SelectedShot?.RawImportData);
+    }
+
+    [Fact]
+    public async Task SearchTextFiltersVisibleShots()
+    {
+        var session = CreateSessionSummary(DateOnly.Parse("2026-07-19", CultureInfo.InvariantCulture), "Morning range");
+        var club = CreateClubSummary("7 Iron", 1);
+        var shots = new[]
+        {
+            CreateShot(session.Id, club.Id, 1, "heel strike"),
+            CreateShot(session.Id, club.Id, 2, "toe strike"),
+        };
+
+        var viewModel = CreateViewModel([club], [session], shots);
+
+        await viewModel.InitializeAsync(CancellationToken.None);
+
+        viewModel.SearchText = "toe";
+        await viewModel.RefreshCommand.ExecuteAsync(null);
+
+        Assert.Single(viewModel.Shots);
+        Assert.Equal("toe strike", viewModel.Shots[0].Notes);
+    }
+
+    [Fact]
+    public async Task BulkExcludeCommandUpdatesSelectedShots()
+    {
+        var session = CreateSessionSummary(DateOnly.Parse("2026-07-19", CultureInfo.InvariantCulture), "Morning range");
+        var club = CreateClubSummary("7 Iron", 1);
+        var shots = new[]
+        {
+            CreateShot(session.Id, club.Id, 1, "first"),
+            CreateShot(session.Id, club.Id, 2, "second"),
+        };
+        var repository = new TestShotRepository(shots);
+
+        var viewModel = CreateViewModel([club], [session], shots, repository);
+
+        await viewModel.InitializeAsync(CancellationToken.None);
+
+        viewModel.Shots[0].IsSelected = true;
+        viewModel.Shots[1].IsSelected = true;
+
+        await viewModel.ExcludeSelectedCommand.ExecuteAsync(null);
+
+        Assert.All(repository.UpdatedShots, shot => Assert.False(shot.IsIncluded));
+        Assert.All(repository.UpdatedShots, shot => Assert.Equal("Manual review", shot.ExclusionReason));
+    }
+
+    [Fact]
+    public async Task ApplyClubAndSwingTypeToSelectedShotsPersistsEdits()
+    {
+        var session = CreateSessionSummary(DateOnly.Parse("2026-07-19", CultureInfo.InvariantCulture), "Morning range");
+        var clubA = CreateClubSummary("7 Iron", 1);
+        var clubB = CreateClubSummary("8 Iron", 2);
+        var shots = new[]
+        {
+            CreateShot(session.Id, clubA.Id, 1, "first"),
+        };
+        var repository = new TestShotRepository(shots);
+
+        var viewModel = CreateViewModel([clubA, clubB], [session], shots, repository);
+
+        await viewModel.InitializeAsync(CancellationToken.None);
+
+        viewModel.SelectedClubId = clubB.Id;
+        viewModel.SelectedSwingType = SwingType.ThreeQuarter;
+        viewModel.Shots[0].IsSelected = true;
+
+        await viewModel.ApplyClubCommand.ExecuteAsync(null);
+        await viewModel.ApplySwingTypeCommand.ExecuteAsync(null);
+
+        Assert.Equal(2, repository.UpdatedShots.Count);
+        Assert.Equal(clubB.Id, repository.UpdatedShots[0].ClubId);
+        Assert.Equal(clubB.Id, repository.UpdatedShots[1].ClubId);
+        Assert.Equal(SwingType.ThreeQuarter, repository.UpdatedShots[1].SwingType);
+    }
+
+    private static ShotReviewViewModel CreateViewModel(
+        IReadOnlyList<ClubSummary> clubs,
+        IReadOnlyList<PracticeSessionSummary> sessions,
+        IReadOnlyList<Shot> shots,
+        TestShotRepository? repository = null)
+    {
+        return new ShotReviewViewModel(
+            new TestClubRepository(clubs),
+            new TestPracticeSessionRepository(sessions),
+            repository ?? new TestShotRepository(shots));
+    }
+
+    private static ClubSummary CreateClubSummary(string name, int sortOrder) =>
+        new(Guid.NewGuid(), name, ClubType.Iron, sortOrder, true);
+
+    private static PracticeSessionSummary CreateSessionSummary(DateOnly sessionDate, string name) =>
+        new(
+            Guid.NewGuid(),
+            Guid.NewGuid(),
+            name,
+            sessionDate,
+            StartTime: null,
+            EndTime: null,
+            Duration: null,
+            SessionType.DrivingRange,
+            "Range",
+            "Trackman",
+            0,
+            0,
+            false);
+
+    private static Shot CreateShot(Guid sessionId, Guid clubId, int sequence, string note) =>
+        new()
+        {
+            Id = Guid.NewGuid(),
+            PracticeSessionId = sessionId,
+            ClubId = clubId,
+            ShotSequence = sequence,
+            RecordedAt = DateTimeOffset.Parse($"2026-07-19T10:0{sequence}:00Z", CultureInfo.InvariantCulture),
+            Source = ShotSourceKind.Manual,
+            CarryDistance = Distance.FromYards(150m + sequence),
+            TotalDistance = Distance.FromYards(160m + sequence),
+            BallSpeed = Speed.FromMilesPerHour(110m + sequence),
+            ClubSpeed = Speed.FromMilesPerHour(80m + sequence),
+            SmashFactor = 1.34m,
+            LaunchAngle = 13.5m,
+            LaunchDirection = -1.2m,
+            ApexHeight = 28m,
+            SpinRate = 6000m,
+            SpinAxis = -2m,
+            OfflineDistance = Distance.FromYards(3m),
+            RollDistance = Distance.FromYards(7m),
+            HangTime = 4.7m,
+            AttackAngle = -4.1m,
+            ClubPath = 1m,
+            FaceAngle = 0.1m,
+            FaceToPath = -0.6m,
+            DynamicLoft = 22m,
+            StrikeQuality = StrikeQuality.Good,
+            ShotShape = ShotShape.Draw,
+            LieType = "Tee",
+            SwingType = SwingType.Full,
+            TargetDistance = Distance.FromYards(155m),
+            IsIncluded = true,
+            ExclusionReason = null,
+            IsEstimated = false,
+            Notes = note,
+            RawImportData = "{\"source\":\"manual\"}",
+            CreatedAt = DateTimeOffset.Parse("2026-07-19T10:00:00Z", CultureInfo.InvariantCulture),
+            UpdatedAt = DateTimeOffset.Parse("2026-07-19T10:00:00Z", CultureInfo.InvariantCulture),
+        };
+
+    private sealed class TestClubRepository(IReadOnlyList<ClubSummary> clubs) : IClubRepository
+    {
+        public Task<Club?> GetAsync(Guid id, CancellationToken cancellationToken) => Task.FromResult<Club?>(null);
+
+        public Task<IReadOnlyList<ClubSummary>> SearchAsync(ClubSearchCriteria criteria, CancellationToken cancellationToken) =>
+            Task.FromResult(clubs);
+
+        public Task SaveAsync(Club club, CancellationToken cancellationToken) => Task.CompletedTask;
+
+        public Task DeleteAsync(Guid id, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class TestPracticeSessionRepository(IReadOnlyList<PracticeSessionSummary> sessions) : IPracticeSessionRepository
+    {
+        public Task<PracticeSession?> GetAsync(Guid id, CancellationToken cancellationToken) => Task.FromResult<PracticeSession?>(null);
+
+        public Task<IReadOnlyList<PracticeSessionSummary>> SearchAsync(SessionSearchCriteria criteria, CancellationToken cancellationToken) =>
+            Task.FromResult(sessions);
+
+        public Task SaveAsync(PracticeSession session, CancellationToken cancellationToken) => Task.CompletedTask;
+
+        public Task DeleteAsync(Guid id, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+
+    private sealed class TestShotRepository : IShotRepository
+    {
+        private readonly List<Shot> _shots;
+
+        public TestShotRepository(IReadOnlyList<Shot> shots)
+        {
+            _shots = shots.ToList();
+        }
+
+        public List<Shot> UpdatedShots { get; } = [];
+
+        public Task AddAsync(Shot shot, CancellationToken cancellationToken)
+        {
+            _shots.Add(shot);
+            return Task.CompletedTask;
+        }
+
+        public Task AddRangeAsync(IReadOnlyCollection<Shot> shots, CancellationToken cancellationToken)
+        {
+            _shots.AddRange(shots);
+            return Task.CompletedTask;
+        }
+
+        public Task UpdateAsync(Shot shot, CancellationToken cancellationToken)
+        {
+            UpdatedShots.Add(shot);
+            var index = _shots.FindIndex(item => item.Id == shot.Id);
+            if (index >= 0)
+            {
+                _shots[index] = shot;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public Task<IReadOnlyList<Shot>> SearchAsync(ShotSearchCriteria criteria, CancellationToken cancellationToken)
+        {
+            IEnumerable<Shot> results = _shots;
+            if (criteria.PracticeSessionId is Guid sessionId)
+            {
+                results = results.Where(shot => shot.PracticeSessionId == sessionId);
+            }
+
+            if (criteria.ClubId is Guid clubId)
+            {
+                results = results.Where(shot => shot.ClubId == clubId);
+            }
+
+            if (criteria.IncludedOnly is bool includedOnly)
+            {
+                results = results.Where(shot => shot.IsIncluded == includedOnly);
+            }
+
+            if (!string.IsNullOrWhiteSpace(criteria.SearchText))
+            {
+                var search = criteria.SearchText.Trim().ToLower(CultureInfo.InvariantCulture);
+                results = results.Where(shot =>
+                    (shot.Notes ?? string.Empty).ToLower(CultureInfo.InvariantCulture).Contains(search, StringComparison.OrdinalIgnoreCase) ||
+                    (shot.ExclusionReason ?? string.Empty).ToLower(CultureInfo.InvariantCulture).Contains(search, StringComparison.OrdinalIgnoreCase) ||
+                    (shot.LieType ?? string.Empty).ToLower(CultureInfo.InvariantCulture).Contains(search, StringComparison.OrdinalIgnoreCase) ||
+                    (shot.RawImportData ?? string.Empty).ToLower(CultureInfo.InvariantCulture).Contains(search, StringComparison.OrdinalIgnoreCase));
+            }
+
+            return Task.FromResult<IReadOnlyList<Shot>>(results.ToList());
+        }
+    }
+}