From d7aa84a38ed611e4fabdf1fbe30bb18935b8efc4 Mon Sep 17 00:00:00 2001
From: AndNowWhat <malisaleez@gmail.com>
Date: Mon, 23 Feb 2026 22:03:12 +0100
Subject: [PATCH] socks_proxy

---
 MainWindow.xaml                    |  61 +++++++++++++++--
 MainWindow.xaml.cs                 |  90 ++++++++++++++++++++++++-
 Models/AccountProfile.cs           |   1 +
 Models/ProxyConfig.cs              |  25 +++++++
 Services/AuthService.cs            |   7 +-
 Services/JagexAccountService.cs    |   7 +-
 Services/LauncherService.cs        |  27 +++++++-
 Services/ProxInjectService.cs      | 105 +++++++++++++++++++++++++++++
 Services/ProxyHttpClientFactory.cs |  23 +++++++
 Views/AuthWindow.xaml.cs           |  12 +++-
 Views/ProxyDialog.xaml             |  98 +++++++++++++++++++++++++++
 Views/ProxyDialog.xaml.cs          |  54 +++++++++++++++
 12 files changed, 495 insertions(+), 15 deletions(-)
 create mode 100644 Models/ProxyConfig.cs
 create mode 100644 Services/ProxInjectService.cs
 create mode 100644 Services/ProxyHttpClientFactory.cs
 create mode 100644 Views/ProxyDialog.xaml
 create mode 100644 Views/ProxyDialog.xaml.cs

diff --git a/MainWindow.xaml b/MainWindow.xaml
index f35e34f..5f0e9cd 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Sigil"
         mc:Ignorable="d"
-        Title="Sigil" Height="580" Width="700"
+        Title="Sigil" Height="680" Width="820"
+        MinHeight="580" MinWidth="700"
         WindowStartupLocation="CenterScreen"
         Background="#1a1a2e">
 
@@ -154,7 +155,7 @@
         <!-- Main Content -->
         <Grid Grid.Row="0" Margin="24">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="280"/>
+                <ColumnDefinition Width="300"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
@@ -205,6 +206,34 @@
                     <TextBlock Text="{Binding SelectedAccount.DisplayName, FallbackValue='No account selected'}"
                                FontSize="24" FontWeight="Bold"
                                Foreground="{StaticResource TextPrimary}"/>
+                    <Border Background="{StaticResource BackgroundCard}"
+                            BorderBrush="{StaticResource BorderColor}"
+                            BorderThickness="1" CornerRadius="6"
+                            Padding="10,6" Margin="0,8,0,0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="Proxy"
+                                       FontSize="11" FontWeight="SemiBold"
+                                       Foreground="{StaticResource TextSecondary}"
+                                       VerticalAlignment="Center"/>
+                            <TextBlock Grid.Column="1"
+                                       Text="{Binding ProxyDisplayText}"
+                                       FontSize="11"
+                                       Foreground="{StaticResource TextPrimary}"
+                                       VerticalAlignment="Center"
+                                       Margin="10,0,0,0"/>
+                            <Button Grid.Column="2"
+                                    Content="Configure"
+                                    Style="{StaticResource SmallButton}"
+                                    Click="OnConfigureProxy"
+                                    Padding="10,3"
+                                    FontSize="10"/>
+                        </Grid>
+                    </Border>
                 </StackPanel>
 
                 <!-- Characters header row -->
@@ -229,20 +258,20 @@
                                VerticalAlignment="Center"/>
 
                     <StackPanel Grid.Column="2" Orientation="Horizontal">
-                          <Button Content="Refresh Char"
+                        <Button Content="Refresh"
                                 Click="OnRefreshCharacters"
                                 Style="{StaticResource SmallButton}"
-                                Margin="4,0,0,0"
+                                Margin="0,0,4,0"
                                 ToolTip="Refresh the characters for this account"/>
                         <Button Content="+ Create"
                                 Style="{StaticResource SmallButton}"
                                 IsEnabled="{Binding CanCreateCharacter}"
-                                Click="OnCreateCharacter"/>
+                                Click="OnCreateCharacter"
+                                Margin="0,0,4,0"/>
                         <Button Content="Auto"
                                 Style="{StaticResource SmallButton}"
                                 IsEnabled="{Binding CanAutoCreate}"
                                 Click="OnAutoCreateCharacters"
