From 1e33787cf596f2170176a1b07d6f85005f6ea589 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 15:53:31 +0100
Subject: [PATCH 01/11] Show statistic in the main area

---
 .../ScriptRunner.GUI/Views/MainWindow.axaml      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
index cb7b2d8..29f3752 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/MainWindow.axaml
@@ -50,7 +50,18 @@
       <Grid Grid.Row="2"  ColumnDefinitions="Auto,*">
           
           <views:SideMenu ></views:SideMenu>
-          <views:ContentWithSidebar Grid.Column="1" IsSidebarOpen="{Binding IsSideBoxVisible}" SidebarPosition="Left" SidebarWidth="300">
+          
+          <!-- Statistics displayed in full width instead of ContentWithSidebar -->
+          <Panel Grid.Column="1" IsVisible="{Binding IsStatisticsVisible}">
+              <views:Statistics DataContext="{Binding Statistics}"/>
+          </Panel>
+          
+          <!-- ContentWithSidebar for Scripts and Recent executions -->
+          <views:ContentWithSidebar Grid.Column="1" 
+                                    IsSidebarOpen="{Binding IsSideBoxVisible}" 
+                                    SidebarPosition="Left" 
+                                    SidebarWidth="300"
+                                    IsVisible="{Binding !IsStatisticsVisible}">
               <views:ContentWithSidebar.Sidebar>
                   <Panel>
                       <views:ActionsList Name="ActionsList"  IsVisible="{Binding IsScriptListVisible}" ></views:ActionsList>
@@ -60,9 +71,6 @@
                                                   SelectedItem="{Binding SelectedRecentExecution, Mode=TwoWay}"
                                                   ShowDatePicker="True"/>
                       </Panel>
-                      <Panel IsVisible="{Binding IsStatisticsVisible}">
-                          <views:Statistics DataContext="{Binding Statistics}"/>
-                      </Panel>
                   </Panel>
               </views:ContentWithSidebar.Sidebar>
               <views:ContentWithSidebar.Main>

From 732f91906f2fd3c712ce42f0aca9f56f6a79352a Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 15:58:05 +0100
Subject: [PATCH 02/11] Add paging to statistics

---
 .../ViewModels/StatisticsViewModel.cs         | 95 ++++++++++++++++++-
 .../ScriptRunner.GUI/Views/Statistics.axaml   | 29 +++++-
 2 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
index ef9cee6..7bba3a3 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows.Input;
 using ReactiveUI;
 
 namespace ScriptRunner.GUI.ViewModels;
@@ -9,10 +10,18 @@ namespace ScriptRunner.GUI.ViewModels;
 public class StatisticsViewModel : ReactiveObject
 {
     private readonly ObservableCollection<ExecutionLogAction> _executionLog;
+    private List<TopActionItem> _allActions = new();
+    private const int PageSize = 10;
 
     public StatisticsViewModel(ObservableCollection<ExecutionLogAction> executionLog)
     {
         _executionLog = executionLog;
+        
+        // Initialize commands
+        NextPageCommand = ReactiveCommand.Create(NextPage, this.WhenAnyValue(x => x.CanGoNext));
+        PreviousPageCommand = ReactiveCommand.Create(PreviousPage, this.WhenAnyValue(x => x.CanGoPrevious));
+        GoToPageCommand = ReactiveCommand.Create<int>(GoToPage);
+        
         RefreshStatistics();
     }
 
@@ -51,6 +60,78 @@ public int MaxWeek
         set => this.RaiseAndSetIfChanged(ref _maxWeek, value);
     }
 
+    private int _currentPage = 1;
+    public int CurrentPage
+    {
+        get => _currentPage;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _currentPage, value);
+            this.RaisePropertyChanged(nameof(CanGoNext));
+            this.RaisePropertyChanged(nameof(CanGoPrevious));
+            this.RaisePropertyChanged(nameof(PageInfo));
+            UpdatePagedActions();
+        }
+    }
+
+    private int _totalPages = 1;
+    public int TotalPages
+    {
+        get => _totalPages;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _totalPages, value);
+            this.RaisePropertyChanged(nameof(CanGoNext));
+            this.RaisePropertyChanged(nameof(PageInfo));
+        }
+    }
+
+    private int _totalActions = 0;
+    public int TotalActions
+    {
+        get => _totalActions;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _totalActions, value);
+            this.RaisePropertyChanged(nameof(PageInfo));
+        }
+    }
+
+    public bool CanGoNext => CurrentPage < TotalPages;
+    public bool CanGoPrevious => CurrentPage > 1;
+    
+    public string PageInfo => TotalActions > 0 
+        ? $"Page {CurrentPage} of {TotalPages} ({TotalActions} total actions)"
+        : "No actions found";
+
+    public ICommand NextPageCommand { get; }
+    public ICommand PreviousPageCommand { get; }
+    public ICommand GoToPageCommand { get; }
+
+    private void NextPage()
+    {
+        if (CanGoNext)
+        {
+            CurrentPage++;
+        }
+    }
+
+    private void PreviousPage()
+    {
+        if (CanGoPrevious)
+        {
+            CurrentPage--;
+        }
+    }
+
+    private void GoToPage(int pageNumber)
+    {
+        if (pageNumber >= 1 && pageNumber <= TotalPages)
+        {
+            CurrentPage = pageNumber;
+        }
+    }
+
     public void RefreshStatistics()
     {
         var now = DateTime.Now;
@@ -161,7 +242,7 @@ private int GetIntensityLevel(int count)
 
     private void GenerateTopActions(List<ExecutionLogAction> yearData)
     {
-        var topActions = yearData
+        _allActions = yearData
             .GroupBy(x => new { x.Source, x.Name })
             .Select(g => new TopActionItem
             {
@@ -170,7 +251,6 @@ private void GenerateTopActions(List<ExecutionLogAction> yearData)
                 ExecutionCount = g.Count()
             })
             .OrderByDescending(x => x.ExecutionCount)
-            .Take(10)
             .Select((item, index) => 
             {
                 item.Rank = (index + 1).ToString();
@@ -178,7 +258,16 @@ private void GenerateTopActions(List<ExecutionLogAction> yearData)
             })
             .ToList();
 
-        TopActions = topActions;
+        TotalActions = _allActions.Count;
+        TotalPages = TotalActions > 0 ? (int)Math.Ceiling((double)TotalActions / PageSize) : 1;
+        CurrentPage = 1;
+        UpdatePagedActions();
+    }
+
+    private void UpdatePagedActions()
+    {
+        var skip = (CurrentPage - 1) * PageSize;
+        TopActions = _allActions.Skip(skip).Take(PageSize).ToList();
     }
 }
 
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
index 44de8c4..2e6c85a 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
@@ -134,7 +134,7 @@
             
             <!-- Top 10 Actions Section -->
             <StackPanel Spacing="10">
-                <TextBlock Text="Top 10 Most Executed Actions" 
+                <TextBlock Text="Most Executed Actions" 
                            FontSize="18" 
                            FontWeight="SemiBold"/>
                 
@@ -212,6 +212,33 @@
                         </ItemsControl>
                     </Grid>
                 </Border>
+                
+                <!-- Pagination Controls -->
+                <Grid ColumnDefinitions="Auto,*,Auto" Margin="0,10,0,0">
+                    <!-- Previous Button -->
+                    <Button Grid.Column="0" 
+                            Content="Previous"
+                            Command="{Binding PreviousPageCommand}"
+                            IsEnabled="{Binding CanGoPrevious}"
+                            Padding="15,8"
+                            Margin="0,0,10,0"/>
+                    
+                    <!-- Page Info -->
+                    <TextBlock Grid.Column="1" 
+                               Text="{Binding PageInfo}"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Center"
+                               FontSize="13"
+                               Foreground="#A0A0A0"/>
+                    
+                    <!-- Next Button -->
+                    <Button Grid.Column="2" 
+                            Content="Next"
+                            Command="{Binding NextPageCommand}"
+                            IsEnabled="{Binding CanGoNext}"
+                            Padding="15,8"
+                            Margin="10,0,0,0"/>
+                </Grid>
             </StackPanel>
             
         </StackPanel>

From 1c6743275a66b81a09222ac1c0a91251523a2cf6 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 16:05:55 +0100
Subject: [PATCH 03/11] Add Last Execution time to statistics

---
 .../ViewModels/StatisticsViewModel.cs           |  5 ++++-
 .../ScriptRunner.GUI/Views/Statistics.axaml     | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
index 7bba3a3..205827a 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
@@ -248,7 +248,8 @@ private void GenerateTopActions(List<ExecutionLogAction> yearData)
             {
                 ActionName = g.Key.Name,
                 Source = g.Key.Source,
-                ExecutionCount = g.Count()
+                ExecutionCount = g.Count(),
+                LastUsed = g.Max(x => x.Timestamp)
             })
             .OrderByDescending(x => x.ExecutionCount)
             .Select((item, index) => 
@@ -287,4 +288,6 @@ public class TopActionItem
     public string ActionName { get; set; } = "";
     public string Source { get; set; } = "";
     public int ExecutionCount { get; set; }
+    public DateTime LastUsed { get; set; }
+    public string LastUsedFormatted => LastUsed.ToString("yyyy-MM-dd");
 }
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
index 2e6c85a..a908f5b 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
@@ -145,7 +145,7 @@
                     <Grid RowDefinitions="Auto,*">
                         <!-- Table Header -->
                         <Grid Grid.Row="0" 
-                              ColumnDefinitions="50,*,200,150"
+                              ColumnDefinitions="50,*,200,120,120"
                               Margin="5"
                               Height="30">
                             <TextBlock Grid.Column="0" 
@@ -164,6 +164,12 @@
                                        Foreground="#858585"
                                        VerticalAlignment="Center"/>
                             <TextBlock Grid.Column="3" 
+                                       Text="Last Used" 
+                                       FontWeight="SemiBold" 
+                                       Foreground="#858585"
+                                       VerticalAlignment="Center"
+                                       HorizontalAlignment="Center"/>
+                            <TextBlock Grid.Column="4" 
                                        Text="Executions" 
                                        FontWeight="SemiBold" 
                                        Foreground="#858585"
@@ -179,7 +185,7 @@
                                     <Border BorderBrush="#2E2E30" 
                                             BorderThickness="0,1,0,0"
                                             Padding="5">
-                                        <Grid ColumnDefinitions="50,*,200,150" Height="35">
+                                        <Grid ColumnDefinitions="50,*,200,120,120" Height="35">
                                             <TextBlock Grid.Column="0" 
                                                        Text="{Binding Rank}"
                                                        VerticalAlignment="Center"
@@ -195,7 +201,12 @@
                                                        Foreground="#A0A0A0"
                                                        TextTrimming="CharacterEllipsis"
                                                        ToolTip.Tip="{Binding Source}"/>
-                                            <StackPanel Grid.Column="3" 
+                                            <TextBlock Grid.Column="3" 
+                                                       Text="{Binding LastUsedFormatted}"
+                                                       VerticalAlignment="Center"
+                                                       HorizontalAlignment="Center"
+                                                       Foreground="#B0B0B0"/>
+                                            <StackPanel Grid.Column="4" 
                                                         Orientation="Horizontal" 
                                                         HorizontalAlignment="Right"
                                                         VerticalAlignment="Center"

From a2e9d2dee27bd15ef93aded029f52890ad571b59 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 16:41:47 +0100
Subject: [PATCH 04/11] Show execution frequency for previous years

---
 .../ViewModels/StatisticsViewModel.cs         | 216 ++++++++++++++++--
 .../ScriptRunner.GUI/Views/Statistics.axaml   |  22 +-
 2 files changed, 218 insertions(+), 20 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
index 205827a..c1d6cc3 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
@@ -22,6 +22,15 @@ public StatisticsViewModel(ObservableCollection<ExecutionLogAction> executionLog
         PreviousPageCommand = ReactiveCommand.Create(PreviousPage, this.WhenAnyValue(x => x.CanGoPrevious));
         GoToPageCommand = ReactiveCommand.Create<int>(GoToPage);
         
+        // Initialize available years
+        InitializeAvailableYears();
+        
+        // Listen to changes in the execution log and refresh year options
+        _executionLog.CollectionChanged += (sender, args) =>
+        {
+            InitializeAvailableYears();
+        };
+        
         RefreshStatistics();
     }
 
