From 0e36c854c6959a99289f4197555ee4912f28a6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Wed, 1 Nov 2023 00:00:49 +0100
Subject: [PATCH 01/13] Simple ScrollBarStyles.xaml

---
 src/ChatPrisma/App.xaml                    |  1 +
 src/ChatPrisma/Themes/ScrollBarStyles.xaml | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/ChatPrisma/Themes/ScrollBarStyles.xaml

diff --git a/src/ChatPrisma/App.xaml b/src/ChatPrisma/App.xaml
index 624b4c5..e23678a 100644
--- a/src/ChatPrisma/App.xaml
+++ b/src/ChatPrisma/App.xaml
@@ -15,6 +15,7 @@
                 <ResourceDictionary Source="/Themes/ContextMenuStyles.xaml" />
                 <ResourceDictionary Source="/Themes/ButtonStyles.xaml" />
                 <ResourceDictionary Source="/Themes/TextBoxStyles.xaml" />
+                <ResourceDictionary Source="/Themes/ScrollBarStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/ChatPrisma/Themes/ScrollBarStyles.xaml b/src/ChatPrisma/Themes/ScrollBarStyles.xaml
new file mode 100644
index 0000000..1b1a424
--- /dev/null
+++ b/src/ChatPrisma/Themes/ScrollBarStyles.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <LinearGradientBrush StartPoint="0, 0" EndPoint="0, 1">
+                    <GradientStop Color="LightGray" Offset="0" />
+                    <GradientStop Color="White" Offset="1" />
+                </LinearGradientBrush>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Width="6" 
+                            CornerRadius="3"  
+                            Background="{TemplateBinding Background}" 
+                            Opacity="0.7" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type ScrollBar}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <Grid>
+                        <Track Name="PART_Track" IsDirectionReversed="True" HorizontalAlignment="Right">
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource ScrollBarThumb}" />
+                            </Track.Thumb>
+                        </Track>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file

From 2344a0619ae0235c7779765e1060500175f99e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Wed, 1 Nov 2023 00:01:03 +0100
Subject: [PATCH 02/13] Ensure we are always scrolled to the bottom when we
 start with a long text

---
 .../TextEnhancement/TextEnhancementView.xaml.cs   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml.cs b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml.cs
index ae9bb1f..d9b9b92 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml.cs
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml.cs
@@ -11,9 +11,13 @@ private void TextEnhancementView_OnLoaded(object sender, RoutedEventArgs e)
     {
         this.InstructionTextBox.Focus();
 
-        // Place window slightly to the top
         var window = Window.GetWindow(this)!;
-        window.Dispatcher.BeginInvoke(DispatcherPriority.Render, new Action(() =>
+
+        // Ensure we are scrolled to the bottom
+        window.Dispatcher.BeginInvoke(DispatcherPriority.Render, this.ScrollToBottom);
+
+        // Place window slightly to the top
+        window.Dispatcher.BeginInvoke(DispatcherPriority.Render, () =>
         {
             var helper = new WindowInteropHelper(window);
             var currentScreen = Screen.FromHandle(helper.Handle);
@@ -21,7 +25,7 @@ private void TextEnhancementView_OnLoaded(object sender, RoutedEventArgs e)
 
             // Place the window a bit moved to the top, so it is perfectly centered if we reach this.MaxHeight
             window.Top = Math.Max((currentScreenHeight - this.MaxHeight) / 2, 0);
-        }));
+        });
 
         // Ensure window is shown above all other windows
         window.Activate();
@@ -52,6 +56,11 @@ private void ViewModelOnApplyInstructionCancelled(object? sender, EventArgs e)
     private void TextTextBlock_OnSizeChanged(object sender, SizeChangedEventArgs e)
     {
         // Keep the ScrollViewer scrolled to the bottom while the text is generating
+        this.ScrollToBottom();
+    }
+
+    private void ScrollToBottom()
+    {
         this.TextScrollViewer.ScrollToVerticalOffset(this.TextScrollViewer.ExtentHeight);
     }
 }

From 2cbd450b4c513c6269b521c9eb2ddbf5576dd817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 19:39:08 +0100
Subject: [PATCH 03/13] Fix height of close window button

---
 src/ChatPrisma/Themes/WindowStyles.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ChatPrisma/Themes/WindowStyles.xaml b/src/ChatPrisma/Themes/WindowStyles.xaml