-                                Margin="4,0,0,0"
                                 ToolTip="Automatically fill this account to 20 characters (30s between each)"/>
                     </StackPanel>
                 </Grid>
@@ -328,6 +357,24 @@
                                        VerticalAlignment="Center" Margin="8,0,0,0"/>
                         </Grid>
 
+                        <!-- ProxInject -->
+                        <TextBlock Text="Game Proxy (ProxInject)"
+                                   FontSize="12"
+                                   Foreground="{StaticResource TextSecondary}"
+                                   Margin="0,4,0,6"/>
+                        <StackPanel Orientation="Horizontal" Margin="0,0,0,12">
+                            <TextBlock x:Name="ProxInjectStatusText"
+                                       Text="Not installed"
+                                       FontSize="11"
+                                       Foreground="{StaticResource TextSecondary}"
+                                       VerticalAlignment="Center"
+                                       Margin="0,0,8,0"/>
+                            <Button x:Name="ProxInjectDownloadBtn"
+                                    Content="Download ProxInject"
+                                    Style="{StaticResource SmallButton}"
+                                    Click="OnDownloadProxInject"/>
+                        </StackPanel>
+
                         <!-- Actions -->
                         <StackPanel Orientation="Horizontal">
                             <Button Content="Refresh Token" Style="{StaticResource SmallButton}"
@@ -345,7 +392,7 @@
         <!-- Log Panel -->
         <Border Grid.Row="1" Background="{StaticResource BackgroundCard}"
                 BorderBrush="{StaticResource BorderColor}" BorderThickness="0,1,0,0"
-                Height="100">
+                Height="120">
             <ScrollViewer x:Name="LogScrollViewer"
                           VerticalScrollBarVisibility="Auto"
                           HorizontalScrollBarVisibility="Disabled"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3f67ea9..cf75beb 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -23,6 +23,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         private readonly AuthService _authService = new();
         private readonly LauncherService _launcherService = new();
         private readonly JagexAccountService _jagexAccountService = new();
+        private readonly ProxInjectService _proxInjectService = new();
         private readonly CharacterCreationQueueService _creationQueue;
 
         private AccountProfile? _selectedAccount;
@@ -70,6 +71,8 @@ public AccountProfile? SelectedAccount
 
                 _selectedAccount = value;
                 OnPropertyChanged();
+                OnPropertyChanged(nameof(ProxyDisplayText));
+                ApplyProxyToServices();
                 UpdateSelectedCharacters();
                 Settings.LastSelectedAccountId = _selectedAccount?.AccountId;
                 _ = _settingsStore.SaveAsync(Settings);
@@ -115,6 +118,9 @@ public GameAccount? SelectedCharacter
         public bool CanAutoCreate =>
             _selectedAccount != null && _selectedAccount.GameAccounts.Count < 20;
 
+        public string ProxyDisplayText =>
+            _selectedAccount?.Proxy?.ToDisplayString() ?? "None";
+
         public string QueueStatusText
         {
             get => _queueStatusText;
@@ -147,6 +153,7 @@ private async void OnLoaded(object sender, RoutedEventArgs e)
             SelectedAccount = Accounts.FirstOrDefault(a => a.AccountId == Settings.LastSelectedAccountId)
                 ?? Accounts.FirstOrDefault();
 
+            UpdateProxInjectStatus();
             await UpdateStatusAsync();
         }
 
@@ -155,7 +162,7 @@ private async void OnAddAccount(object sender, RoutedEventArgs e)
             try
             {
                 StatusText = "Opening browser for login...";
-                var authWindow = new AuthWindow(_authService, Settings, null)
+                var authWindow = new AuthWindow(_authService, Settings, null, SelectedAccount?.Proxy)
                 {
                     Owner = this
                 };
@@ -282,7 +289,8 @@ private async void OnLaunch(object sender, RoutedEventArgs e)
                 await _accountStore.SaveAsync(Accounts);
 
                 var character = SelectedCharacter ?? SelectedAccount.GameAccounts.FirstOrDefault();
-                await _launcherService.LaunchAsync(Settings, token, character);
+                await _launcherService.LaunchAsync(Settings, token, character, SelectedAccount.Proxy,
+                    msg => Dispatcher.Invoke(() => AppendLog(msg)));
 
                 StatusText = "Game launched";
             }
@@ -550,6 +558,84 @@ private void OnCancelQueue(object sender, RoutedEventArgs e)
             QueueStatusText = string.Empty;
         }
 