@@ -60,6 +69,44 @@ public int MaxWeek
         set => this.RaiseAndSetIfChanged(ref _maxWeek, value);
     }
 
+    private List<int> _availableYears = new();
+    public List<int> AvailableYears
+    {
+        get => _availableYears;
+        set => this.RaiseAndSetIfChanged(ref _availableYears, value);
+    }
+
+    private List<YearOption> _yearOptions = new();
+    public List<YearOption> YearOptions
+    {
+        get => _yearOptions;
+        set => this.RaiseAndSetIfChanged(ref _yearOptions, value);
+    }
+
+    private YearOption? _selectedYearOption;
+    public YearOption? SelectedYearOption
+    {
+        get => _selectedYearOption;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _selectedYearOption, value);
+            if (value != null)
+            {
+                RefreshHeatmapForSelectedOption();
+            }
+        }
+    }
+
+    private int _selectedYear;
+    public int SelectedYear
+    {
+        get => _selectedYear;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _selectedYear, value);
+        }
+    }
+
     private int _currentPage = 1;
     public int CurrentPage
     {
@@ -132,6 +179,69 @@ private void GoToPage(int pageNumber)
         }
     }
 
+    private void InitializeAvailableYears()
+    {
+        var yearOptions = new List<YearOption>();
+        
+        // Add "Last Year" option first
+        yearOptions.Add(new YearOption { DisplayName = "Last Year", IsLastYear = true, Year = null });
+
+        System.Diagnostics.Debug.WriteLine($"=== InitializeAvailableYears called ===");
+        System.Diagnostics.Debug.WriteLine($"Execution log count: {_executionLog.Count}");
+        
+        if (_executionLog.Count == 0)
+        {
+            System.Diagnostics.Debug.WriteLine("Execution log is empty!");
+            _selectedYearOption = yearOptions[0];
+            YearOptions = yearOptions;
+            return;
+        }
+
+        // Print first and last few entries for debugging
+        var sortedLog = _executionLog.OrderBy(x => x.Timestamp).ToList();
+        System.Diagnostics.Debug.WriteLine($"First execution: {sortedLog.First().Timestamp:yyyy-MM-dd}");
+        System.Diagnostics.Debug.WriteLine($"Last execution: {sortedLog.Last().Timestamp:yyyy-MM-dd}");
+
+        // Get all years from execution log
+        var years = _executionLog
+            .Select(x => x.Timestamp.Year)
+            .Distinct()
+            .OrderByDescending(y => y)
+            .ToList();
+
+        // Debug: Print all years found
+        System.Diagnostics.Debug.WriteLine($"Found {years.Count} unique years in execution log: {string.Join(", ", years)}");
+        
+        // Add individual years (exclude current year since "Last Year" covers it)
+        var currentYear = DateTime.Now.Year;
+        System.Diagnostics.Debug.WriteLine($"Current year: {currentYear}");
+        
+        foreach (var year in years)
+        {
+            // Only add years that are NOT the current year
+            if (year < currentYear)
+            {
+                System.Diagnostics.Debug.WriteLine($"Adding year option: {year}");
+                yearOptions.Add(new YearOption { DisplayName = year.ToString(), IsLastYear = false, Year = year });
+            }
+            else
+            {
+                System.Diagnostics.Debug.WriteLine($"Skipping year: {year} (current or future year)");
+            }
+        }
+
+        System.Diagnostics.Debug.WriteLine($"Total year options: {yearOptions.Count}");
+        System.Diagnostics.Debug.WriteLine($"=== End InitializeAvailableYears ===");
+        
+        YearOptions = yearOptions;
+        
+        // Only set selected year option if it's not already set
+        if (_selectedYearOption == null || !yearOptions.Contains(_selectedYearOption))
+        {
+            _selectedYearOption = yearOptions[0]; // Select "Last Year" by default
+        }
+    }
+
     public void RefreshStatistics()
     {
         var now = DateTime.Now;
@@ -142,14 +252,59 @@ public void RefreshStatistics()
             .Where(x => x.Timestamp >= yearAgo)
             .ToList();
 
-        // Generate heatmap data
-        GenerateHeatmapData(yearData, yearAgo, now);
+        // Generate heatmap data for selected year
+        RefreshHeatmapForSelectedOption();
         
-        // Generate top 10 actions
+        // Generate top actions
         GenerateTopActions(yearData);
     }
 
-    private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime startDate, DateTime endDate)
+    private void RefreshHeatmapForSelectedOption()
+    {
+        if (_selectedYearOption == null)
+            return;
+
+        DateTime startDate;
+        DateTime endDate;
+
+        if (_selectedYearOption.IsLastYear)
+        {
+            // Last year: from today going back 365 days
+            endDate = DateTime.Now.Date;
+            startDate = endDate.AddYears(-1).AddDays(1); // Start from 364 days ago
+        }
+        else if (_selectedYearOption.Year.HasValue)
+        {
+            // Specific year: January 1 to December 31
+            startDate = new DateTime(_selectedYearOption.Year.Value, 1, 1);
+            endDate = new DateTime(_selectedYearOption.Year.Value, 12, 31);
+        }
+        else
+        {
+            return;
+        }
+        
+        var yearData = _executionLog
+            .Where(x => x.Timestamp >= startDate && x.Timestamp <= endDate)
+            .ToList();
+
+        GenerateHeatmapData(yearData, startDate, endDate, _selectedYearOption.IsLastYear);
+    }
+
+    private void RefreshHeatmapForYear()
+    {
+        // Get data for the selected year
+        var startDate = new DateTime(SelectedYear, 1, 1);
+        var endDate = new DateTime(SelectedYear, 12, 31);
+        
+        var yearData = _executionLog
+            .Where(x => x.Timestamp >= startDate && x.Timestamp <= endDate)
+            .ToList();
+
+        GenerateHeatmapData(yearData, startDate, endDate, false);
+    }
+
+    private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime startDate, DateTime endDate, bool isLastYear)
     {
         // Group by date and count executions
         var executionsByDate = yearData
@@ -170,9 +325,24 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
         string currentMonth = "";
         int currentMonthStartWeek = 0;
         
-        while (currentDate <= endDate)
+        // Continue until we reach a Saturday after the end date
+        var actualEndDate = endDate;
+        while (actualEndDate.DayOfWeek != DayOfWeek.Saturday)
         {
-            var count = executionsByDate.TryGetValue(currentDate, out var c) ? c : 0;
+            actualEndDate = actualEndDate.AddDays(1);
+        }
+        
+        while (currentDate <= actualEndDate)
+        {
+            // Only count executions if date is within the actual range
+            var count = 0;
+            var isInRange = currentDate >= startDate && currentDate <= endDate;
+            
+            if (isInRange)
+            {
+                count = executionsByDate.TryGetValue(currentDate, out var c) ? c : 0;
+            }
+            
             var intensity = GetIntensityLevel(count);
             
             // Calculate week index based on days from start Sunday
@@ -186,21 +356,25 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
                 Intensity = intensity,
                 DayOfWeek = (int)currentDate.DayOfWeek,
                 WeekIndex = weekIndex,
-                ToolTip = $"{currentDate:MMM dd, yyyy}: {count} execution{(count != 1 ? "s" : "")} [Week {weekIndex}, Day {(int)currentDate.DayOfWeek}]"
+                ToolTip = $"{currentDate:MMM dd, yyyy}: {count} execution{(count != 1 ? "s" : "")}",
+                IsOutOfRange = !isInRange
             });
 
-            // Track month changes for labels
-            var monthName = currentDate.ToString("MMM");
-            if (monthName != currentMonth)
+            // Track month changes for labels (only for months in the actual range)
+            if (isInRange)
             {
-                // Only add the previous month if we had one
-                if (!string.IsNullOrEmpty(currentMonth))
+                var monthName = currentDate.ToString("MMM");
+                if (monthName != currentMonth)
                 {
-                    int weeksInMonth = weekIndex - currentMonthStartWeek;
-                    monthLabels.Add($"{currentMonth}|{weeksInMonth}");
+                    // Only add the previous month if we had one
+                    if (!string.IsNullOrEmpty(currentMonth))
+                    {
+                        int weeksInMonth = weekIndex - currentMonthStartWeek;
+                        monthLabels.Add($"{currentMonth}|{weeksInMonth}");
+                    }
+                    currentMonth = monthName;
+                    currentMonthStartWeek = weekIndex;
                 }
-                currentMonth = monthName;
-                currentMonthStartWeek = weekIndex;
             }
             
             currentDate = currentDate.AddDays(1);
@@ -209,7 +383,7 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
         // Add the final month
         if (!string.IsNullOrEmpty(currentMonth))
         {
-            int daysSinceStart = (int)(endDate - startSunday).TotalDays;
+            int daysSinceStart = (int)(actualEndDate - startSunday).TotalDays;
             int finalWeekIndex = daysSinceStart / 7;
             int weeksInMonth = finalWeekIndex - currentMonthStartWeek + 1;
             monthLabels.Add($"{currentMonth}|{weeksInMonth}");
@@ -280,6 +454,14 @@ public class HeatmapDay
     public int DayOfWeek { get; set; }
     public int WeekIndex { get; set; }
     public string ToolTip { get; set; } = "";
+    public bool IsOutOfRange { get; set; }
+}
+
+public class YearOption
+{
+    public string DisplayName { get; set; } = "";
+    public bool IsLastYear { get; set; }
+    public int? Year { get; set; }
 }
 
 public class TopActionItem
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
index a908f5b..2c2e11c 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
@@ -55,9 +55,25 @@
             
             <!-- Heatmap Section -->
             <StackPanel Spacing="10">
-                <TextBlock Text="Execution Frequency (Last Year)" 
-                           FontSize="18" 
-                           FontWeight="SemiBold"/>
+                <!-- Header with Year Selector -->
+                <StackPanel Orientation="Horizontal" Spacing="15">
+                    <TextBlock Text="Execution Frequency" 
+                               FontSize="18" 
+                               FontWeight="SemiBold"
+                               VerticalAlignment="Center"/>
+                    
+                    <ComboBox ItemsSource="{Binding YearOptions}"
+                              SelectedItem="{Binding SelectedYearOption}"
+                              MinWidth="120"
+                              VerticalAlignment="Center">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding DisplayName}"/>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </StackPanel>
+                
                 <StackPanel Spacing="5">
                     <!-- Day labels -->
                     <Grid ColumnDefinitions="30,*">

From 4d2f8239823333adca6e6c3bf22ac7d6916f7f6c Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 17:10:54 +0100
Subject: [PATCH 05/11] Improve tooltips for execution frequency

---
 .../ViewModels/StatisticsViewModel.cs         |  30 ++++-
 .../ScriptRunner.GUI/Views/Statistics.axaml   | 119 +++++++++++++++---
 2 files changed, 128 insertions(+), 21 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
index c1d6cc3..5df50be 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
@@ -309,7 +309,7 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
         // Group by date and count executions
         var executionsByDate = yearData
             .GroupBy(x => x.Timestamp.Date)
-            .ToDictionary(x => x.Key, x => x.Count());
+            .ToDictionary(x => x.Key, x => x.ToList());
 
         var heatmapDays = new List<HeatmapDay>();
         var monthLabels = new List<string>();
@@ -337,10 +337,23 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
             // Only count executions if date is within the actual range
             var count = 0;
             var isInRange = currentDate >= startDate && currentDate <= endDate;
+            List<DayActionDetail> actionDetails = new();
             
-            if (isInRange)
+            if (isInRange && executionsByDate.TryGetValue(currentDate, out var dayExecutions))
             {
-                count = executionsByDate.TryGetValue(currentDate, out var c) ? c : 0;
+                count = dayExecutions.Count;
+                
+                // Group actions by name and source, count executions
+                actionDetails = dayExecutions
+                    .GroupBy(x => new { x.Source, x.Name })
+                    .Select(g => new DayActionDetail
+                    {
+                        ActionName = g.Key.Name,
+                        Source = g.Key.Source,
+                        ExecutionCount = g.Count()
+                    })
+                    .OrderByDescending(x => x.ExecutionCount)
+                    .ToList();
             }
             
             var intensity = GetIntensityLevel(count);