index a6eb8bc..d589d4f 100644
--- a/src/ChatPrisma/Themes/WindowStyles.xaml
+++ b/src/ChatPrisma/Themes/WindowStyles.xaml
@@ -183,6 +183,7 @@
 
                                 <Button Grid.Column="2"
                                         Width="40"
+                                        Height="32"
                                         Click="CloseButton_Click"
                                         WindowChrome.IsHitTestVisibleInChrome="True">
                                     <Button.Template>

From 6eeb843f408d0ae877415a2d3b0b012d21468098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 20:14:13 +0100
Subject: [PATCH 04/13] Make text in TextEnhancementView.xaml look nicer when
 you have to scroll

---
 .../Views/TextEnhancement/TextEnhancementView.xaml   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
index 6278567..8fd41c7 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
@@ -26,12 +26,18 @@
         </Grid.RowDefinitions>
 
         <GroupBox Grid.Row="0" Header="Text" themes:Attached.Icon="TextEditStyle">
-            <ScrollViewer VerticalScrollBarVisibility="Auto" x:Name="TextScrollViewer">
-                <emoji:TextBlock x:Name="TextTextBlock" 
+            <ScrollViewer x:Name="TextScrollViewer"
+                          VerticalScrollBarVisibility="Auto"
+                          Padding="0, -8, 0, -10"> <!-- Make the content stretch fully vertically inside the GroupBox (same values as GroupBox inner margin) -->
+                <emoji:TextBlock x:Name="TextTextBlock"
                                  Text="{Binding CurrentText}"
                                  FontSize="{Binding TextSize}"
                                  TextWrapping="Wrap" 
-                                 SizeChanged="TextTextBlock_OnSizeChanged"/>
+                                 SizeChanged="TextTextBlock_OnSizeChanged">
+                    <emoji:TextBlock.Margin>
+                        <Thickness>0, 8, 0, 10</Thickness> <!-- Give it some inner margin back (same values as GroupBox inner margin) -->
+                    </emoji:TextBlock.Margin>
+                </emoji:TextBlock>
             </ScrollViewer>
         </GroupBox>
         

From 21ddc60ee2d294b49a4efaea8d987b23b2781589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 20:38:47 +0100
Subject: [PATCH 05/13] Improve system prompt

---
 src/ChatPrisma/Services/ChatBot/ChatPrompts.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
index 33b0594..145b372 100644
--- a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
+++ b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
@@ -3,13 +3,13 @@ namespace ChatPrisma.Services.ChatBot;
 public static class ChatPrompts
 {
     public static string System(string text) => $"""
-                                                You are "Chat Prisma," an expert assistant focused on elevating the quality of written content. 
-                                                Your task is to rigorously fine-tune the user's text according to their precise specifications. 
+                                                You are "Chat Prisma," an expert assistant focused on helping users improve their written text. 
+                                                Your task is to fine-tune the user's text according to their precise specifications. 
                                                 Respond exclusively with the improved text, omitting any additional commentary.
-                                                Collaborate with the user in iterative cycles until the text meets their satisfaction.
+                                                Collaborate with the user in iterative cycles until the user is satisfied.
                                                 Always build upon the most recent version of the text, rather than reverting to the original.
                                                 
                                                 The current iteration of the text is as follows:
                                                 {text}
                                                 """;
-}
\ No newline at end of file
+}

From 5a08420d713df0dbefff20eec2531eba54f4f2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 21:12:54 +0100
Subject: [PATCH 06/13] Improve ButtonStyles.xaml to be dark gray

---
 src/ChatPrisma/Themes/ButtonStyles.xaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/ChatPrisma/Themes/ButtonStyles.xaml b/src/ChatPrisma/Themes/ButtonStyles.xaml
index a1a0b52..7b53cd6 100644
--- a/src/ChatPrisma/Themes/ButtonStyles.xaml
+++ b/src/ChatPrisma/Themes/ButtonStyles.xaml
@@ -3,18 +3,22 @@
 
     <Style TargetType="Button">
         <Setter Property="Foreground" Value="White" />
-        <Setter Property="Height" Value="30" />
+        <Setter Property="Padding" Value="5, 6, 5, 6" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
                     <Border Name="border" CornerRadius="6" BorderBrush="#4D4D4D" BorderThickness="1">
                         <Border.Background>