+        private void ApplyProxyToServices()
+        {
+            var proxy = _selectedAccount?.Proxy;
+            _authService.SetProxy(proxy);
+            _jagexAccountService.SetProxy(proxy);
+        }
+
+        private async void OnConfigureProxy(object sender, RoutedEventArgs e)
+        {
+            if (SelectedAccount == null) return;
+            var dialog = new ProxyDialog(SelectedAccount.Proxy ?? new ProxyConfig()) { Owner = this };
+            if (dialog.ShowDialog() == true)
+            {
+                SelectedAccount.Proxy = dialog.Result;
+                await _accountStore.SaveAsync(Accounts);
+                OnPropertyChanged(nameof(ProxyDisplayText));
+                ApplyProxyToServices();
+                StatusText = dialog.Result.Enabled
+                    ? $"Proxy set: {dialog.Result.ToDisplayString()}"
+                    : "Proxy disabled";
+            }
+        }
+
+        private async void OnDownloadProxInject(object sender, RoutedEventArgs e)
+        {
+            if (ProxInjectService.IsInstalled)
+            {
+                MessageBox.Show("ProxInject is already installed.", "Sigil");
+                return;
+            }
+
+            var result = MessageBox.Show(
+                "Sigil needs to download ProxInject (a third-party open-source tool) to proxy game client traffic.\n\n" +
+                $"Download URL:\n{ProxInjectService.DownloadUrl}\n\n" +
+                "Source: https://github.com/PragmaTwice/proxinject\n\n" +
+                "Do you want to download and install it now?",
+                "Download ProxInject",
+                MessageBoxButton.YesNo,
+                MessageBoxImage.Question);
+
+            if (result != MessageBoxResult.Yes) return;
+
+            try
+            {
+                ProxInjectDownloadBtn.IsEnabled = false;
+                ProxInjectStatusText.Text = "Downloading...";
+                StatusText = "Downloading ProxInject...";
+
+                await _proxInjectService.DownloadAsync(msg => Dispatcher.Invoke(() => AppendLog(msg)));
+
+                ProxInjectStatusText.Text = "Installed";
+                ProxInjectDownloadBtn.Content = "Reinstall";
+                ProxInjectDownloadBtn.IsEnabled = true;
+                StatusText = "ProxInject installed successfully";
+            }
+            catch (Exception ex)
+            {
+                ProxInjectStatusText.Text = "Failed";
+                ProxInjectDownloadBtn.IsEnabled = true;
+                StatusText = $"ProxInject download failed: {ex.Message}";
+                MessageBox.Show($"Download failed:\n{ex.Message}", "Sigil");
+            }
+        }
+
+        private void UpdateProxInjectStatus()
+        {
+            if (ProxInjectService.IsInstalled)
+            {
+                ProxInjectStatusText.Text = "Installed";
+                ProxInjectDownloadBtn.Content = "Reinstall";
+            }
+            else
+            {
+                ProxInjectStatusText.Text = "Not installed";
+                ProxInjectDownloadBtn.Content = "Download ProxInject";
+            }
+        }
+
         private void OnWindowClosed(object? sender, EventArgs e)
         {
             _creationQueue.Dispose();
diff --git a/Models/AccountProfile.cs b/Models/AccountProfile.cs
index f257272..45f0075 100644
--- a/Models/AccountProfile.cs
+++ b/Models/AccountProfile.cs
@@ -10,4 +10,5 @@ public sealed class AccountProfile
     public DateTimeOffset CreatedAt { get; set; } = DateTimeOffset.UtcNow;
     public DateTimeOffset? LastUsedAt { get; set; }
     public List<GameAccount> GameAccounts { get; set; } = new();
+    public ProxyConfig? Proxy { get; set; }
 }