@@ -357,7 +370,8 @@ private void GenerateHeatmapData(List<ExecutionLogAction> yearData, DateTime sta
                 DayOfWeek = (int)currentDate.DayOfWeek,
                 WeekIndex = weekIndex,
                 ToolTip = $"{currentDate:MMM dd, yyyy}: {count} execution{(count != 1 ? "s" : "")}",
-                IsOutOfRange = !isInRange
+                IsOutOfRange = !isInRange,
+                ActionDetails = actionDetails
             });
 
             // Track month changes for labels (only for months in the actual range)
@@ -455,6 +469,14 @@ public class HeatmapDay
     public int WeekIndex { get; set; }
     public string ToolTip { get; set; } = "";
     public bool IsOutOfRange { get; set; }
+    public List<DayActionDetail> ActionDetails { get; set; } = new();
+}
+
+public class DayActionDetail
+{
+    public string ActionName { get; set; } = "";
+    public string Source { get; set; } = "";
+    public int ExecutionCount { get; set; }
 }
 
 public class YearOption
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
index 2c2e11c..9eff627 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/Statistics.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:ScriptRunner.GUI.ViewModels"
              xmlns:converters="using:ScriptRunner.GUI.Converters"
+             xmlns:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
              x:Class="ScriptRunner.GUI.Views.Statistics"
              x:DataType="vm:StatisticsViewModel">
@@ -25,6 +26,16 @@
             <Setter Property="Height" Value="12"/>
             <Setter Property="Margin" Value="1"/>
             <Setter Property="CornerRadius" Value="2"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.2" Easing="CubicEaseOut"/>
+                </Transitions>
+            </Setter>
+        </Style>
+        
+        <Style Selector="Border.heatmap-cell:pointerover">
+            <Setter Property="RenderTransform" Value="scale(1.4)"/>
+            <Setter Property="ZIndex" Value="100"/>
         </Style>
         
         <Style Selector="Border.intensity-0">
@@ -117,7 +128,7 @@
                                                     Height="12" 
                                                     Margin="1" 
                                                     CornerRadius="2"
-                                                    ToolTip.Tip="{Binding ToolTip}">
+                                                    Classes="heatmap-cell">
                                                 <Border.Background>
                                                     <SolidColorBrush>
                                                         <SolidColorBrush.Color>
@@ -127,6 +138,73 @@
                                                         </SolidColorBrush.Color>
                                                     </SolidColorBrush>
                                                 </Border.Background>
+                                                
+                                                <!-- Custom Tooltip with Action Details -->
+                                                <ToolTip.Tip>
+                                                    <Border Background="#2D2D30"
+                                                            BorderBrush="#3E3E40"
+                                                            BorderThickness="1"
+                                                            CornerRadius="5"
+                                                            Padding="12"
+                                                            MaxWidth="350">
+                                                        <StackPanel Spacing="8">
+                                                            <!-- Header -->
+                                                            <StackPanel Spacing="4">
+                                                                <TextBlock Text="{Binding Date, StringFormat='MMMM dd, yyyy'}"
+                                                                           FontSize="14"
+                                                                           FontWeight="SemiBold"
+                                                                           Foreground="White"/>
+                                                                <TextBlock FontSize="12"
+                                                                           Foreground="#A0A0A0">
+                                                                    <Run Text="{Binding Count}"/>
+                                                                    <Run Text="execution(s)"/>
+                                                                </TextBlock>
+                                                            </StackPanel>
+                                                            
+                                                            <!-- Separator -->
+                                                            <Border Height="1" 
+                                                                    Background="#3E3E40"
+                                                                    IsVisible="{Binding ActionDetails.Count}"/>
+                                                            
+                                                            <!-- Actions List -->
+                                                            <ItemsControl ItemsSource="{Binding ActionDetails}"
+                                                                          IsVisible="{Binding ActionDetails.Count}">
+                                                                <ItemsControl.ItemTemplate>
+                                                                    <DataTemplate>
+                                                                        <Grid ColumnDefinitions="*,Auto" 
+                                                                              Margin="0,4">
+                                                                            <StackPanel Grid.Column="0" Spacing="2">
+                                                                                <TextBlock Text="{Binding ActionName}"
+                                                                                           FontSize="12"
+                                                                                           FontWeight="Medium"
+                                                                                           Foreground="White"
+                                                                                           TextTrimming="CharacterEllipsis"/>
+                                                                                <TextBlock Text="{Binding Source}"
+                                                                                           FontSize="10"
+                                                                                           Foreground="#858585"
+                                                                                           TextTrimming="CharacterEllipsis"/>
+                                                                            </StackPanel>
+                                                                            <TextBlock Grid.Column="1"
+                                                                                       Text="{Binding ExecutionCount}"
+                                                                                       FontSize="13"
+                                                                                       FontWeight="SemiBold"
+                                                                                       Foreground="#3baced"
+                                                                                       VerticalAlignment="Top"
+                                                                                       Margin="12,0,0,0"/>
+                                                                        </Grid>
+                                                                    </DataTemplate>
+                                                                </ItemsControl.ItemTemplate>
+                                                            </ItemsControl>
+                                                            
+                                                            <!-- No actions message -->
+                                                            <TextBlock Text="No executions on this day"
+                                                                       FontSize="11"
+                                                                       Foreground="#858585"
+                                                                       FontStyle="Italic"
+                                                                       IsVisible="{Binding !ActionDetails.Count}"/>
+                                                        </StackPanel>
+                                                    </Border>
+                                                </ToolTip.Tip>
                                             </Border>
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
@@ -241,31 +319,38 @@
                 </Border>
                 
                 <!-- Pagination Controls -->
-                <Grid ColumnDefinitions="Auto,*,Auto" Margin="0,10,0,0">
+                <StackPanel Orientation="Horizontal" 
+                            HorizontalAlignment="Center"
+                            Spacing="10" 
+                            Margin="0,15,0,0">
                     <!-- Previous Button -->
-                    <Button Grid.Column="0" 
-                            Content="Previous"
+                    <Button i:Attached.Icon="fas fa-chevron-left"
                             Command="{Binding PreviousPageCommand}"
                             IsEnabled="{Binding CanGoPrevious}"
-                            Padding="15,8"
-                            Margin="0,0,10,0"/>
+                            Width="40"
+                            Height="40"
+                            ToolTip.Tip="Previous page"/>
                     
                     <!-- Page Info -->
-                    <TextBlock Grid.Column="1" 
-                               Text="{Binding PageInfo}"
-                               VerticalAlignment="Center"
-                               HorizontalAlignment="Center"
-                               FontSize="13"
-                               Foreground="#A0A0A0"/>
+                    <Border Background="#2D2D30"
+                            BorderBrush="#3E3E40"
+                            BorderThickness="1"
+                            CornerRadius="4"
+                            Padding="15,8"
+                            VerticalAlignment="Center">
+                        <TextBlock Text="{Binding PageInfo}"
+                                   FontSize="13"
+                                   Foreground="#A0A0A0"/>
+                    </Border>
                     
                     <!-- Next Button -->
-                    <Button Grid.Column="2" 
-                            Content="Next"
+                    <Button i:Attached.Icon="fas fa-chevron-right"
                             Command="{Binding NextPageCommand}"
                             IsEnabled="{Binding CanGoNext}"
-                            Padding="15,8"
-                            Margin="10,0,0,0"/>
-                </Grid>
+                            Width="40"
+                            Height="40"
+                            ToolTip.Tip="Next page"/>
+                </StackPanel>
             </StackPanel>
             
         </StackPanel>

From 22fe99ff9ffb61b761aeb9255fc5f5535f6fda78 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 17:36:37 +0100
Subject: [PATCH 06/11] Add Install Command details to action header

---
 .../ScriptConfigs/ScriptConfig.cs             |  2 +-
 .../ScriptReader/ScriptConfigReader.cs        | 23 +++++++++++++++++++
 .../Views/ActionDetailsSection.axaml          | 23 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptConfigs/ScriptConfig.cs b/src/ScriptRunner/ScriptRunner.GUI/ScriptConfigs/ScriptConfig.cs
index 6e63972..a698562 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptConfigs/ScriptConfig.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptConfigs/ScriptConfig.cs
@@ -39,6 +39,7 @@ public class ScriptConfig
     public List<TroubleshootingItem> Troubleshooting { get; set; } = new();
     public List<TroubleshootingItem> InstallTroubleshooting { get; set; } = new();
     public InlineCollection CommandFormatted { get; set; } = new();
+    public InlineCollection InstallCommandFormatted { get; set; } = new();
 }
 
 public class TroubleshootingItem
@@ -154,4 +155,3 @@ public class InteractiveInputItem
     public string Label { get; set; }
     public string Value { get; set; }
 }
-
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
index f5be178..b0207c4 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
@@ -263,6 +263,29 @@ string ResolveAbsolutePath(string path)
 
                     return inline;
                 }));
+
+                // Format InstallCommand if it exists
+                if (!string.IsNullOrWhiteSpace(action.InstallCommand))
+                {
+                    var installWithMarkers = action.Params.Aggregate
+                    (
+                        seed: action.InstallCommand,
+                        func: (string accumulate, ScriptParam source) =>
+                            accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
+                    );
+
+                    action.InstallCommandFormatted.AddRange(installWithMarkers.Split("[!@#]").Select(x =>
+                    {
+                        var inline = new Run(x);
+                        if (x.StartsWith("{"))
+                        {
+                            inline.Foreground = Brushes.LightGreen;
+                            inline.FontWeight = FontWeight.ExtraBold;
+                        }
+
+                        return inline;
+                    }));
+                }
             }
 
             return scriptConfig.Actions;
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
index 12723b6..4d09e57 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionDetailsSection.axaml
@@ -89,7 +89,28 @@
                 </TextBlock>
 
               </StackPanel>
-              <SelectableTextBlock  TextWrapping="Wrap"  Classes="consoleOutput"  Inlines="{Binding SelectedAction.CommandFormatted}" ></SelectableTextBlock>
+              
+              <!-- Command Section -->
+              <StackPanel Margin="0,10,0,0">
+                <TextBlock FontWeight="SemiBold" Margin="0,0,0,5">Command:</TextBlock>
+                <SelectableTextBlock TextWrapping="Wrap" Classes="consoleOutput" Inlines="{Binding SelectedAction.CommandFormatted}" />
+              </StackPanel>
+              
+              <!-- Install Command Section (only shown if InstallCommand exists) -->
+              <StackPanel Margin="0,10,0,0" IsVisible="{Binding SelectedAction.InstallCommand, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+                <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,5">
+                  <TextBlock Grid.Column="0" FontWeight="SemiBold" VerticalAlignment="Center">Install Command:</TextBlock>
+                  <Button Grid.Column="1" 
+                          Command="{Binding InstallScript}" 
+                          avalonia:Attached.Icon="fas fa-download"
+                          Padding="8,4"
+                          Margin="0,0,15,0"
+                          ToolTip.Tip="Run install command">
+                    Install
+                  </Button>
+                </Grid>
+                <SelectableTextBlock TextWrapping="Wrap" Classes="consoleOutput" Inlines="{Binding SelectedAction.InstallCommandFormatted}" />
+              </StackPanel>
             </StackPanel>
           </Expander>
               

From f45af8bb5e8c8efd7e39f2ecf481a0000d64018d Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sat, 22 Nov 2025 18:02:57 +0100
Subject: [PATCH 07/11] Detect corrupted manifest files