-                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1.5">
-                                <GradientStop Color="#802F66" Offset="0.0"/>
-                                <GradientStop Color="#26234D" Offset="1.0"/>
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                <GradientStop Color="#333333" Offset="0.0"/>
+                                <GradientStop Color="#262626" Offset="1.0"/>
                             </LinearGradientBrush>
                         </Border.Background>
                         <Grid>
+                            <ContentPresenter HorizontalAlignment="Center" 
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
+                            
                             <Border Name="PressedOverlay" CornerRadius="6" Visibility="Hidden">
                                 <Border.Background>
                                     <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="1">
@@ -23,21 +27,22 @@
                                     </LinearGradientBrush>
                                 </Border.Background>
                             </Border>
-
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="border" Property="BorderBrush">
                                 <Setter.Value>
-                                    <SolidColorBrush Color="#99FFFFFF" />
+                                    <SolidColorBrush Color="#60FFFFFF" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
                             <Setter TargetName="PressedOverlay" Property="Visibility" Value="Visible" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="PressedOverlay" Property="Visibility" Value="Visible" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

From 635edb785811ce34515f4a7705a899c15c4188f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 21:30:33 +0100
Subject: [PATCH 07/13] Fix comment in ClipboardTextExtractor.cs

---
 src/ChatPrisma/Services/TextExtractor/ClipboardTextExtractor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ChatPrisma/Services/TextExtractor/ClipboardTextExtractor.cs b/src/ChatPrisma/Services/TextExtractor/ClipboardTextExtractor.cs
index 002a85d..443406b 100644
--- a/src/ChatPrisma/Services/TextExtractor/ClipboardTextExtractor.cs
+++ b/src/ChatPrisma/Services/TextExtractor/ClipboardTextExtractor.cs
@@ -79,7 +79,7 @@ private static bool AnyKeyPressed()
         var task = Task.Delay(TimeSpan.FromMilliseconds(hotkeyOptions.CurrentValue.ClipboardDelayInMilliseconds));
         var watch = Stopwatch.StartNew();
 