diff --git a/Models/ProxyConfig.cs b/Models/ProxyConfig.cs
new file mode 100644
index 0000000..1aa8171
--- /dev/null
+++ b/Models/ProxyConfig.cs
@@ -0,0 +1,25 @@
+namespace Sigil.Models;
+
+public sealed class ProxyConfig
+{
+    public bool Enabled { get; set; }
+    public string Host { get; set; } = string.Empty;
+    public int Port { get; set; } = 1080;
+    public ProxyType Type { get; set; } = ProxyType.Socks5;
+    public string? Username { get; set; }
+    public string? Password { get; set; }
+
+    public string ToUri() => Type switch
+    {
+        ProxyType.Http => $"http://{Host}:{Port}",
+        ProxyType.Socks5 => $"socks5://{Host}:{Port}",
+        _ => $"socks5://{Host}:{Port}"
+    };
+
+    public string ToDisplayString() =>
+        Enabled && !string.IsNullOrWhiteSpace(Host)
+            ? $"{Type} {Host}:{Port}"
+            : "None";
+}
+
+public enum ProxyType { Http, Socks5 }
diff --git a/Services/AuthService.cs b/Services/AuthService.cs
index c93a0a2..c6f50b7 100644
--- a/Services/AuthService.cs
+++ b/Services/AuthService.cs
@@ -12,7 +12,12 @@ namespace Sigil.Services;
 
 public sealed class AuthService
 {
-    private readonly HttpClient _httpClient = new();
+    private HttpClient _httpClient = new();
+
+    public void SetProxy(ProxyConfig? proxy)
+    {
+        _httpClient = ProxyHttpClientFactory.Create(proxy);
+    }
 
     public AuthStart BeginLogin(AppSettings settings)
     {
diff --git a/Services/JagexAccountService.cs b/Services/JagexAccountService.cs
index b1e3c23..006acea 100644
--- a/Services/JagexAccountService.cs
+++ b/Services/JagexAccountService.cs
@@ -12,7 +12,12 @@ namespace Sigil.Services;
 
 public sealed class JagexAccountService
 {
-    private readonly HttpClient _httpClient = new(new HttpClientHandler { UseCookies = false });
+    private HttpClient _httpClient = new(new HttpClientHandler { UseCookies = false });
+
+    public void SetProxy(ProxyConfig? proxy)
+    {
+        _httpClient = ProxyHttpClientFactory.Create(proxy, useCookies: false);
+    }
     private static readonly JsonSerializerOptions JsonOptions = new()
     {
         PropertyNameCaseInsensitive = true
diff --git a/Services/LauncherService.cs b/Services/LauncherService.cs
index 22b4841..afbd9bc 100644
--- a/Services/LauncherService.cs
+++ b/Services/LauncherService.cs
@@ -8,12 +8,15 @@ namespace Sigil.Services;
 
 public sealed class LauncherService
 {
+    private readonly ProxInjectService _proxInject = new();
+
     /// <summary>
     /// Launches the RS3 game client directly with session credentials.
     /// The game client reads JX_SESSION_ID, JX_CHARACTER_ID, and JX_DISPLAY_NAME from environment variables.
     /// Returns the started process so the caller can inject into it (e.g. agent DLL).
+    /// If a proxy is configured and ProxInject is installed, injects the proxy into the game process.
     /// </summary>
-    public Task<Process> LaunchAsync(AppSettings settings, OAuthToken? token, GameAccount? selectedCharacter)
+    public async Task<Process> LaunchAsync(AppSettings settings, OAuthToken? token, GameAccount? selectedCharacter, ProxyConfig? proxy = null, Action<string>? log = null)
     {
         var exePath = settings.Rs3ClientPath;
 
@@ -51,6 +54,26 @@ public Task<Process> LaunchAsync(AppSettings settings, OAuthToken? token, GameAc
         var process = Process.Start(startInfo);
         if (process == null)
             throw new InvalidOperationException("Failed to start the game process.");
-        return Task.FromResult(process);
+
+        // Inject proxy into the game process if configured
+        if (proxy is { Enabled: true } && !string.IsNullOrWhiteSpace(proxy.Host) && ProxInjectService.IsInstalled)
+        {
+            try
+            {
+                // Give the process a moment to initialize before injecting
+                await Task.Delay(2000).ConfigureAwait(false);
+                await _proxInject.InjectAsync(process.Id, proxy, log).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                log?.Invoke($"Proxy injection warning: {ex.Message}");
+            }
+        }
+        else if (proxy is { Enabled: true } && !ProxInjectService.IsInstalled)
+        {
+            log?.Invoke("Proxy configured but ProxInject not installed. Game traffic will NOT be proxied. Download it from Advanced Settings.");
+        }
+
+        return process;
     }
 }
diff --git a/Services/ProxInjectService.cs b/Services/ProxInjectService.cs
new file mode 100644
index 0000000..5bf543a
--- /dev/null
+++ b/Services/ProxInjectService.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Sigil.Models;
+using Sigil.Storage;
+
+namespace Sigil.Services;
+
+public sealed class ProxInjectService
+{
+    private const string ReleaseUrl =
+        "https://github.com/PragmaTwice/proxinject/releases/download/v0.5.0-pre/proxinject-v0.5.0-pre-x64.zip";
+    private const string CliExeName = "proxinjector-cli.exe";
+
+    public static string DefaultInstallDir =>
+        Path.Combine(AppPaths.AppDataRoot, "proxinject");
+
+    public static string DefaultCliPath =>
+        Path.Combine(DefaultInstallDir, "release", CliExeName);
+
+    public static bool IsInstalled => File.Exists(DefaultCliPath);
+
+    /// <summary>
+    /// Downloads and extracts proxinject to the Sigil app data folder.
+    /// </summary>
+    public async Task DownloadAsync(Action<string>? log = null, CancellationToken ct = default)
+    {
+        var dir = DefaultInstallDir;
+        Directory.CreateDirectory(dir);
+
+        var zipPath = Path.Combine(dir, "proxinject.zip");
+
+        log?.Invoke($"Downloading proxinject from {ReleaseUrl} ...");
+
+        using (var http = new HttpClient())
+        {
+            http.DefaultRequestHeaders.UserAgent.ParseAdd("Sigil/1.0");
+            using var response = await http.GetAsync(ReleaseUrl, ct).ConfigureAwait(false);
+            response.EnsureSuccessStatusCode();
+            var bytes = await response.Content.ReadAsByteArrayAsync(ct).ConfigureAwait(false);
+            await File.WriteAllBytesAsync(zipPath, bytes, ct).ConfigureAwait(false);
+        }
+
+        log?.Invoke("Extracting...");
+        ZipFile.ExtractToDirectory(zipPath, dir, overwriteFiles: true);
+        File.Delete(zipPath);
+
+        if (!File.Exists(DefaultCliPath))
+            throw new FileNotFoundException(
+                $"Expected {CliExeName} not found after extraction. Check the zip contents in {dir}.");
+
+        log?.Invoke("ProxInject installed successfully.");
+    }
+
+    /// <summary>
+    /// Injects a SOCKS5/HTTP proxy into a running process by PID.
+    /// </summary>
+    public async Task InjectAsync(int processId, ProxyConfig proxy, Action<string>? log = null)
+    {
+        var cliPath = DefaultCliPath;
+        if (!File.Exists(cliPath))
+            throw new InvalidOperationException("ProxInject CLI not found. Please download it first.");
+
+        // proxinjector-cli uses host:port format (no scheme prefix)
+        var proxyAddress = $"{proxy.Host}:{proxy.Port}";
+        var args = $"-i {processId} -p {proxyAddress}";
+
+        log?.Invoke($"Running: {CliExeName} {args}");
+
+        var psi = new ProcessStartInfo
+        {
+            FileName = cliPath,
+            Arguments = args,
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            CreateNoWindow = true
+        };
+
+        using var proc = Process.Start(psi);
+        if (proc == null)
+            throw new InvalidOperationException("Failed to start proxinjector-cli.");
+
+        var stdout = await proc.StandardOutput.ReadToEndAsync().ConfigureAwait(false);
+        var stderr = await proc.StandardError.ReadToEndAsync().ConfigureAwait(false);
+        await proc.WaitForExitAsync().ConfigureAwait(false);
+
+        if (!string.IsNullOrWhiteSpace(stdout))
+            log?.Invoke($"proxinject: {stdout.Trim()}");
+        if (!string.IsNullOrWhiteSpace(stderr))
+            log?.Invoke($"proxinject error: {stderr.Trim()}");
+
+        if (proc.ExitCode != 0)
+            log?.Invoke($"proxinject exited with code {proc.ExitCode}");
+    }
+
+    /// <summary>
+    /// The URL users need to approve before downloading.
+    /// </summary>
+    public static string DownloadUrl => ReleaseUrl;
+}
diff --git a/Services/ProxyHttpClientFactory.cs b/Services/ProxyHttpClientFactory.cs
new file mode 100644
index 0000000..7c746c5
--- /dev/null
+++ b/Services/ProxyHttpClientFactory.cs
@@ -0,0 +1,23 @@
+using System.Net;
+using System.Net.Http;
+using Sigil.Models;
+
+namespace Sigil.Services;
+
+public static class ProxyHttpClientFactory
+{
+    public static HttpClient Create(ProxyConfig? proxy, bool useCookies = true)
+    {
+        var handler = new HttpClientHandler { UseCookies = useCookies };
+
+        if (proxy is { Enabled: true } && !string.IsNullOrWhiteSpace(proxy.Host))
+        {
+            handler.Proxy = new WebProxy(proxy.ToUri());
+            if (!string.IsNullOrWhiteSpace(proxy.Username))
+                handler.Proxy.Credentials = new NetworkCredential(proxy.Username, proxy.Password);
+            handler.UseProxy = true;
+        }
+
+        return new HttpClient(handler);
+    }
+}
diff --git a/Views/AuthWindow.xaml.cs b/Views/AuthWindow.xaml.cs
index aaa8bb2..68ddf11 100644
--- a/Views/AuthWindow.xaml.cs
+++ b/Views/AuthWindow.xaml.cs
@@ -15,6 +15,7 @@ public partial class AuthWindow : Window
     private readonly AuthService _authService;
     private readonly AppSettings _settings;
     private readonly Action<string>? _log;
+    private readonly ProxyConfig? _proxy;
     private readonly TaskCompletionSource<OAuthToken> _tcs = new();
     private string? _expectedState;
     private string? _verifier;
@@ -22,12 +23,13 @@ public partial class AuthWindow : Window
     private bool _completed;
     private OAuthToken? _pendingToken;
 
-    public AuthWindow(AuthService authService, AppSettings settings, Action<string>? log)
+    public AuthWindow(AuthService authService, AppSettings settings, Action<string>? log, ProxyConfig? proxy = null)
     {
         InitializeComponent();
         _authService = authService;
         _settings = settings;
         _log = log;
+        _proxy = proxy;
         Loaded += OnLoaded;
         Closing += OnClosing;
     }
@@ -42,7 +44,13 @@ private async void OnLoaded(object sender, RoutedEventArgs e)
     {
         try
         {
-            await Browser.EnsureCoreWebView2Async();
+            CoreWebView2Environment? env = null;
+            if (_proxy is { Enabled: true } && !string.IsNullOrWhiteSpace(_proxy.Host))
+            {
+                var options = new CoreWebView2EnvironmentOptions($"--proxy-server={_proxy.ToUri()}");
+                env = await CoreWebView2Environment.CreateAsync(null, null, options);
+            }
+            await Browser.EnsureCoreWebView2Async(env);
             Browser.CoreWebView2.NavigationStarting += OnNavigationStarting;
             Browser.CoreWebView2.NavigationCompleted += OnNavigationCompleted;
             StartLogin();
diff --git a/Views/ProxyDialog.xaml b/Views/ProxyDialog.xaml
new file mode 100644
index 0000000..835fc39
--- /dev/null
+++ b/Views/ProxyDialog.xaml
@@ -0,0 +1,98 @@
+<Window x:Class="Sigil.Views.ProxyDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Proxy Settings"
+        Height="340"
+        Width="420"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Background="#1a1a2e">
+
+    <Window.Resources>
+        <SolidColorBrush x:Key="BackgroundCard" Color="#16213e"/>
+        <SolidColorBrush x:Key="TextPrimary" Color="#ffffff"/>
+        <SolidColorBrush x:Key="TextSecondary" Color="#a0a0a0"/>
+        <SolidColorBrush x:Key="BorderColor" Color="#2a2a4a"/>
+
+        <Style x:Key="FieldLabel" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Foreground" Value="{StaticResource TextSecondary}"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="0,0,8,0"/>
+        </Style>
+
+        <Style x:Key="FieldBox" TargetType="TextBox">
+            <Setter Property="Background" Value="{StaticResource BackgroundCard}"/>
+            <Setter Property="Foreground" Value="{StaticResource TextPrimary}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource BorderColor}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Padding" Value="8,4"/>
+            <Setter Property="CaretBrush" Value="{StaticResource TextPrimary}"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid Margin="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="90"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- Enable -->
+        <CheckBox x:Name="EnabledCheck" Grid.Row="0" Grid.ColumnSpan="2"
+                  Content="Enable proxy for this account"
+                  Foreground="{StaticResource TextPrimary}"
+                  Margin="0,0,0,12"/>
+
+        <!-- Type -->
+        <TextBlock Grid.Row="1" Text="Type:" Style="{StaticResource FieldLabel}"/>
+        <ComboBox x:Name="TypeCombo" Grid.Row="1" Grid.Column="1"
+                  Margin="0,0,0,8" Height="28">
+            <ComboBoxItem Content="SOCKS5" Tag="Socks5"/>
+            <ComboBoxItem Content="HTTP" Tag="Http"/>
+        </ComboBox>
+
+        <!-- Host -->
+        <TextBlock Grid.Row="2" Text="Host:" Style="{StaticResource FieldLabel}"/>
+        <TextBox x:Name="HostBox" Grid.Row="2" Grid.Column="1"
+                 Style="{StaticResource FieldBox}" Margin="0,0,0,8"/>
+
+        <!-- Port -->
+        <TextBlock Grid.Row="3" Text="Port:" Style="{StaticResource FieldLabel}"/>
+        <TextBox x:Name="PortBox" Grid.Row="3" Grid.Column="1"
+                 Style="{StaticResource FieldBox}" Margin="0,0,0,8" Width="80" HorizontalAlignment="Left"/>
+
+        <!-- Username -->
+        <TextBlock Grid.Row="4" Text="Username:" Style="{StaticResource FieldLabel}"/>
+        <TextBox x:Name="UsernameBox" Grid.Row="4" Grid.Column="1"
+                 Style="{StaticResource FieldBox}" Margin="0,0,0,8"/>
+
+        <!-- Password -->
+        <TextBlock Grid.Row="5" Text="Password:" Style="{StaticResource FieldLabel}"/>
+        <PasswordBox x:Name="PasswordBox" Grid.Row="5" Grid.Column="1"
+                     Background="{StaticResource BackgroundCard}"
+                     Foreground="{StaticResource TextPrimary}"
+                     BorderBrush="{StaticResource BorderColor}"
+                     BorderThickness="1"
+                     Margin="0,0,0,8"/>
+
+        <!-- Buttons -->
+        <StackPanel Grid.Row="7" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width="80" Margin="0,0,8,0" Content="Cancel" Click="OnCancel"
+                    Foreground="{StaticResource TextPrimary}" Background="{StaticResource BackgroundCard}"
+                    BorderBrush="{StaticResource BorderColor}"/>
+            <Button Width="80" Content="OK" IsDefault="True" Click="OnOk"
+                    Foreground="{StaticResource TextPrimary}" Background="#e94560"
+                    BorderBrush="#e94560"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Views/ProxyDialog.xaml.cs b/Views/ProxyDialog.xaml.cs
new file mode 100644
index 0000000..8badbb2
--- /dev/null
+++ b/Views/ProxyDialog.xaml.cs
@@ -0,0 +1,54 @@
+using System.Windows;
+using System.Windows.Controls;
+using Sigil.Models;
+
+namespace Sigil.Views;
+
+public partial class ProxyDialog : Window
+{
+    public ProxyConfig Result { get; private set; }
+
+    public ProxyDialog(ProxyConfig existing)
+    {
+        InitializeComponent();
+        Result = existing;
+
+        EnabledCheck.IsChecked = existing.Enabled;
+        HostBox.Text = existing.Host;
+        PortBox.Text = existing.Port.ToString();
+        UsernameBox.Text = existing.Username ?? string.Empty;
+        PasswordBox.Password = existing.Password ?? string.Empty;
+
+        // Select type combo
+        TypeCombo.SelectedIndex = existing.Type == ProxyType.Http ? 1 : 0;
+    }
+
+    private void OnOk(object sender, RoutedEventArgs e)
+    {
+        var type = ProxyType.Socks5;
+        if (TypeCombo.SelectedItem is ComboBoxItem item && item.Tag?.ToString() == "Http")
+            type = ProxyType.Http;
+
+        if (!int.TryParse(PortBox.Text.Trim(), out var port))
+            port = 1080;
+
+        Result = new ProxyConfig
+        {
+            Enabled = EnabledCheck.IsChecked == true,
+            Host = HostBox.Text.Trim(),
+            Port = port,
+            Type = type,
+            Username = string.IsNullOrWhiteSpace(UsernameBox.Text) ? null : UsernameBox.Text.Trim(),
+            Password = string.IsNullOrWhiteSpace(PasswordBox.Password) ? null : PasswordBox.Password
+        };
+
+        DialogResult = true;
+        Close();
+    }
+
+    private void OnCancel(object sender, RoutedEventArgs e)
+    {
+        DialogResult = false;
+        Close();
+    }
+}