---
 .../ScriptReader/ConfigLoadResult.cs          |  11 +
 .../ScriptReader/ScriptConfigReader.cs        | 240 +++++++++++++++++-
 .../ScriptRunner.GUI/ScriptRunner.GUI.csproj  |   1 -
 .../ViewModels/MainWindowViewModel.cs         |  31 ++-
 4 files changed, 277 insertions(+), 6 deletions(-)
 create mode 100644 src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ConfigLoadResult.cs

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ConfigLoadResult.cs b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ConfigLoadResult.cs
new file mode 100644
index 0000000..f0d0d5e
--- /dev/null
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ConfigLoadResult.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using ScriptRunner.GUI.ScriptConfigs;
+
+namespace ScriptRunner.GUI.ScriptReader;
+
+public class ConfigLoadResult
+{
+    public List<ScriptConfig> Configs { get; } = new();
+    public List<string> CorruptedFiles { get; } = new();
+}
+
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
index b0207c4..f31205c 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
@@ -19,6 +19,43 @@ namespace ScriptRunner.GUI.ScriptReader;
 
 public static class ScriptConfigReader
 {
+    public static ConfigLoadResult LoadWithErrorTracking(ConfigScriptEntry source,
+        ScriptRunnerAppSettings appSettings)
+    {
+        var result = new ConfigLoadResult();
+        
+        if (string.IsNullOrWhiteSpace(source.Path))
+        {
+            return result;
+        }
+        
+        if (source.Type == ConfigScriptType.File)
+        {
+            if (File.Exists(source.Path) == false)
+            {
+                return result;
+            }
+
+            LoadFileSourceWithTracking(source.Path, appSettings, result, source.Name);
+            return result;
+        }
+
+        if (source.Type == ConfigScriptType.Directory)
+        {
+            if (Directory.Exists(source.Path) == false)
+            {
+                return result;
+            }
+
+            foreach (var file in Directory.EnumerateFiles(source.Path, "*.json", source.Recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly))
+            {
+                LoadFileSourceWithTracking(file, appSettings, result, source.Name);
+            }
+        }
+        
+        return result;
+    }
+
     public static IEnumerable<ScriptConfig> Load(ConfigScriptEntry source,
         ScriptRunnerAppSettings appSettings)
     {
@@ -103,6 +140,207 @@ private static IAutoParameterBuilder CreateBuilder(ScriptConfig scriptConfig)
         return EmptyAutoParameterBuilder.Instance;
     }
 
+    private static void LoadFileSourceWithTracking(string fileName,
+        ScriptRunnerAppSettings appSettings, ConfigLoadResult result, string sourceName)
+    {
+        if (!File.Exists(fileName)) return;
+
+        try
+        {
+            var jsonString = File.ReadAllText(fileName);
+
+            if (jsonString.Contains("ScriptRunnerSchema.json") == false)
+            {
+                return;
+            }
+
+            var scriptConfig = JsonSerializer.Deserialize<ActionsConfig>(jsonString, new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+                AllowTrailingCommas = true,
+                Converters = { new PromptTypeJsonConverter(), new ParamTypeJsonConverter(), new JsonStringEnumConverter() }
+            })!;
+
+            foreach (var action in scriptConfig.Actions)
+            {
+                action.Source = fileName;
+                action.SourceName = sourceName;
+                action.Categories ??= new List<string>();
+
+                var mainCategory = string.IsNullOrWhiteSpace(action.SourceName) == false
+                    ? action.SourceName
+                    : Path.GetFileName(fileName);
+                if (string.IsNullOrWhiteSpace(mainCategory) == false)
+                {
+                    action.Categories.Add(mainCategory);
+                }
+
+                var parameterBuilder = CreateBuilder(action);
+
+                var actionDir = Path.GetDirectoryName(fileName);
+
+                string ResolveAbsolutePath(string path)
+                {
+                    if (string.IsNullOrWhiteSpace(path) == false)
+                    {
+                        if (Path.IsPathRooted(path) == false)
+                        {
+                            return Path.GetFullPath(Path.Combine(actionDir!, path));
+                        }
+                    }
+
+                    return path;
+                }
+
+                [return:NotNullIfNotNull("command")]
+                string? AdjustCommandPath(string? command)
+                {
+                    if (string.IsNullOrWhiteSpace(command) == false && (command.StartsWith(".")))
+                    {
+                        var (commandPath, args) = MainWindowViewModel.SplitCommandAndArgs(command);
+                        return (ResolveAbsolutePath(commandPath) + " " + args).Trim();
+                    }
+
+                    return command;
+                }
+                
+                action.Command = AdjustCommandPath(action.Command);
+                action.InstallCommand = AdjustCommandPath(action.InstallCommand);
+                
+                var autoGeneratedParameters = action.Params.Where(x=>x.SkipFromAutoParameterBuilder == false).Select(param => parameterBuilder.Build(param)).Where(paramString => string.IsNullOrWhiteSpace(paramString) == false);
+                action.Command += " "+string.Join(" ", autoGeneratedParameters);
+
+                if (string.IsNullOrWhiteSpace(action.Docs) == false )
+                {
+                    var docPaths = ResolveAbsolutePath(action.Docs);
+                    if (File.Exists(docPaths))
+                    {
+                        action.HasDocs = true;
+                        action.DocsContent = File.ReadAllText(docPaths);
+                        action.DocAssetPath = Path.GetDirectoryName(docPaths);
+                    }
+                }
+                
+                action.WorkingDirectory = string.IsNullOrWhiteSpace(action.WorkingDirectory) ? actionDir : ResolveAbsolutePath(action.WorkingDirectory);
+                action.InstallCommandWorkingDirectory = string.IsNullOrWhiteSpace(action.InstallCommandWorkingDirectory) ? actionDir : ResolveAbsolutePath(action.InstallCommandWorkingDirectory);
+
+                var defaultSet = new ArgumentSet()
+                {
+                    Description = MainWindowViewModel.DefaultParameterSetName
+                };
+
+                foreach (var param in action.Params)
+                {
+                    param.ValueGeneratorCommand = AdjustCommandPath(param.ValueGeneratorCommand);
+                    defaultSet.Arguments[param.Name] = param.Default;
+                }
+
+                foreach (var set in action.PredefinedArgumentSets.Where(x => x.FallbackToDefault))
+                {
+                    foreach (var (key, val) in defaultSet.Arguments)
+                    {
+                        if (set.Arguments.ContainsKey(key) == false)
+                        {
+                            set.Arguments[key] = val;
+                        }
+                    }
+                }
+
+                if (appSettings.ExtraParameterSets?.Where(x => x.ActionName == action.Name).ToList() is { } extraSets)
+                {
+                    foreach (var extraSet in extraSets.Select(x => new ArgumentSet
+                             {
+                                 Description = x.Description,
+                                 Arguments = x.Arguments
+                             }))
+                    {
+                        var existing = action.PredefinedArgumentSets.FirstOrDefault(x => x.Description == extraSet.Description);
+                        if (existing != null)
+                        {
+                            action.PredefinedArgumentSets[action.PredefinedArgumentSets.IndexOf(existing)] = extraSet;
+                        }
+                        else
+                        {
+                            action.PredefinedArgumentSets.Add(extraSet);
+                        }
+                    }
+                }
+
+                switch (action.PredefinedArgumentSetsOrdering)
+                {
+                    case PredefinedArgumentSetsOrdering.Ascending:
+                        action.PredefinedArgumentSets.Sort((s1, s2) => string.CompareOrdinal(s1.Description, s2.Description));
+                        break;
+                    case PredefinedArgumentSetsOrdering.Descending:
+                        action.PredefinedArgumentSets.Sort((s1, s2) => string.CompareOrdinal(s2.Description, s1.Description));
+                        break;
+                }
+
+                action.PredefinedArgumentSets.Insert(0, defaultSet);
+
+                foreach (var param in action.Params.Where(x=>x.Prompt == PromptType.FileContent))
+                {
+                    foreach (var set in action.PredefinedArgumentSets)
+                    {
+                        if (set.Arguments.TryGetValue(param.Name, out var defaultValue))
+                        {
+                            set.Arguments[param.Name] = ResolveAbsolutePath(defaultValue);
+                        }
+                    }
+                }
+
+                var withMarkers = action.Params.Aggregate
+                (
+                    seed: action.Command,
+                    func: (string accumulate, ScriptParam source) =>
+                        accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
+                );
+
+                action.CommandFormatted.AddRange(withMarkers.Split("[!@#]").Select(x =>
+                {
+                    var inline = new Run(x);
+                    if (x.StartsWith("{"))
+                    {
+
+                        inline.Foreground = Brushes.LightGreen;
+                        inline.FontWeight = FontWeight.ExtraBold;
+                    }
+
+                    return inline;
+                }));
+
+                // Format InstallCommand if it exists
+                if (!string.IsNullOrWhiteSpace(action.InstallCommand))
+                {
+                    var installWithMarkers = action.Params.Aggregate
+                    (
+                        seed: action.InstallCommand,
+                        func: (string accumulate, ScriptParam source) =>
+                            accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
+                    );
+
+                    action.InstallCommandFormatted.AddRange(installWithMarkers.Split("[!@#]").Select(x =>
+                    {
+                        var inline = new Run(x);
+                        if (x.StartsWith("{"))
+                        {
+                            inline.Foreground = Brushes.LightGreen;
+                            inline.FontWeight = FontWeight.ExtraBold;
+                        }
+
+                        return inline;
+                    }));
+                }
+                
+                result.Configs.Add(action);
+            }
+        }
+        catch (Exception ex)
+        {
+            result.CorruptedFiles.Add(fileName);
+        }
+    }
+
     private static IEnumerable<ScriptConfig> LoadFileSource(string fileName,
         ScriptRunnerAppSettings appSettings)
     {
@@ -217,8 +455,6 @@ string ResolveAbsolutePath(string path)
                             action.PredefinedArgumentSets.Add(extraSet);
                         }
                     }
-
-                    
                 }
 
                 switch (action.PredefinedArgumentSetsOrdering)
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj b/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
index b225cb6..330434e 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptRunner.GUI.csproj
@@ -16,7 +16,6 @@
   </PropertyGroup>
   <ItemGroup>
 	<AvaloniaResource Include="Assets\**" />
-    <Folder Include="ScriptReader\" />
     <None Remove=".gitignore" />
     <None Remove="Themes\DarkTheme.xaml" />
   </ItemGroup>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index ade8658..ea216aa 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -499,9 +499,13 @@ private void BuildUi()
             ? SampleScripts
             : appSettings.ConfigScripts;
         var actions = new List<ScriptConfig>();
-        foreach (var action in  sources.SelectMany(x=> ScriptConfigReader.Load(x, appSettings)).OrderBy(x=>x.SourceName).ThenBy(x=>x.Name))
+        var allCorruptedFiles = new List<string>();
+        
+        foreach (var source in sources)
         {
-            actions.Add(action);
+            var result = ScriptConfigReader.LoadWithErrorTracking(source, appSettings);
+            actions.AddRange(result.Configs.OrderBy(x => x.SourceName).ThenBy(x => x.Name));
+            allCorruptedFiles.AddRange(result.CorruptedFiles);
         }
 
         Actions = actions;
@@ -528,8 +532,29 @@ private void BuildUi()
         }
         ExecutionLog.Clear();
         ExecutionLog.AddRange(AppSettingsService.LoadExecutionLog());
+        
+        if (allCorruptedFiles.Count > 0)
+        {
+            ShowCorruptedFilesDialog(allCorruptedFiles);
+        }
     }
-
+    
+    private async void ShowCorruptedFilesDialog(List<string> corruptedFiles)
+    {
+        var fileList = string.Join("\n", corruptedFiles.Select(f => $"• {f}"));
+        var message = $"The following configuration files are corrupted and were skipped:\n\n{fileList}\n\nPlease check these files for JSON syntax errors.";
+        var messageBox = MessageBoxManager.GetMessageBoxStandard(
+            "Corrupted Configuration Files", 
+            message, 
+            icon: MsBox.Avalonia.Enums.Icon.Warning,
+            windowStartupLocation: WindowStartupLocation.CenterOwner);
+        
+        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            await messageBox.ShowWindowDialogAsync(desktop.MainWindow);
+        }
+    }
+    
     private static List<ConfigScriptEntry> SampleScripts => new()
     {
         new ConfigScriptEntry

From 5d2b98afced80b68e9183c0391e7ee6d9b7b8fa1 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sun, 23 Nov 2025 08:49:29 +0100
Subject: [PATCH 08/11] Handle config reload in non-blocking way

---
 .../ScriptReader/ScriptConfigReader.cs        |  43 +---
 .../ViewModels/MainWindowViewModel.cs         | 239 ++++++++++++++----
 .../ViewModels/StatisticsViewModel.cs         |  30 ++-
 .../ScriptRunner.GUI/Views/SideMenu.axaml     |  12 +-
 4 files changed, 216 insertions(+), 108 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
index f31205c..3267b74 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ScriptReader/ScriptConfigReader.cs
@@ -289,48 +289,7 @@ string ResolveAbsolutePath(string path)
                     }
                 }
 