-        // Either wait until the task is completed or the user releases all keys
+        // Either wait until the task is completed or we got some text in the clipboard
         while (task.IsCompleted is false)
         {
             var dataObject = Clipboard.GetDataObject();

From 9e75a0f1975d4c3c593db9642a6de17cee76f8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Fri, 10 Nov 2023 23:34:16 +0100
Subject: [PATCH 08/13] Add "next-previous-version" feature to
 TextEnhancementView

---
 .../Services/ChatBot/ChatPrompts.cs           | 19 ++++----
 src/ChatPrisma/Themes/Stepper.xaml            | 30 +++++++++++++
 src/ChatPrisma/Themes/Stepper.xaml.cs         | 41 ++++++++++++++++++
 .../TextEnhancement/TextEnhancementView.xaml  | 18 +++++++-
 .../TextEnhancementViewModel.cs               | 43 ++++++++++++++++++-
 5 files changed, 139 insertions(+), 12 deletions(-)
 create mode 100644 src/ChatPrisma/Themes/Stepper.xaml
 create mode 100644 src/ChatPrisma/Themes/Stepper.xaml.cs

diff --git a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
index 145b372..4b7935f 100644
--- a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
+++ b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
@@ -2,14 +2,13 @@ namespace ChatPrisma.Services.ChatBot;
 
 public static class ChatPrompts
 {
-    public static string System(string text) => $"""
-                                                You are "Chat Prisma," an expert assistant focused on helping users improve their written text. 
-                                                Your task is to fine-tune the user's text according to their precise specifications. 
-                                                Respond exclusively with the improved text, omitting any additional commentary.
-                                                Collaborate with the user in iterative cycles until the user is satisfied.
-                                                Always build upon the most recent version of the text, rather than reverting to the original.
-                                                
-                                                The current iteration of the text is as follows:
-                                                {text}
-                                                """;
+    public static string System() => """
+                                     You are "Chat Prisma," an expert assistant focused on helping users improve their written text. 
+                                     Your task is to fine-tune the user's text according to their precise specifications. 
+                                     Respond exclusively with the improved text, omitting any additional commentary.
+                                     Collaborate with the user in iterative cycles until the user is satisfied.
+                                     Always build upon the most recent version of the text, rather than reverting to the original.
+                                     
+                                     The current iteration of the text is in the next message.
+                                     """;
 }
diff --git a/src/ChatPrisma/Themes/Stepper.xaml b/src/ChatPrisma/Themes/Stepper.xaml
new file mode 100644
index 0000000..477a4b1
--- /dev/null
+++ b/src/ChatPrisma/Themes/Stepper.xaml
@@ -0,0 +1,30 @@
+<UserControl x:Class="ChatPrisma.Themes.Stepper"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:ChatPrisma.Themes"
+
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d">
+    <GroupBox VerticalAlignment="Stretch">
+        <StackPanel Orientation="Horizontal" Margin="-8, -6, -8, -8"> <!-- Sneak closely up to the GroupBox border -->
+            <Button Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=PreviousCommand}"
+                    Content="-" 
+                    Width="20" 
+                    VerticalAlignment="Stretch">
+                <Button.Padding>0, -4, 0, 0</Button.Padding> <!-- Fix placement of the content -->
+            </Button>
+            
+            <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=Value, Mode=OneWay}" 
+                       Margin="8, 0, 8, 0" 
+                       VerticalAlignment="Center" />
+            
+            <Button Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=NextCommand}"
+                    Content="+" 
+                    Width="20" 
+                    VerticalAlignment="Stretch">
+                <Button.Padding>0, -4, 0, 0</Button.Padding> <!-- Fix placement of the content -->
+            </Button>
+        </StackPanel>
+    </GroupBox>
+</UserControl>
diff --git a/src/ChatPrisma/Themes/Stepper.xaml.cs b/src/ChatPrisma/Themes/Stepper.xaml.cs
new file mode 100644
index 0000000..077634d
--- /dev/null
+++ b/src/ChatPrisma/Themes/Stepper.xaml.cs
@@ -0,0 +1,41 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace ChatPrisma.Themes;
+
+public partial class Stepper
+{
+    public Stepper()
+    {
+        this.InitializeComponent();
+    }
+
+    public static readonly DependencyProperty PreviousCommandProperty = DependencyProperty.Register(
+        nameof(PreviousCommand), typeof(ICommand), typeof(Stepper), new PropertyMetadata(default(ICommand)));
+
+    public ICommand PreviousCommand
+    {
+        get { return (ICommand)GetValue(PreviousCommandProperty); }
+        set { SetValue(PreviousCommandProperty, value); }
+    }
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+        nameof(Value), typeof(int), typeof(Stepper), new PropertyMetadata(default(int)));
+
+#pragma warning disable CA1721
+    public int Value
+    {
+        get { return (int)GetValue(ValueProperty); }
+        set { SetValue(ValueProperty, value); }
+    }
+#pragma warning restore CA1721
+
+    public static readonly DependencyProperty NextCommandProperty = DependencyProperty.Register(
+        nameof(NextCommand), typeof(ICommand), typeof(Stepper), new PropertyMetadata(default(ICommand)));
+
+    public ICommand NextCommand
+    {
+        get { return (ICommand)GetValue(NextCommandProperty); }
+        set { SetValue(NextCommandProperty, value); }
+    }
+}
diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
index 8fd41c7..3182fa9 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
@@ -25,7 +25,23 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <GroupBox Grid.Row="0" Header="Text" themes:Attached.Icon="TextEditStyle">
+        <GroupBox Grid.Row="0" Header="{Binding}" themes:Attached.Icon="TextEditStyle">
+            <GroupBox.HeaderTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal" themes:Spacing.Horizontal="8">
+                        <TextBlock Text="Text" />
+
+                        <Grid IsEnabled="{DXBinding '!ApplyInstructionCommand.IsRunning'}">
+                            <themes:Stepper Height="24" 
+                                            Margin="0, -2"
+                                            PreviousCommand="{Binding PreviousVersionCommand}" 
+                                            Value="{Binding CurrentVersion}" 
+                                            NextCommand="{Binding NextVersionCommand}" 
+                                            ToolTip="Die Version des aktuell angezeigten Textes." /> 
+                        </Grid>
+                    </StackPanel>
+                </DataTemplate>
+            </GroupBox.HeaderTemplate>
             <ScrollViewer x:Name="TextScrollViewer"
                           VerticalScrollBarVisibility="Auto"
                           Padding="0, -8, 0, -10"> <!-- Make the content stretch fully vertically inside the GroupBox (same values as GroupBox inner margin) -->
diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
index 240e930..d428da7 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
@@ -13,7 +13,8 @@ public partial class TextEnhancementViewModel(string inputText, IClipboardTextWr
 {
     private List<PrismaChatMessage> _allMessages = new()
     {
-        new PrismaChatMessage(PrismaChatRole.System, ChatPrompts.System(inputText))
+        new PrismaChatMessage(PrismaChatRole.System, ChatPrompts.System()),
+        new PrismaChatMessage(PrismaChatRole.User, inputText),
     };
 
     [ObservableProperty]
@@ -28,6 +29,42 @@ public partial class TextEnhancementViewModel(string inputText, IClipboardTextWr
     [ObservableProperty]
     private int _textSize = textEnhancementOptions.CurrentValue.TextSize;
 
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(PreviousVersionCommand))]
+    [NotifyCanExecuteChangedFor(nameof(NextVersionCommand))]
+    private int _currentVersion = 1;
+
+    partial void OnCurrentVersionChanged(int value)
+    {
+        this.CurrentText = this._allMessages[(value * 2) - 1].Content;
+    }
+
+    [RelayCommand(CanExecute = nameof(CanPreviousVersion))]
+    private void PreviousVersion()
+    {
+        if (this.ApplyInstructionCommand.IsRunning)
+            return;
+
+        this.CurrentVersion--;
+    }
+    private bool CanPreviousVersion()
+    {
+        return this.CurrentVersion > 1;
+    }
+
+    [RelayCommand(CanExecute = nameof(CanNextVersion))]
+    private void NextVersion()
+    {
+        if (this.ApplyInstructionCommand.IsRunning)
+            return;
+
+        this.CurrentVersion++;
+    }
+    private bool CanNextVersion()
+    {
+        return this.CurrentVersion < (this._allMessages.Count / 2);
+    }
+
     public event EventHandler? ApplyInstructionCancelled;
 
     [RelayCommand(IncludeCancelCommand = true)]
@@ -36,6 +73,8 @@ private async Task ApplyInstruction(CancellationToken token)
         // Remember those, if the user cancels the operation we can reset the UI
         var previousInstruction = this.Instruction;
         var previousText = this.CurrentText;
+        var removedMessages = this._allMessages.Skip(this.CurrentVersion * 2).ToList();
+        this._allMessages.RemoveRange(this.CurrentVersion * 2, removedMessages.Count);
 
         try
         {
@@ -51,6 +90,7 @@ private async Task ApplyInstruction(CancellationToken token)
             }
 
             this._allMessages.Add(new PrismaChatMessage(PrismaChatRole.Assistant, this.CurrentText));
+            this.CurrentVersion++;
         }
         catch (OperationCanceledException)
         {
@@ -58,6 +98,7 @@ private async Task ApplyInstruction(CancellationToken token)
             this._allMessages.Remove(this._allMessages[^1]);
             this.Instruction = previousInstruction;
             this.CurrentText = previousText;
+            this._allMessages.AddRange(removedMessages);
 
             this.ApplyInstructionCancelled?.Invoke(this, EventArgs.Empty);
         }

From b0800c6ea0fc5f337d09a60ac1cc60943fdd042b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Mon, 13 Nov 2023 14:25:43 +0100
Subject: [PATCH 09/13] Add keyboard shortcuts to TextEnhancementView.xaml for
 next and previous versions

---
 .../TextEnhancement/TextEnhancementView.xaml  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
index 3182fa9..4b523f2 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
@@ -36,8 +36,19 @@
                                             Margin="0, -2"
                                             PreviousCommand="{Binding PreviousVersionCommand}" 
                                             Value="{Binding CurrentVersion}" 
-                                            NextCommand="{Binding NextVersionCommand}" 
-                                            ToolTip="Die Version des aktuell angezeigten Textes." /> 
+                                            NextCommand="{Binding NextVersionCommand}">
+                                <themes:Stepper.ToolTip>
+                                    <TextBlock>
+                                        <Run Text="Die Version des aktuell angezeigten Textes." />
+                                        <LineBreak /><LineBreak />
+                                        <Bold>Vorherige Version:</Bold><LineBreak />
+                                        <Run Text="ALT+Links" />
+                                        <LineBreak /><LineBreak />
+                                        <Bold>Nächste Version:</Bold><LineBreak />
+                                        <Run Text="ALT+Rechts" />
+                                    </TextBlock>
+                                </themes:Stepper.ToolTip>
+                            </themes:Stepper>
                         </Grid>
                     </StackPanel>
                 </DataTemplate>
@@ -61,11 +72,15 @@
             <Grid>
                 <TextBox x:Name="InstructionTextBox"
                          themes:Attached.Placeholder="Anweisung"
+                         IsReadOnly="{Binding ApplyInstructionCommand.IsRunning}"
                          Text="{Binding Instruction, UpdateSourceTrigger=PropertyChanged}">
                     <TextBox.InputBindings>
                         <KeyBinding Key="Enter" Command="{Binding ApplyInstructionCommand}" />
                         <KeyBinding Key="Enter" Modifiers="Control" Command="{Binding AcceptTextCommand}" />
                         <KeyBinding Key="Escape" Command="{Binding ApplyInstructionCancelCommand}" />
+                        
+                        <KeyBinding Key="Left" Modifiers="Alt" Command="{Binding PreviousVersionCommand}" />
+                        <KeyBinding Key="Right" Modifiers="Alt" Command="{Binding NextVersionCommand}" />
                     </TextBox.InputBindings>
                 </TextBox>
             </Grid>

From b630d7341e220f76d4e1770a403673a9068911fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Mon, 13 Nov 2023 14:44:08 +0100
Subject: [PATCH 10/13] Improve width of the Stepper.xaml control

---
 .../NumberWidthPlaceholderTextConverter.cs    | 21 +++++++++++++++
 src/ChatPrisma/Themes/Stepper.xaml            | 27 ++++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 src/ChatPrisma/Themes/Converters/NumberWidthPlaceholderTextConverter.cs

diff --git a/src/ChatPrisma/Themes/Converters/NumberWidthPlaceholderTextConverter.cs b/src/ChatPrisma/Themes/Converters/NumberWidthPlaceholderTextConverter.cs
new file mode 100644
index 0000000..51f1efd
--- /dev/null
+++ b/src/ChatPrisma/Themes/Converters/NumberWidthPlaceholderTextConverter.cs
@@ -0,0 +1,21 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace ChatPrisma.Themes.Converters;
+
+public class NumberWidthPlaceholderTextConverter : IValueConverter
+{
+    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not int intValue)
+            return string.Empty;
+
+        // Use character "4" as a placeholder, because it seems to be even wider than 0
+        return new string('4', intValue.ToString().Length);
+    }
+
+    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
diff --git a/src/ChatPrisma/Themes/Stepper.xaml b/src/ChatPrisma/Themes/Stepper.xaml
index 477a4b1..117f81b 100644
--- a/src/ChatPrisma/Themes/Stepper.xaml
+++ b/src/ChatPrisma/Themes/Stepper.xaml
@@ -2,10 +2,15 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:ChatPrisma.Themes"
+             xmlns:converters="clr-namespace:ChatPrisma.Themes.Converters"
 
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d">
+    <UserControl.Resources>
+        <converters:NumberWidthPlaceholderTextConverter x:Key="WidthPlaceholderTextConverter" />
+    </UserControl.Resources>
+    
     <GroupBox VerticalAlignment="Stretch">
         <StackPanel Orientation="Horizontal" Margin="-8, -6, -8, -8"> <!-- Sneak closely up to the GroupBox border -->
             <Button Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=PreviousCommand}"
@@ -15,9 +20,23 @@
                 <Button.Padding>0, -4, 0, 0</Button.Padding> <!-- Fix placement of the content -->
             </Button>
             
-            <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=Value, Mode=OneWay}" 
-                       Margin="8, 0, 8, 0" 
-                       VerticalAlignment="Center" />
+            <Grid>
+                <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=Value, Mode=OneWay}" 
+                           Margin="8, 0, 8, 0" 
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center" />
+                
+                <!-- 
+                    This hidden textblock makes sure we have a consistent width of the stepper for values with 1 digit, 2 digits etc
+                    If we don't have this, then the width changes between values "1" and "2", and that looks ugly 
+                -->
+                <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=Value, Converter={StaticResource WidthPlaceholderTextConverter}, Mode=OneWay}"
+                           Margin="8, 0, 8, 0"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           
+                           Visibility="Hidden"/>
+            </Grid>
             
             <Button Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Stepper}}, Path=NextCommand}"
                     Content="+" 