-                var withMarkers = action.Params.Aggregate
-                (
-                    seed: action.Command,
-                    func: (string accumulate, ScriptParam source) =>
-                        accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
-                );
-
-                action.CommandFormatted.AddRange(withMarkers.Split("[!@#]").Select(x =>
-                {
-                    var inline = new Run(x);
-                    if (x.StartsWith("{"))
-                    {
-
-                        inline.Foreground = Brushes.LightGreen;
-                        inline.FontWeight = FontWeight.ExtraBold;
-                    }
-
-                    return inline;
-                }));
-
-                // Format InstallCommand if it exists
-                if (!string.IsNullOrWhiteSpace(action.InstallCommand))
-                {
-                    var installWithMarkers = action.Params.Aggregate
-                    (
-                        seed: action.InstallCommand,
-                        func: (string accumulate, ScriptParam source) =>
-                            accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
-                    );
-
-                    action.InstallCommandFormatted.AddRange(installWithMarkers.Split("[!@#]").Select(x =>
-                    {
-                        var inline = new Run(x);
-                        if (x.StartsWith("{"))
-                        {
-                            inline.Foreground = Brushes.LightGreen;
-                            inline.FontWeight = FontWeight.ExtraBold;
-                        }
-
-                        return inline;
-                    }));
-                }
+               
                 
                 result.Configs.Add(action);
             }
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index ea216aa..73bcb15 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -12,8 +12,10 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Documents;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.Media;
 using Avalonia.Threading;
 using CliWrap;
 using DynamicData;
@@ -57,6 +59,55 @@ public bool IsStatisticsVisible
 
     private bool _isStatisticsVisible;
 
+    public bool IsLoadingConfig
+    {
+        get => _isLoadingConfig;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _isLoadingConfig, value);
+            UpdateIsAnyRefreshInProgress();
+        }
+    }
+
+    private bool _isLoadingConfig;
+
+    public bool IsRefreshingAppUpdates
+    {
+        get => _isRefreshingAppUpdates;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _isRefreshingAppUpdates, value);
+            UpdateIsAnyRefreshInProgress();
+        }
+    }
+
+    private bool _isRefreshingAppUpdates;
+
+    public bool IsRefreshingRepositories
+    {
+        get => _isRefreshingRepositories;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _isRefreshingRepositories, value);
+            UpdateIsAnyRefreshInProgress();
+        }
+    }
+
+    private bool _isRefreshingRepositories;
+
+    public bool IsAnyRefreshInProgress
+    {
+        get => _isAnyRefreshInProgress;
+        private set => this.RaiseAndSetIfChanged(ref _isAnyRefreshInProgress, value);
+    }
+
+    private bool _isAnyRefreshInProgress;
+
+    private void UpdateIsAnyRefreshInProgress()
+    {
+        IsAnyRefreshInProgress = IsRefreshingAppUpdates || IsRefreshingRepositories || IsLoadingConfig;
+    }
+
     public StatisticsViewModel Statistics { get; private set; }
 
     public bool IsSideBoxVisible => _isSideBoxVisible.Value;
@@ -318,6 +369,7 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
             .FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
                 h => this.ExecutionLog.CollectionChanged += h,
                 h => this.ExecutionLog.CollectionChanged -= h)
+            .Throttle(TimeSpan.FromMilliseconds(500))
             .Select(_ => Unit.Default) // We don't care about the event args; we just want to know something changed.
             .StartWith(Unit.Default) // To ensure initial population.
             .CombineLatest(
@@ -352,6 +404,7 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
             .FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
                 h => this.ExecutionLog.CollectionChanged += h,
                 h => this.ExecutionLog.CollectionChanged -= h)
+            .Throttle(TimeSpan.FromMilliseconds(500))
             .Select(_ => Unit.Default)
             .StartWith(Unit.Default)
             .Select(_ =>
@@ -383,6 +436,7 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
             .FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
                 h => this.ExecutionLog.CollectionChanged += h,
                 h => this.ExecutionLog.CollectionChanged -= h)
+            .Throttle(TimeSpan.FromMilliseconds(500))
             .Select(_ => Unit.Default)
             .StartWith(Unit.Default)
             .Select(_ =>
@@ -444,24 +498,40 @@ public string TermForCurrentHistoryFilter
     
     private async Task RefreshInfoAbouAppUpdates()
     {
-        var isNewerVersion = await appUpdater.CheckIsNewerVersionAvailable();
-        if (isNewerVersion)
+        IsRefreshingAppUpdates = true;
+        try
         {
-            Dispatcher.UIThread.Post(() =>
+            var isNewerVersion = await appUpdater.CheckIsNewerVersionAvailable();
+            if (isNewerVersion)
             {
-                ShowNewVersionAvailable = true;
-            });
+                Dispatcher.UIThread.Post(() =>
+                {
+                    ShowNewVersionAvailable = true;
+                });
+            }
+        }
+        finally
+        {
+            IsRefreshingAppUpdates = false;
         }
     }
 
     private async Task RefreshInfoAboutRepositories()
     {
-        var outOfDateRepos = await _configRepositoryUpdater.CheckAllRepositories();
-        Dispatcher.UIThread.Post(() =>
+        IsRefreshingRepositories = true;
+        try
         {
-            OutOfDateConfigRepositories.Clear();
-            OutOfDateConfigRepositories.AddRange(outOfDateRepos);
-        });
+            var outOfDateRepos = await _configRepositoryUpdater.CheckAllRepositories();
+            Dispatcher.UIThread.Post(() =>
+            {
+                OutOfDateConfigRepositories.Clear();
+                OutOfDateConfigRepositories.AddRange(outOfDateRepos);
+            });
+        }
+        finally
+        {
+            IsRefreshingRepositories = false;
+        }
     }
 
     public void CheckForUpdates()
@@ -493,50 +563,107 @@ public void DismissOutdatedRepositories()
 
     private void BuildUi()
     {
-        var selectedActionName = SelectedAction?.Name;
-        var appSettings = AppSettingsService.Load();
-        var sources = appSettings.ConfigScripts == null || appSettings.ConfigScripts.Count == 0
-            ? SampleScripts
-            : appSettings.ConfigScripts;
-        var actions = new List<ScriptConfig>();
-        var allCorruptedFiles = new List<string>();
-        
-        foreach (var source in sources)
+        IsLoadingConfig = true;
+        Task.Run(() =>
         {
-            var result = ScriptConfigReader.LoadWithErrorTracking(source, appSettings);
-            actions.AddRange(result.Configs.OrderBy(x => x.SourceName).ThenBy(x => x.Name));
-            allCorruptedFiles.AddRange(result.CorruptedFiles);
-        }
+            var selectedActionName = SelectedAction?.Name;
+            var appSettings = AppSettingsService.Load();
+            var sources = appSettings.ConfigScripts == null || appSettings.ConfigScripts.Count == 0
+                ? SampleScripts
+                : appSettings.ConfigScripts;
+            var actions = new List<ScriptConfig>();
+            var allCorruptedFiles = new List<string>();
+
+            var results = sources.Select(source => ScriptConfigReader.LoadWithErrorTracking(source, appSettings)).ToList();
+            var el = AppSettingsService.LoadExecutionLog();
+            Dispatcher.UIThread.Post(() =>
+            {
+                foreach (var result in results)
+                {
+            
+                    actions.AddRange(result.Configs.OrderBy(x => x.SourceName).ThenBy(x => x.Name));
+                    allCorruptedFiles.AddRange(result.CorruptedFiles);
+                }
 
-        Actions = actions;
 
-        if (string.IsNullOrWhiteSpace(selectedActionName) == false && Actions.FirstOrDefault(x => x.Name == selectedActionName) is { } previouslySelected)
-        {
-            SelectedAction = previouslySelected;
-        }
-        else if (appSettings.Recent?.OrderByDescending(x => x.Value.Timestamp).FirstOrDefault() is { } recent && Actions.FirstOrDefault(a =>
-                         a.Name == recent.Value?.ActionId.ActionName &&
-                         a.SourceName == recent.Value.ActionId.SourceName) is
-                     { } existingRecent)
-        {
-            SelectedAction = existingRecent;
-            if (existingRecent.PredefinedArgumentSets.FirstOrDefault(p =>
-                    p.Description == recent.Value.ActionId.ParameterSet) is { } ps)
-            {
-                SelectedArgumentSet = ps;
-            }
-        }
-        else if(Actions.FirstOrDefault() is { } firstAction)
-        {
-            SelectedAction = firstAction;
-        }
-        ExecutionLog.Clear();
-        ExecutionLog.AddRange(AppSettingsService.LoadExecutionLog());
-        
-        if (allCorruptedFiles.Count > 0)
-        {
-            ShowCorruptedFilesDialog(allCorruptedFiles);
-        }
+                foreach (var action in actions)
+                {
+                    var withMarkers = action.Params.Aggregate
+                    (
+                        seed: action.Command,
+                        func: (string accumulate, ScriptParam source) =>
+                            accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
+                    );
+
+                    action.CommandFormatted.AddRange(withMarkers.Split("[!@#]").Select(x =>
+                    {
+                        var inline = new Run(x);
+                        if (x.StartsWith("{"))
+                        {
+
+                            inline.Foreground = Brushes.LightGreen;
+                            inline.FontWeight = FontWeight.ExtraBold;
+                        }
+
+                        return inline;
+                    }));
+
+                    // Format InstallCommand if it exists
+                    if (!string.IsNullOrWhiteSpace(action.InstallCommand))
+                    {
+                        var installWithMarkers = action.Params.Aggregate
+                        (
+                            seed: action.InstallCommand,
+                            func: (string accumulate, ScriptParam source) =>
+                                accumulate.Replace("{" + source.Name + "}", "[!@#]{" + source.Name + "}[!@#]")
+                        );
+
+                        action.InstallCommandFormatted.AddRange(installWithMarkers.Split("[!@#]").Select(x =>
+                        {
+                            var inline = new Run(x);
+                            if (x.StartsWith("{"))
+                            {
+                                inline.Foreground = Brushes.LightGreen;
+                                inline.FontWeight = FontWeight.ExtraBold;
+                            }
+
+                            return inline;
+                        }));
+                    }
+                }
+                
+                Actions = actions;
+
+                if (string.IsNullOrWhiteSpace(selectedActionName) == false && Actions.FirstOrDefault(x => x.Name == selectedActionName) is { } previouslySelected)
+                {
+                    SelectedAction = previouslySelected;
+                }
+                else if (appSettings.Recent?.OrderByDescending(x => x.Value.Timestamp).FirstOrDefault() is { } recent && Actions.FirstOrDefault(a =>
+                                 a.Name == recent.Value?.ActionId.ActionName &&
+                                 a.SourceName == recent.Value.ActionId.SourceName) is
+                             { } existingRecent)
+                {
+                    SelectedAction = existingRecent;
+                    if (existingRecent.PredefinedArgumentSets.FirstOrDefault(p =>
+                            p.Description == recent.Value.ActionId.ParameterSet) is { } ps)
+                    {
+                        SelectedArgumentSet = ps;
+                    }
+                }
+                else if(Actions.FirstOrDefault() is { } firstAction)
+                {
+                    SelectedAction = firstAction;
+                }
+                ExecutionLog.Clear();
+            
+                ExecutionLog.AddRange(el);
+                IsLoadingConfig = false;
+                if (allCorruptedFiles.Count > 0)
+                {
+                    ShowCorruptedFilesDialog(allCorruptedFiles);
+                }
+            });
+        });
     }
     
     private async void ShowCorruptedFilesDialog(List<string> corruptedFiles)
@@ -714,8 +841,14 @@ public void OpenSettingsWindow()
 
     public void ForceRefresh()
     {
-        _ = RefreshInfoAbouAppUpdates();
-        _ = RefreshInfoAboutRepositories();
+        Task.Run(async () =>
+        {
+            await RefreshInfoAbouAppUpdates();
+        });
+        Task.Run(async () =>
+        {
+            await RefreshInfoAboutRepositories();
+        });
         BuildUi();
     }
     public void RefreshSettings() => BuildUi();
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
index 5df50be..6dcd6e1 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/StatisticsViewModel.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
+using System.Reactive;
+using System.Reactive.Linq;
 using System.Windows.Input;
 using ReactiveUI;
 