From d7cbfdce274d48ace3cab9ef3abc57f9a8aabd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Mon, 13 Nov 2023 21:48:02 +0100
Subject: [PATCH 11/13] Move the version-selection to the right

---
 src/ChatPrisma/Themes/GroupBoxStyles.xaml     | 36 +++++++++++--------
 .../TextEnhancement/TextEnhancementView.xaml  |  7 ++--
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/ChatPrisma/Themes/GroupBoxStyles.xaml b/src/ChatPrisma/Themes/GroupBoxStyles.xaml
index 15cbd93..25d300e 100644
--- a/src/ChatPrisma/Themes/GroupBoxStyles.xaml
+++ b/src/ChatPrisma/Themes/GroupBoxStyles.xaml
@@ -10,12 +10,7 @@
         <Setter Property="HeaderTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <StackPanel Orientation="Horizontal">
-                        <wpf:SymbolIcon Symbol="{Binding RelativeSource={RelativeSource AncestorType=GroupBox}, Path=(themes:Attached.Icon)}" 
-                                        FontSize="24" 
-                                        Margin="-3, -4, 5, -4" />
-                        <TextBlock Text="{Binding}" />
-                    </StackPanel>
+                    <TextBlock Text="{Binding}" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
@@ -77,14 +72,27 @@
                             </Border>
 
                             <!-- Header -->
-                            <ContentPresenter Grid.Row="0" 
-                                              Margin="10, 7, 10, 7"
-                                              Visibility="{DXBinding '@p.Header != null ? $Visibility.Visible : $Visibility.Collapsed'}"
-                                              TextBlock.FontSize="16"
-                                              TextBlock.FontWeight="SemiBold"
-                                              Content="{TemplateBinding Header}" 
-                                              ContentTemplate="{TemplateBinding HeaderTemplate}" 
-                                              ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" />
+                            <Grid Grid.Row="0" 
+                                  Margin="10, 7, 10, 7"
+                                  HorizontalAlignment="Stretch"
+                                  Visibility="{DXBinding '@p.Header != null ? $Visibility.Visible : $Visibility.Collapsed'}"
+                                  TextBlock.FontSize="16"
+                                  TextBlock.FontWeight="SemiBold">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <wpf:SymbolIcon Grid.Column="0" 
+                                                Symbol="{Binding RelativeSource={RelativeSource AncestorType=GroupBox}, Path=(themes:Attached.Icon)}" 
+                                                FontSize="24" 
+                                                Margin="-3, -4, 5, -4" />
+
+                                <ContentPresenter Grid.Column="1" 
+                                                  Content="{TemplateBinding Header}" 
+                                                  ContentTemplate="{TemplateBinding HeaderTemplate}" 
+                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" />
+                            </Grid>
                             
                             <!-- Animated Header Line -->
                             <Border x:Name="InnerBorder"
diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
index 4b523f2..59fc2ac 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementView.xaml
@@ -28,10 +28,11 @@
         <GroupBox Grid.Row="0" Header="{Binding}" themes:Attached.Icon="TextEditStyle">
             <GroupBox.HeaderTemplate>
                 <DataTemplate>
-                    <StackPanel Orientation="Horizontal" themes:Spacing.Horizontal="8">
+                    <Grid>
                         <TextBlock Text="Text" />
 
-                        <Grid IsEnabled="{DXBinding '!ApplyInstructionCommand.IsRunning'}">
+                        <Grid IsEnabled="{DXBinding '!ApplyInstructionCommand.IsRunning'}"
+                              HorizontalAlignment="Right">
                             <themes:Stepper Height="24" 
                                             Margin="0, -2"
                                             PreviousCommand="{Binding PreviousVersionCommand}" 
@@ -50,7 +51,7 @@
                                 </themes:Stepper.ToolTip>
                             </themes:Stepper>
                         </Grid>
-                    </StackPanel>
+                    </Grid>
                 </DataTemplate>
             </GroupBox.HeaderTemplate>
             <ScrollViewer x:Name="TextScrollViewer"