@@ -21,17 +24,20 @@ public StatisticsViewModel(ObservableCollection<ExecutionLogAction> executionLog
         NextPageCommand = ReactiveCommand.Create(NextPage, this.WhenAnyValue(x => x.CanGoNext));
         PreviousPageCommand = ReactiveCommand.Create(PreviousPage, this.WhenAnyValue(x => x.CanGoPrevious));
         GoToPageCommand = ReactiveCommand.Create<int>(GoToPage);
-        
-        // Initialize available years
-        InitializeAvailableYears();
-        
-        // Listen to changes in the execution log and refresh year options
-        _executionLog.CollectionChanged += (sender, args) =>
-        {
-            InitializeAvailableYears();
-        };
-        
-        RefreshStatistics();
+
+        Observable
+            .FromEventPattern<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
+                h => _executionLog.CollectionChanged += h,
+                h => _executionLog.CollectionChanged -= h)
+            .Throttle(TimeSpan.FromMilliseconds(500))
+            .Select(_ => Unit.Default)
+            .StartWith(Unit.Default)
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .Subscribe(unit =>
+            {
+                InitializeAvailableYears();
+                RefreshStatistics();
+            });
     }
 
     private List<HeatmapDay> _heatmapDays = new();
@@ -238,7 +244,7 @@ private void InitializeAvailableYears()
         // Only set selected year option if it's not already set
         if (_selectedYearOption == null || !yearOptions.Contains(_selectedYearOption))
         {
-            _selectedYearOption = yearOptions[0]; // Select "Last Year" by default
+            SelectedYearOption = yearOptions[0]; // Select "Last Year" by default
         }
     }
 
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml
index 7b54641..7697ccd 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/SideMenu.axaml
@@ -26,7 +26,17 @@
         <ToggleButton i:Attached.Icon="fas fa-clock" IsChecked="{Binding IsRecentListVisible}"  ToolTip.Tip="Recently executed"/>
         <ToggleButton i:Attached.Icon="fas fa-chart-bar" IsChecked="{Binding IsStatisticsVisible}"  ToolTip.Tip="Statistics"/>
         <Button i:Attached.Icon="fas fa-cog" Command="{Binding OpenSettingsWindow}"   ToolTip.Tip="Configure actions sources"/>
-        <Button i:Attached.Icon="fas fa-sync" Command="{Binding ForceRefresh}"   ToolTip.Tip="Refresh actions" />
+        <Button Command="{Binding ForceRefresh}" ToolTip.Tip="Refresh actions" Margin="5" Width="50" Height="35">
+            <Grid>
+                <i:Icon Value="fas fa-sync" FontSize="18"/>
+                <ProgressBar IsIndeterminate="True" 
+                             IsVisible="{Binding IsAnyRefreshInProgress}"
+                             Height="3" 
+                             VerticalAlignment="Bottom"
+                             ZIndex="1"
+                             Margin="0,0,0,-5"/>
+            </Grid>
+        </Button>
         <Button i:Attached.Icon="fas fa-lock" Command="{Binding OpenVaultWindow}"   ToolTip.Tip="Open Vault" />
         <Button i:Attached.Icon="fas fa-search" Click="OpenSearchBox" HotKey="{Binding SearchBoxHotKey}"  ToolTip.Tip="Open Search Box (Ctrl+P)" />
     </StackPanel>

From 1e0517f27e1bdb82078343835d6c9e441ffe60b3 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sun, 23 Nov 2025 10:05:54 +0100
Subject: [PATCH 09/11] Add formatting to command in the running job window

---
 .../ViewModels/MainWindowViewModel.cs         | 50 ++++++++++++++++++-
 .../ViewModels/RunningJobViewModel.cs         |  1 +
 .../Views/RunningJobsSection.axaml            | 18 ++++---
 3 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index 73bcb15..4019279 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -274,6 +274,7 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
                     Tile = $"Update repository",
                     ExecutedCommand = $"{command.Command} {command.Parameters}",
                 };
+                job.ExecutedCommandFormatted.AddRange(CreateSimpleFormattedCommand($"{command.Command} {command.Parameters}"));
                 this.RunningJobs.Add(job);
                 SelectedRunningJob = job;
 
@@ -797,6 +798,7 @@ public void InstallScript()
                 ExecutedCommand = installCommand,
                 EnvironmentVariables = new Dictionary<string, string?>()
             };
+            job.ExecutedCommandFormatted.AddRange(CreateSimpleFormattedCommand(installCommand));
             job.ExecutionCompleted += (sender, eventArgs) =>
             {
                 SelectedActionInstalled = true;
@@ -1113,12 +1115,22 @@ private void ExecuteCommand(string command, ScriptConfig selectedAction, bool us
         var (commandPath, args) = SplitCommandAndArgs(command);
         var envVariables = new Dictionary<string, string?>(selectedAction.EnvironmentVariables);
         var maskedArgs = args;
+        
+        // Track parameter replacements for formatting with descriptions
+        var parameterReplacements = new List<(string paramName, string value, bool masked, string description)>();
+        
         foreach (var controlRecord in _controlRecords)
         {
             var controlValue = controlRecord.GetFormattedValue()?.Trim();
             args = args.Replace($"{{{controlRecord.Name}}}", controlValue);
             commandPath = commandPath.Replace($"{{{controlRecord.Name}}}", controlValue);
-            maskedArgs = maskedArgs.Replace($"{{{controlRecord.Name}}}", controlRecord.MaskingRequired? "*****": controlValue);
+            var displayValue = controlRecord.MaskingRequired ? "*****" : controlValue;
+            maskedArgs = maskedArgs.Replace($"{{{controlRecord.Name}}}", displayValue);
+            
+            // Find the parameter description from the action's Params
+            var paramDescription = selectedAction.Params.FirstOrDefault(p => p.Name == controlRecord.Name)?.Description ?? string.Empty;
+            
+            parameterReplacements.Add((controlRecord.Name, displayValue, controlRecord.MaskingRequired, paramDescription));
 
             foreach (var (key, val) in envVariables)
             {
@@ -1127,12 +1139,39 @@ private void ExecuteCommand(string command, ScriptConfig selectedAction, bool us
             }
         }
 
+        var executedCommand = $"{commandPath} {maskedArgs}";
+        
+        // Create formatted version with highlighted parameter values
+        var formattedCommand = executedCommand;
+        foreach (var (paramName, value, masked, description) in parameterReplacements)
+        {
+            if (!string.IsNullOrWhiteSpace(value))
+            {
+                formattedCommand = formattedCommand.Replace(value, $"[!@#]{value}[!@#]");
+            }
+        }
+        
+        var executedCommandFormatted = formattedCommand.Split("[!@#]").Select(x =>
+        {
+            var inline = new Run(x);
+            // Check if this is a parameter value (not the original text)
+            var matchingParam = parameterReplacements.FirstOrDefault(p => p.value == x && !string.IsNullOrWhiteSpace(x));
+            if (matchingParam != default)
+            {
+                inline.Foreground = Brushes.LightGreen;
+                inline.FontWeight = FontWeight.ExtraBold;
+            }
+            return inline;
+        }).ToList();
+
         var job = new RunningJobViewModel
         {
             Tile = $"#{jobCounter++} {title ?? selectedAction.Name}",
-            ExecutedCommand = $"{commandPath} {maskedArgs}",
+            ExecutedCommand = executedCommand,
             EnvironmentVariables = envVariables
         };
+        job.ExecutedCommandFormatted.AddRange(executedCommandFormatted);
+        
         this.RunningJobs.Add(job);
         SelectedRunningJob = job;
 
@@ -1282,6 +1321,13 @@ private static string[] SplitCommand(string command)
 
         return command.Split(' ', 2);
     }
+    
+    private static InlineCollection CreateSimpleFormattedCommand(string command)
+    {
+        var collection = new InlineCollection();
+        collection.Add(new Run(command));
+        return collection;
+    }
 }
 
 public record RecentAction(ActionId ActionId, DateTime Timestamp);
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs
index c14c24f..c3f0097 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs
@@ -56,6 +56,7 @@ public RunningJobStatus Status
     }
 
     public string ExecutedCommand { get; set; }
+    public InlineCollection ExecutedCommandFormatted { get; set; } = new();
     public void CancelExecution()
     {
         GracefulCancellation.Cancel();
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
index b091a31..470ba2a 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
@@ -42,14 +42,16 @@
               <RowDefinition Height="Auto"></RowDefinition>
             </Grid.RowDefinitions>
             
-              <TextBox Height="30" 
-                       GotFocus="InputElement_OnGotFocus"
-                       LostFocus="InputElement_OnLostFocus"
-                       Text="{Binding ExecutedCommand}" 
-                       Background="#474747" 
-                       CornerRadius="0" 
-                       BorderBrush="#6e6e6e" 
-                       Padding="5"  Margin="0, 5,5, 10" BorderThickness="1" IsReadOnly="True" TextWrapping="Wrap" VerticalAlignment="Stretch"></TextBox>
+              <Border Background="#474747" 
+                      CornerRadius="0" 
+                      BorderBrush="#6e6e6e" 
+                      Padding="5" 
+                      Margin="0, 5,5, 10" 
+                      BorderThickness="1">
+                <SelectableTextBlock TextWrapping="Wrap" 
+                                     Classes="consoleOutput" 
+                                     Inlines="{Binding ExecutedCommandFormatted}" />
+              </Border>
               <Panel Grid.Row="1" IsVisible="{Binding CurrentTroubleshootingMessage, Converter={x:Static ObjectConverters.IsNotNull}}" Background="{Binding CurrentTroubleShootingSeverity, Converter={x:Static viewModels:TroubleShootingSeverityToBrushConverter.Instance}}" Opacity="0.5" ZIndex="10"></Panel>
               <ScrollViewer Grid.Row="1" IsVisible="{Binding CurrentTroubleshootingMessage, Converter={x:Static ObjectConverters.IsNotNull}}" ZIndex="11">
                   <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">

From 6bf1d2eb491da0890074707d60f3e2e9731e2cd2 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sun, 23 Nov 2025 10:27:00 +0100
Subject: [PATCH 10/11] Improve context meanu on running job

---
 .../Controls/FormattedTextEditor.cs           | 81 +++++++++++++++++++
 .../Views/RunningJobsSection.axaml            | 14 ++--
 2 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/Controls/FormattedTextEditor.cs b/src/ScriptRunner/ScriptRunner.GUI/Controls/FormattedTextEditor.cs
index a181fc9..c68d159 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Controls/FormattedTextEditor.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Controls/FormattedTextEditor.cs
@@ -46,6 +46,10 @@ public FormattedTextEditor()
         Padding = new Thickness(15);
         TextArea.TextView.LinkTextForegroundBrush = Brushes.LightBlue;
         TextArea.TextView.ElementGenerators.Add(new FilePathElementGenerator());
+        
+        // Add context menu
+        ContextMenu = CreateContextMenu();
+        
         // Subscribe to scroll changes
         this.Loaded += (_, _) =>
         {
@@ -60,6 +64,83 @@ public FormattedTextEditor()
         };
     }
 
+    private ContextMenu CreateContextMenu()
+    {
+        var contextMenu = new ContextMenu();
+        
+        var copySelectedItem = new MenuItem
+        {
+            Header = "Copy Selected"
+        };
+        copySelectedItem.Click += (_, _) =>
+        {
+            if (!string.IsNullOrEmpty(SelectedText))
+            {
+                CopyToClipboard(SelectedText);
+            }
+        };
+        
+        var copyAllItem = new MenuItem
+        {
+            Header = "Copy All"
+        };
+        copyAllItem.Click += (_, _) =>
+        {
+            if (Document != null)
+            {
+                CopyToClipboard(Document.Text);
+            }
+        };
+        
+        var selectAllItem = new MenuItem
+        {
+            Header = "Select All"
+        };
+        selectAllItem.Click += (_, _) =>
+        {
+            if (Document != null)
+            {
+                SelectionStart = 0;
+                SelectionLength = Document.TextLength;
+            }
+        };
+        
+        var searchItem = new MenuItem
+        {
+            Header = "Search (Ctrl+F)"
+        };
+        searchItem.Click += (_, _) =>
+        {
+            // Trigger the built-in search functionality
+            var searchPanel = AvaloniaEdit.Search.SearchPanel.Install(this);
+            searchPanel?.Open();
+        };
+        
+        contextMenu.Items.Add(copySelectedItem);
+        contextMenu.Items.Add(copyAllItem);
+        contextMenu.Items.Add(selectAllItem);
+        contextMenu.Items.Add(new Separator());
+        contextMenu.Items.Add(searchItem);
+        
+        // Update menu items based on selection when opening
+        contextMenu.Opening += (_, _) =>
+        {
+            copySelectedItem.IsEnabled = !string.IsNullOrEmpty(SelectedText);
+            copyAllItem.IsEnabled = Document != null && !string.IsNullOrEmpty(Document.Text);
+        };
+        
+        return contextMenu;
+    }
+
+    private async void CopyToClipboard(string text)
+    {
+        var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+        if (clipboard != null)
+        {
+            await clipboard.SetTextAsync(text);
+        }
+    }
+
     private void OnScrollChanged(object? sender, ScrollChangedEventArgs e)
     {
         ScrollChanged?.Invoke(this, e);
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
index 470ba2a..8edffcd 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/RunningJobsSection.axaml
@@ -12,16 +12,16 @@
              x:DataType="viewModels:MainWindowViewModel"
              >
     <TabControl x:Name="RunningJobsPanel" ItemsSource="{Binding RunningJobs}" SelectedItem="{Binding SelectedRunningJob, Mode=TwoWay}" >
-      <TabControl.ContextMenu>
-        <ContextMenu>
-          <MenuItem Header="Close All Finished" Command="{Binding CloseAllFinished}" />
-          <MenuItem Header="Close All Failed" Command="{Binding CloseAllFailed}" />
-          <MenuItem Header="Close All Cancelled" Command="{Binding CloseAllCancelled}" />
-        </ContextMenu>
-      </TabControl.ContextMenu>
       <TabControl.ItemTemplate>
         <DataTemplate x:DataType="viewModels:RunningJobViewModel">
           <StackPanel Orientation="Horizontal">
+              <StackPanel.ContextMenu>
+                <ContextMenu>
+                  <MenuItem Header="Close All Finished" Command="{Binding $parent[TabControl].DataContext.CloseAllFinished}" />
+                  <MenuItem Header="Close All Failed" Command="{Binding $parent[TabControl].DataContext.CloseAllFailed}" />
+                  <MenuItem Header="Close All Cancelled" Command="{Binding $parent[TabControl].DataContext.CloseAllCancelled}" />
+                </ContextMenu>
+              </StackPanel.ContextMenu>
               <StackPanel >
                   <StackPanel Orientation="Horizontal">
                       <TextBlock FontSize="16" Text="{Binding Tile}" />

From d28bc72def9864d72ffbbd85c67069c7473ce622 Mon Sep 17 00:00:00 2001
From: Cezary Piatek <cezarypiatek@live.com>
Date: Sun, 23 Nov 2025 14:03:28 +0100
Subject: [PATCH 11/11] Add new look for action list

---
 .../ViewModels/MainWindowViewModel.cs         |  75 ++++-
 .../ScriptRunner.GUI/Views/ActionsList.axaml  | 275 ++++++++++++++++--
 .../Views/ActionsList.axaml.cs                | 160 +++++++++-
 3 files changed, 479 insertions(+), 31 deletions(-)

diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
index 4019279..a5ff2f8 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/MainWindowViewModel.cs
@@ -120,6 +120,7 @@ private void UpdateIsAnyRefreshInProgress()
 
     public IReactiveCommand SaveAsPredefinedCommand { get; set; }
 
+    public ReactiveCommand<TaggedScriptConfig, Unit> SelectActionCommand { get; set; }
 
     private readonly ParamsPanelFactory _paramsPanelFactory;
     private readonly VaultProvider _vaultProvider;
@@ -152,6 +153,25 @@ public string ActionFilter
 
     private string _actionFilter;
 
+    public string SelectedCategoryFilter
+    {
+        get => _selectedCategoryFilter;
+        set => this.RaiseAndSetIfChanged(ref _selectedCategoryFilter, value);
+    }
+
+    private string _selectedCategoryFilter = "All";
+
+    private readonly ObservableAsPropertyHelper<IEnumerable<string>> _availableCategories;
+    public IEnumerable<string> AvailableCategories => _availableCategories.Value;
+
+    public bool IsTreeViewMode
+    {
+        get => _isTreeViewMode;
+        set => this.RaiseAndSetIfChanged(ref _isTreeViewMode, value);
+    }
+
+    private bool _isTreeViewMode = false;
+
     private readonly ObservableAsPropertyHelper<IEnumerable<ScriptConfigGroupWrapper>> _filteredActionList;
     public IEnumerable<ScriptConfigGroupWrapper> FilteredActionList => _filteredActionList.Value;
 
@@ -288,6 +308,15 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
         }));
         IsScriptListVisible = true;
         SaveAsPredefinedCommand = ReactiveCommand.Create(() => { });
+        SelectActionCommand = ReactiveCommand.Create<TaggedScriptConfig, Unit>(taggedScriptConfig =>
+        {
+            if (taggedScriptConfig.Config is { } scriptConfig)
+            {
+                SelectedAction = scriptConfig;
+            }
+
+            return Unit.Default;
+        });
         _paramsPanelFactory = paramsPanelFactory;
         _vaultProvider = vaultProvider;
         this.appUpdater = new GithubUpdater();
@@ -336,14 +365,50 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
                 Statistics.RefreshStatistics();
             });
         
-        this.WhenAnyValue(x => x.ActionFilter, x => x.Actions)
+        // Build available categories list
+        this.WhenAnyValue(x => x.Actions)
+            .Select(actions =>
+            {
+                var categories = new List<string> { "All" };
+                var allCategories = actions
+                    .SelectMany(a => a.Categories ?? Enumerable.Empty<string>())
+                    .Where(c => !string.IsNullOrWhiteSpace(c))
+                    .Distinct()
+                    .OrderBy(c => c);
+                categories.AddRange(allCategories);
+                if (actions.Any(a => a.Categories == null || a.Categories.Count == 0))
+                {
+                    categories.Add("(No Category)");
+                }
+                return categories.AsEnumerable();
+            })
+            .ObserveOn(RxApp.MainThreadScheduler)
+            .ToProperty(this, x => x.AvailableCategories, out _availableCategories);
+        
+        this.WhenAnyValue(x => x.ActionFilter, x => x.SelectedCategoryFilter, x => x.Actions)
             .Throttle(TimeSpan.FromMilliseconds(200))
             .DistinctUntilChanged()