From 41fb16c24c12fb9d550f12453a1cbf91a842cc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Mon, 13 Nov 2023 22:30:27 +0100
Subject: [PATCH 12/13] Add support for custom instructions

---
 .../Options/TextEnhancementOptions.cs         |  1 +
 .../Services/ChatBot/ChatPrompts.cs           | 28 +++++++++++++------
 .../TextEnhancementViewModel.cs               |  2 +-
 src/ChatPrisma/appsettings.json               |  1 +
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/ChatPrisma/Options/TextEnhancementOptions.cs b/src/ChatPrisma/Options/TextEnhancementOptions.cs
index d57bade..03a4b6f 100644
--- a/src/ChatPrisma/Options/TextEnhancementOptions.cs
+++ b/src/ChatPrisma/Options/TextEnhancementOptions.cs
@@ -3,4 +3,5 @@
 public class TextEnhancementOptions
 {
     public int TextSize { get; set; }
+    public string? CustomInstructions { get; set; }
 }
diff --git a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
index 4b7935f..7ea7c69 100644
--- a/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
+++ b/src/ChatPrisma/Services/ChatBot/ChatPrompts.cs
@@ -2,13 +2,23 @@ namespace ChatPrisma.Services.ChatBot;
 
 public static class ChatPrompts
 {
-    public static string System() => """
-                                     You are "Chat Prisma," an expert assistant focused on helping users improve their written text. 
-                                     Your task is to fine-tune the user's text according to their precise specifications. 
-                                     Respond exclusively with the improved text, omitting any additional commentary.
-                                     Collaborate with the user in iterative cycles until the user is satisfied.
-                                     Always build upon the most recent version of the text, rather than reverting to the original.
-                                     
-                                     The current iteration of the text is in the next message.
-                                     """;
+    public static string System(string? customInstructions)
+    {
+        customInstructions = string.IsNullOrWhiteSpace(customInstructions)
+            ? null
+            : customInstructions;
+
+        return $"""
+               You are "Chat Prisma," an expert assistant focused on helping users improve their written text.
+               Your task is to fine-tune the user's text according to their precise specifications.
+               Respond exclusively with the improved text, omitting any additional commentary.
+               Collaborate with the user in iterative cycles until the user is satisfied.
+               Always build upon the most recent version of the text, rather than reverting to the original.
+               
+               Also consider the following instructions from the user:
+               {customInstructions ?? "None"}
+               
+               The current iteration of the text is in the next message.
+               """;
+    }
 }
diff --git a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
index d428da7..7937075 100644
--- a/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
+++ b/src/ChatPrisma/Views/TextEnhancement/TextEnhancementViewModel.cs
@@ -13,7 +13,7 @@ public partial class TextEnhancementViewModel(string inputText, IClipboardTextWr
 {
     private List<PrismaChatMessage> _allMessages = new()
     {
-        new PrismaChatMessage(PrismaChatRole.System, ChatPrompts.System()),
+        new PrismaChatMessage(PrismaChatRole.System, ChatPrompts.System(textEnhancementOptions.CurrentValue.CustomInstructions)),
         new PrismaChatMessage(PrismaChatRole.User, inputText),
     };
 
diff --git a/src/ChatPrisma/appsettings.json b/src/ChatPrisma/appsettings.json
index dd934be..438486e 100644
--- a/src/ChatPrisma/appsettings.json
+++ b/src/ChatPrisma/appsettings.json
@@ -14,6 +14,7 @@
     "ClipboardDelayInMilliseconds": 500,
   },
   "TextEnhancement": {
+    "CustomInstructions": "",
     "TextSize": 12,
   },
   "NLog": {

From 651f1ad8cff5e55a0a85be95ef1022613a56be2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Mon, 13 Nov 2023 22:31:16 +0100
Subject: [PATCH 13/13] Use gpt-4-turbo by default

---
 src/ChatPrisma/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ChatPrisma/appsettings.json b/src/ChatPrisma/appsettings.json
index 438486e..a8115b8 100644
--- a/src/ChatPrisma/appsettings.json
+++ b/src/ChatPrisma/appsettings.json
@@ -1,6 +1,6 @@
 {
   "OpenAI": {
-    "Model": "gpt-3.5-turbo",
+    "Model": "gpt-4-1106-preview",
     "ApiKey": ""
   },
   "Updater": {