-            .Select((pair, cancellationToken) =>
+            .Select((tuple, cancellationToken) =>
             {
+                var (textFilter, categoryFilter, actions) = tuple;
                 
-                var configs = string.IsNullOrWhiteSpace(pair.Item1)? pair.Item2:pair.Item2.Where(x => x.Name.Contains(pair.Item1, StringComparison.InvariantCultureIgnoreCase));
-
+                // Apply text filter
+                var configs = string.IsNullOrWhiteSpace(textFilter) 
+                    ? actions 
+                    : actions.Where(x => x.Name.Contains(textFilter, StringComparison.InvariantCultureIgnoreCase));
+                
+                // Apply category filter (AND operator with text filter)
+                if (!string.IsNullOrWhiteSpace(categoryFilter) && categoryFilter != "All")
+                {
+                    if (categoryFilter == "(No Category)")
+                    {
+                        configs = configs.Where(x => x.Categories == null || x.Categories.Count == 0);
+                    }
+                    else
+                    {
+                        configs = configs.Where(x => x.Categories != null && x.Categories.Contains(categoryFilter));
+                    }
+                }
 
                 IEnumerable<ScriptConfigGroupWrapper> scriptConfigGroupWrappers = configs.SelectMany(c =>
                     {
@@ -360,8 +425,6 @@ public MainWindowViewModel(ParamsPanelFactory paramsPanelFactory, VaultProvider
                         Children = x.Select(p=> new TaggedScriptConfig(x.Key, p.script.Name, p.script)).OrderBy(x=>x.Name)
                     });
                 return scriptConfigGroupWrappers;
-                
-                
             })
             .ObserveOn(RxApp.MainThreadScheduler)
             .ToProperty(this, x => x.FilteredActionList, out _filteredActionList);
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
index 8176b14..70bb807 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml
@@ -5,31 +5,258 @@
              xmlns:viewModels="clr-namespace:ScriptRunner.GUI.ViewModels"
              xmlns:scriptConfigs="clr-namespace:ScriptRunner.GUI.ScriptConfigs"
              xmlns:avalonia="https://github.com/projektanker/icons.avalonia"
+             xmlns:converters="clr-namespace:ScriptRunner.GUI.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="viewModels:MainWindowViewModel"
              x:Class="ScriptRunner.GUI.Views.ActionsList">
-    <TreeView x:Name="ActionTree" Background="#1e1e1e" Classes="actionsMenu" Grid.Row="0" ItemsSource="{Binding FilteredActionList }" SelectedItem="{Binding SelectedActionOrGroup, Mode=TwoWay}">
-        <TreeView.Styles>
-            <Style Selector="TreeViewItem:empty Panel#PART_ExpandCollapseChevronContainer">
-                <Setter Property="IsVisible" Value="False"></Setter>
-            </Style>
-            <Style Selector="TreeViewItem:empty Grid#PART_Header">
-                <Setter Property="Margin" Value="35,0,0,0"></Setter>
-            </Style>
-        </TreeView.Styles>
-        <TreeView.DataTemplates>
-            <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="viewModels:ScriptConfigGroupWrapper">
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <avalonia:Icon Value="fa-folder" FontSize="16" Foreground="#ffd700" />
-                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
-                </StackPanel>
-            </TreeDataTemplate>
-            <DataTemplate x:DataType="viewModels:TaggedScriptConfig">
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <avalonia:Icon Value="fa-file-code" FontSize="16" Foreground="#3baced" />
-                    <TextBlock Text="{Binding  Name}" VerticalAlignment="Center" />
-                </StackPanel>
-            </DataTemplate>
-        </TreeView.DataTemplates>
-    </TreeView>
+    <UserControl.Resources>
+        <converters:CategoryToColorConverter x:Key="CategoryToColorConverter"/>
+    </UserControl.Resources>
+    
+    <UserControl.Styles>
+        <!-- Styles for list view tiles -->
+        <Style Selector="Border.actionTile">
+            <Setter Property="Background" Value="#252525"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0,0,0,0"/>
+        </Style>
+        
+        <Style Selector="Border.actionTile:pointerover">
+            <Setter Property="Background" Value="#2d2d2d"/>
+            <Setter Property="BorderBrush" Value="#3baced"/>
+            <Setter Property="BorderThickness" Value="3,0,0,0"/>
+        </Style>
+        
+        <Style Selector="Border.actionTile.selected">
+            <Setter Property="Background" Value="#2a4a5a"/>
+            <Setter Property="BorderBrush" Value="#3baced"/>
+            <Setter Property="BorderThickness" Value="3,0,0,0"/>
+        </Style>
+        
+        <Style Selector="Border.actionTile.selected:pointerover">
+            <Setter Property="Background" Value="#336a7f"/>
+            <Setter Property="BorderBrush" Value="#3baced"/>
+            <Setter Property="BorderThickness" Value="3,0,0,0"/>
+        </Style>
+    </UserControl.Styles>
+    
+    <Grid RowDefinitions="Auto,Auto,Auto,*">
+        <!-- View Mode Tabs -->
+        <Border Grid.Row="0" Background="#252526" BorderBrush="#3f3f46" BorderThickness="0,0,0,1" Padding="10,5">
+            <StackPanel Orientation="Horizontal" Spacing="5">
+                <RadioButton GroupName="ViewMode" IsChecked="{Binding IsTreeViewMode}" Padding="12,6">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <avalonia:Icon Value="fa-solid fa-folder-tree" FontSize="14"/>
+                        <TextBlock Text="Tree" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </RadioButton>
+                <RadioButton GroupName="ViewMode" IsChecked="{Binding !IsTreeViewMode}" Padding="12,6">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <avalonia:Icon Value="fa-solid fa-list" FontSize="14"/>
+                        <TextBlock Text="List" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </RadioButton>
+            </StackPanel>
+        </Border>
+        
+        <!-- Search Box -->
+        <Border Grid.Row="1" Background="#1e1e1e" Padding="10" BorderBrush="#3f3f46" BorderThickness="0,0,0,1">
+            <TextBox x:Name="SearchTextBox"
+                     Text="{Binding ActionFilter}" 
+                     Watermark="Search actions..."
+                     BorderThickness="1"
+                     BorderBrush="#3f3f46"
+                     Background="#252526"
+                     Padding="8,6,35,6">
+                <TextBox.InnerLeftContent>
+                    <avalonia:Icon Value="fa-search" FontSize="14" Foreground="#888888" Margin="8,0,0,0"/>
+                </TextBox.InnerLeftContent>
+                <TextBox.InnerRightContent>
+                    <Button Classes="clearButton"
+                            Width="24"
+                            Height="24"
+                            Padding="0"
+                            Margin="0,0,4,0"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Cursor="Hand"
+                            IsVisible="{Binding ActionFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                            Click="ClearSearch_Click">
+                        <avalonia:Icon Value="fa-times-circle" FontSize="14" Foreground="#888888"/>
+                    </Button>
+                </TextBox.InnerRightContent>
+            </TextBox>
+        </Border>
+        
+        <!-- Category Filter -->
+        <Border Grid.Row="2" Background="#1e1e1e" Padding="10,5" BorderBrush="#3f3f46" BorderThickness="0,0,0,1">
+            <ItemsControl ItemsSource="{Binding AvailableCategories}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Horizontal"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Border Background="{Binding Converter={StaticResource CategoryToColorConverter}}" 
+                                CornerRadius="3" 
+                                Padding="8,4" 
+                                Margin="0,0,4,4"
+                                Cursor="Hand"
+                                Classes="categoryBadge"
+                                Classes.selected="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).SelectedCategoryFilter, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={Binding}}"
+                                Tapped="CategoryBadge_OnTapped"
+                                Name="CategoryBadgeBorder">
+                            <Border.Styles>
+                                <Style Selector="Border.categoryBadge">
+                                    <Setter Property="Opacity" Value="1"/>
+                                </Style>
+                                <Style Selector="Border.categoryBadge.grayed">
+                                    <Setter Property="Opacity" Value="0.3"/>
+                                </Style>
+                                <Style Selector="Border.categoryBadge:pointerover">
+                                    <Setter Property="Opacity" Value="0.8"/>
+                                </Style>
+                                <Style Selector="Border.categoryBadge.selected">
+                                    <Setter Property="BorderBrush" Value="White"/>
+                                    <Setter Property="BorderThickness" Value="2"/>
+                                    <Setter Property="Opacity" Value="1"/>
+                                </Style>
+                                <Style Selector="Border.categoryBadge.selected:pointerover">
+                                    <Setter Property="Opacity" Value="1"/>
+                                </Style>
+                            </Border.Styles>
+                            <TextBlock Text="{Binding}" 
+                                       FontSize="11" 
+                                       FontWeight="SemiBold"
+                                       Foreground="White"/>
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </Border>
+        
+        <!-- Content Area: Tree or List View -->
+        <Panel Grid.Row="3">
+            <!-- Tree View -->
+            <TreeView x:Name="ActionTree" 
+                      Background="#1e1e1e" 
+                      Classes="actionsMenu" 
+                      ItemsSource="{Binding FilteredActionList}" 
+                      SelectedItem="{Binding SelectedActionOrGroup, Mode=TwoWay}"
+                      IsVisible="{Binding IsTreeViewMode}">
+                <TreeView.Styles>
+                    <Style Selector="TreeViewItem:empty Panel#PART_ExpandCollapseChevronContainer">
+                        <Setter Property="IsVisible" Value="False"></Setter>
+                    </Style>
+                    <Style Selector="TreeViewItem:empty Grid#PART_Header">
+                        <Setter Property="Margin" Value="35,0,0,0"></Setter>
+                    </Style>
+                </TreeView.Styles>
+                <TreeView.DataTemplates>
+                    <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="viewModels:ScriptConfigGroupWrapper">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <avalonia:Icon Value="fa-folder" FontSize="16" Foreground="#ffd700" />
+                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </TreeDataTemplate>
+                    <DataTemplate x:DataType="viewModels:TaggedScriptConfig">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <avalonia:Icon Value="fa-file-code" FontSize="16" Foreground="#3baced" />
+                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </DataTemplate>
+                </TreeView.DataTemplates>
+            </TreeView>
+            
+            <!-- List View with Tiles -->
+            <ScrollViewer IsVisible="{Binding !IsTreeViewMode}" 
+                          Background="#1e1e1e"
+                          VerticalScrollBarVisibility="Auto">
+                <ItemsControl ItemsSource="{Binding FilteredActionList}" Margin="10">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate x:DataType="viewModels:ScriptConfigGroupWrapper">
+                            <StackPanel Margin="0,0,0,15">
+                                <!-- Category Header -->
+                                <Border Background="#252526" 
+                                        CornerRadius="4"
+                                        Padding="12,8"
+                                        Margin="0,0,0,8">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <avalonia:Icon Value="fa-folder" FontSize="16" Foreground="#ffd700" />
+                                        <TextBlock Text="{Binding Name}" 
+                                                   FontWeight="SemiBold" 
+                                                   FontSize="14"
+                                                   VerticalAlignment="Center"/>
+                                    </StackPanel>
+                                </Border>
+                                
+                                <!-- Action Tiles -->
+                                <ItemsControl ItemsSource="{Binding Children}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate x:DataType="viewModels:TaggedScriptConfig">
+                                            <Border CornerRadius="4"
+                                                    Padding="16,12"
+                                                    Margin="4,2"
+                                                    Cursor="Hand"
+                                                    Classes="actionTile"
+                                                    Tapped="ActionTile_OnTapped">
+                                                <Grid RowDefinitions="Auto,Auto,Auto">
+                                                    <!-- Action Name with Icon -->
+                                                    <StackPanel Orientation="Horizontal" Spacing="10" Grid.Row="0">
+                                                        <avalonia:Icon Value="fa-file-code" FontSize="20" Foreground="#3baced" VerticalAlignment="Top" Margin="0,2,0,0"/>
+                                                        <TextBlock Text="{Binding Name}" 
+                                                                   FontSize="15"
+                                                                   FontWeight="SemiBold"
+                                                                   TextWrapping="Wrap"
+                                                                   VerticalAlignment="Center"/>
+                                                    </StackPanel>
+                                                    
+                                                    <!-- Description -->
+                                                    <TextBlock Grid.Row="1"
+                                                               Text="{Binding Config.Description}" 
+                                                               Foreground="#b0b0b0"
+                                                               FontSize="12"
+                                                               TextWrapping="Wrap"
+                                                               Margin="30,6,0,0"
+                                                               MaxHeight="40"
+                                                               TextTrimming="CharacterEllipsis"
+                                                               IsVisible="{Binding Config.Description, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
+                                                    
+                                                    <!-- Category Badges -->
+                                                    <ItemsControl Grid.Row="2"
+                                                                  ItemsSource="{Binding Config.Categories}" 
+                                                                  Margin="30,8,0,0"
+                                                                  IsVisible="{Binding Config.Categories.Count}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <WrapPanel Orientation="Horizontal"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                        <ItemsControl.ItemTemplate>
+                                                            <DataTemplate>
+                                                                <Border Background="{Binding Converter={StaticResource CategoryToColorConverter}}" 
+                                                                        CornerRadius="3" 
+                                                                        Padding="6,2" 
+                                                                        Margin="0,0,4,4">
+                                                                    <TextBlock Text="{Binding}" 
+                                                                               FontSize="10" 
+                                                                               FontWeight="SemiBold"
+                                                                               Foreground="White"/>
+                                                                </Border>
+                                                            </DataTemplate>
+                                                        </ItemsControl.ItemTemplate>
+                                                    </ItemsControl>
+                                                </Grid>
+                                            </Border>
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Panel>
+    </Grid>
 </UserControl>
diff --git a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
index c7557e0..ffbd24b 100644
--- a/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
+++ b/src/ScriptRunner/ScriptRunner.GUI/Views/ActionsList.axaml.cs
@@ -1,18 +1,176 @@
-using Avalonia;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+using ScriptRunner.GUI.ViewModels;
 
 namespace ScriptRunner.GUI.Views;
 
 public partial class ActionsList : UserControl
 {
+    private Border? _previouslySelectedBorder;
+    private bool _isInternalSelection;
+    private readonly List<Border> _categoryBadges = new();
+
     public ActionsList()
     {
         InitializeComponent();
+        this.DataContextChanged += OnDataContextChanged;
+        this.Loaded += OnLoaded;
     }
 
     private void InitializeComponent()
     {
         AvaloniaXamlLoader.Load(this);
     }
+
+    private void OnLoaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        // Give the UI time to render, then find all category badges
+        Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+        {
+            FindAndTrackAllCategoryBadges();
+        }, Avalonia.Threading.DispatcherPriority.Loaded);
+    }
+
+    private void OnDataContextChanged(object? sender, EventArgs e)
+    {
+        if (DataContext is MainWindowViewModel viewModel)
+        {
+            viewModel.PropertyChanged += (s, args) =>
+            {
+                if (args.PropertyName == nameof(MainWindowViewModel.SelectedAction))
+                {
+                    // Only clear if this is an external selection change (not from our click handler)
+                    if (!_isInternalSelection)
+                    {
+                        if (_previouslySelectedBorder != null)
+                        {
+                            _previouslySelectedBorder.Classes.Remove("selected");
+                            _previouslySelectedBorder = null;
+                        }
+                    }
+                }
+                else if (args.PropertyName == nameof(MainWindowViewModel.SelectedCategoryFilter))
+                {
+                    // Update grayed state of all category badges when selection changes
+                    UpdateCategoryBadgesGrayedState();
+                }
+                else if (args.PropertyName == nameof(MainWindowViewModel.AvailableCategories))
+                {
+                    // When categories change, re-scan for badges
+                    Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+                    {
+                        _categoryBadges.Clear();
+                        FindAndTrackAllCategoryBadges();
+                        UpdateCategoryBadgesGrayedState();
+                    }, Avalonia.Threading.DispatcherPriority.Loaded);
+                }
+            };
+        }
+    }
+
+    private void ActionTile_OnTapped(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Border border && border.DataContext is TaggedScriptConfig taggedScriptConfig)
+        {
+            if (DataContext is MainWindowViewModel viewModel)
+            {
+                // Set flag to prevent the PropertyChanged handler from clearing our selection
+                _isInternalSelection = true;
+
+                try
+                {
+                    // Remove selected class from previously selected border
+                    if (_previouslySelectedBorder != null && _previouslySelectedBorder != border)
+                    {
+                        _previouslySelectedBorder.Classes.Remove("selected");
+                    }
+
+                    // Add selected class to clicked border immediately
+                    border.Classes.Add("selected");
+                    _previouslySelectedBorder = border;
+
+                    // Set SelectedActionOrGroup to trigger the same behavior as tree view selection
+                    viewModel.SelectedActionOrGroup = taggedScriptConfig;
+                }
+                finally
+                {
+                    // Reset flag after selection is complete
+                    _isInternalSelection = false;
+                }
+            }
+        }
+    }
+
+    private void ClearSearch_Click(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is MainWindowViewModel viewModel)
+        {
+            viewModel.ActionFilter = string.Empty;
+        }
+    }
+
+    private void CategoryBadge_OnTapped(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Border border && border.DataContext is string category)
+        {
+            // Track this badge if not already tracked
+            if (!_categoryBadges.Contains(border))
+            {
+                _categoryBadges.Add(border);
+            }
+
+            if (DataContext is MainWindowViewModel viewModel)
+            {
+                viewModel.SelectedCategoryFilter = category;
+                // Gray state will be updated by PropertyChanged handler
+            }
+        }
+    }
+
+    private void UpdateCategoryBadgesGrayedState()
+    {
+        if (DataContext is not MainWindowViewModel viewModel)
+            return;
+
+        var selectedCategory = viewModel.SelectedCategoryFilter;
+        var shouldGrayOut = !string.IsNullOrEmpty(selectedCategory) && selectedCategory != "All";
+
+        // Update all tracked badges
+        foreach (var badge in _categoryBadges.ToList())
+        {
+            if (badge.DataContext is string category)
+            {
+                if (shouldGrayOut && category != selectedCategory)
+                {
+                    badge.Classes.Add("grayed");
+                }
+                else
+                {
+                    badge.Classes.Remove("grayed");
+                }
+            }
+        }
+    }
+
+    private void FindAndTrackAllCategoryBadges()
+    {
+        // Find all Border elements with the categoryBadge class
+        var allBadges = this.GetVisualDescendants()
+            .OfType<Border>()
+            .Where(b => b.Classes.Contains("categoryBadge"))
+            .ToList();
+
+        foreach (var badge in allBadges)
+        {
+            if (!_categoryBadges.Contains(badge))
+            {
+                _categoryBadges.Add(badge);
+            }
+        }
+    }
 }
\ No newline at end of file