From 2aa7ebd7827ff83fa4969ad26bc8458073b8fcec Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Tue, 29 Sep 2026 20:54:30 -0300
Subject: [PATCH 01/23] add impl for retrieving missed events from select
 services

---
 .../Interfaces/IMissedEventSource.cs          |   7 +
 .../FourthWallService.cs                      | 238 ++++++++++-----
 .../GoAffProService.cs                        |  47 +--
 SubathonManager.Integration/TiltifyService.cs |  77 +++--
 .../FourthWallUnitTests.cs                    |  12 +-
 .../Views/ImportMissedWindow.axaml            | 111 +++++++
 .../Views/ImportMissedWindow.axaml.cs         | 285 ++++++++++++++++++
 .../External/FourthWallSettings.axaml         |   3 +
 .../External/FourthWallSettings.axaml.cs      |   9 +-
 .../External/GoAffProSettings.axaml           |   4 +
 .../External/GoAffProSettings.axaml.cs        |   5 +
 .../External/TiltifySettings.axaml            |   3 +
 .../External/TiltifySettings.axaml.cs         |   5 +
 13 files changed, 676 insertions(+), 130 deletions(-)
 create mode 100644 SubathonManager.Core/Interfaces/IMissedEventSource.cs
 create mode 100644 SubathonManager.UI/Views/ImportMissedWindow.axaml
 create mode 100644 SubathonManager.UI/Views/ImportMissedWindow.axaml.cs

diff --git a/SubathonManager.Core/Interfaces/IMissedEventSource.cs b/SubathonManager.Core/Interfaces/IMissedEventSource.cs
new file mode 100644
index 0000000..6f8439d
--- /dev/null
+++ b/SubathonManager.Core/Interfaces/IMissedEventSource.cs
@@ -0,0 +1,7 @@
+using SubathonManager.Core.Models;
+
+namespace SubathonManager.Core.Interfaces;
+
+public interface IMissedEventSource {
+    Task<List<SubathonEvent>> FetchMissedEventsAsync(DateTime from, DateTime to, CancellationToken ct = default);
+}
diff --git a/SubathonManager.Integration/FourthWallService.cs b/SubathonManager.Integration/FourthWallService.cs
index 122a3a5..f4063f6 100644
--- a/SubathonManager.Integration/FourthWallService.cs
+++ b/SubathonManager.Integration/FourthWallService.cs
@@ -36,7 +36,7 @@ public class FourthWallService(
     IConfig config,
     DevTunnelsService devTunnels,
     OAuthService oAuth)
-    : IWebhookIntegration {
+    : IWebhookIntegration, IMissedEventSource {
     private readonly string _configSection = "FourthWall";
 
     private readonly FourthwallWebhookHandler _handler = new(new FourthwallWebhookSignatureVerifier());
@@ -45,6 +45,8 @@ public class FourthWallService(
         StorageKeys.FourthWallRefreshToken);
 
     public readonly Dictionary<string, string> MembershipNames = new();
+    internal int MaxMissedPages = 50;
+    internal int MissedPageSize = 100;
 
     private string? AccessToken => oAuth.GetAccessToken(OAuthKeys);
     private string? ShopName { get; set; }
@@ -315,8 +317,6 @@ private void BroadcastStatus(bool enabled, string? tunnelBaseUrl) {
 
     public SubathonEvent? MapToSubathonEvent(FourthwallWebhookEvent fwEvent) {
         try {
-            OrderTypeModes sourceMode = config.GetOrderTypeMode(_configSection,
-                $"{SubathonEventType.FourthWallOrder}", OrderTypeModes.Dollar);
             OrderTypeModes sourceMode2 = config.GetOrderTypeMode(_configSection,
                 $"{SubathonEventType.FourthWallGiftOrder}", OrderTypeModes.Dollar);
             var defaultCurrency = "USD";
@@ -324,87 +324,10 @@ private void BroadcastStatus(bool enabled, string? tunnelBaseUrl) {
             if (fwEvent.TestMode) username = "FourthWall Test"; //"SYSTEM";
             SubathonEvent? ev = null;
             if (fwEvent is FourthwallDonationWebhookEvent donationEvent) {
-                DonationV1 d = donationEvent.Data;
-                if (!fwEvent.TestMode && !string.IsNullOrWhiteSpace(d.Username))
-                    username = d.Username.Split(' ').First();
-                ev = new SubathonEvent {
-                    Id = Utils.TryParseGuid(d.Id),
-                    Source = string.Equals(username, "SYSTEM")
-                        ? SubathonEventSource.Simulated
-                        : SubathonEventSource.FourthWall,
-                    EventType = SubathonEventType.FourthWallDonation,
-                    User = username,
-                    Value =
-                        d.Amounts?.Total?.Value?.ToString("F2", CultureInfo.InvariantCulture) ??
-                        "0.00",
-                    Currency = !string.IsNullOrWhiteSpace(d.Amounts?.Total?.Currency)
-                        ? d.Amounts?.Total?.Currency
-                        : defaultCurrency,
-                    EventTimestamp = d.CreatedAt?.LocalDateTime ?? DateTime.Now.ToLocalTime()
-                };
+                ev = MapDonation(donationEvent.Data, fwEvent.TestMode);
             }
             else if (fwEvent is FourthwallOrderPlacedWebhookEvent orderPlacedEvent) {
-                OrderV1 order = orderPlacedEvent.Data;
-                if (!string.Equals("ORDER", order.Source?.Order?.Type ?? "", StringComparison.CurrentCultureIgnoreCase)
-                    && !string.Equals("SAMPLES_ORDER", order.Source?.Order?.Type ?? "",
-                        StringComparison.CurrentCultureIgnoreCase))
-                    return null;
-
-                //if (order.Status != OrderV1_status.CONFIRMED) return null;
-                if (!fwEvent.TestMode && !string.IsNullOrWhiteSpace(order.Username))
-                    username = order.Username.Split(' ').First();
-                if (string.Equals("SAMPLES_ORDER", order.Source?.Order?.Type ?? "",
-                        StringComparison.CurrentCultureIgnoreCase))
-                    username = "Internal Samples";
-                var itemCount = 0;
-                double totalValue = 0;
-                double totalDirect = 0;
-                string currency = !string.IsNullOrWhiteSpace(order.Amounts?.Subtotal?.Currency)
-                    ? order.Amounts.Subtotal.Currency
-                    : defaultCurrency;
-
-                double costs = 0;
-                double prices = 0;
-                order.Offers?.ForEach(x => {
-                    itemCount += x.Variant?.Quantity ?? 1;
-                    costs += x.Variant?.Cost?.Value ?? 0;
-                    prices += x.Variant?.Price?.Value ?? 0;
-                });
-
-                totalValue += order.Amounts?.Subtotal?.Value ?? 0;
-                totalDirect += order.Amounts?.Donation?.Value ?? 0;
-
-                double profit = Math.Max(prices - costs, 0);
-                if (string.Equals("SAMPLES_ORDER", order.Source?.Order?.Type ?? "",
-                        StringComparison.CurrentCultureIgnoreCase)) {
-                    logger?.LogInformation("[FourthWall] Samples order placed. Setting profit from {Profit} to 0.",
-                        profit);
-                    profit = 0;
-                }
-
-                totalDirect += profit;
-                ev = new SubathonEvent {
-                    Id = Utils.TryParseGuid(order.Id),
-                    Source = string.Equals(username, "SYSTEM")
-                        ? SubathonEventSource.Simulated
-                        : SubathonEventSource.FourthWall,
-                    EventType = SubathonEventType.FourthWallOrder,
-                    User = username,
-                    Value = sourceMode switch {
-                        OrderTypeModes.Item => $"{itemCount}",
-                        OrderTypeModes.Order => "New",
-                        _ => totalValue.ToString("F2", CultureInfo.InvariantCulture)
-                    },
-                    Currency = sourceMode switch {
-                        OrderTypeModes.Item => "items",
-                        OrderTypeModes.Order => "order",
-                        _ => !string.IsNullOrWhiteSpace(currency) ? currency : defaultCurrency
-                    },
-                    Amount = Math.Max(itemCount, 1),
-                    SecondaryValue = $"{totalDirect.ToString("F2", CultureInfo.InvariantCulture)}|{
-                        (!string.IsNullOrWhiteSpace(currency) ? currency : defaultCurrency)}",
-                    EventTimestamp = order.CreatedAt?.LocalDateTime ?? DateTime.Now.ToLocalTime()
-                };
+                ev = MapOrder(orderPlacedEvent.Data, fwEvent.TestMode);
             }
             else if (fwEvent is FourthwallGiftPurchaseWebhookEvent giftPurchaseWebhookEvent) {
                 GiftPurchaseV1 order = giftPurchaseWebhookEvent.Data;
@@ -507,4 +430,153 @@ private void BroadcastStatus(bool enabled, string? tunnelBaseUrl) {
             return null;
         }
     }
-}
\ No newline at end of file
+
+    private static SubathonEvent MapDonation(DonationV1 d, bool testMode) {
+        var username = testMode ? "FourthWall Test" : "FourthWall Customer";
+        if (!testMode && !string.IsNullOrWhiteSpace(d.Username))
+            username = d.Username.Split(' ').First();
+        return new SubathonEvent {
+            Id = Utils.TryParseGuid(d.Id),
+            Source = string.Equals(username, "SYSTEM")
+                ? SubathonEventSource.Simulated
+                : SubathonEventSource.FourthWall,
+            EventType = SubathonEventType.FourthWallDonation,
+            User = username,
+            Value = d.Amounts?.Total?.Value?.ToString("F2", CultureInfo.InvariantCulture) ?? "0.00",
+            Currency = !string.IsNullOrWhiteSpace(d.Amounts?.Total?.Currency) ? d.Amounts?.Total?.Currency : "USD",
+            EventTimestamp = d.CreatedAt?.LocalDateTime ?? DateTime.Now.ToLocalTime()
+        };
+    }
+
+    private static string GetOrderType(OrderV1 order) {
+        OrderV1.OrderV1_source? source = order.Source;
+        return source?.Order?.Type ?? source?.SamplesOrder?.Type ?? source?.TwitchGiftRedemption?.Type ??
+            source?.GiveawayLinks?.Type ?? "";
+    }
+
+    private SubathonEvent? MapOrder(OrderV1 order, bool testMode) {
+        string orderType = GetOrderType(order);
+        bool isSamples = string.Equals("SAMPLES_ORDER", orderType, StringComparison.CurrentCultureIgnoreCase);
+        if (!isSamples && !string.Equals("ORDER", orderType, StringComparison.CurrentCultureIgnoreCase))
+            return null;
+
+        OrderTypeModes sourceMode = config.GetOrderTypeMode(_configSection,
+            $"{SubathonEventType.FourthWallOrder}", OrderTypeModes.Dollar);
+        const string defaultCurrency = "USD";
+        var username = testMode ? "FourthWall Test" : "FourthWall Customer";
+        if (!testMode && !string.IsNullOrWhiteSpace(order.Username))
+            username = order.Username.Split(' ').First();
+        if (isSamples) username = "Internal Samples";
+
+        var itemCount = 0;
+        double costs = 0;
+        double prices = 0;
+        order.Offers?.ForEach(x => {
+            itemCount += x.Variant?.Quantity ?? 1;
+            costs += x.Variant?.Cost?.Value ?? 0;
+            prices += x.Variant?.Price?.Value ?? 0;
+        });
+
+        double totalValue = order.Amounts?.Subtotal?.Value ?? 0;
+        double totalDirect = order.Amounts?.Donation?.Value ?? 0;
+        string currency = !string.IsNullOrWhiteSpace(order.Amounts?.Subtotal?.Currency)
+            ? order.Amounts.Subtotal.Currency
+            : defaultCurrency;
+
+        double profit = Math.Max(prices - costs, 0);
+        if (isSamples) {
+            if (logger?.IsEnabled(LogLevel.Information) ?? false)
+                logger?.LogInformation("[FourthWall] Samples order placed. Setting profit from {Profit} to 0.", profit);
+            profit = 0;
+        }
+
+        totalDirect += profit;
+        return new SubathonEvent {
+            Id = Utils.TryParseGuid(order.Id),
+            Source = string.Equals(username, "SYSTEM")
+                ? SubathonEventSource.Simulated
+                : SubathonEventSource.FourthWall,
+            EventType = SubathonEventType.FourthWallOrder,
+            User = username,
+            Value = sourceMode switch {
+                OrderTypeModes.Item => $"{itemCount}",
+                OrderTypeModes.Order => "New",
+                _ => totalValue.ToString("F2", CultureInfo.InvariantCulture)
+            },
+            Currency = sourceMode switch {
+                OrderTypeModes.Item => "items",
+                OrderTypeModes.Order => "order",
+                _ => currency
+            },
+            Amount = Math.Max(itemCount, 1),
+            SecondaryValue = $"{totalDirect.ToString("F2", CultureInfo.InvariantCulture)}|{currency}",
+            EventTimestamp = order.CreatedAt?.LocalDateTime ?? DateTime.Now.ToLocalTime()
+        };
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task<List<SubathonEvent>> FetchMissedEventsAsync(DateTime from, DateTime to,
+        CancellationToken ct = default) {
+        if (!HasTokenFile()) throw new InvalidOperationException("FourthWall is not connected");
+        if (oAuth.NeedsRefresh(OAuthKeys) && !await oAuth.RefreshAsync(OAuthKeys, ct))
+            throw new InvalidOperationException("FourthWall login has expired, reconnect it first");
+
+        var client = new FourthwallApiClient(
+            new HttpClientRequestAdapter(new FourthwallBearerAuthenticationProvider(AccessToken!)));
+        DateTimeOffset start = from.ToUniversalTime();
+        DateTimeOffset end = to.ToUniversalTime();
+        List<SubathonEvent> events = [];
+
+        List<OrderV1> orders = await FetchAllPagesAsync<OrderV1>(async page =>
+            (await client.OpenApi.V10.Order.GetAsync(r => {
+                r.QueryParameters.CreatedAtgt = start;
+                r.QueryParameters.CreatedAtlt = end;
+                r.QueryParameters.Page = page;
+                r.QueryParameters.Size = MissedPageSize;
+            }, ct))?.Results, o => o.Id);
+        List<OrderV1> inRange = orders.Where(o => o.CreatedAt >= start && o.CreatedAt <= end).ToList();
+        int cancelled = inRange.Count(o => o.Status == OrderV1_status.CANCELLED);
+        events.AddRange(inRange.Where(o => o.Status != OrderV1_status.CANCELLED)
+            .Select(o => MapOrder(o, false)).OfType<SubathonEvent>());
+        int mappedOrders = events.Count;
+        string skippedTypes = string.Join(", ", inRange.Where(o => o.Status != OrderV1_status.CANCELLED)
+            .Select(GetOrderType).Where(t => t is not "ORDER" and not "SAMPLES_ORDER")
+            .GroupBy(t => t == "" ? "(no source)" : t).Select(g => $"{g.Key} x{g.Count()}"));
+
+        List<DonationV1> donations = await FetchAllPagesAsync<DonationV1>(async page =>
+            (await client.OpenApi.V10.Donations.GetAsync(r => {
+                r.QueryParameters.Page = page;
+                r.QueryParameters.Size = MissedPageSize;
+            }, ct))?.Results, d => d.Id);
+        List<DonationV1> donationsInRange = donations.Where(d => d.CreatedAt >= start && d.CreatedAt <= end).ToList();
+        events.AddRange(donationsInRange.Where(d => d.Status is null or DonationV1_status.COMPLETED)
+            .Select(d => MapDonation(d, false)));
+
+        if (logger?.IsEnabled(LogLevel.Information) ?? false)
+            logger?.LogInformation(
+                "[FourthWall] Missed event lookup {Start:u} to {End:u}: {Orders} order(s) returned, {InRange} in range, " +
+                "{Cancelled} cancelled, {Mapped} usable, skipped types [{Skipped}]; {Donations} donation(s) checked, " +
+                "{DonationsInRange} in range",
+                start, end, orders.Count, inRange.Count, cancelled, mappedOrders, skippedTypes, donations.Count,
+                donationsInRange.Count);
+        return events;
+    }
+
+    private async Task<List<T>> FetchAllPagesAsync<T>(Func<int, Task<List<T>?>> getPage, Func<T, string?> getId) {
+        List<T> all = [];
+        HashSet<string> seen = [];
+        for (var page = 0; page < MaxMissedPages; page++) {
+            List<T> items = await getPage(page) ?? [];
+            if (items.Count == 0) {
+                if (page == 0) continue;
+                break;
+            }
+
+            List<T> fresh = items.Where(i => seen.Add(getId(i) ?? Guid.NewGuid().ToString())).ToList();
+            if (fresh.Count == 0) break;
+            all.AddRange(fresh);
+        }
+
+        return all;
+    }
+}
diff --git a/SubathonManager.Integration/GoAffProService.cs b/SubathonManager.Integration/GoAffProService.cs
index d8618b8..6f2d1e4 100644
--- a/SubathonManager.Integration/GoAffProService.cs
+++ b/SubathonManager.Integration/GoAffProService.cs
@@ -22,7 +22,7 @@ public class GoAffProService(
     ILogger<GoAffProService>? logger,
     IConfig config,
     ISecureStorage secureStorage,
-    ITimerService? timerService = null) : IDisposable, IAppService {
+    ITimerService? timerService = null) : IDisposable, IAppService, IMissedEventSource {
     private readonly string _configSection = "GoAffPro";
 
     private GoAffProClient? _client;
@@ -209,7 +209,7 @@ private async Task PollWithBackfillAsync(GoAffProClient client, TimeSpan initial
     }
 
     private async Task<List<UserOrderFeedItem>> FetchOrdersAsync(GoAffProClient client, DateTimeOffset? createdAtMin,
-        string? sinceId, CancellationToken ct) {
+        string? sinceId, CancellationToken ct, DateTimeOffset? createdAtMax = null) {
         List<UserOrderFeedItem> all = new();
         var offset = 0;
 
@@ -220,6 +220,7 @@ private async Task<List<UserOrderFeedItem>> FetchOrdersAsync(GoAffProClient clie
                 reqConfig.QueryParameters.Limit = PageSize;
                 reqConfig.QueryParameters.Offset = pageOffset;
                 if (createdAtMin.HasValue) reqConfig.QueryParameters.CreatedAtMin = createdAtMin.Value;
+                if (createdAtMax.HasValue) reqConfig.QueryParameters.CreatedAtMax = createdAtMax.Value;
                 if (!string.IsNullOrWhiteSpace(sinceId)) reqConfig.QueryParameters.SinceId = sinceId;
             }, ct);
 
@@ -320,14 +321,28 @@ public void SimulateOrder(decimal total, int itemCount, decimal commissionTotal,
         HandleOrder(order);
     }
 
+    [ExcludeFromCodeCoverage]
+    public async Task<List<SubathonEvent>> FetchMissedEventsAsync(DateTime from, DateTime to,
+        CancellationToken ct = default) {
+        GoAffProClient client = _client ?? throw new InvalidOperationException("GoAffPro is not connected");
+        List<UserOrderFeedItem> orders = await FetchOrdersAsync(client, from.ToUniversalTime(), null, ct,
+            to.ToUniversalTime());
+        return orders.Select(MapOrder).OfType<SubathonEvent>().ToList();
+    }
+
     private void HandleOrder(UserOrderFeedItem order) {
+        SubathonEvent? ev = MapOrder(order);
+        if (ev != null) SubathonEvents.RaiseSubathonEventCreated(ev);
+    }
+
+    private SubathonEvent? MapOrder(UserOrderFeedItem order) {
         try {
             // If an order comes in as new and then approved, only one is added due to unique id's 
 
             if (order.Id == null || order.SiteId == null || order.LineItems == null ||
                 string.IsNullOrWhiteSpace(order.Status) ||
                 (!string.Equals(order.Status, "approved", StringComparison.OrdinalIgnoreCase) &&
-                 !string.Equals(order.Status, "new", StringComparison.OrdinalIgnoreCase))) return;
+                 !string.Equals(order.Status, "new", StringComparison.OrdinalIgnoreCase))) return null;
             // new and approved can both come in, but same id will mean it doesn't add twice
 
             var ev = new SubathonEvent {
@@ -346,12 +361,12 @@ private void HandleOrder(UserOrderFeedItem order) {
             }
 
             int? site = order.SiteId!.Integer;
-            if (site == null || !GoAffProStoreRegistry.TryGetBySiteId((int)site, out GoAffProStore? store)) return;
-            if (!store.Enabled) return;
+            if (site == null || !GoAffProStoreRegistry.TryGetBySiteId((int)site, out GoAffProStore? store)) return null;
+            if (!store.Enabled) return null;
 
             // we will listen for these sites regardless in orders, but will ignore if not enabled.
             bool enabled = config.GetBool(_configSection, $"{store.InternalName}.Enabled", true);
-            if (!enabled) return;
+            if (!enabled) return null;
 
             OrderTypeModes sourceMode = config.GetOrderTypeMode(_configSection,
                 store.InternalName, OrderTypeModes.Dollar);
@@ -368,18 +383,11 @@ private void HandleOrder(UserOrderFeedItem order) {
             }
 
             ev.Amount = itemCount;
-            switch (sourceMode) {
-                case OrderTypeModes.Dollar:
-                    ev.Value = $"{order.Subtotal}";
-                    break;
-                case OrderTypeModes.Order:
-                    ev.Value = "New";
-                    break;
-                default: {
-                    ev.Value = $"{itemCount}";
-                    break;
-                }
-            }
+            ev.Value = sourceMode switch {
+                OrderTypeModes.Dollar => $"{order.Subtotal}",
+                OrderTypeModes.Order => "New",
+                _ => $"{itemCount}"
+            };
 
             ev.SecondaryValue = $"{order.Commission}|{order.Currency}";
             ev.EventType = SubathonEventType.GoAffProOrder;
@@ -389,11 +397,12 @@ private void HandleOrder(UserOrderFeedItem order) {
             if (ev.Source == SubathonEventSource.Simulated)
                 ev.User = $"SYSTEM {store.InternalName}";
 
-            SubathonEvents.RaiseSubathonEventCreated(ev);
+            return ev;
         }
         catch (Exception e) {
             logger?.LogWarning(e, "[GoAffPro] Failed to consume order. Data: {Serialize}",
                 JsonSerializer.Serialize(order.AdditionalData));
+            return null;
         }
     }
 
diff --git a/SubathonManager.Integration/TiltifyService.cs b/SubathonManager.Integration/TiltifyService.cs
index c35c933..ba6ec9a 100644
--- a/SubathonManager.Integration/TiltifyService.cs
+++ b/SubathonManager.Integration/TiltifyService.cs
@@ -24,7 +24,7 @@ public class TiltifyService(
     ILogger<TiltifyService>? logger,
     IConfig config,
     ITimerService timerService,
-    OAuthService oAuth) : IAppService, IDisposable {
+    OAuthService oAuth) : IAppService, IMissedEventSource, IDisposable {
     private const string ApiBase = "https://v5api.tiltify.com";
     internal const string CampaignIdsKey = "CampaignIds";
     internal const string TeamCampaignIdsKey = "TeamCampaignIds";
@@ -260,21 +260,36 @@ private async Task PollAsync(CancellationToken ct) {
     [ExcludeFromCodeCoverage]
     private async Task PollCampaignAsync(Guid campaignId, bool isTeam, DateTimeOffset since, CancellationToken ct) {
         if (_client == null) return;
-        var completedAfter = (since - PollOverlap).UtcDateTime
-            .ToString("yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture);
+        List<Donation> donations = await FetchDonationsAsync(campaignId, isTeam, since - PollOverlap,
+            MaxPagesPerPoll, ct);
+
+        foreach (Donation donation in donations.OrderBy(d => d.CompletedAt ?? DateTimeOffset.MinValue)) {
+            if (donation.Id == null || donation.CompletedAt == null) continue;
+            if (donation.CompletedAt > _watermarks.GetValueOrDefault(campaignId, since))
+                _watermarks[campaignId] = donation.CompletedAt.Value;
+            if (!_seen.TryAdd(donation.Id.Value, donation.CompletedAt.Value)) continue;
+            HandleDonation(donation, campaignId);
+        }
+    }
+
+    [ExcludeFromCodeCoverage]
+    private async Task<List<Donation>> FetchDonationsAsync(Guid campaignId, bool isTeam,
+        DateTimeOffset completedAfter, int maxPages, CancellationToken ct) {
+        if (_client == null) return [];
+        string after = completedAfter.UtcDateTime.ToString("yyyy-MM-ddTHH:mm:ss.fffZ", CultureInfo.InvariantCulture);
         string? cursor = null;
         List<Donation> donations = [];
 
-        for (var page = 0; page < MaxPagesPerPoll; page++) {
+        for (var page = 0; page < maxPages; page++) {
             string? pageCursor = cursor;
             RequestInformation req = isTeam
                 ? _client.Api.Public.Team_campaigns[campaignId.ToString()].Donations.ToGetRequestInformation(r => {
-                    r.QueryParameters.CompletedAfter = completedAfter;
+                    r.QueryParameters.CompletedAfter = after;
                     r.QueryParameters.Limit = PageSize;
                     r.QueryParameters.After = pageCursor;
                 })
                 : _client.Api.Public.Campaigns[campaignId.ToString()].Donations.ToGetRequestInformation(r => {
-                    r.QueryParameters.CompletedAfter = completedAfter;
+                    r.QueryParameters.CompletedAfter = after;
                     r.QueryParameters.Limit = PageSize;
                     r.QueryParameters.After = pageCursor;
                 });
@@ -285,13 +300,7 @@ private async Task PollCampaignAsync(Guid campaignId, bool isTeam, DateTimeOffse
             cursor = next;
         }
 
-        foreach (Donation donation in donations.OrderBy(d => d.CompletedAt ?? DateTimeOffset.MinValue)) {
-            if (donation.Id == null || donation.CompletedAt == null) continue;
-            if (donation.CompletedAt > _watermarks.GetValueOrDefault(campaignId, since))
-                _watermarks[campaignId] = donation.CompletedAt.Value;
-            if (!_seen.TryAdd(donation.Id.Value, donation.CompletedAt.Value)) continue;
-            HandleDonation(donation, campaignId);
-        }
+        return donations;
     }
 
     [ExcludeFromCodeCoverage]
@@ -322,9 +331,18 @@ private void PruneSeen() {
     }
 
     internal void HandleDonation(Donation donation, Guid? polledCampaignId = null) {
+        foreach (SubathonEvent ev in MapDonation(donation, polledCampaignId)) {
+            SubathonEvents.RaiseSubathonEventCreated(ev);
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("[Tiltify] Raised donation {Id} from {User}", ev.Id, ev.User);
+        }
+    }
+
+    private List<SubathonEvent> MapDonation(Donation donation, Guid? polledCampaignId = null) {
+        List<SubathonEvent> events = [];
         try {
             if (!double.TryParse(donation.Amount?.Value, NumberStyles.Any, CultureInfo.InvariantCulture,
-                    out double amount)) return;
+                    out double amount)) return events;
             string? currency = donation.Amount?.Currency;
 
             var ev = new SubathonEvent {
@@ -338,9 +356,7 @@ internal void HandleDonation(Donation donation, Guid? polledCampaignId = null) {
                 EventTypeMeta = (donation.CampaignId ?? polledCampaignId)?.ToString(),
                 TertiaryValue = GetCampaignName(donation.CampaignId) ?? GetCampaignName(polledCampaignId) ?? ""
             };
-
-            SubathonEvents.RaiseSubathonEventCreated(ev);
-            logger?.LogDebug("[Tiltify] Raised donation {Id} from {User}", ev.Id, ev.User);
+            events.Add(ev);
 
             foreach (DonationMatch match in donation.DonationMatches ?? []) {
                 if (match.Active != true || match.Id == null) continue;
@@ -348,7 +364,7 @@ internal void HandleDonation(Donation donation, Guid? polledCampaignId = null) {
                         out double matchAmount) || matchAmount <= 0) continue;
                 string? matchCurrency = match.Amount?.Currency;
 
-                var matchEv = new SubathonEvent {
+                events.Add(new SubathonEvent {
                     Id = match.Id.Value,
                     Source = SubathonEventSource.Tiltify,
                     EventType = SubathonEventType.TiltifyDonation,
@@ -358,16 +374,31 @@ internal void HandleDonation(Donation donation, Guid? polledCampaignId = null) {
                     EventTimestamp = match.CompletedAt?.LocalDateTime ?? ev.EventTimestamp,
                     EventTypeMeta = ev.EventTypeMeta,
                     TertiaryValue = ev.TertiaryValue
-                };
-
-                SubathonEvents.RaiseSubathonEventCreated(matchEv);
-                logger?.LogDebug("[Tiltify] Raised donation match {Id} from {User} on donation {Donation}",
-                    matchEv.Id, matchEv.User, ev.Id);
+                });
             }
         }
         catch (Exception ex) {
             logger?.LogWarning(ex, "[Tiltify] Failed to consume donation {Id}", donation.Id);
         }
+
+        return events;
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task<List<SubathonEvent>> FetchMissedEventsAsync(DateTime from, DateTime to,
+        CancellationToken ct = default) {
+        if (_client == null) throw new InvalidOperationException("Tiltify is not connected");
+        if (oAuth.NeedsRefresh(OAuthKeys)) await oAuth.RefreshAsync(OAuthKeys, ct);
+
+        DateTimeOffset start = from.ToUniversalTime();
+        DateTimeOffset end = to.ToUniversalTime();
+        List<SubathonEvent> events = [];
+        foreach ((Guid id, bool isTeam) in GetSelectedCampaigns())
+        foreach (Donation donation in (await FetchDonationsAsync(id, isTeam, start, 1000, ct))
+                 .Where(donation => donation.CompletedAt <= end))
+            events.AddRange(MapDonation(donation, id));
+
+        return events;
     }
 
     public static void SimulateDonation(string amount, string currency, CampaignOption? campaign = null) {
diff --git a/SubathonManager.Tests/IntegrationUnitTests/FourthWallUnitTests.cs b/SubathonManager.Tests/IntegrationUnitTests/FourthWallUnitTests.cs
index f398146..39bbd24 100644
--- a/SubathonManager.Tests/IntegrationUnitTests/FourthWallUnitTests.cs
+++ b/SubathonManager.Tests/IntegrationUnitTests/FourthWallUnitTests.cs
@@ -102,16 +102,20 @@ private static FourthwallOrderPlacedWebhookEvent MakeOrderEvent(
             UnitCost = new Money { Value = unitCost, Currency = currency }
         };
         var offer = new OfferOrderV1 { Variant = variant };
+        
+        // don't necessarily care about samples orders, but is useful for testing.
+        // user can delete if they import it or listen for it anyways
+        
         var data = new OrderV1 {
             Id = id ?? Guid.NewGuid().ToString(),
             Username = username,
             Message = "test",
             CreatedAt = DateTimeOffset.UtcNow,
             Status = OrderV1_status.CONFIRMED,
-            Source = new OrderV1.OrderV1_source {
-                Order = new Order { Type = orderType }
-            },
-            Offers = new List<OfferOrderV1> { offer },
+            Source = orderType == "SAMPLES_ORDER"
+                ? new OrderV1.OrderV1_source { SamplesOrder = new SamplesOrder { Type = orderType } }
+                : new OrderV1.OrderV1_source { Order = new Order { Type = orderType } },
+            Offers = [offer],
             Amounts = new OrderAmounts {
                 Subtotal = new Money { Value = subtotal, Currency = currency },
                 Total = new Money { Value = subtotal * 1.10, Currency = currency },
diff --git a/SubathonManager.UI/Views/ImportMissedWindow.axaml b/SubathonManager.UI/Views/ImportMissedWindow.axaml
new file mode 100644
index 0000000..8e723f5
--- /dev/null
+++ b/SubathonManager.UI/Views/ImportMissedWindow.axaml
@@ -0,0 +1,111 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:ctl="using:SubathonManager.UI.Controls"
+        mc:Ignorable="d"
+        x:CompileBindings="False"
+        x:Class="SubathonManager.UI.Views.ImportMissedWindow"
+        Title="Import Missed Events"
+        Width="1040" Height="680"
+        MinWidth="760" MinHeight="420"
+        WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource AppGeneralBackground}">
+
+    <Window.Styles>
+        <Style Selector="TextBlock.hint">
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrushSoft}" />
+            <Setter Property="FontSize" Value="11" />
+        </Style>
+        <Style Selector="DataGridRow:nth-child(2n)">
+            <Setter Property="Background" Value="#14808080" />
+        </Style>
+        <Style Selector="DataGridColumnHeader">
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+            <Setter Property="MinHeight" Value="32" />
+            <Setter Property="Padding" Value="8,4" />
+        </Style>
+        <Style Selector="DataGridCell">
+            <Setter Property="Padding" Value="8,2" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+        </Style>
+    </Window.Styles>
+
+    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="12">
+
+        <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,*" RowDefinitions="Auto,Auto"
+              Margin="0,0,0,8">
+            <TextBlock Grid.Row="0" Grid.Column="0" Text="From" VerticalAlignment="Center" Margin="0,0,8,0" />
+            <DatePicker Grid.Row="0" Grid.Column="1" x:Name="FromDatePicker" VerticalAlignment="Center" />
+            <TimePicker Grid.Row="0" Grid.Column="2" x:Name="FromTimePicker" ClockIdentifier="24HourClock"
+                        VerticalAlignment="Center" Margin="8,0,0,0" />
+
+            <TextBlock Grid.Row="1" Grid.Column="0" Text="To" VerticalAlignment="Center" Margin="0,6,8,0" />
+            <DatePicker Grid.Row="1" Grid.Column="1" x:Name="ToDatePicker" VerticalAlignment="Center"
+                        Margin="0,6,0,0" />
+            <TimePicker Grid.Row="1" Grid.Column="2" x:Name="ToTimePicker" ClockIdentifier="24HourClock"
+                        VerticalAlignment="Center" Margin="8,6,0,0" />
+
+            <Button Grid.Row="0" Grid.RowSpan="2" Grid.Column="3" x:Name="FetchBtn" Content="Fetch" Width="90"
+                    Height="60" Click="Fetch_Click" Margin="12,0,0,0" />
+            <TextBlock Grid.Row="0" Grid.RowSpan="2" Grid.Column="4" x:Name="StatusText" VerticalAlignment="Center"
+                       Margin="12,0,0,0" Classes="hint" TextWrapping="Wrap"
+                       Text="Pick the time range to look through, then Fetch" />
+        </Grid>
+
+        <Grid Grid.Row="1" ColumnDefinitions="Auto,300,*,Auto" Margin="0,0,0,8">
+            <TextBlock Grid.Column="0" Text="Event Types" VerticalAlignment="Center" Margin="0,0,8,0" />
+            <ctl:FilterPopout Grid.Column="1" x:Name="TypePopout" VerticalAlignment="Center" />
+            <CheckBox Grid.Column="3" x:Name="ShowCapturedBox" Content="Show already captured"
+                      IsCheckedChanged="ShowCaptured_Changed" />
+        </Grid>
+
+        <DataGrid Grid.Row="2" x:Name="EventGrid"
+                  AutoGenerateColumns="False" IsReadOnly="True" HeadersVisibility="Column"
+                  CanUserSortColumns="True" CanUserResizeColumns="True"
+                  GridLinesVisibility="All" SelectionMode="Single"
+                  BorderBrush="{DynamicResource ControlElevationBorderBrush}" BorderThickness="1">
+            <DataGrid.Columns>
+                <DataGridTemplateColumn Header="" Width="44" SortMemberPath="Selected">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <CheckBox IsChecked="{Binding Selected, Mode=TwoWay}" IsEnabled="{Binding CanSelect}"
+                                      HorizontalAlignment="Center" />
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Time" Width="150" IsReadOnly="True"
+                                    Binding="{Binding Timestamp, StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" />
+                <DataGridTextColumn Header="Source" Width="120" IsReadOnly="True" Binding="{Binding TrueSource}" />
+                <DataGridTextColumn Header="Type" Width="150" IsReadOnly="True" Binding="{Binding TypeLabel}" />
+                <DataGridTextColumn Header="User" Width="150" IsReadOnly="True" Binding="{Binding User}" />
+                <DataGridTextColumn Header="Value" Width="120" IsReadOnly="True" Binding="{Binding DisplayValue}" />
+                <DataGridTextColumn Header="Amount" Width="80" IsReadOnly="True" Binding="{Binding Amount}" />
+                <DataGridTextColumn Header="Details" Width="*" IsReadOnly="True" Binding="{Binding Details}" />
+                
+                <DataGridTemplateColumn Header="Status" Width="170" SortMemberPath="StatusText">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding StatusText}" Foreground="{Binding StatusBrush}"
+                                       VerticalAlignment="Center" />
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <Grid Grid.Row="3" ColumnDefinitions="Auto,Auto,*,Auto" Margin="0,8,0,0">
+            <Button Grid.Column="0" Content="Select all" Click="SelectAll_Click" Margin="0,0,6,0" />
+            <Button Grid.Column="1" Content="Select none" Click="SelectNone_Click" />
+            
+            <StackPanel Grid.Column="2" Margin="12,0" VerticalAlignment="Center">
+                <TextBlock x:Name="SelectionText" Classes="hint" />
+                <TextBlock x:Name="WarningText" Foreground="#E8A33D" TextWrapping="Wrap" IsVisible="False" />
+            </StackPanel>
+
+            <Button Grid.Column="3" x:Name="ImportBtn" Content="Import Selected" Width="140" IsEnabled="False"
+                    Classes="accent" Click="Import_Click" />
+        </Grid>
+    </Grid>
+</Window>
diff --git a/SubathonManager.UI/Views/ImportMissedWindow.axaml.cs b/SubathonManager.UI/Views/ImportMissedWindow.axaml.cs
new file mode 100644
index 0000000..953c015
--- /dev/null
+++ b/SubathonManager.UI/Views/ImportMissedWindow.axaml.cs
@@ -0,0 +1,285 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using FluentAvalonia.UI.Controls;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Data;
+using SubathonManager.UI.Controls;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views;
+
+public partial class ImportMissedWindow : Window {
+    private static readonly IBrush MissedBrush = new SolidColorBrush(Color.Parse("#4CAF50"));
+    private static readonly IBrush WarnBrush = new SolidColorBrush(Color.Parse("#E8A33D"));
+    private static readonly IBrush CapturedBrush = new SolidColorBrush(Color.Parse("#808080"));
+
+    private readonly List<ImportRow> _all = [];
+    private readonly IDbContextFactory<AppDbContext> _factory =
+        AppServices.Provider.GetRequiredService<IDbContextFactory<AppDbContext>>();
+    private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<ImportMissedWindow>>();
+    private readonly ObservableCollection<ImportRow> _rows = [];
+    private readonly IMissedEventSource? _source;
+    private CancellationTokenSource? _fetchCts;
+    private bool _hasActiveSubathon;
+    private DateTime? _subathonStart;
+
+    public ImportMissedWindow() {
+        InitializeComponent();
+        EventGrid.ItemsSource = _rows;
+        TypePopout.EmptyText = "All event types";
+        TypePopout.SelectionChanged += (_, _) => ApplyFilter();
+
+        DateTime now = DateTime.Now;
+        DateTime from = now.AddHours(-24);
+        FromDatePicker.SelectedDate = new DateTimeOffset(from.Date);
+        FromTimePicker.SelectedTime = new TimeSpan(from.Hour, from.Minute, 0);
+        ToDatePicker.SelectedDate = new DateTimeOffset(now.Date);
+        ToTimePicker.SelectedTime = new TimeSpan(now.Hour, now.Minute, 0);
+        Closed += (_, _) => _fetchCts?.Cancel();
+    }
+
+    public ImportMissedWindow(SubathonEventSource source, IMissedEventSource service) : this() {
+        _source = service;
+        Title = $"Import Missed Events - {source}";
+        TypePopout.SetOptions(BuildTypeOptions(source), true);
+    }
+
+    public static void Open(Control owner, SubathonEventSource source, IMissedEventSource service) {
+        var window = new ImportMissedWindow(source, service);
+        if (TopLevel.GetTopLevel(owner) is Window parent) {
+            UiHelpers.CenterOver(window, parent);
+            _ = window.ShowDialog(parent);
+            return;
+        }
+
+        window.Show();
+    }
+
+    private async void Fetch_Click(object? sender, RoutedEventArgs e) {
+        if (_source == null) return;
+        if (FromDatePicker.SelectedDate is not { } fromDate || ToDatePicker.SelectedDate is not { } toDate) {
+            StatusText.Text = "Pick both a From and a To date";
+            return;
+        }
+
+        DateTime from = fromDate.Date + (FromTimePicker.SelectedTime ?? TimeSpan.Zero);
+        DateTime to = toDate.Date + (ToTimePicker.SelectedTime ?? TimeSpan.Zero) + TimeSpan.FromMinutes(1);
+        if (from >= to) {
+            StatusText.Text = "From has to be before To";
+            return;
+        }
+
+        _fetchCts?.Cancel();
+        _fetchCts = new CancellationTokenSource();
+        CancellationToken ct = _fetchCts.Token;
+        FetchBtn.IsEnabled = false;
+        ImportBtn.IsEnabled = false;
+        StatusText.Text = $"Fetching events from {from.ToString("yyyy-MM-dd HH:mm", CultureInfo.CurrentCulture)} " +
+                          $"to {to.AddMinutes(-1).ToString("yyyy-MM-dd HH:mm", CultureInfo.CurrentCulture)}...";
+
+        try {
+            List<SubathonEvent> fetched = await Task.Run(() => _source.FetchMissedEventsAsync(from, to, ct), ct);
+            List<Guid> ids = fetched.Select(ev => ev.Id).Distinct().ToList();
+
+            await using AppDbContext db = await _factory.CreateDbContextAsync(ct);
+            HashSet<(Guid, SubathonEventSource)> captured = (await db.SubathonEvents.AsNoTracking()
+                    .Where(ev => ids.Contains(ev.Id))
+                    .Select(ev => new { ev.Id, ev.Source })
+                    .ToListAsync(ct))
+                .Select(ev => (ev.Id, ev.Source))
+                .ToHashSet();
+
+            SubathonData? active = await db.SubathonDatas.AsNoTracking().FirstOrDefaultAsync(s => s.IsActive, ct);
+            _hasActiveSubathon = active != null;
+            _subathonStart = active == null
+                ? null
+                : await db.SubathonEvents.AsNoTracking()
+                    .Where(ev => ev.SubathonId == active.Id)
+                    .MinAsync(ev => (DateTime?)ev.EventTimestamp, ct);
+
+            _all.Clear();
+            foreach (SubathonEvent ev in fetched.DistinctBy(ev => (ev.Id, ev.Source)).OrderBy(ev => ev.EventTimestamp)) {
+                var row = new ImportRow(ev, captured.Contains((ev.Id, ev.Source)),
+                    _subathonStart != null && ev.EventTimestamp < _subathonStart);
+                row.PropertyChanged += (_, args) => {
+                    if (args.PropertyName == nameof(ImportRow.Selected)) UpdateSelectionState();
+                };
+                _all.Add(row);
+            }
+
+            int missed = _all.Count(r => !r.Captured);
+            StatusText.Text = _all.Count == 0
+                ? "No events found in that time range"
+                : $"Found {_all.Count:N0} event(s), {missed:N0} not captured yet" +
+                  (missed < _all.Count ? $" ({_all.Count - missed:N0} already captured are hidden unless shown)" : "");
+            if (!_hasActiveSubathon) StatusText.Text += ". There's no active subathon to import into";
+            ApplyFilter();
+        }
+        catch (OperationCanceledException) {
+            StatusText.Text = "Fetch cancelled";
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "Failed to fetch missed events");
+            StatusText.Text = $"Couldn't fetch events: {ex.Message}";
+        }
+        finally {
+            FetchBtn.IsEnabled = true;
+            UpdateSelectionState();
+        }
+    }
+
+    private static List<FilterOption> BuildTypeOptions(SubathonEventSource source) {
+        if (source == SubathonEventSource.GoAffPro)
+            return GoAffProStoreRegistry.All()
+                .OrderBy(s => s.StoreName, StringComparer.OrdinalIgnoreCase)
+                .Select(s => {
+                    string meta = s.SiteId.ToString(CultureInfo.InvariantCulture);
+                    return new FilterOption {
+                        Label = GoAffProOrderHelper.GetOrderLabel(meta),
+                        Value = FilterKeyFor(SubathonEventType.GoAffProOrder, meta),
+                        Group = nameof(SubathonEventSource.GoAffPro)
+                    };
+                })
+                .ToList();
+
+        return Enum.GetValues<SubathonEventType>()
+            .Where(t => ((SubathonEventType?)t).GetSource() == source && !t.IsDisabled())
+            .Select(t => new FilterOption {
+                Label = ((SubathonEventType?)t).GetLabel(), Value = FilterKeyFor(t, null), Group = source.ToString()
+            })
+            .OrderBy(o => o.Label, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+    }
+
+    private static string FilterKeyFor(SubathonEventType? type, string? meta) {
+        return type == SubathonEventType.GoAffProOrder ? $"{type}|{meta}" : $"{type}";
+    }
+
+    private void ApplyFilter() {
+        HashSet<string> types = TypePopout.SelectedOptions.Select(o => o.Value).ToHashSet();
+        bool showCaptured = ShowCapturedBox.IsChecked == true;
+
+        _rows.Clear();
+        foreach (ImportRow row in _all.Where(r =>
+                     (showCaptured || !r.Captured) && (types.Count == 0 || types.Contains(r.FilterKey))))
+            _rows.Add(row);
+        UpdateSelectionState();
+    }
+
+    private void UpdateSelectionState() {
+        List<ImportRow> selected = _rows.Where(r => r.Selected).ToList();
+        int beforeStart = selected.Count(r => r.BeforeStart);
+
+        SelectionText.Text = _all.Count == 0 ? "" : $"{selected.Count:N0} of {_rows.Count:N0} shown selected";
+        WarningText.IsVisible = beforeStart > 0;
+        WarningText.Text = beforeStart == 0 || _subathonStart == null
+            ? ""
+            : $"{beforeStart:N0} selected event(s) happened before this subathon started " +
+              $"({_subathonStart.Value.ToString("yyyy-MM-dd HH:mm", CultureInfo.CurrentCulture)})";
+        ImportBtn.IsEnabled = selected.Count > 0 && _hasActiveSubathon;
+    }
+
+    private void ShowCaptured_Changed(object? sender, RoutedEventArgs e) {
+        ApplyFilter();
+    }
+
+    private void SelectAll_Click(object? sender, RoutedEventArgs e) {
+        foreach (ImportRow row in _rows) row.Selected = true;
+    }
+
+    private void SelectNone_Click(object? sender, RoutedEventArgs e) {
+        foreach (ImportRow row in _rows) row.Selected = false;
+    }
+
+    private async void Import_Click(object? sender, RoutedEventArgs e) {
+        List<ImportRow> chosen = _rows.Where(r => r.Selected && !r.Captured).ToList();
+        if (chosen.Count == 0 || !_hasActiveSubathon) return;
+
+        int beforeStart = chosen.Count(r => r.BeforeStart);
+        var dialog = new FAContentDialog {
+            Title = $"Import {chosen.Count:N0} Event(s)",
+            PrimaryButtonText = "Import",
+            CloseButtonText = "Cancel",
+            Content = new TextBlock {
+                TextWrapping = TextWrapping.Wrap,
+                Text = "They'll be added to the active subathon using your current values." +
+                       (beforeStart > 0
+                           ? $"\n\n{beforeStart:N0} of them happened before this subathon started"
+                           : "")
+            }
+        };
+        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
+
+        foreach (ImportRow row in chosen) {
+            SubathonEvents.RaiseSubathonEventCreated(row.Event);
+            row.MarkImported();
+        }
+
+        _logger?.LogInformation("Imported {Count} missed event(s) from {Title}", chosen.Count, Title);
+        StatusText.Text = $"Imported {chosen.Count:N0} event(s)";
+        ApplyFilter();
+    }
+
+    public sealed class ImportRow(SubathonEvent ev, bool captured, bool beforeStart) : INotifyPropertyChanged {
+        private bool _imported;
+        private bool _selected;
+
+        public SubathonEvent Event { get; } = ev;
+        public bool Captured { get; private set; } = captured;
+        public bool BeforeStart { get; } = beforeStart;
+        public bool CanSelect => !Captured;
+        public DateTime Timestamp => Event.EventTimestamp;
+        public string TrueSource { get; } = ev.EventType.GetTypeTrueSource(ev.EventTypeMeta) ?? ev.Source.ToString();
+        public string TypeLabel => Event.EventType.GetLabel();
+        public string FilterKey => FilterKeyFor(Event.EventType, Event.EventTypeMeta);
+        public string User => Event.User ?? "";
+        public string DisplayValue => string.IsNullOrWhiteSpace(Event.Currency)
+            ? Event.Value
+            : $"{Event.Value} {Event.Currency}";
+        public int Amount => Event.Amount;
+        public string Details => Event.TertiaryValue;
+
+        public string StatusText => _imported ? "Imported"
+            : Captured ? "Already captured"
+            : BeforeStart ? "Missed (before start)"
+            : "Missed";
+
+        public IBrush StatusBrush => Captured ? CapturedBrush : BeforeStart ? WarnBrush : MissedBrush;
+
+        public bool Selected {
+            get => _selected;
+            set {
+                if (_selected == value || (value && Captured)) return;
+                _selected = value;
+                Raise(nameof(Selected));
+            }
+        }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        public void MarkImported() {
+            _imported = true;
+            Captured = true;
+            Selected = false;
+            Raise(nameof(Captured));
+            Raise(nameof(CanSelect));
+            Raise(nameof(StatusText));
+            Raise(nameof(StatusBrush));
+        }
+
+        private void Raise(string name) {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+        }
+    }
+}
diff --git a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml
index 79680b6..280377e 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml
@@ -49,6 +49,9 @@
                             x:Name="ConnectBtn" />
                     <Button Content="Disconnect" Margin="4 0" Width="116" Height="34" Click="DisconnectFw_Click"
                             IsVisible="False" x:Name="DisconnBtn" />
+                    <Button Content="Import Missed" Margin="4 0" Width="116" Height="34" Click="ImportMissed_Click"
+                            IsVisible="False" x:Name="ImportMissedBtn"
+                            ToolTip.Tip="Look up events that were missed while disconnected" />
                 </StackPanel>
             </StackPanel>
 
diff --git a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
index a80671d..e98f497 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
@@ -73,7 +73,14 @@ internal override void UpdateStatus(IntegrationConnection? conn) {
         if (conn == null) return;
         base.UpdateStatus(conn);
         if (conn.Source != SubathonEventSource.FourthWall) return;
-        Dispatcher.UIThread.Post(() => DisconnBtn.IsVisible = conn.Status);
+        Dispatcher.UIThread.Post(() => {
+            DisconnBtn.IsVisible = conn.Status;
+            ImportMissedBtn.IsVisible = conn.Status;
+        });
+    }
+
+    private void ImportMissed_Click(object? sender, RoutedEventArgs e) {
+        ImportMissedWindow.Open(this, SubathonEventSource.FourthWall, ServiceManager.FourthWall);
     }
 
     protected internal override void LoadValues(AppDbContext db) {
diff --git a/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml
index 0c83181..35b6006 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml
@@ -12,6 +12,10 @@
                     Padding="2" Width="120" Height="35" x:Name="ConnectBtn" VerticalAlignment="Center" Margin="0,0,6,0" />
             <TextBlock x:Name="StatusText" Text="Disconnected" VerticalAlignment="Center" FontSize="12"
                        Margin="14 0 0 0" Width="140" />
+            <Button Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Import Missed"
+                    Click="ImportMissed_Click" Padding="2" Width="120" Height="35" x:Name="ImportMissedBtn"
+                    VerticalAlignment="Center" IsVisible="False"
+                    ToolTip.Tip="Look up orders from all your stores that were missed while disconnected" />
             <TextBlock Text="Lookback Days"
                        ToolTip.Tip="Number of days to look back on connect for orders that were missed"
                        VerticalAlignment="Center" Margin="48 0 0 0" />
diff --git a/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml.cs
index a7d5b77..d179f96 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/GoAffProSettings.axaml.cs
@@ -128,10 +128,15 @@ private void SelectGroup(string label) {
         _activeSource = label;
     }
 
+    private void ImportMissed_Click(object? sender, RoutedEventArgs e) {
+        ImportMissedWindow.Open(this, SubathonEventSource.GoAffPro, ServiceManager.GoAffPro);
+    }
+
     internal override void UpdateStatus(IntegrationConnection? connection) {
         if (connection is not { Source: SubathonEventSource.GoAffPro }) return;
         if (connection.Service == nameof(SubathonEventSource.GoAffPro)) {
             Host.UpdateConnectionStatus(connection.Status, StatusText, ConnectBtn);
+            Dispatcher.UIThread.Post(() => ImportMissedBtn.IsVisible = connection.Status);
             return;
         }
 
diff --git a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml
index 25f15af..de44c52 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml
@@ -12,6 +12,9 @@
                     Margin="0,5,0,10" Click="Connect_Click" />
             <Button x:Name="DisconnBtn" Content="Disconnect" Width="120" Height="35"
                     Margin="6,5,0,10" IsVisible="False" Click="Disconnect_Click" />
+            <Button x:Name="ImportMissedBtn" Content="Import Missed" Width="120" Height="35"
+                    Margin="6,5,0,10" IsVisible="False" Click="ImportMissed_Click"
+                    ToolTip.Tip="Look up donations from your selected campaigns that were missed while disconnected" />
             <TextBlock x:Name="TiltifyStatusText" Text="Disconnected" VerticalAlignment="Center"
                        FontSize="12" Margin="14,0,0,10" />
         </StackPanel>
diff --git a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
index 78fb798..25e5062 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
@@ -51,6 +51,7 @@ internal override void UpdateStatus(IntegrationConnection? connection) {
             if (ConnectBtn.Content?.ToString() != connectLabel) ConnectBtn.Content = connectLabel;
 
             DisconnBtn.IsVisible = connection.Status;
+            ImportMissedBtn.IsVisible = connection.Status;
             RefreshCampaignsBtn.IsEnabled = connection.Status;
 
             if (connection.Status && !_wasConnected) _ = LoadCampaignsAsync();
@@ -166,6 +167,10 @@ private async void Disconnect_Click(object? sender, RoutedEventArgs e) {
         SetTestCampaigns([]);
     }
 
+    private void ImportMissed_Click(object? sender, RoutedEventArgs e) {
+        ImportMissedWindow.Open(this, SubathonEventSource.Tiltify, ServiceManager.Tiltify);
+    }
+
     private async void RefreshCampaigns_Click(object? sender, RoutedEventArgs e) {
         await LoadCampaignsAsync();
     }

From 27044a184a8e021cd83edece5fe33c1637cc1480 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 1 Oct 2026 21:08:47 -0300
Subject: [PATCH 02/23] initial patreon setup #145

---
 .../Enums/SubathonEventSource.cs              |   6 +-
 .../Enums/SubathonEventType.cs                |   7 +-
 .../Events/IntegrationEvents.cs               |   6 +-
 SubathonManager.Core/Security/StorageKeys.cs  |   6 +
 SubathonManager.Core/Utils.cs                 |  19 +
 SubathonManager.Data/DbContext.cs             |   6 +
 .../Overlays/OverlayPackInstaller.cs          |   7 +-
 .../Widgets/WidgetCollectionInstaller.cs      |   9 +-
 .../Widgets/WidgetPackInstaller.cs            |   9 +-
 .../DevTunnelsService.cs                      |  20 +
 .../FourthWallService.cs                      |  19 +-
 SubathonManager.Integration/PatreonService.cs | 501 ++++++++++++++++++
 .../SubathonManager.Integration.csproj        |   1 +
 SubathonManager.Integration/TiltifyService.cs |   6 +-
 SubathonManager.Services/EventService.cs      |   6 +-
 .../PatreonServiceTests.cs                    | 303 +++++++++++
 .../SubathonManager.Tests.csproj              |   1 +
 SubathonManager.UI/App.axaml.cs               |  15 +-
 .../MainWindow.ConnectionStatus.cs            |   2 +-
 SubathonManager.UI/Services/ServiceManager.cs |   3 +
 .../Services/ServiceRegistration.cs           |   6 +
 SubathonManager.UI/Views/SettingsControl.cs   | 139 +++++
 .../External/FourthWallSettings.axaml.cs      | 157 +-----
 .../External/PatreonSettings.axaml            | 117 ++++
 .../External/PatreonSettings.axaml.cs         | 196 +++++++
 .../SettingsViews/ExternalSettings.axaml.cs   |   3 +
 26 files changed, 1381 insertions(+), 189 deletions(-)
 create mode 100644 SubathonManager.Integration/PatreonService.cs
 create mode 100644 SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
 create mode 100644 SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
 create mode 100644 SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs

diff --git a/SubathonManager.Core/Enums/SubathonEventSource.cs b/SubathonManager.Core/Enums/SubathonEventSource.cs
index 68bfd2e..b074948 100644
--- a/SubathonManager.Core/Enums/SubathonEventSource.cs
+++ b/SubathonManager.Core/Enums/SubathonEventSource.cs
@@ -112,7 +112,11 @@ public enum SubathonEventSource {
 
     [EventSourceMeta(Description = "Tiltify", SourceGroup = SubathonSourceGroup.ExternalService, SourceOrder = 67,
         Order = 56)]
-    Tiltify
+    Tiltify,
+
+    [EventSourceMeta(Description = "Patreon", SourceGroup = SubathonSourceGroup.ExternalService, SourceOrder = 68,
+        Order = 57)]
+    Patreon
 }
 
 [ExcludeFromCodeCoverage]
diff --git a/SubathonManager.Core/Enums/SubathonEventType.cs b/SubathonManager.Core/Enums/SubathonEventType.cs
index 0e3a3e8..0c91c75 100644
--- a/SubathonManager.Core/Enums/SubathonEventType.cs
+++ b/SubathonManager.Core/Enums/SubathonEventType.cs
@@ -216,7 +216,12 @@ public enum SubathonEventType {
     JuniperMerchSale,
 
     [EventTypeMeta(Label = "Donation", Source = SubathonEventSource.Tiltify, IsCurrencyDonation = true, Order = 1)]
-    TiltifyDonation
+    TiltifyDonation,
+
+    // meta = highest tier title, synced from the campaign, or Utils.PerUnitMeta when valued by the amount pledged
+    // buhhhh, this is a subscription but can in a mode be used as donation stuff. Tricky
+    [EventTypeMeta(Label = "Membership", Source = SubathonEventSource.Patreon, IsMembership = true, Order = 1)]
+    PatreonPledge
     // any new must be added after the last
 }
 
diff --git a/SubathonManager.Core/Events/IntegrationEvents.cs b/SubathonManager.Core/Events/IntegrationEvents.cs
index a48323d..3154b64 100644
--- a/SubathonManager.Core/Events/IntegrationEvents.cs
+++ b/SubathonManager.Core/Events/IntegrationEvents.cs
@@ -7,7 +7,7 @@ namespace SubathonManager.Core.Events;
 [ExcludeFromCodeCoverage]
 public static class IntegrationEvents {
     public static event Action<IntegrationConnection>? ConnectionUpdated; // status, src, acc name, service
-    public static event Action<Dictionary<string, string>>? FourthWallMembershipsSynced;
+    public static event Action<SubathonEventSource, IReadOnlyCollection<string>>? MembershipTiersSynced;
     public static event Action? DevTunnelLegacyNotification;
     public static event Action<SubathonEventSource>? ExternalSourceSeen;
 
@@ -20,8 +20,8 @@ public static void RaiseExternalSourceSeen(SubathonEventSource source) {
         ExternalSourceSeen?.Invoke(source);
     }
 
-    public static void RaiseFourthWallMembershipsSynced(Dictionary<string, string> synced) {
-        FourthWallMembershipsSynced?.Invoke(synced);
+    public static void RaiseMembershipTiersSynced(SubathonEventSource source, IReadOnlyCollection<string> tierNames) {
+        MembershipTiersSynced?.Invoke(source, tierNames);
     }
 
     public static void RaiseDevTunnelLegacyNotification() {
diff --git a/SubathonManager.Core/Security/StorageKeys.cs b/SubathonManager.Core/Security/StorageKeys.cs
index 2151af2..d775c50 100644
--- a/SubathonManager.Core/Security/StorageKeys.cs
+++ b/SubathonManager.Core/Security/StorageKeys.cs
@@ -33,4 +33,10 @@ public static class StorageKeys {
     public const string TiltifyAccessToken = "SM.Tiltify.AccessToken";
     public const string TiltifyRefreshToken = "SM.Tiltify.RefreshToken";
     public const string TiltifyTokenExpiry = "SM.Tiltify.TokenExpiry";
+
+    public const string PatreonAccessToken = "SM.Patreon.AccessToken";
+    public const string PatreonRefreshToken = "SM.Patreon.RefreshToken";
+    public const string PatreonTokenExpiry = "SM.Patreon.TokenExpiry";
+    public const string PatreonWebhookId = "SM.Patreon.WebhookId";
+    public const string PatreonWebhookSecret = "SM.Patreon.WebhookSecret";
 }
\ No newline at end of file
diff --git a/SubathonManager.Core/Utils.cs b/SubathonManager.Core/Utils.cs
index deee597..3973681 100644
--- a/SubathonManager.Core/Utils.cs
+++ b/SubathonManager.Core/Utils.cs
@@ -274,7 +274,26 @@ public static (bool, double) GetAltCurrencyUseAsDonation(IConfig config, Subatho
         }
     }
 
+    public static string? GetJsonString(JsonElement element, string property) {
+        return element.ValueKind == JsonValueKind.Object && element.TryGetProperty(property, out JsonElement value) &&
+               value.ValueKind == JsonValueKind.String
+            ? value.GetString()
+            : null;
+    }
+
+    // dates without an offset are taken as utc
+    public static DateTimeOffset? ParseDateFromString(string? value) {
+        return DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal,
+            out DateTimeOffset parsed)
+            ? parsed
+            : null;
+    }
+    
+    public const string PerUnitMeta = "PER_UNIT";
+
     public static bool IsCommissionAsDonation(IConfig config, SubathonEvent ev) {
+        if (ev.EventType == SubathonEventType.PatreonPledge)
+            return config.GetBool(nameof(SubathonEventSource.Patreon),$"{ev.EventType}.CommissionAsDonation");
         if (!ev.EventType.IsOrder()) return false;
 
         if (ev.EventType == SubathonEventType.GoAffProOrder) {
diff --git a/SubathonManager.Data/DbContext.cs b/SubathonManager.Data/DbContext.cs
index 70e51db..f547d4a 100644
--- a/SubathonManager.Data/DbContext.cs
+++ b/SubathonManager.Data/DbContext.cs
@@ -283,8 +283,12 @@ public static async Task<List<SubathonEvent>> GetSubathonCurrencyEvents(AppDbCon
             .Select(s => s.SiteId.ToString())
             .ToHashSet();
 
+        bool includePatreon = Utils.DonationSettings.TryGetValue(nameof(SubathonEventType.PatreonPledge),
+            out bool patreonAsDonation) && patreonAsDonation;
+
         events = events.Where(e => e.EventType != null &&
                                    (e.EventType.IsCurrencyDonation() ||
+                                    (includePatreon && e.EventType == SubathonEventType.PatreonPledge) ||
                                     (e.EventType == SubathonEventType.GoAffProOrder &&
                                      !string.IsNullOrEmpty(e.EventTypeMeta) &&
                                      goAffProMetasToInclude.Contains(e.EventTypeMeta)) ||
@@ -466,6 +470,8 @@ public static void SeedDefaultValues(AppDbContext db) {
             new() { EventType = SubathonEventType.TangiaTokens, Seconds = 0.12 },
             new() { EventType = SubathonEventType.PallyGGDonation, Seconds = 12 }, // per 1 USD, Pally is USD only
             new() { EventType = SubathonEventType.TiltifyDonation, Seconds = 12 },
+            new() { EventType = SubathonEventType.PatreonPledge, Meta = "DEFAULT", Seconds = 60, Points = 1 },
+            new() { EventType = SubathonEventType.PatreonPledge, Meta = Utils.PerUnitMeta, Seconds = 12 },
             new() { EventType = SubathonEventType.TreatStreamOrder, Seconds = 600 }, // per treat, always 1 item
             new() {
                 EventType = SubathonEventType.MakeShipPledge, Meta = "DEFAULT", Seconds = 60
diff --git a/SubathonManager.Data/Overlays/OverlayPackInstaller.cs b/SubathonManager.Data/Overlays/OverlayPackInstaller.cs
index 69de2b8..eda723a 100644
--- a/SubathonManager.Data/Overlays/OverlayPackInstaller.cs
+++ b/SubathonManager.Data/Overlays/OverlayPackInstaller.cs
@@ -1,5 +1,6 @@
 using System.IO.Compression;
 using System.Text.Json;
+using SubathonManager.Core;
 
 namespace SubathonManager.Data.Overlays;
 
@@ -98,10 +99,8 @@ private static OverlayManifest Parse(JsonElement root, string smoPath) {
     }
 
     private static string Str(JsonElement el, string name) {
-        return el.ValueKind == JsonValueKind.Object && el.TryGetProperty(name, out JsonElement v) &&
-               v.ValueKind == JsonValueKind.String
-            ? v.GetString() ?? string.Empty
-            : string.Empty;
+        // just for a default
+        return Utils.GetJsonString(el, name) ?? string.Empty;
     }
 
     private static List<string> StrList(JsonElement el, string name) {
diff --git a/SubathonManager.Data/Widgets/WidgetCollectionInstaller.cs b/SubathonManager.Data/Widgets/WidgetCollectionInstaller.cs
index 3cffda4..48f72cc 100644
--- a/SubathonManager.Data/Widgets/WidgetCollectionInstaller.cs
+++ b/SubathonManager.Data/Widgets/WidgetCollectionInstaller.cs
@@ -1,5 +1,6 @@
 using System.IO.Compression;
 using System.Text.Json;
+using SubathonManager.Core;
 
 namespace SubathonManager.Data.Widgets;
 
@@ -107,17 +108,15 @@ private static WidgetCollectionManifest Parse(JsonElement root, string smwcPath)
     }
 
     private static string Str(JsonElement el, string name) {
-        return el.ValueKind == JsonValueKind.Object && el.TryGetProperty(name, out JsonElement v) &&
-               v.ValueKind == JsonValueKind.String
-            ? v.GetString() ?? string.Empty
-            : string.Empty;
+        // to have a default
+        return Utils.GetJsonString(el, name) ?? string.Empty;
     }
 
     private static List<string> StrList(JsonElement el, string name) {
         if (el.ValueKind != JsonValueKind.Object ||
             !el.TryGetProperty(name, out JsonElement v) ||
             v.ValueKind != JsonValueKind.Array)
-            return new List<string>();
+            return [];
 
         return v.EnumerateArray()
             .Where(item => item.ValueKind == JsonValueKind.String)
diff --git a/SubathonManager.Data/Widgets/WidgetPackInstaller.cs b/SubathonManager.Data/Widgets/WidgetPackInstaller.cs
index 67f56f9..8931b35 100644
--- a/SubathonManager.Data/Widgets/WidgetPackInstaller.cs
+++ b/SubathonManager.Data/Widgets/WidgetPackInstaller.cs
@@ -1,5 +1,6 @@
 using System.IO.Compression;
 using System.Text.Json;
+using SubathonManager.Core;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Models;
 
@@ -237,17 +238,15 @@ private static WidgetPackManifest Parse(JsonElement root, string smwPath) {
     }
 
     private static string Str(JsonElement el, string name) {
-        return el.ValueKind == JsonValueKind.Object && el.TryGetProperty(name, out JsonElement v) &&
-               v.ValueKind == JsonValueKind.String
-            ? v.GetString() ?? string.Empty
-            : string.Empty;
+        // to have a default
+        return Utils.GetJsonString(el, name) ?? string.Empty;
     }
 
     private static List<string> StrList(JsonElement el, string name) {
         if (el.ValueKind != JsonValueKind.Object ||
             !el.TryGetProperty(name, out JsonElement v) ||
             v.ValueKind != JsonValueKind.Array)
-            return new List<string>();
+            return [];
 
         return v.EnumerateArray()
             .Where(item => item.ValueKind == JsonValueKind.String)
diff --git a/SubathonManager.Integration/DevTunnelsService.cs b/SubathonManager.Integration/DevTunnelsService.cs
index 98377a5..617dae3 100644
--- a/SubathonManager.Integration/DevTunnelsService.cs
+++ b/SubathonManager.Integration/DevTunnelsService.cs
@@ -6,6 +6,7 @@
 using DevTunnels.Client.Ports;
 using DevTunnels.Client.Tunnels;
 using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Events;
 using SubathonManager.Core.Interfaces;
@@ -133,6 +134,25 @@ public async Task<DevTunnelLoginStatus> LogoutAsync(CancellationToken ct = defau
         BroadcastTunnelStatus(false, null);
         return new DevTunnelLoginStatus { Status = "Logged out" };
     }
+    
+    [ExcludeFromCodeCoverage]
+    public async Task<IntegrationConnection?> RequireTunnelAsync(SubathonEventSource source,
+        CancellationToken ct = default) {
+        IntegrationConnection tunnelConn = Utils.GetConnection(SubathonEventSource.DevTunnels, "Tunnel");
+        if (tunnelConn.Status) return tunnelConn;
+
+        await StartTunnelAsync(ct);
+        tunnelConn = Utils.GetConnection(SubathonEventSource.DevTunnels, "Tunnel");
+        if (tunnelConn.Status) return tunnelConn;
+
+        string reason = !IsCliInstalled ? "the DevTunnels CLI isn't installed"
+            : !IsLoggedIn ? "DevTunnels isn't logged in"
+            : "the tunnel failed to start";
+        logger?.LogWarning("[{Source}] Can't connect: {Reason}", source, reason);
+        ErrorMessageEvents.RaiseErrorEvent("WARN", source.ToString(),
+            $"{source} needs a DevTunnel but {reason}. Check the DevTunnels settings.", DateTime.Now);
+        return null;
+    }
 
     public async Task StartTunnelAsync(CancellationToken ct = default) {
         // Fast path: no lock needed if a session is already running.
diff --git a/SubathonManager.Integration/FourthWallService.cs b/SubathonManager.Integration/FourthWallService.cs
index f4063f6..1000269 100644
--- a/SubathonManager.Integration/FourthWallService.cs
+++ b/SubathonManager.Integration/FourthWallService.cs
@@ -160,20 +160,9 @@ public async Task Initialize(CancellationToken ct = default) {
 
     [ExcludeFromCodeCoverage]
     private async Task InitializeCoreAsync(CancellationToken ct) {
-        IntegrationConnection tunnelConn = Utils.GetConnection(SubathonEventSource.DevTunnels, "Tunnel");
-        if (!tunnelConn.Status) {
-            await devTunnels.StartTunnelAsync(ct);
-            tunnelConn = Utils.GetConnection(SubathonEventSource.DevTunnels, "Tunnel");
-            if (!tunnelConn.Status) {
-                string reason = !devTunnels.IsCliInstalled ? "the DevTunnels CLI isn't installed"
-                    : !devTunnels.IsLoggedIn ? "DevTunnels isn't logged in"
-                    : "the tunnel failed to start";
-                logger?.LogWarning("[FourthWall] Can't connect: {Reason}", reason);
-                ErrorMessageEvents.RaiseErrorEvent("WARN", nameof(SubathonEventSource.FourthWall),
-                    $"FourthWall needs a DevTunnel but {reason}. Check the DevTunnels settings.", DateTime.Now);
-                BroadcastStatus(HasTokenFile(), null);
-                return;
-            }
+        if (await devTunnels.RequireTunnelAsync(SubathonEventSource.FourthWall, ct) is not { } tunnelConn) {
+            BroadcastStatus(HasTokenFile(), null);
+            return;
         }
 
         bool canConnect = await CheckForTokenAsync(ct);
@@ -268,7 +257,7 @@ await client.OpenApi.V10.Webhooks[webhookConfigurationV1.Id].PutAsync(
 
                 MembershipNames[x.Id] = x.Name;
             });
-        IntegrationEvents.RaiseFourthWallMembershipsSynced(MembershipNames);
+        IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.FourthWall, MembershipNames.Values.ToList());
 
         // Seed status; include public URL if the tunnel is already running
         tunnelConn = Utils.GetConnection(SubathonEventSource.DevTunnels, "Tunnel");
diff --git a/SubathonManager.Integration/PatreonService.cs b/SubathonManager.Integration/PatreonService.cs
new file mode 100644
index 0000000..76725c5
--- /dev/null
+++ b/SubathonManager.Integration/PatreonService.cs
@@ -0,0 +1,501 @@
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+using Agash.Webhook.Abstractions;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Patreon.Client;
+using Patreon.Client.Events;
+using Patreon.Client.JsonApi;
+using Patreon.Client.Models;
+using Patreon.Client.Webhooks;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Core.Security;
+using SubathonManager.Core.Security.Interfaces;
+using SubathonManager.Services;
+
+namespace SubathonManager.Integration;
+
+public class PatreonService(
+    ILogger<PatreonService>? logger,
+    IConfig config,
+    IHttpClientFactory httpClientFactory,
+    DevTunnelsService devTunnels,
+    ISecureStorage secureStorage,
+    OAuthService oAuth) : IWebhookIntegration {
+    private const string ApiBase = "https://www.patreon.com/api/oauth2/v2/";
+    internal const string PledgeCreated = "members:pledge:create";
+    internal const string PledgeUpdated = "members:pledge:update";
+    internal const string MemberUpdated = "members:update";
+
+    // patreon tokens last ~30d, set to under to be safe
+    private static readonly OAuthProvider OAuthKeys = new("patreon", StorageKeys.PatreonAccessToken,
+        StorageKeys.PatreonRefreshToken, StorageKeys.PatreonTokenExpiry,
+        DefaultLifetime: TimeSpan.FromDays(30), RefreshMargin: TimeSpan.FromDays(4));
+
+    internal static readonly IReadOnlyList<string> Triggers = [PledgeCreated, PledgeUpdated, MemberUpdated];
+    internal static readonly TimeSpan LiveWindow = TimeSpan.FromMinutes(30);
+
+    private readonly PatreonWebhookHandler _handler = new(new PatreonWebhookSignatureVerifier());
+    private readonly SemaphoreSlim _initLock = new(1, 1);
+
+    // tier id -> title, refreshed from webhook payloads so renames follow the id
+    internal readonly ConcurrentDictionary<string, string> Tiers = new();
+    private string? _campaignId;
+    private string _currency = "USD";
+
+    private bool ByAmount => config.GetBool(nameof(SubathonEventSource.Patreon),
+        $"{SubathonEventType.PatreonPledge}.ValueByAmount");
+
+    public string WebhookPath => "/api/webhooks/patreon";
+
+    public async Task StartAsync(CancellationToken ct = default) {
+        IntegrationEvents.ConnectionUpdated += OnTunnelUpdated;
+        if (HasTokens()) {
+            logger?.LogInformation("[Patreon] Webhook listener ready at {Path}", WebhookPath);
+            _ = devTunnels.StartTunnelAsync(ct);
+        }
+        else {
+            logger?.LogInformation("[Patreon] Has not been setup before. Integration is disabled");
+            BroadcastStatus(null);
+        }
+
+        await Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken ct = default) {
+        IntegrationEvents.ConnectionUpdated -= OnTunnelUpdated;
+        BroadcastStatus(null);
+        return Task.CompletedTask;
+    }
+
+    public async Task HandleWebhookAsync(byte[] rawBody, IReadOnlyDictionary<string, string> headers,
+        CancellationToken ct = default) {
+        string? secret = secureStorage.GetOrDefault(StorageKeys.PatreonWebhookSecret, string.Empty);
+        if (string.IsNullOrWhiteSpace(secret)) {
+            logger?.LogWarning("[Patreon] Received a webhook but no signing secret is stored. Recreate the webhook");
+            return;
+        }
+
+        Dictionary<string, string[]> requestHeaders = new(StringComparer.OrdinalIgnoreCase);
+        foreach (KeyValuePair<string, string> header in headers) requestHeaders[header.Key] = [header.Value];
+
+        var request = new WebhookRequest {
+            Method = "POST",
+            Path = WebhookPath,
+            Body = rawBody,
+            ContentType = requestHeaders.TryGetValue("Content-Type", out string[]? type) ? type[0] : "application/json",
+            Headers = requestHeaders
+        };
+
+        WebhookHandleResult<PatreonWebhookEvent> result =
+            await _handler.HandleAsync(request, new PatreonWebhookOptions { WebhookSecret = secret }, ct);
+        if (!result.IsAuthenticated) {
+            logger?.LogWarning("[Patreon] Rejected webhook: {Reason}", result.FailureReason);
+            return;
+        }
+
+        // string body = Encoding.UTF8.GetString(rawBody);
+        // logger?.LogInformation("[Patreon] Received {Type} webhook: {Body}", result.Event?.EventType, body);
+
+        (MemberAttributes? member, IReadOnlyList<string> tierIds, IReadOnlyList<JsonElement>? included) =
+            result.Event switch {
+                PatreonPledgeWebhookEvent { EventType: PledgeCreated or PledgeUpdated } p =>
+                    (p.Attributes, p.EntitledTierIds, p.Document?.Included),
+                PatreonMemberWebhookEvent { EventType: MemberUpdated } m =>
+                    (m.Attributes, m.EntitledTierIds, m.Document?.Included),
+                _ => (null, [], null)
+            };
+        if (member == null || string.IsNullOrWhiteSpace(result.Event?.ResourceId)) {
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("[Patreon] Ignoring {Type} webhook", result.Event?.EventType);
+            return;
+        }
+
+        var index = new JsonApiIncludedIndex(included);
+        SubathonEvent? ev = MapPledge(result.Event.EventType, result.Event.ResourceId, member, tierIds, index,
+            PatronVanity(member.FullName, index) ?? member.FullName?.Split(" ").First() ?? "Patreon Member",
+            DateTimeOffset.UtcNow);
+        if (ev == null) return;
+
+        SubathonEvents.RaiseSubathonEventCreated(ev);
+        if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+            logger?.LogDebug("[Patreon] Raised pledge {Id} from {User} ({Value})", ev.Id, ev.User, ev.Value);
+    }
+
+    public bool HasTokens() {
+        return oAuth.HasTokens(OAuthKeys);
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task ConnectAsync(CancellationToken ct = default) {
+        if (!await oAuth.AuthorizeAsync(OAuthKeys, ct)) {
+            BroadcastStatus(null);
+            return;
+        }
+
+        IntegrationEvents.ConnectionUpdated -= OnTunnelUpdated;
+        IntegrationEvents.ConnectionUpdated += OnTunnelUpdated;
+        await InitializeAsync(ct);
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task DisconnectAsync(CancellationToken ct = default) {
+        string? webhookId = secureStorage.GetOrDefault(StorageKeys.PatreonWebhookId, string.Empty);
+        if (!string.IsNullOrWhiteSpace(webhookId) && HasTokens())
+            try {
+                await CreateApiClient().DeleteWebhookAsync(webhookId, ct);
+                logger?.LogInformation("[Patreon] Deleted webhook {Id}", webhookId);
+            }
+            catch (Exception ex) {
+                logger?.LogWarning(ex, "[Patreon] Couldn't delete webhook {Id}, it may need removing on Patreon",
+                    webhookId);
+            }
+
+        await StopAsync(ct);
+        oAuth.RevokeTokens(OAuthKeys);
+        secureStorage.Delete(StorageKeys.PatreonWebhookId);
+        secureStorage.Delete(StorageKeys.PatreonWebhookSecret);
+        BroadcastStatus(null);
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task RecreateWebhookAsync(CancellationToken ct = default) {
+        secureStorage.Delete(StorageKeys.PatreonWebhookId);
+        secureStorage.Delete(StorageKeys.PatreonWebhookSecret);
+        await InitializeAsync(ct);
+    }
+
+    [ExcludeFromCodeCoverage]
+    public async Task InitializeAsync(CancellationToken ct = default) {
+        if (!await _initLock.WaitAsync(0, ct)) return;
+        try {
+            await InitializeCoreAsync(ct);
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Patreon] Failed to initialize");
+            ErrorMessageEvents.RaiseErrorEvent("ERROR", nameof(SubathonEventSource.Patreon),
+                $"Patreon failed to connect: {ex.Message}", DateTime.Now);
+            BroadcastStatus(null);
+        }
+        finally {
+            _initLock.Release();
+        }
+    }
+
+    private HttpClient CreateHttpClient() {
+        HttpClient http = httpClientFactory.CreateClient(nameof(PatreonService));
+        http.BaseAddress = new Uri(ApiBase);
+        http.DefaultRequestHeaders.Authorization =
+            new AuthenticationHeaderValue("Bearer", oAuth.GetAccessToken(OAuthKeys));
+        http.DefaultRequestHeaders.UserAgent.ParseAdd("SubathonManager");
+        return http;
+    }
+
+    private PatreonApiClient CreateApiClient() {
+        return new PatreonApiClient(CreateHttpClient(), NullLogger<PatreonApiClient>.Instance);
+    }
+
+    [ExcludeFromCodeCoverage]
+    private async Task<(string? Id, string? Secret)> CreateWebhookAsync(string url, CancellationToken ct) {
+        var payload = new {
+            data = new {
+                type = "webhook",
+                attributes = new { triggers = Triggers, uri = url },
+                relationships = new { campaign = new { data = new { type = "campaign", id = _campaignId } } }
+            }
+        };
+
+        using HttpClient http = CreateHttpClient();
+        using var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
+        using HttpResponseMessage response = await http.PostAsync("webhooks", content, ct);
+        string body = await response.Content.ReadAsStringAsync(ct);
+        if (!response.IsSuccessStatusCode) return (null, null);
+
+        using JsonDocument doc = JsonDocument.Parse(body);
+        if (!doc.RootElement.TryGetProperty("data", out JsonElement data)) {
+            logger?.LogWarning("[Patreon] Webhook create response had no data: {Body}", body);
+            return (null, null);
+        }
+
+        string? id = data.TryGetProperty("id", out JsonElement idEl) ? idEl.GetString() : null;
+        string? secret = data.TryGetProperty("attributes", out JsonElement attrs) &&
+                         attrs.TryGetProperty("secret", out JsonElement secretEl)
+            ? secretEl.GetString()
+            : null;
+        if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(secret))
+            logger?.LogWarning("[Patreon] Webhook create response was missing {Missing}: {Body}",
+                string.IsNullOrWhiteSpace(id) ? "the id" : "the secret", body);
+        return (id, secret);
+    }
+
+    [ExcludeFromCodeCoverage]
+    private async Task InitializeCoreAsync(CancellationToken ct) {
+        if (await devTunnels.RequireTunnelAsync(SubathonEventSource.Patreon, ct) is not { } tunnelConn) {
+            BroadcastStatus(null);
+            return;
+        }
+
+        if (!HasTokens() || (oAuth.NeedsRefresh(OAuthKeys) && !await oAuth.RefreshAsync(OAuthKeys, ct))) {
+            logger?.LogWarning("[Patreon] Login is missing or expired");
+            ErrorMessageEvents.RaiseErrorEvent("WARN", nameof(SubathonEventSource.Patreon),
+                "Patreon login has expired. Reconnect it in the Patreon settings.", DateTime.Now);
+            BroadcastStatus(null);
+            return;
+        }
+
+        PatreonApiClient client = CreateApiClient();
+        JsonApiCollectionDocument<CampaignAttributes>? campaigns =
+            await client.GetCampaignsAsync(["name", "currency"], cancellationToken: ct);
+        JsonApiResource<CampaignAttributes>? campaign = campaigns?.Data?.Count > 0 ? campaigns?.Data?[0] : null;
+
+        if (campaign == null) {
+            logger?.LogWarning("[Patreon] The connected account has no campaign");
+            ErrorMessageEvents.RaiseErrorEvent("WARN", nameof(SubathonEventSource.Patreon),
+                "The connected Patreon account doesn't have a creator campaign.", DateTime.Now);
+            BroadcastStatus(null);
+            return;
+        }
+
+        _campaignId = campaign.Id;
+        if (!string.IsNullOrWhiteSpace(campaign.Attributes?.Currency)) _currency = campaign.Attributes.Currency;
+        logger?.LogInformation("[Patreon] Connected to campaign {Name}", campaign.Attributes?.Name);
+
+        IReadOnlyList<JsonApiResource<TierAttributes>>? tiers =
+            await client.GetCampaignTiersAsync(campaign.Id, ["title", "amount_cents", "published"], ct);
+        Tiers.Clear();
+
+        foreach (JsonApiResource<TierAttributes> tier in tiers ?? [])
+            if (tier.Attributes is { AmountCents: > 0 } attrs && !string.IsNullOrWhiteSpace(attrs.Title))
+                Tiers[tier.Id] = attrs.Title;
+        IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon, Tiers.Values.ToList());
+
+        string url = tunnelConn.Name.TrimEnd('/') + WebhookPath;
+        if (!await EnsureWebhookAsync(client, url, ct)) {
+            BroadcastStatus(null);
+            return;
+        }
+
+        BroadcastStatus(tunnelConn.Name);
+    }
+
+    [ExcludeFromCodeCoverage]
+    private async Task<bool> EnsureWebhookAsync(PatreonApiClient client, string url, CancellationToken ct) {
+        string? storedId = secureStorage.GetOrDefault(StorageKeys.PatreonWebhookId, string.Empty);
+        string? secret = secureStorage.GetOrDefault(StorageKeys.PatreonWebhookSecret, string.Empty);
+
+        IReadOnlyList<JsonApiResource<WebhookAttributes>> hooks = (await client.GetWebhooksAsync(ct))?.Data ?? [];
+
+        JsonApiResource<WebhookAttributes>? ours = string.IsNullOrWhiteSpace(storedId)
+            ? null
+            : hooks.FirstOrDefault(h => h.Id == storedId);
+
+        if (ours != null && !string.IsNullOrWhiteSpace(secret)) {
+            WebhookAttributes? attrs = ours.Attributes;
+            bool triggersMatch = attrs?.Triggers != null && Triggers.All(attrs.Triggers.Contains);
+            if (attrs?.Uri == url && !attrs.Paused && triggersMatch) return true;
+
+            JsonApiDocument<WebhookAttributes>? updated = null;
+            try {
+                updated = await client.UpdateWebhookAsync(ours.Id, false, url, Triggers, ct);
+            }
+            catch (Exception ex) {
+                logger?.LogWarning(ex, "[Patreon] Updating webhook {Id} threw", ours.Id);
+            }
+
+            if (updated?.Data != null) {
+                logger?.LogInformation("[Patreon] Updated webhook {Id} (url changed, paused, or triggers changed)",
+                    ours.Id);
+                return true;
+            }
+
+            logger?.LogWarning("[Patreon] Couldn't update webhook {Id}, recreating it", ours.Id);
+        }
+
+        foreach (JsonApiResource<WebhookAttributes> stale in hooks.Where(h =>
+                     h.Attributes?.Uri?.EndsWith(WebhookPath, StringComparison.OrdinalIgnoreCase) == true))
+            try {
+                await client.DeleteWebhookAsync(stale.Id, ct);
+                logger?.LogInformation("[Patreon] Removed stale webhook {Id} ({Uri})", stale.Id, stale.Attributes?.Uri);
+            }
+            catch (Exception ex) {
+                logger?.LogWarning(ex, "[Patreon] Couldn't remove stale webhook {Id}", stale.Id);
+            }
+
+        (string? newId, string? newSecret) = await CreateWebhookAsync(url, ct);
+        if (string.IsNullOrWhiteSpace(newId) || string.IsNullOrWhiteSpace(newSecret)) {
+            logger?.LogWarning("[Patreon] Couldn't create a webhook for {Url} on campaign {Campaign}", url,
+                _campaignId);
+            ErrorMessageEvents.RaiseErrorEvent("ERROR", nameof(SubathonEventSource.Patreon),
+                "Couldn't create the Patreon webhook, check the log for Patreon's reply. " +
+                "Try Recreate Webhook in the Patreon settings.", DateTime.Now);
+            return false;
+        }
+
+        secureStorage.Set(StorageKeys.PatreonWebhookId, newId);
+        secureStorage.Set(StorageKeys.PatreonWebhookSecret, newSecret);
+        logger?.LogInformation("[Patreon] Created webhook {Id}", newId);
+        return true;
+    }
+
+    internal SubathonEvent? MapPledge(string eventType, string memberId, MemberAttributes? member,
+        IReadOnlyList<string> tierIds, JsonApiIncludedIndex included, string? name, DateTimeOffset now) {
+        if (member is not { PatronStatus: "active_patron", IsFreeTrial: false }) return null;
+
+        int willPay = member.WillPayAmountCents;
+        int entitled = member.CurrentlyEntitledAmountCents;
+        // possibly a downgrade if weillPay is 0
+        if (willPay <= 0 || entitled <= 0) return null;
+
+        // get highest if multiple come for some reason
+        string tier = tierIds
+            .Select(id => ResolveTier(included, id))
+            .OfType<(string Title, int Cents)>()
+            .OrderByDescending(t => t.Cents)
+            .Select(t => t.Title)
+            .FirstOrDefault() ?? "DEFAULT";
+        string currency = CampaignCurrency(included);
+
+        // annual or other term cadence: will_pay is the whole cadence while entitled is per month
+        // if tier mode we multiply the config for tier by cadence amount
+        // if amount/mode mode, we ignore cadence as amount is amount charged/paid at time of
+        int cadence = member.PledgeCadence ?? 1;
+
+        DateTimeOffset? charged = Utils.ParseDateFromString(member.LastChargeDate);
+        var chargeKey = $"patreon|{memberId}|charge|{member.LastChargeDate}";
+
+        if (eventType == PledgeCreated) {
+            if (!string.IsNullOrEmpty(member.LastChargeStatus) && !IsPaid(member.LastChargeStatus)) return null;
+            return BuildPledgeEvent(
+                charged != null ? chargeKey : $"patreon|{memberId}|start|{member.PledgeRelationshipStart}",
+                name, tier, willPay, currency, cadence, Utils.ParseDateFromString(member.PledgeRelationshipStart) ?? now);
+        }
+
+        if (!IsPaid(member.LastChargeStatus) || charged == null || charged < now - LiveWindow) return null;
+        if (eventType == MemberUpdated)
+            return BuildPledgeEvent(chargeKey, name, tier, willPay, currency, cadence, charged.Value);
+
+        // assumes an upgrade shows will_pay below entitled so only the difference counts
+        // unless its upgrade to annual, then will pay is above likely. Either way we don't care much
+        // we get the amount charged anyways
+        return BuildPledgeEvent(chargeKey, name, tier, willPay, currency,
+            cadence, charged.Value);
+    }
+
+    private static string? PatronVanity(string? fullName, JsonApiIncludedIndex included) {
+        foreach (JsonElement user in included.GetAllOfType("user")) {
+            JsonElement attrs = user.TryGetProperty("attributes", out JsonElement nested) ? nested : user;
+            string? tryName = Utils.GetJsonString(attrs, "full_name");
+            if (!string.IsNullOrWhiteSpace(tryName) &&
+                tryName.Equals(fullName, StringComparison.InvariantCultureIgnoreCase) &&
+                Utils.GetJsonString(attrs, "vanity") is { Length: > 0 } vanity)
+                return vanity;
+        }
+
+        return null;
+    }
+
+    private static bool IsPaid(string? status) {
+        return string.Equals(status, "Paid", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private string CampaignCurrency(JsonApiIncludedIndex included) {
+        foreach (JsonElement campaign in included.GetAllOfType("campaign")) {
+            JsonElement attrs = campaign.TryGetProperty("attributes", out JsonElement nested) ? nested : campaign;
+            if (Utils.GetJsonString(attrs, "currency") is { Length: > 0 } currency) return currency;
+        }
+
+        return _currency;
+    }
+
+    private (string Title, int Cents)? ResolveTier(JsonApiIncludedIndex included, string id) {
+        JsonElement attrs = default;
+        if (included.TryGet("tier", id, out JsonElement tier))
+            attrs = tier.TryGetProperty("attributes", out JsonElement nested) ? nested : tier;
+        if (attrs.ValueKind != JsonValueKind.Object || Utils.GetJsonString(attrs, "title") is not { Length: > 0 } title)
+            return Tiers.TryGetValue(id, out string? known) ? (known, 0) : null;
+
+        bool newTitle = !Tiers.Values.Contains(title);
+        Tiers[id] = title;
+        if (newTitle) IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon, Tiers.Values.ToList());
+        int cents = attrs.TryGetProperty("amount_cents", out JsonElement amount) && amount.TryGetInt32(out int c)
+            ? c
+            : 0;
+        return (title, cents);
+    }
+
+    private SubathonEvent BuildPledgeEvent(string idKey, string? name, string tierName, int cents,
+        string? currency, int months, DateTimeOffset timestamp) {
+        string user = string.IsNullOrWhiteSpace(name) || name.Equals("Patreon Member") ? "Patreon Member" : name;
+        string chargedIn = string.IsNullOrWhiteSpace(currency) ? _currency : currency;
+        var amount = (cents / 100.0).ToString("F2", CultureInfo.InvariantCulture);
+        bool byAmount = ByAmount;
+
+        return new SubathonEvent {
+            Id = Utils.CreateGuidFromUniqueString(idKey),
+            Source = user == "SYSTEM" ? SubathonEventSource.Simulated : SubathonEventSource.Patreon,
+            EventType = SubathonEventType.PatreonPledge,
+            User = user,
+            Value = byAmount ? amount : tierName,
+            EventTypeMeta = byAmount ? Utils.PerUnitMeta : tierName,
+            Currency = byAmount ? chargedIn : "member",
+            Amount = byAmount ? 1 : Math.Max(months, 1),
+            SecondaryValue = $"{amount}|{chargedIn}",
+            TertiaryValue = tierName,
+            EventTimestamp = timestamp.LocalDateTime
+        };
+    }
+
+    public void SimulateMembership(string tierName, bool annual) {
+        SubathonEvent ev = BuildPledgeEvent($"patreon|simulated|{Guid.NewGuid()}", "SYSTEM", tierName,
+            annual ? 6000 : 500, _currency, annual ? 12 : 1, DateTimeOffset.Now);
+        SubathonEvents.RaiseSubathonEventCreated(ev);
+    }
+
+    [ExcludeFromCodeCoverage]
+    private void OnTunnelUpdated(IntegrationConnection connection) {
+        if (connection is not { Source: SubathonEventSource.DevTunnels, Service: "Tunnel" }) return;
+        if (HasTokens() && connection.Status) {
+            Task.Run(() => InitializeAsync());
+            return;
+        }
+
+        BroadcastStatus(null);
+    }
+
+    private void BroadcastStatus(string? tunnelBaseUrl) {
+        string? fullUrl = !string.IsNullOrWhiteSpace(tunnelBaseUrl) && tunnelBaseUrl != "(starting...)"
+            ? tunnelBaseUrl.TrimEnd('/') + WebhookPath
+            : null;
+
+        IntegrationEvents.RaiseConnectionUpdate(new IntegrationConnection {
+            Name = fullUrl ?? "",
+            Status = HasTokens() && fullUrl != null,
+            Source = SubathonEventSource.Patreon,
+            Service = nameof(SubathonEventSource.Patreon),
+            Configured = HasTokens()
+        });
+    }
+
+    public sealed class ErrorLoggingHandler(ILogger? logger) : DelegatingHandler {
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
+            CancellationToken cancellationToken) {
+            HttpResponseMessage response = await base.SendAsync(request, cancellationToken);
+            if (response.IsSuccessStatusCode) return response;
+
+            await response.Content.LoadIntoBufferAsync(cancellationToken);
+            string body = await response.Content.ReadAsStringAsync(cancellationToken);
+            logger?.LogWarning("[Patreon] {Method} {Url} returned HTTP {Status}: {Body}", request.Method,
+                request.RequestUri, (int)response.StatusCode, body.Length > 2000 ? body[..2000] : body);
+            return response;
+        }
+    }
+}
\ No newline at end of file
diff --git a/SubathonManager.Integration/SubathonManager.Integration.csproj b/SubathonManager.Integration/SubathonManager.Integration.csproj
index efc58d0..9ae3573 100644
--- a/SubathonManager.Integration/SubathonManager.Integration.csproj
+++ b/SubathonManager.Integration/SubathonManager.Integration.csproj
@@ -18,6 +18,7 @@
         <PackageReference Include="Agash.YTLiveChat" Version="4.2.0"/>
         <PackageReference Include="GoAffPro.Client" Version="0.4.1"/>
         <PackageReference Include="obs-websocket-dotnet" Version="5.7.0"/>
+        <PackageReference Include="Patreon.Client" Version="0.1.3-dev1"/>
         <PackageReference Include="StreamElements.WebSocket" Version="1.0.2"/>
         <PackageReference Include="Tiltify.Client" Version="0.1.3-dev1"/>
         <PackageReference Include="Streamlabs.SocketClient" Version="3.0.0"/>
diff --git a/SubathonManager.Integration/TiltifyService.cs b/SubathonManager.Integration/TiltifyService.cs
index ba6ec9a..0ce118a 100644
--- a/SubathonManager.Integration/TiltifyService.cs
+++ b/SubathonManager.Integration/TiltifyService.cs
@@ -7,6 +7,7 @@
 using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Abstractions.Serialization;
 using Microsoft.Kiota.Http.HttpClientLibrary;
+using SubathonManager.Core;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Events;
 using SubathonManager.Core.Interfaces;
@@ -315,9 +316,8 @@ private async Task<List<Donation>> FetchDonationsAsync(Guid campaignId, bool isT
                         data.ValueKind == JsonValueKind.Array
             ? (await KiotaJsonSerializer.DeserializeCollectionAsync(data.GetRawText(), factory, ct)).ToList()
             : [];
-        string? after = doc.RootElement.TryGetProperty("metadata", out JsonElement meta) &&
-                        meta.TryGetProperty("after", out JsonElement a) && a.ValueKind == JsonValueKind.String
-            ? a.GetString()
+        string? after = doc.RootElement.TryGetProperty("metadata", out JsonElement meta)
+            ? Utils.GetJsonString(meta, "after")
             : null;
         return (items, after);
     }
diff --git a/SubathonManager.Services/EventService.cs b/SubathonManager.Services/EventService.cs
index bb9d5b9..22068f6 100644
--- a/SubathonManager.Services/EventService.cs
+++ b/SubathonManager.Services/EventService.cs
@@ -216,8 +216,10 @@ private async Task LoopAsync() {
             }
             else if (!string.IsNullOrEmpty(ev.Currency) && _currencyService.IsValidCurrency(ev.Currency)
                                                         && (ev.EventType.IsCurrencyDonation() ||
-                                                            ev.EventType
-                                                                .IsOrder())) // includes orders when parsed as money mode
+                                                            ev.EventType.IsOrder() ||
+                                                            ev.EventType == SubathonEventType.PatreonPledge))
+                // includes orders when parsed as money mode, and patreon pledges valued by amount
+                // currency would be "member" if it was not added in currency mode
             {
                 double rate = Task.Run(() =>
                     _currencyService.ConvertAsync(Utils.ParseAmount(ev.Value), ev.Currency)).Result;
diff --git a/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs b/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
new file mode 100644
index 0000000..2bf9d62
--- /dev/null
+++ b/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
@@ -0,0 +1,303 @@
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using DevTunnels.Client;
+using Microsoft.Extensions.Logging;
+using Moq;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Security;
+using SubathonManager.Integration;
+using SubathonManager.Services;
+using SubathonManager.Tests.Utility;
+
+// ReSharper disable NullableWarningSuppressionIsUsed
+namespace SubathonManager.Tests.IntegrationUnitTests;
+
+[Collection("GlobalState")]
+public class PatreonServiceTests {
+    private const string Secret = "patreon-webhook-secret";
+
+    public PatreonServiceTests() {
+        typeof(IntegrationEvents)
+            .GetField("ConnectionUpdated", BindingFlags.Static | BindingFlags.NonPublic)
+            ?.SetValue(null, null);
+    }
+
+    private static PatreonService MakeService(bool withSecret = true, bool byAmount = false) {
+        var storage = new InMemorySecureStorage(withSecret
+            ? new Dictionary<string, string> { [StorageKeys.PatreonWebhookSecret] = Secret }
+            : null);
+        IConfig dtConfig = MockConfig.MakeMockConfig(new Dictionary<(string, string), string> {
+            { ("Server", "Port"), "14040" }
+        });
+        var devTunnels = new DevTunnelsService(new Mock<ILogger<DevTunnelsService>>().Object, dtConfig,
+            new Mock<IDevTunnelsClient>().Object);
+        var oAuth = new OAuthService(null, new Mock<IHttpClientFactory>().Object, storage) { OpenBrowser = _ => { } };
+        IConfig config = MockConfig.MakeMockConfig(new Dictionary<(string, string), string> {
+            { ("Patreon", $"{SubathonEventType.PatreonPledge}.ValueByAmount"), byAmount ? "True" : "False" }
+        });
+        return new PatreonService(null, config, new Mock<IHttpClientFactory>().Object, devTunnels, storage, oAuth);
+    }
+
+    private static string Payload(int willPay = 500, int entitled = 500, int cadence = 1, bool freeTrial = false,
+        string status = "active_patron", DateTimeOffset? lastCharge = null, string? chargeStatus = null,
+        string currency = "USD", string? vanity = null) {
+        return JsonSerializer.Serialize(new {
+            data = new {
+                id = "member-1", type = "member",
+                attributes = new {
+                    full_name = "Jane Doe", patron_status = status, is_free_trial = freeTrial,
+                    pledge_cadence = cadence, will_pay_amount_cents = willPay,
+                    currently_entitled_amount_cents = entitled,
+                    pledge_relationship_start = "2026-09-01T10:00:00.000+00:00",
+                    last_charge_date = lastCharge?.ToString("O"), last_charge_status = chargeStatus
+                },
+                relationships = new {
+                    currently_entitled_tiers = new {
+                        data = new[] { new { id = "t1", type = "tier" }, new { id = "t2", type = "tier" } }
+                    }
+                }
+            },
+            included = new object[] {
+                new { id = "c1", type = "campaign", attributes = new { currency } },
+                new { id = "u0", type = "user", attributes = new { full_name = "The Creator", vanity = "creator" } },
+                new { id = "u1", type = "user", attributes = new { full_name = "Jane Doe", vanity } },
+                new { id = "t1", type = "tier", attributes = new { title = "Bronze", amount_cents = 300 } },
+                new { id = "t2", type = "tier", attributes = new { title = "Gold", amount_cents = 500 } }
+            }
+        });
+    }
+
+    private static async Task<SubathonEvent?> SendAsync(PatreonService service, string eventType, string body,
+        string? signatureSecret = Secret) {
+        byte[] bytes = Encoding.UTF8.GetBytes(body);
+        string signature =
+            Convert.ToHexStringLower(HMACMD5.HashData(Encoding.UTF8.GetBytes(signatureSecret ?? ""), bytes));
+        var headers = new Dictionary<string, string> {
+            ["Content-Type"] = "application/json",
+            ["X-Patreon-Event"] = eventType,
+            ["X-Patreon-Signature"] = signature
+        };
+        return await EventUtil.SubathonEventCapture.CaptureAsync(() =>
+            service.HandleWebhookAsync(bytes, headers, TestContext.Current.CancellationToken));
+    }
+
+    private static DateTimeOffset MinutesAgo(int minutes) {
+        return DateTimeOffset.UtcNow.AddMinutes(-minutes);
+    }
+
+    [Fact]
+    public async Task PledgeCreate_CountsTheWillPayAmountAtTheHighestTier() {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.PledgeCreated, Payload());
+
+        Assert.NotNull(ev);
+        Assert.Equal(SubathonEventSource.Patreon, ev.Source);
+        Assert.Equal(SubathonEventType.PatreonPledge, ev.EventType);
+        Assert.Equal("Jane", ev.User);
+        Assert.Equal("Gold", ev.Value);
+        Assert.Equal("Gold", ev.EventTypeMeta);
+        Assert.Equal("member", ev.Currency);
+        Assert.Equal(1, ev.Amount);
+        Assert.Equal("5.00|USD", ev.SecondaryValue);
+        Assert.Equal(new DateTimeOffset(2026, 9, 1, 10, 0, 0, TimeSpan.Zero).LocalDateTime, ev.EventTimestamp);
+    }
+
+    [Theory]
+    [InlineData("janedoe", "janedoe")]
+    [InlineData(null, "Jane")]
+    [InlineData("", "Jane")]
+    public async Task User_IsThePatronsVanity_OrTheirName(string? vanity, string expected) {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.PledgeCreated, Payload(vanity: vanity));
+
+        Assert.NotNull(ev);
+        Assert.Equal(expected, ev.User);
+    }
+
+    [Fact]
+    public async Task PayloadTier_OverridesAStaleCachedTier() {
+        PatreonService service = MakeService();
+        service.Tiers["t2"] = "Old Gold";
+
+        SubathonEvent? ev = await SendAsync(service, PatreonService.PledgeCreated, Payload());
+
+        Assert.NotNull(ev);
+        Assert.Equal("Gold", ev.Value);
+        Assert.Equal("Gold", service.Tiers["t2"]);
+    }
+
+    [Fact]
+    public async Task PledgeCreate_UsesTheCampaignCurrency() {
+        SubathonEvent? ev = await SendAsync(MakeService(byAmount: true), PatreonService.PledgeCreated,
+            Payload(currency: "EUR"));
+
+        Assert.NotNull(ev);
+        Assert.Equal("5.00", ev.Value);
+        Assert.Equal("EUR", ev.Currency);
+        Assert.Equal("5.00|EUR", ev.SecondaryValue);
+    }
+
+    [Theory]
+    [InlineData(false, "Gold", 12)]
+    [InlineData(true, "54.00", 1)]
+    public async Task AnnualPledge_IsTierTimesCadenceOrTheWillPayAmountOnce(bool byAmount, string value,
+        int amount) {
+        SubathonEvent? ev = await SendAsync(MakeService(byAmount: byAmount), PatreonService.PledgeCreated,
+            Payload(5400, 500, 12));
+
+        Assert.NotNull(ev);
+        Assert.Equal(value, ev.Value);
+        Assert.Equal(amount, ev.Amount);
+        Assert.Equal("54.00|USD", ev.SecondaryValue);
+    }
+
+    [Fact]
+    public async Task PledgeUpdate_PaidChargeAtTheSameAmount_CountsInFull() {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.PledgeUpdated,
+            Payload(lastCharge: MinutesAgo(2), chargeStatus: "Paid"));
+
+        Assert.NotNull(ev);
+        Assert.Equal("Gold", ev.Value);
+        Assert.Equal("5.00|USD", ev.SecondaryValue);
+    }
+
+    [Theory]
+    [InlineData(false, "Gold", "member")]
+    [InlineData(true, "5.00", "USD")]
+    public async Task PledgeUpdate_Upgrade_CountsTheTierOrTheDifference(bool byAmount, string value,
+        string currency) {
+        SubathonEvent? ev = await SendAsync(MakeService(byAmount: byAmount), PatreonService.PledgeUpdated,
+            Payload(1000, 500, lastCharge: MinutesAgo(1), chargeStatus: "Paid"));
+
+        Assert.NotNull(ev);
+        Assert.Equal(value, ev.Value);
+        Assert.Equal(currency, ev.Currency);
+        Assert.Equal(1, ev.Amount);
+        Assert.Equal("5.00|USD", ev.SecondaryValue);
+    }
+
+    [Fact]
+    public async Task PledgeUpdate_AnnualCharge_IsNotMistakenForAnUpgrade() {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.PledgeUpdated,
+            Payload(5400, 500, 12, lastCharge: MinutesAgo(1), chargeStatus: "Paid"));
+
+        Assert.NotNull(ev);
+        Assert.Equal(12, ev.Amount);
+        Assert.Equal("54.00|USD", ev.SecondaryValue);
+    }
+
+    [Theory]
+    [InlineData(300, 500, 1, "Paid")]
+    [InlineData(500, 500, null, null)]
+    [InlineData(500, 500, 2, "Declined")]
+    [InlineData(500, 500, 120, "Paid")]
+    public async Task PledgeUpdate_DowngradeOrNoFreshPaidCharge_IsIgnored(int willPay, int entitled,
+        int? chargedMinutesAgo, string? chargeStatus) {
+        Assert.Null(await SendAsync(MakeService(), PatreonService.PledgeUpdated,
+            Payload(willPay, entitled, lastCharge: chargedMinutesAgo is { } m ? MinutesAgo(m) : null,
+                chargeStatus: chargeStatus)));
+    }
+
+    [Theory]
+    [InlineData(PatreonService.PledgeCreated, "declined_patron", false, null)]
+    [InlineData(PatreonService.PledgeCreated, "former_patron", false, null)]
+    [InlineData(PatreonService.PledgeCreated, "active_patron", true, null)]
+    [InlineData(PatreonService.PledgeCreated, "active_patron", false, "Declined")]
+    [InlineData(PatreonService.PledgeUpdated, "former_patron", false, "Paid")]
+    public async Task InactiveTrialOrDeclinedPledges_AreIgnored(string eventType, string status, bool freeTrial,
+        string? chargeStatus) {
+        Assert.Null(await SendAsync(MakeService(), eventType,
+            Payload(freeTrial: freeTrial, status: status, lastCharge: MinutesAgo(1), chargeStatus: chargeStatus)));
+    }
+
+    [Fact]
+    public async Task MemberUpdate_NewPaidCharge_IsARenewal() {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.MemberUpdated,
+            Payload(lastCharge: MinutesAgo(2), chargeStatus: "Paid"));
+
+        Assert.NotNull(ev);
+        Assert.Equal("Gold", ev.Value);
+        Assert.Equal(1, ev.Amount);
+        Assert.Equal("5.00|USD", ev.SecondaryValue);
+    }
+
+    [Theory]
+    [InlineData(null, null)]
+    [InlineData(2, "Declined")]
+    [InlineData(120, "Paid")]
+    public async Task MemberUpdate_WithoutAFreshPaidCharge_IsIgnored(int? chargedMinutesAgo, string? chargeStatus) {
+        Assert.Null(await SendAsync(MakeService(), PatreonService.MemberUpdated,
+            Payload(lastCharge: chargedMinutesAgo is { } m ? MinutesAgo(m) : null, chargeStatus: chargeStatus)));
+    }
+
+    [Theory]
+    [InlineData(PatreonService.PledgeCreated)]
+    [InlineData(PatreonService.PledgeUpdated)]
+    public async Task SameChargeOnMemberUpdate_HasTheSameId(string firstEvent) {
+        PatreonService service = MakeService();
+        DateTimeOffset charged = MinutesAgo(1);
+
+        SubathonEvent? first = await SendAsync(service, firstEvent, Payload(1000, 500, lastCharge: charged,
+            chargeStatus: "Paid"));
+        SubathonEvent? same = await SendAsync(service, PatreonService.MemberUpdated, Payload(1000, 1000,
+            lastCharge: charged, chargeStatus: "Paid"));
+        SubathonEvent? renewal = await SendAsync(service, PatreonService.MemberUpdated, Payload(1000, 1000,
+            lastCharge: charged.AddSeconds(30), chargeStatus: "Paid"));
+
+        Assert.NotNull(first);
+        Assert.NotNull(renewal);
+        Assert.Equal(first.Id, same?.Id);
+        Assert.NotEqual(first.Id, renewal.Id);
+    }
+
+    [Fact]
+    public async Task RedeliveredWebhook_HasTheSameId() {
+        PatreonService service = MakeService();
+        string body = Payload();
+
+        SubathonEvent? first = await SendAsync(service, PatreonService.PledgeCreated, body);
+        SubathonEvent? again = await SendAsync(service, PatreonService.PledgeCreated, body);
+
+        Assert.NotNull(first);
+        Assert.Equal(first.Id, again?.Id);
+    }
+
+    [Theory]
+    [InlineData("members:create", Secret)]
+    [InlineData("members:pledge:delete", Secret)]
+    [InlineData(PatreonService.PledgeCreated, "wrong-secret")]
+    public async Task IgnoredOrUnverifiedWebhooks_RaiseNothing(string eventType, string signedWith) {
+        Assert.Null(await SendAsync(MakeService(), eventType, Payload(), signedWith));
+    }
+
+    [Fact]
+    public async Task NoStoredSecret_RaisesNothing() {
+        Assert.Null(await SendAsync(MakeService(false), PatreonService.PledgeCreated, Payload()));
+    }
+
+    [Theory]
+    [InlineData("True", true)]
+    [InlineData("False", false)]
+    public void PledgeCountsAsDonation_FromMode(string setting, bool expected) {
+        IConfig config = MockConfig.MakeMockConfig(new Dictionary<(string, string), string> {
+            { ("Patreon", $"{SubathonEventType.PatreonPledge}.CommissionAsDonation"), setting }
+        });
+        var ev = new SubathonEvent { EventType = SubathonEventType.PatreonPledge, SecondaryValue = "5.00|USD" };
+        Assert.Equal(expected, Utils.IsCommissionAsDonation(config, ev));
+    }
+
+    [Fact]
+    public void SimulateMembership_RaisesSimulatedEventForChosenTier() {
+        PatreonService service = MakeService();
+
+        SubathonEvent? ev = EventUtil.SubathonEventCapture.Capture(() => service.SimulateMembership("Silver", true));
+
+        Assert.NotNull(ev);
+        Assert.Equal(SubathonEventSource.Simulated, ev.Source);
+        Assert.Equal("Silver", ev.Value);
+        Assert.Equal(12, ev.Amount);
+    }
+}
diff --git a/SubathonManager.Tests/SubathonManager.Tests.csproj b/SubathonManager.Tests/SubathonManager.Tests.csproj
index 8ea47e0..7c348fe 100644
--- a/SubathonManager.Tests/SubathonManager.Tests.csproj
+++ b/SubathonManager.Tests/SubathonManager.Tests.csproj
@@ -22,6 +22,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12"/>
         <PackageReference Include="Moq" Version="4.20.72"/>
+        <PackageReference Include="Patreon.Client" Version="0.1.3-dev1"/>
         <PackageReference Include="xunit.v3" Version="4.0.0"/>
     </ItemGroup>
     <ItemGroup>
diff --git a/SubathonManager.UI/App.axaml.cs b/SubathonManager.UI/App.axaml.cs
index 3a5b4f7..5526cb2 100644
--- a/SubathonManager.UI/App.axaml.cs
+++ b/SubathonManager.UI/App.axaml.cs
@@ -91,6 +91,10 @@ public override void OnFrameworkInitializationCompleted() {
                     config.GetBool($"{orderSource.GetSource()}",
                         $"{orderSource.ToString()?.Split("Order")[0]}.CommissionAsDonation", true);
 
+            Utils.DonationSettings[nameof(SubathonEventType.PatreonPledge)] =
+                config.GetBool(nameof(SubathonEventSource.Patreon), 
+                    $"{SubathonEventType.PatreonPledge}.CommissionAsDonation");
+
             _currencyVal = config.Get("Currency", "Primary", "USD")!;
 
             SetThemeVariant(config);
@@ -432,6 +436,15 @@ private void ConfigChanged(object sender, FileSystemEventArgs e) {
                 Utils.DonationSettings[$"{orderSource.ToString()?.Split("Order")[0]}"] = asDonation;
             }
 
+            bool patreonAsDonation =
+                config.GetBool(nameof(SubathonEventSource.Patreon),
+                    $"{SubathonEventType.PatreonPledge}.CommissionAsDonation");
+            if (!Utils.DonationSettings.TryGetValue(nameof(SubathonEventType.PatreonPledge), out bool hadPatreon) ||
+                hadPatreon != patreonAsDonation) {
+                optionToggled = true;
+                Utils.DonationSettings[nameof(SubathonEventType.PatreonPledge)] = patreonAsDonation;
+            }
+
             if (currencyChanged || optionToggled)
                 Task.Run(async () => {
                     await using AppDbContext db = await _factory!.CreateDbContextAsync();
@@ -485,7 +498,7 @@ private async Task SetupSubathonCurrencyData(AppDbContext db, bool? optionToggle
             if (string.IsNullOrWhiteSpace(ev.Currency)) continue;
             string value = ev.Value;
             string? curr = ev.Currency;
-            if (ev.EventType.IsOrder()) {
+            if (ev.EventType.IsOrder() || ev.EventType == SubathonEventType.PatreonPledge) {
                 string[] parts = ev.SecondaryValue.Split('|');
                 if (parts.Length < 2 || !Utils.TryParseAmount(parts[0], out _)) continue;
                 value = parts[0];
diff --git a/SubathonManager.UI/MainWindow.ConnectionStatus.cs b/SubathonManager.UI/MainWindow.ConnectionStatus.cs
index f211eab..fbbb8c6 100644
--- a/SubathonManager.UI/MainWindow.ConnectionStatus.cs
+++ b/SubathonManager.UI/MainWindow.ConnectionStatus.cs
@@ -141,7 +141,7 @@ private MenuItem BuildSourceItem(SubathonEventSource source, List<IntegrationCon
         SubathonSourceGroup sourceGroup = source.GetGroup();
         if (sourceGroup is SubathonSourceGroup.StreamExtension or SubathonSourceGroup.ExternalSoftware
             || source is SubathonEventSource.FourthWall or SubathonEventSource.Throne
-                or SubathonEventSource.MakeShip) {
+                or SubathonEventSource.MakeShip or SubathonEventSource.Patreon) {
             bool up = connections.Any(c => c.Status);
             IBrush brush = up
                 ? StatusUpBrush
diff --git a/SubathonManager.UI/Services/ServiceManager.cs b/SubathonManager.UI/Services/ServiceManager.cs
index 708c2dc..b8129db 100644
--- a/SubathonManager.UI/Services/ServiceManager.cs
+++ b/SubathonManager.UI/Services/ServiceManager.cs
@@ -58,6 +58,7 @@ private static IServiceProvider Provider {
     public static ThroneService Throne => Provider.GetRequiredService<ThroneService>();
     public static PallyService Pally => Provider.GetRequiredService<PallyService>();
     public static TiltifyService Tiltify => Provider.GetRequiredService<TiltifyService>();
+    public static PatreonService Patreon => Provider.GetRequiredService<PatreonService>();
     public static DevTunnelsService DevTunnels => Provider.GetRequiredService<DevTunnelsService>();
     public static KoFiService KoFi => Provider.GetRequiredService<KoFiService>();
     public static TwitchService Twitch => Provider.GetRequiredService<TwitchService>();
@@ -93,6 +94,7 @@ public async Task StartIntegrationsAsync() {
         await StartAsync<DevTunnelsService>(); // shared tunnel infrastructure; must start before webhook integrations
         await StartAsync<KoFiService>();
         await StartAsync<FourthWallService>();
+        await StartAsync<PatreonService>();
         await StartAsync<ThroneService>();
         await StartAsync<MixItUpService>();
         await StartAsync<PallyService>();
@@ -120,6 +122,7 @@ public async Task StopIntegrationsAsync() {
         await StopAsync<PallyService>();
         await StopAsync<TiltifyService>();
         await StopAsync<FourthWallService>();
+        await StopAsync<PatreonService>();
         await StopAsync<DevTunnelsService>();
         await StopAsync<DiscordWebhookService>();
     }
diff --git a/SubathonManager.UI/Services/ServiceRegistration.cs b/SubathonManager.UI/Services/ServiceRegistration.cs
index 9dede73..3a9add9 100644
--- a/SubathonManager.UI/Services/ServiceRegistration.cs
+++ b/SubathonManager.UI/Services/ServiceRegistration.cs
@@ -76,6 +76,12 @@ public static void AddIntegrations(this IServiceCollection services) {
         services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<KoFiService>());
         services.AddSingleton<FourthWallService>();
         services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<FourthWallService>());
+        services.AddHttpClient(nameof(PatreonService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan)
+            .AddHttpMessageHandler(sp =>
+                // logging handler is so client logs responses instead of null return
+                new PatreonService.ErrorLoggingHandler(sp.GetService<ILogger<PatreonService>>()));
+        services.AddSingleton<PatreonService>();
+        services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<PatreonService>());
         services.AddSingleton<ThroneService>();
         services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<ThroneService>());
         services.AddSingleton<PallyService>();
diff --git a/SubathonManager.UI/Views/SettingsControl.cs b/SubathonManager.UI/Views/SettingsControl.cs
index 30cfaa9..7a061cc 100644
--- a/SubathonManager.UI/Views/SettingsControl.cs
+++ b/SubathonManager.UI/Views/SettingsControl.cs
@@ -45,6 +45,17 @@ protected SettingsControl() {
 
     protected virtual bool allowMembershipDelete => true;
 
+    // synced-tier integrations
+    protected virtual TextBox? _DefaultMembershipSecondsBox => null;
+    protected virtual TextBox? _DefaultMembershipPointsBox => null;
+    protected virtual ComboBox? _MembershipTierCombo => null;
+
+    // a non-tier value row
+    protected virtual string? _PerUnitMembershipMeta => null;
+
+    protected virtual void OnMembershipRowsLoaded() {
+    }
+
     public virtual void Init(SettingsView host) {
         Host = host;
     }
@@ -256,6 +267,134 @@ internal void DeleteRow(SubathonValue subathonValue, DynamicSubRow subRow) {
         _dynamicSubRows.Remove(subRow);
         _MembershipsPanel.Children.Remove(subRow.RowGrid);
     }
+
+    internal void SyncMembershipTiers(IEnumerable<string> tierNames) {
+        if (_membershipEventType is not { } type) return;
+        List<string> names = tierNames.Where(n => !string.IsNullOrWhiteSpace(n)).Distinct().ToList();
+        using AppDbContext db = _factory.CreateDbContext();
+        List<string> existing = db.SubathonValues.Where(v => v.EventType == type && names.Contains(v.Meta))
+            .Select(v => v.Meta).ToList();
+        // new tiers start from the DEFAULT row so they count the same until set
+        SubathonValue? fallback = db.SubathonValues.AsNoTracking()
+            .FirstOrDefault(v => v.EventType == type && v.Meta == "DEFAULT");
+        List<SubathonValue> newValues = names.Where(n => !existing.Contains(n))
+            .Select(n => new SubathonValue {
+                Meta = n, Seconds = fallback?.Seconds ?? 0, Points = fallback?.Points ?? 0, EventType = type
+            })
+            .ToList();
+        if (newValues.Count == 0) return;
+
+        db.SubathonValues.AddRange(newValues);
+        db.SaveChanges();
+        Dispatcher.UIThread.Post(() => SuppressUnsavedChanges(() => LoadMembershipValues(null)));
+    }
+
+    internal void LoadMembershipValues(AppDbContext? db) {
+        if (_membershipEventType is not { } type || _MembershipsPanel == null) return;
+        using AppDbContext? owned = db == null ? _factory.CreateDbContext() : null;
+        db ??= owned!;
+        List<SubathonValue> values = db.SubathonValues.Where(v => v.EventType == type)
+            .OrderBy(v => v.Meta).AsNoTracking().ToList();
+
+        for (int i = _MembershipsPanel.Children.Count - 1; i >= 0; i--) {
+            Control child = _MembershipsPanel.Children[i];
+            if (child.Name != "DefaultMember" && child.Name != "AddBtn")
+                _MembershipsPanel.Children.RemoveAt(i);
+        }
+
+        _dynamicSubRows.Clear();
+        foreach (SubathonValue value in values) {
+            if (value.Meta == _PerUnitMembershipMeta) continue;
+            if (value.Meta != "DEFAULT") {
+                AddMembershipRow(value);
+                continue;
+            }
+
+            if (_DefaultMembershipSecondsBox != null && _DefaultMembershipPointsBox != null)
+                Host.UpdateTimePointsBoxes(_DefaultMembershipSecondsBox, _DefaultMembershipPointsBox,
+                    $"{value.Seconds}", $"{value.Points}");
+        }
+
+        RefreshMembershipTierCombo(values.Select(v => v.Meta).Where(m => m != _PerUnitMembershipMeta));
+        OnMembershipRowsLoaded();
+    }
+
+    internal bool SaveMembershipValues(AppDbContext db) {
+        if (_membershipEventType is not { } type) return false;
+        var hasUpdated = false;
+
+        SubathonValue? defaultValue =
+            db.SubathonValues.FirstOrDefault(sv => sv.EventType == type && sv.Meta == "DEFAULT");
+        if (defaultValue != null && double.TryParse(_DefaultMembershipSecondsBox?.Text, out double defaultSeconds) &&
+            !defaultSeconds.Equals(defaultValue.Seconds)) {
+            defaultValue.Seconds = defaultSeconds;
+            hasUpdated = true;
+        }
+
+        if (defaultValue != null && double.TryParse(_DefaultMembershipPointsBox?.Text, out double defaultPoints) &&
+            !defaultPoints.Equals(defaultValue.Points)) {
+            defaultValue.Points = defaultPoints;
+            hasUpdated = true;
+        }
+
+        List<DynamicSubRow> removeRows =
+            _dynamicSubRows.Where(row => string.IsNullOrWhiteSpace(row.NameBox.Text)).ToList();
+        if (removeRows.Count > 0) hasUpdated = true;
+        foreach (DynamicSubRow row in removeRows)
+            DeleteRow(row.SubValue, row);
+
+        EnsureUniqueName(_dynamicSubRows);
+
+        foreach (DynamicSubRow subRow in _dynamicSubRows) {
+            string meta = (subRow.NameBox.Text ?? "").Trim();
+            if (meta == "DEFAULT") continue;
+            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
+            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
+
+#pragma warning disable CA1862
+            SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
+                sv.EventType == type && sv.Meta.ToLower() == meta.ToLower());
+#pragma warning restore CA1862
+            if (existing != null) {
+                hasUpdated |= !seconds.Equals(existing.Seconds) || !points.Equals(existing.Points);
+                existing.Seconds = seconds;
+                existing.Points = points;
+                subRow.SubValue = existing;
+            }
+            else {
+                subRow.SubValue.Meta = meta;
+                subRow.SubValue.Seconds = seconds;
+                subRow.SubValue.Points = points;
+                db.SubathonValues.Add(subRow.SubValue);
+                hasUpdated = true;
+            }
+        }
+
+        List<string> names = ["DEFAULT", .. _dynamicSubRows.Select(row => (row.NameBox.Text ?? "").Trim())];
+        if (_PerUnitMembershipMeta != null) names.Add(_PerUnitMembershipMeta);
+        List<SubathonValue> stale = db.SubathonValues.Where(x => x.EventType == type && !names.Contains(x.Meta))
+            .ToList();
+        if (stale.Count > 0) {
+            db.SubathonValues.RemoveRange(stale);
+            hasUpdated = true;
+        }
+
+        return hasUpdated;
+    }
+
+    private void RefreshMembershipTierCombo(IEnumerable<string> metas) {
+        if (_MembershipTierCombo is not { } combo) return;
+        string selectedTier = (combo.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "";
+
+        combo.Items.Clear();
+        combo.Items.Add(new ComboBoxItem { Content = "DEFAULT" });
+        foreach (string meta in metas.Where(m => m != "DEFAULT" && !string.IsNullOrWhiteSpace(m)).Distinct()
+                     .OrderBy(m => m))
+            combo.Items.Add(new ComboBoxItem { Content = meta });
+
+        combo.SelectedItem = combo.Items.OfType<ComboBoxItem>().FirstOrDefault(i =>
+            string.Equals(i.Content?.ToString(), selectedTier, StringComparison.OrdinalIgnoreCase)) ?? combo.Items[0];
+    }
 }
 
 public class DynamicSubRow {
diff --git a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
index e98f497..26cd262 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
@@ -39,17 +39,20 @@ public FourthWallSettings() {
         UiHelpers.AttachMoneyPointRateHint(DonoBox2, DonoRateHint);
         Loaded += (_, _) => {
             IntegrationEvents.ConnectionUpdated += UpdateStatus;
-            IntegrationEvents.FourthWallMembershipsSynced += SyncMemberships;
+            IntegrationEvents.MembershipTiersSynced += OnTiersSynced;
             RegisterUnsavedChangeHandlers();
             RefreshFromStoredState();
         };
         Unloaded += (_, _) => {
             IntegrationEvents.ConnectionUpdated -= UpdateStatus;
-            IntegrationEvents.FourthWallMembershipsSynced -= SyncMemberships;
+            IntegrationEvents.MembershipTiersSynced -= OnTiersSynced;
         };
     }
 
     protected override StackPanel? _MembershipsPanel => MembershipsPanel;
+    protected override TextBox? _DefaultMembershipSecondsBox => FwSubDTextBox;
+    protected override TextBox? _DefaultMembershipPointsBox => FwSubDTextBox2;
+    protected override ComboBox? _MembershipTierCombo => SimFwTierSelection;
 
     protected override TextBox _WebhookUrlBox => WebhookUrlBox;
     protected override TextBlock _WebhookStatusText => FwWebhookStatusText;
@@ -85,7 +88,7 @@ private void ImportMissed_Click(object? sender, RoutedEventArgs e) {
 
     protected internal override void LoadValues(AppDbContext db) {
         SuppressUnsavedChanges(() => {
-            LoadValuesForMemberships(db);
+            LoadMembershipValues(db);
             LoadConfigValues();
         });
     }
@@ -121,71 +124,7 @@ public override bool UpdateValueSettings(AppDbContext db) {
             hasUpdated = true;
         }
 
-        SubathonValue? defaultSubValue = db.SubathonValues.FirstOrDefault(sv =>
-            sv.EventType == SubathonEventType.FourthWallMembership && sv.Meta == "DEFAULT");
-        if (defaultSubValue != null && double.TryParse(FwSubDTextBox.Text, out double defaultSeconds) &&
-            !defaultSeconds.Equals(defaultSubValue.Seconds)) {
-            defaultSubValue.Seconds = defaultSeconds;
-            hasUpdated = true;
-        }
-
-        if (defaultSubValue != null && double.TryParse(FwSubDTextBox2.Text, out double defaultPoints) &&
-            !defaultPoints.Equals(defaultSubValue.Points)) {
-            defaultSubValue.Points = defaultPoints;
-            hasUpdated = true;
-        }
-
-        List<DynamicSubRow> removeRows =
-            _dynamicSubRows.Where(row => string.IsNullOrWhiteSpace(row.NameBox.Text)).ToList();
-        if (removeRows.Any()) hasUpdated = true;
-        foreach (DynamicSubRow row in removeRows)
-            DeleteRow(row.SubValue, row);
-
-        EnsureUniqueName(_dynamicSubRows);
-
-        foreach (DynamicSubRow subRow in _dynamicSubRows) {
-            string meta = (subRow.NameBox.Text ?? "").Trim();
-            if (string.IsNullOrWhiteSpace(meta)) {
-                DeleteRow(subRow.SubValue, subRow);
-                hasUpdated = true;
-                continue;
-            }
-
-            if (meta == "DEFAULT") continue;
-
-            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
-            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
-
-#pragma warning disable CA1862
-            SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
-                sv.EventType == SubathonEventType.FourthWallMembership && sv.Meta.ToLower() == meta.ToLower());
-#pragma warning restore CA1862
-            if (existing != null) {
-                existing.Seconds = seconds;
-                existing.Points = points;
-                subRow.SubValue = existing;
-                if (!seconds.Equals(existing.Seconds) || !points.Equals(existing.Points))
-                    hasUpdated = true;
-            }
-            else {
-                subRow.SubValue.Meta = meta;
-                subRow.SubValue.Seconds = seconds;
-                subRow.SubValue.Points = points;
-                db.SubathonValues.Add(subRow.SubValue);
-                hasUpdated = true;
-            }
-        }
-
-        List<string> names = ["DEFAULT"];
-        foreach (DynamicSubRow row in _dynamicSubRows)
-            names.Add((row.NameBox.Text ?? "").Trim());
-
-        List<SubathonValue> dbRows = db.SubathonValues.Where(x =>
-            !names.Contains(x.Meta) && x.EventType == SubathonEventType.FourthWallMembership).ToList();
-        if (dbRows.Count > 0) {
-            db.SubathonValues.RemoveRange(dbRows);
-            hasUpdated = true;
-        }
+        hasUpdated |= SaveMembershipValues(db);
 
         SubathonValue? orderVal =
             db.SubathonValues.FirstOrDefault(x => x.EventType == SubathonEventType.FourthWallOrder && x.Meta == "");
@@ -428,88 +367,10 @@ private async void DisconnectFw_Click(object? sender, RoutedEventArgs e) {
         ServiceManager.FourthWall.RevokeTokenFile();
     }
 
-    private void SyncMemberships(Dictionary<string, string> memberships) {
-        List<string> names = memberships.Values.ToList();
-        using AppDbContext db = _factory.CreateDbContext();
-        List<string> existing = db.SubathonValues.Where(v => names.Contains(v.Meta)).Select(v => v.Meta).ToList();
-        var newValues = new List<SubathonValue>();
-        foreach (string tier in names.Where(x => !existing.Contains(x))) {
-            var val = new SubathonValue
-                { Meta = tier, Seconds = 0, Points = 0, EventType = SubathonEventType.FourthWallMembership };
-            newValues.Add(val);
-        }
-
-        if (newValues.Any()) {
-            db.SubathonValues.AddRange(newValues);
-            db.SaveChanges();
-            Dispatcher.UIThread.Post(() => SuppressUnsavedChanges(() => LoadValuesForMemberships(null)));
-        }
+    private void OnTiersSynced(SubathonEventSource source, IReadOnlyCollection<string> tierNames) {
+        if (source == SubathonEventSource.FourthWall) SyncMembershipTiers(tierNames);
     }
 
     internal override void AddMembership_Click(object? sender, RoutedEventArgs e) {
     }
-
-    private void LoadValuesForMemberships(AppDbContext? db) {
-        using AppDbContext? owned = db == null ? _factory.CreateDbContext() : null;
-        // ReSharper disable once NullableWarningSuppressionIsUsed
-        db ??= owned!;
-        List<SubathonValue> values = db.SubathonValues.Where(v => v.EventType == SubathonEventType.FourthWallMembership)
-            .OrderBy(meta => meta)
-            .AsNoTracking().ToList();
-
-        for (int i = MembershipsPanel.Children.Count - 1; i >= 0; i--) {
-            Control child = MembershipsPanel.Children[i];
-            if (child.Name != "DefaultMember" && child.Name != "AddBtn")
-                MembershipsPanel.Children.RemoveAt(i);
-        }
-
-        _dynamicSubRows.Clear();
-        foreach (SubathonValue value in values) {
-            TextBox? box1 = null;
-            TextBox? box2 = null;
-            var v = $"{value.Seconds}";
-            var p = $"{value.Points}";
-
-            if (value is { Meta: "DEFAULT", EventType: SubathonEventType.FourthWallMembership }) {
-                box1 = FwSubDTextBox;
-                box2 = FwSubDTextBox2;
-            }
-            else if (value.EventType == SubathonEventType.FourthWallMembership) {
-                AddMembershipRow(value);
-            }
-
-            if (!string.IsNullOrWhiteSpace(v) && !string.IsNullOrWhiteSpace(p) && box1 != null && box2 != null)
-                Host.UpdateTimePointsBoxes(box1, box2, v, p);
-        }
-
-        RefreshTierCombo();
-    }
-
-    private void RefreshTierCombo() {
-        string selectedTier = (SimFwTierSelection.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "";
-        using AppDbContext db = _factory.CreateDbContext();
-
-        List<string> metas = db.SubathonValues
-            .Where(v => v.EventType == SubathonEventType.FourthWallMembership)
-            .Select(v => v.Meta)
-            .Where(meta => meta != "DEFAULT" && !string.IsNullOrWhiteSpace(meta))
-            .Distinct()
-            .OrderBy(meta => meta)
-            .AsNoTracking()
-            .ToList();
-
-        SimFwTierSelection.Items.Clear();
-        SimFwTierSelection.Items.Add(new ComboBoxItem { Content = "DEFAULT" });
-        foreach (string meta in metas)
-            SimFwTierSelection.Items.Add(new ComboBoxItem { Content = meta });
-
-        foreach (object? comboItem in SimFwTierSelection.Items) {
-            if (comboItem is not ComboBoxItem cbi ||
-                !string.Equals(cbi.Content?.ToString(), selectedTier, StringComparison.OrdinalIgnoreCase)) continue;
-            SimFwTierSelection.SelectedItem = cbi;
-            break;
-        }
-
-        SimFwTierSelection.SelectedItem ??= SimFwTierSelection.Items[0];
-    }
 }
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
new file mode 100644
index 0000000..3a695db
--- /dev/null
+++ b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
@@ -0,0 +1,117 @@
+<external:DevTunnelSettingsControl xmlns="https://github.com/avaloniaui"
+                                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                                   xmlns:external="using:SubathonManager.UI.Views.SettingsViews.External"
+                                   xmlns:views="using:SubathonManager.UI.Views"
+                                   xmlns:v="using:SubathonManager.UI.Validation"
+                                   xmlns:ui2="using:SubathonManager.UI.UiUtils"
+                                   mc:Ignorable="d"
+                                   x:Class="SubathonManager.UI.Views.SettingsViews.External.PatreonSettings">
+    <StackPanel>
+        <StackPanel>
+            <StackPanel Orientation="Horizontal" Margin="0,2,0,8">
+                <TextBlock Text="Status:" Width="80" VerticalAlignment="Center" FontSize="12" />
+                <TextBlock x:Name="WebhookStatusText" Text="Disconnected" VerticalAlignment="Center" FontSize="12" />
+            </StackPanel>
+
+            <Border BorderThickness="1" CornerRadius="4" Padding="8,6"
+                    BorderBrush="{DynamicResource ControlElevationBorderBrush}"
+                    Background="{DynamicResource ControlFillColorDefaultBrush}"
+                    Margin="0,0,0,10">
+                <StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="DevTunnels:" Width="110" VerticalAlignment="Center" FontSize="12" />
+                        <TextBlock x:Name="TunnelPrereqStatusText" Text="Not running"
+                                   VerticalAlignment="Center" FontSize="12" Margin="0,0,12,0" />
+                        <Button Content="Go to setup" Click="GoToDevTunnels_Click" x:Name="TunnelPrereqHint"
+                                FontSize="11"
+                                Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                    </StackPanel>
+                    <StackPanel x:Name="WebhookUrlRow" Orientation="Horizontal" Margin="0,8,0,2" IsVisible="False"
+                                MinHeight="36">
+                        <TextBlock Text="Webhook URL:" Width="110" VerticalAlignment="Center" FontSize="12" />
+                        <TextBox x:Name="WebhookUrlBox" Width="420" Height="34" IsReadOnly="True" PasswordChar="●"
+                                 ui2:TextBoxAssist.Reveal="True"
+                                 views:SettingsProperties.ExcludeFromUnsaved="True" FontSize="11"
+                                 VerticalAlignment="Center" />
+                        <Button Content="Copy" Click="CopyWebhookUrl_Click" Width="56" Height="34" Padding="4,2"
+                                Foreground="{DynamicResource TextFillColorPrimaryBrush}" Margin="6,0,2,0" />
+                        <Button Content="Manage" Click="ManageWebhooks_Click" Width="80" Height="34" Margin="4 0"
+                                ToolTip.Tip="Open Patreon's webhook management page" />
+                    </StackPanel>
+                </StackPanel>
+            </Border>
+
+            <StackPanel Orientation="Horizontal" Margin="2,4">
+                <Button Content="Connect" Width="116" Height="34" Click="Connect_Click" x:Name="ConnectBtn" />
+                <Button Content="Disconnect" Margin="4 0" Width="116" Height="34" Click="Disconnect_Click"
+                        IsVisible="False" x:Name="DisconnBtn"
+                        ToolTip.Tip="Removes the webhook from Patreon and forgets your login" />
+                <Button Content="Recreate Webhook" Margin="4 0" Width="170" Height="34" Click="RecreateWebhook_Click"
+                        IsVisible="False" x:Name="RecreateWebhookBtn"
+                        ToolTip.Tip="Deletes and remakes the Patreon webhook. Use this if memberships stop coming in" />
+            </StackPanel>
+            <TextBlock FontSize="11" Margin="4,2,0,0" TextWrapping="Wrap"
+                       Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                       Text="New pledges, renewals and paid pledge changes add time; upgrades count the difference. Free members, trials and downgrades do not. Tiers sync on connect" />
+
+            <Separator Margin="0,8,0,8" />
+
+            <StackPanel Margin="4,0,0,4" Spacing="2">
+                <CheckBox x:Name="AsDonationBox" Content="Count the pledged amount as a donation"
+                          ToolTip.Tip="Adds the amount pledged to the subathon money total"/>
+                <CheckBox x:Name="ByAmountBox" Content="Add time/points per 1$ pledged instead of per tier"
+                          IsCheckedChanged="ByAmount_Changed"
+                          ToolTip.Tip="Scales off the amount pledged/charged (the full year for annual pledges). Only affects new pledges / not retroactive" />
+            </StackPanel>
+        </StackPanel>
+
+        <Expander Header="Memberships" IsExpanded="True" Margin="0,5,0,0">
+            <StackPanel>
+                <StackPanel x:Name="PerUnitRow" Orientation="Horizontal" Margin="14,5,0,2">
+                    <TextBlock Text="Per 1$ pledged:" Width="160" VerticalAlignment="Center" Margin="8,0,0,0" />
+                    <TextBox Width="100" v:NumericInputBehaviour.Mode="SignedDecimal" PlaceholderText="12"
+                             x:Name="PerUnitBox" Height="36" />
+                    <TextBlock Margin="8,0,0,0" Text="Seconds" Width="120" VerticalAlignment="Center" />
+                    <TextBox Width="100" v:NumericInputBehaviour.Mode="SignedDecimal" Height="36"
+                             PlaceholderText="0" x:Name="PerUnitBox2" />
+                    <TextBlock Margin="8,0,0,0" Text="Points" Width="100" VerticalAlignment="Center" />
+                    <TextBlock x:Name="PerUnitRateHint" FontSize="11" Foreground="Gray" VerticalAlignment="Center" />
+                </StackPanel>
+
+                <StackPanel x:Name="MembershipsPanel" Margin="10,5,0,5">
+                    <Grid x:Name="DefaultMember" Margin="0,2" ColumnDefinitions="*,400">
+                        <StackPanel Orientation="Horizontal" Margin="4,2">
+                            <TextBlock Text="Default:" Width="160" VerticalAlignment="Center" Margin="8,0,0,0" />
+                            <TextBox Width="100" v:NumericInputBehaviour.Mode="SignedDecimal" PlaceholderText="60"
+                                     x:Name="SubDTextBox" Height="36" />
+                            <TextBlock Margin="8,0,0,0" Text="Seconds" Width="120" VerticalAlignment="Center" />
+                            <TextBox Width="100" v:NumericInputBehaviour.Mode="SignedDecimal" Height="36"
+                                     PlaceholderText="1" x:Name="SubDTextBox2" />
+                            <TextBlock Margin="8,0,0,0" Text="Points" Width="100" VerticalAlignment="Center" />
+                        </StackPanel>
+
+                        <StackPanel Grid.Column="0" Grid.ColumnSpan="2" Orientation="Horizontal"
+                                    HorizontalAlignment="Right">
+                            <ComboBox PlaceholderText="Duration" Width="110" Height="36" FontSize="12"
+                                      x:Name="SimDuration" ToolTip.Tip="Select Monthly (x1) or Annual (x12)"
+                                      views:SettingsProperties.ExcludeFromUnsaved="True" SelectedIndex="0" Margin="4,0,4,0">
+                                <ComboBoxItem Content="Monthly" />
+                                <ComboBoxItem Content="Annual" />
+                            </ComboBox>
+
+                            <ComboBox PlaceholderText="Tier" Width="150" Height="36" FontSize="12"
+                                      x:Name="SimTierSelection" ToolTip.Tip="Select Membership Tier"
+                                      views:SettingsProperties.ExcludeFromUnsaved="True" SelectedIndex="0" Margin="4,0,4,0">
+                                <ComboBoxItem Content="DEFAULT" />
+                            </ComboBox>
+                            <Button Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Test"
+                                    Click="TestSub_Click" Width="60" Padding="2" Height="36" Margin="4,0,0,0" />
+                        </StackPanel>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+        </Expander>
+    </StackPanel>
+</external:DevTunnelSettingsControl>
diff --git a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs
new file mode 100644
index 0000000..6314c54
--- /dev/null
+++ b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs
@@ -0,0 +1,196 @@
+using System.Diagnostics;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Data;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.SettingsViews.External;
+
+public partial class PatreonSettings : DevTunnelSettingsControl {
+    private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<PatreonSettings>>();
+
+    public PatreonSettings() {
+        InitializeComponent();
+        UiHelpers.AttachMoneyPointRateHint(PerUnitBox2, PerUnitRateHint);
+        Loaded += (_, _) => {
+            IntegrationEvents.ConnectionUpdated += UpdateStatus;
+            IntegrationEvents.MembershipTiersSynced += OnTiersSynced;
+            RegisterUnsavedChangeHandlers();
+            RefreshFromStoredState();
+        };
+        Unloaded += (_, _) => {
+            IntegrationEvents.ConnectionUpdated -= UpdateStatus;
+            IntegrationEvents.MembershipTiersSynced -= OnTiersSynced;
+        };
+    }
+
+    protected override StackPanel? _MembershipsPanel => MembershipsPanel;
+    protected override TextBox? _DefaultMembershipSecondsBox => SubDTextBox;
+    protected override TextBox? _DefaultMembershipPointsBox => SubDTextBox2;
+    protected override ComboBox? _MembershipTierCombo => SimTierSelection;
+    protected override SubathonEventType? _membershipEventType => SubathonEventType.PatreonPledge;
+    protected override bool allowMembershipDelete => false;
+    protected override string? _PerUnitMembershipMeta => Utils.PerUnitMeta;
+
+    protected override TextBox _WebhookUrlBox => WebhookUrlBox;
+    protected override TextBlock _WebhookStatusText => WebhookStatusText;
+    protected override SubathonEventSource _EventSource => SubathonEventSource.Patreon;
+    protected override StackPanel _WebhookUrlRow => WebhookUrlRow;
+    protected override TextBlock _TunnelPrereqStatusText => TunnelPrereqStatusText;
+    protected override Button _TunnelPrereqHint => TunnelPrereqHint;
+    protected override TextBox? _WebhookForwardUrlsBox => null;
+    protected override Popup? _ForwardUrlsPopup => null;
+    protected override TextBox? _ForwardUrlsMultiBox => null;
+    protected override Button? _ConnectBtn => ConnectBtn;
+
+    public override void Init(SettingsView host) {
+        Host = host;
+        RegisterUnsavedChangeHandlers();
+    }
+
+    internal override void UpdateStatus(IntegrationConnection? conn) {
+        if (conn == null) return;
+        base.UpdateStatus(conn);
+        if (conn.Source != SubathonEventSource.Patreon) return;
+        Dispatcher.UIThread.Post(() => {
+            DisconnBtn.IsVisible = conn.Configured;
+            RecreateWebhookBtn.IsVisible = conn.Configured;
+        });
+    }
+
+    protected internal override void LoadValues(AppDbContext db) {
+        SuppressUnsavedChanges(() => {
+            var config = AppServices.Provider.GetRequiredService<IConfig>();
+            AsDonationBox.IsChecked = config.GetBool(nameof(SubathonEventSource.Patreon),
+                $"{SubathonEventType.PatreonPledge}.CommissionAsDonation");
+            ByAmountBox.IsChecked = config.GetBool(nameof(SubathonEventSource.Patreon), 
+                $"{SubathonEventType.PatreonPledge}.ValueByAmount");
+            LoadMembershipValues(db);
+        });
+    }
+
+    public override bool UpdateValueSettings(AppDbContext db) {
+        bool hasUpdated = SaveMembershipValues(db);
+        SubathonValue? perUnit = db.SubathonValues.FirstOrDefault(v =>
+            v.EventType == SubathonEventType.PatreonPledge && v.Meta == Utils.PerUnitMeta);
+        if (perUnit != null && double.TryParse(PerUnitBox.Text, out double seconds) &&
+            !seconds.Equals(perUnit.Seconds)) {
+            perUnit.Seconds = seconds;
+            hasUpdated = true;
+        }
+
+        if (perUnit != null && double.TryParse(PerUnitBox2.Text, out double points) &&
+            !points.Equals(perUnit.Points)) {
+            perUnit.Points = points;
+            hasUpdated = true;
+        }
+
+        return hasUpdated;
+    }
+
+    protected internal override bool UpdateConfigValueSettings() {
+        var config = AppServices.Provider.GetRequiredService<IConfig>();
+        var hasUpdated = false;
+        hasUpdated |= config.SetBool(nameof(SubathonEventSource.Patreon), 
+            $"{SubathonEventType.PatreonPledge}.CommissionAsDonation",
+            AsDonationBox.IsChecked == true);
+        hasUpdated |= config.SetBool(nameof(SubathonEventSource.Patreon), 
+            $"{SubathonEventType.PatreonPledge}.ValueByAmount",
+            ByAmountBox.IsChecked == true);
+        return hasUpdated;
+    }
+
+    protected override void OnMembershipRowsLoaded() {
+        ApplyValueMode();
+    }
+
+    private void ByAmount_Changed(object? sender, RoutedEventArgs e) {
+        ApplyValueMode();
+    }
+
+    private void ApplyValueMode() {
+        bool byAmount = ByAmountBox.IsChecked == true;
+        PerUnitBox.IsEnabled = byAmount;
+        PerUnitBox2.IsEnabled = byAmount;
+        SubDTextBox.IsEnabled = !byAmount;
+        SubDTextBox2.IsEnabled = !byAmount;
+        foreach (DynamicSubRow row in _dynamicSubRows) {
+            row.TimeBox.IsEnabled = !byAmount;
+            row.PointsBox.IsEnabled = !byAmount;
+        }
+    }
+
+    public override void UpdateCurrencyBoxes(List<string> currencies, string selected) {
+    }
+
+    public override (string seconds, string points, TextBox? timeBox, TextBox? pointsBox) GetValueBoxes(
+        SubathonValue val) {
+        return val.Meta == Utils.PerUnitMeta
+            ? ($"{val.Seconds}", $"{val.Points}", PerUnitBox, PerUnitBox2)
+            : ($"{val.Seconds}", $"{val.Points}", null, null);
+    }
+
+    internal override void AddMembership_Click(object? sender, RoutedEventArgs e) {
+    }
+
+    private void OnTiersSynced(SubathonEventSource source, IReadOnlyCollection<string> tierNames) {
+        if (source == SubathonEventSource.Patreon) SyncMembershipTiers(tierNames);
+    }
+
+    private async void Connect_Click(object? sender, RoutedEventArgs e) {
+        try {
+            await ServiceManager.Patreon.ConnectAsync();
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "Failed to connect Patreon");
+        }
+    }
+
+    private async void Disconnect_Click(object? sender, RoutedEventArgs e) {
+        try {
+            await ServiceManager.Patreon.DisconnectAsync();
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "Failed to disconnect Patreon");
+        }
+    }
+
+    private async void RecreateWebhook_Click(object? sender, RoutedEventArgs e) {
+        try {
+            await ServiceManager.Patreon.RecreateWebhookAsync();
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "Failed to recreate the Patreon webhook");
+        }
+    }
+
+    private void ManageWebhooks_Click(object? sender, RoutedEventArgs e) {
+        try {
+            Process.Start(new ProcessStartInfo {
+                FileName = "https://www.patreon.com/portal/registration/register-webhooks",
+                UseShellExecute = true
+            });
+        }
+        catch {
+            /**/
+        }
+    }
+
+    private void TestSub_Click(object? sender, RoutedEventArgs e) {
+        string tier = (SimTierSelection.SelectedItem as ComboBoxItem)?.Content?.ToString() ?? "DEFAULT";
+        bool annual = string.Equals((SimDuration.SelectedItem as ComboBoxItem)?.Content?.ToString(), "Annual",
+            StringComparison.OrdinalIgnoreCase);
+        ServiceManager.Patreon.SimulateMembership(tier, annual);
+    }
+}
diff --git a/SubathonManager.UI/Views/SettingsViews/ExternalSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/ExternalSettings.axaml.cs
index 4bd6bf3..ccec52d 100644
--- a/SubathonManager.UI/Views/SettingsViews/ExternalSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/ExternalSettings.axaml.cs
@@ -35,6 +35,9 @@ public ExternalSettings() {
             case SubathonEventSource.FourthWall:
                 _settingsControls[eventSource] = new FourthWallSettings();
                 break;
+            case SubathonEventSource.Patreon:
+                _settingsControls[eventSource] = new PatreonSettings();
+                break;
             case SubathonEventSource.Throne:
                 _settingsControls[eventSource] = new ThroneSettings();
                 break;

From c2edd2712ffe6f90d4d1022bd6cea85562f74b33 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 1 Oct 2026 21:47:05 -0300
Subject: [PATCH 03/23] patreon fix handle update events

---
 SubathonManager.Integration/PatreonService.cs | 35 ++++++++++------
 .../PatreonServiceTests.cs                    | 41 ++++++++++++-------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/SubathonManager.Integration/PatreonService.cs b/SubathonManager.Integration/PatreonService.cs
index 76725c5..63c9223 100644
--- a/SubathonManager.Integration/PatreonService.cs
+++ b/SubathonManager.Integration/PatreonService.cs
@@ -47,8 +47,9 @@ public class PatreonService(
     private readonly PatreonWebhookHandler _handler = new(new PatreonWebhookSignatureVerifier());
     private readonly SemaphoreSlim _initLock = new(1, 1);
 
-    // tier id -> title, refreshed from webhook payloads so renames follow the id
-    internal readonly ConcurrentDictionary<string, string> Tiers = new();
+    // tier id -> (title, cents), refreshed from webhook payloads so renames follow the id
+    // cents stored is for simulating/testing
+    internal readonly ConcurrentDictionary<string, (string Title, int Cents)> Tiers = new();
     private string? _campaignId;
     private string _currency = "USD";
 
@@ -275,8 +276,9 @@ private async Task InitializeCoreAsync(CancellationToken ct) {
 
         foreach (JsonApiResource<TierAttributes> tier in tiers ?? [])
             if (tier.Attributes is { AmountCents: > 0 } attrs && !string.IsNullOrWhiteSpace(attrs.Title))
-                Tiers[tier.Id] = attrs.Title;
-        IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon, Tiers.Values.ToList());
+                Tiers[tier.Id] = (attrs.Title, attrs.AmountCents);
+        IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon,
+            Tiers.Values.Select(t => t.Title).ToList());
 
         string url = tunnelConn.Name.TrimEnd('/') + WebhookPath;
         if (!await EnsureWebhookAsync(client, url, ct)) {
@@ -379,15 +381,19 @@ private async Task<bool> EnsureWebhookAsync(PatreonApiClient client, string url,
                 name, tier, willPay, currency, cadence, Utils.ParseDateFromString(member.PledgeRelationshipStart) ?? now);
         }
 
-        if (!IsPaid(member.LastChargeStatus) || charged == null || charged < now - LiveWindow) return null;
+        // charge date needed for members:update to be within window
+        // created and update for pledge can be null just bc it's surely a pledge, but also, their test webhooks have it null...
+        if (charged != null && (!IsPaid(member.LastChargeStatus) || charged < now - LiveWindow)) return null;
         if (eventType == MemberUpdated)
-            return BuildPledgeEvent(chargeKey, name, tier, willPay, currency, cadence, charged.Value);
+            return charged is { } paidAt
+                ? BuildPledgeEvent(chargeKey, name, tier, willPay, currency, cadence, paidAt)
+                : null;
 
         // assumes an upgrade shows will_pay below entitled so only the difference counts
         // unless its upgrade to annual, then will pay is above likely. Either way we don't care much
         // we get the amount charged anyways
         return BuildPledgeEvent(chargeKey, name, tier, willPay, currency,
-            cadence, charged.Value);
+            cadence, charged ?? now);
     }
 
     private static string? PatronVanity(string? fullName, JsonApiIncludedIndex included) {
@@ -421,14 +427,16 @@ private string CampaignCurrency(JsonApiIncludedIndex included) {
         if (included.TryGet("tier", id, out JsonElement tier))
             attrs = tier.TryGetProperty("attributes", out JsonElement nested) ? nested : tier;
         if (attrs.ValueKind != JsonValueKind.Object || Utils.GetJsonString(attrs, "title") is not { Length: > 0 } title)
-            return Tiers.TryGetValue(id, out string? known) ? (known, 0) : null;
+            return Tiers.TryGetValue(id, out (string Title, int Cents) known) ? known : null;
 
-        bool newTitle = !Tiers.Values.Contains(title);
-        Tiers[id] = title;
-        if (newTitle) IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon, Tiers.Values.ToList());
         int cents = attrs.TryGetProperty("amount_cents", out JsonElement amount) && amount.TryGetInt32(out int c)
             ? c
-            : 0;
+            : Tiers.TryGetValue(id, out (string Title, int Cents) cached) ? cached.Cents : 0;
+        bool newTitle = Tiers.Values.All(t => t.Title != title);
+        Tiers[id] = (title, cents);
+        if (newTitle)
+            IntegrationEvents.RaiseMembershipTiersSynced(SubathonEventSource.Patreon,
+                Tiers.Values.Select(t => t.Title).ToList());
         return (title, cents);
     }
 
@@ -455,8 +463,9 @@ private SubathonEvent BuildPledgeEvent(string idKey, string? name, string tierNa
     }
 
     public void SimulateMembership(string tierName, bool annual) {
+        int cents = Tiers.Values.FirstOrDefault(t => t.Title == tierName).Cents is > 0 and var known ? known : 500;
         SubathonEvent ev = BuildPledgeEvent($"patreon|simulated|{Guid.NewGuid()}", "SYSTEM", tierName,
-            annual ? 6000 : 500, _currency, annual ? 12 : 1, DateTimeOffset.Now);
+            annual ? cents * 12 : cents, _currency, annual ? 12 : 1, DateTimeOffset.Now);
         SubathonEvents.RaiseSubathonEventCreated(ev);
     }
 
diff --git a/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs b/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
index 2bf9d62..60f5cf3 100644
--- a/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
+++ b/SubathonManager.Tests/IntegrationUnitTests/PatreonServiceTests.cs
@@ -120,13 +120,13 @@ public async Task User_IsThePatronsVanity_OrTheirName(string? vanity, string exp
     [Fact]
     public async Task PayloadTier_OverridesAStaleCachedTier() {
         PatreonService service = MakeService();
-        service.Tiers["t2"] = "Old Gold";
+        service.Tiers["t2"] = ("Old Gold", 400);
 
         SubathonEvent? ev = await SendAsync(service, PatreonService.PledgeCreated, Payload());
 
         Assert.NotNull(ev);
         Assert.Equal("Gold", ev.Value);
-        Assert.Equal("Gold", service.Tiers["t2"]);
+        Assert.Equal(("Gold", 500), service.Tiers["t2"]);
     }
 
     [Fact]
@@ -166,8 +166,8 @@ public async Task PledgeUpdate_PaidChargeAtTheSameAmount_CountsInFull() {
 
     [Theory]
     [InlineData(false, "Gold", "member")]
-    [InlineData(true, "5.00", "USD")]
-    public async Task PledgeUpdate_Upgrade_CountsTheTierOrTheDifference(bool byAmount, string value,
+    [InlineData(true, "10.00", "USD")]
+    public async Task PledgeUpdate_Upgrade_CountsTheTierOrTheWillPayAmount(bool byAmount, string value,
         string currency) {
         SubathonEvent? ev = await SendAsync(MakeService(byAmount: byAmount), PatreonService.PledgeUpdated,
             Payload(1000, 500, lastCharge: MinutesAgo(1), chargeStatus: "Paid"));
@@ -176,7 +176,7 @@ public async Task PledgeUpdate_Upgrade_CountsTheTierOrTheDifference(bool byAmoun
         Assert.Equal(value, ev.Value);
         Assert.Equal(currency, ev.Currency);
         Assert.Equal(1, ev.Amount);
-        Assert.Equal("5.00|USD", ev.SecondaryValue);
+        Assert.Equal("10.00|USD", ev.SecondaryValue);
     }
 
     [Fact]
@@ -190,15 +190,13 @@ public async Task PledgeUpdate_AnnualCharge_IsNotMistakenForAnUpgrade() {
     }
 
     [Theory]
-    [InlineData(300, 500, 1, "Paid")]
-    [InlineData(500, 500, null, null)]
+    [InlineData(300, 500, 60 * 24 * 10, "Paid")]
     [InlineData(500, 500, 2, "Declined")]
     [InlineData(500, 500, 120, "Paid")]
     public async Task PledgeUpdate_DowngradeOrNoFreshPaidCharge_IsIgnored(int willPay, int entitled,
-        int? chargedMinutesAgo, string? chargeStatus) {
+        int chargedMinutesAgo, string? chargeStatus) {
         Assert.Null(await SendAsync(MakeService(), PatreonService.PledgeUpdated,
-            Payload(willPay, entitled, lastCharge: chargedMinutesAgo is { } m ? MinutesAgo(m) : null,
-                chargeStatus: chargeStatus)));
+            Payload(willPay, entitled, lastCharge: MinutesAgo(chargedMinutesAgo), chargeStatus: chargeStatus)));
     }
 
     [Theory]
@@ -233,6 +231,14 @@ public async Task MemberUpdate_WithoutAFreshPaidCharge_IsIgnored(int? chargedMin
             Payload(lastCharge: chargedMinutesAgo is { } m ? MinutesAgo(m) : null, chargeStatus: chargeStatus)));
     }
 
+    [Fact]
+    public async Task PledgeUpdate_WithNoChargeDate_IsCounted() {
+        SubathonEvent? ev = await SendAsync(MakeService(), PatreonService.PledgeUpdated, Payload());
+        Assert.NotNull(ev);
+        Assert.Equal("Gold", ev.Value);
+        Assert.Equal("5.00|USD", ev.SecondaryValue);
+    }
+
     [Theory]
     [InlineData(PatreonService.PledgeCreated)]
     [InlineData(PatreonService.PledgeUpdated)]
@@ -289,15 +295,20 @@ public void PledgeCountsAsDonation_FromMode(string setting, bool expected) {
         Assert.Equal(expected, Utils.IsCommissionAsDonation(config, ev));
     }
 
-    [Fact]
-    public void SimulateMembership_RaisesSimulatedEventForChosenTier() {
+    [Theory]
+    [InlineData("Silver", true, 12, "96.00|USD")]
+    [InlineData("Silver", false, 1, "8.00|USD")]
+    [InlineData("DEFAULT", false, 1, "5.00|USD")]
+    public void SimulateMembership_ChargesTheTiersPrice(string tier, bool annual, int amount, string charged) {
         PatreonService service = MakeService();
+        service.Tiers["t9"] = ("Silver", 800);
 
-        SubathonEvent? ev = EventUtil.SubathonEventCapture.Capture(() => service.SimulateMembership("Silver", true));
+        SubathonEvent? ev = EventUtil.SubathonEventCapture.Capture(() => service.SimulateMembership(tier, annual));
 
         Assert.NotNull(ev);
         Assert.Equal(SubathonEventSource.Simulated, ev.Source);
-        Assert.Equal("Silver", ev.Value);
-        Assert.Equal(12, ev.Amount);
+        Assert.Equal(tier, ev.Value);
+        Assert.Equal(amount, ev.Amount);
+        Assert.Equal(charged, ev.SecondaryValue);
     }
 }

From aa18a4fcf8695dda85ec4334eb6c4e8bdcbab960 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sat, 3 Oct 2026 18:19:13 -0300
Subject: [PATCH 04/23] holy actions framework #338

---
 SubathonManager.Core/CsvUtils.cs              |  127 ++
 SubathonManager.Core/Enums/ActionEnums.cs     |  367 +++++
 SubathonManager.Core/Enums/EnumExtensions.cs  |   30 +-
 .../Enums/SubathonCommandType.cs              |    6 +-
 SubathonManager.Core/Enums/WheelSpinEnums.cs  |   87 +-
 SubathonManager.Core/Events/ActionEvents.cs   |   13 +
 .../Interfaces/IActionStepRunner.cs           |   10 +
 SubathonManager.Core/Models/Wheels.cs         |    3 +
 SubathonManager.Core/Objects/ActionGraph.cs   |  335 +++++
 .../Objects/VTSWheelAction.cs                 |   56 +-
 SubathonManager.Core/ScheduleCsv.cs           |   97 +-
 SubathonManager.Core/Utils.cs                 |   18 +-
 .../ActionVariableResolver.cs                 |  114 ++
 SubathonManager.Data/DbContext.cs             |   99 +-
 ...1525_updateActinsAndWheelStuff.Designer.cs | 1143 +++++++++++++++
 ...0261002031525_updateActinsAndWheelStuff.cs |   28 +
 .../Migrations/AppDbContextModelSnapshot.cs   |    5 +-
 SubathonManager.Integration/MixItUpService.cs |   25 +-
 SubathonManager.Integration/OBSService.cs     |  165 ++-
 SubathonManager.Integration/PatreonService.cs |    1 +
 .../StreamerBotService.cs                     |  152 ++
 .../SubathonManager.Integration.csproj        |    1 +
 SubathonManager.Integration/VTSService.cs     |  171 +--
 SubathonManager.Server/WebServer.WebSocket.cs |    3 +-
 SubathonManager.Services/ActionService.cs     |  557 ++++++++
 SubathonManager.Services/CommandService.cs    |   11 +
 .../DiscordWebhookService.cs                  |    3 +-
 SubathonManager.Services/EventService.cs      |    3 +
 .../CoreUnitTests/CsvUtilsTests.cs            |   91 ++
 .../CoreUnitTests/UtilsTests.cs               |   10 -
 .../WheelSpinVtsActionTypeTests.cs            |    5 +-
 .../DataUnitTests/DbContextTests.cs           |    9 +-
 .../IntegrationUnitTests/VTSServiceTests.cs   |   69 +-
 .../ServicesUnitTests/ActionServiceTests.cs   |  513 +++++++
 SubathonManager.UI/App.axaml                  |    1 +
 SubathonManager.UI/App.axaml.cs               |   10 +-
 .../EditRouteWindow.Handlers.cs               |   30 +-
 SubathonManager.UI/EditRouteWindow.axaml.cs   |   79 ++
 .../MainWindow.ConnectionStatus.cs            |   17 +
 SubathonManager.UI/MainWindow.Routes.cs       |   15 +-
 SubathonManager.UI/MainWindow.axaml           |    4 +
 SubathonManager.UI/MainWindow.axaml.cs        |   27 +
 .../Platform/IPlatformIntegration.cs          |    3 +-
 .../Platform/PosixPlatformIntegration.cs      |    9 +-
 SubathonManager.UI/Platform/ProtocolParser.cs |   12 +
 .../Platform/WindowsPlatformIntegration.cs    |    9 +
 SubathonManager.UI/Services/ServiceManager.cs |   18 +-
 .../Services/ServiceRegistration.cs           |   15 +-
 SubathonManager.UI/SubathonManager.UI.csproj  |    1 +
 .../Views/Actions/ActionEditorViewModels.cs   |  104 ++
 .../Views/Actions/ActionEditorWindow.Graph.cs |  332 +++++
 .../Actions/ActionEditorWindow.Properties.cs  |  318 +++++
 .../Views/Actions/ActionEditorWindow.axaml    |  318 +++++
 .../Views/Actions/ActionEditorWindow.axaml.cs |  266 ++++
 .../Views/Actions/ActionsView.axaml           |  205 +++
 .../Views/Actions/ActionsView.axaml.cs        |  296 ++++
 SubathonManager.UI/Views/GoalsEditor.axaml.cs |   83 +-
 .../Views/Prompts/PromptsEditor.axaml.cs      |  112 +-
 .../Views/Schedule/ScheduleView.Csv.cs        |    2 +-
 .../Views/SettingsView.Settings.cs            |    3 +-
 .../External/PatreonSettings.axaml            |    2 +-
 .../StreamerBotSettings.axaml                 |   21 +-
 .../StreamerBotSettings.axaml.cs              |   59 +-
 .../Views/SubathonSummaryWindow.Export.cs     |   96 +-
 .../Views/WheelSpin/WheelEditor.Actions.cs    |  832 +++++++++++
 .../Views/WheelSpin/WheelEditor.History.cs    |  349 +++++
 .../WheelSpin/WheelEditor.ImportExport.cs     |  135 ++
 .../Views/WheelSpin/WheelEditor.axaml         |   96 ++
 .../Views/WheelSpin/WheelEditor.axaml.cs      | 1260 +----------------
 .../WheelSpin/WheelTriggerEditor.axaml.cs     |  138 +-
 external/linux/install.sh                     |   11 +-
 external/linux/subathonmanager-smo.xml        |    5 +
 external/macos/Info.plist                     |   34 +
 73 files changed, 7712 insertions(+), 1942 deletions(-)
 create mode 100644 SubathonManager.Core/CsvUtils.cs
 create mode 100644 SubathonManager.Core/Enums/ActionEnums.cs
 create mode 100644 SubathonManager.Core/Events/ActionEvents.cs
 create mode 100644 SubathonManager.Core/Interfaces/IActionStepRunner.cs
 create mode 100644 SubathonManager.Core/Objects/ActionGraph.cs
 create mode 100644 SubathonManager.Data/ActionVariableResolver.cs
 create mode 100644 SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.Designer.cs
 create mode 100644 SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.cs
 create mode 100644 SubathonManager.Integration/StreamerBotService.cs
 create mode 100644 SubathonManager.Services/ActionService.cs
 create mode 100644 SubathonManager.Tests/CoreUnitTests/CsvUtilsTests.cs
 create mode 100644 SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
 create mode 100644 SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionsView.axaml
 create mode 100644 SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
 create mode 100644 SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
 create mode 100644 SubathonManager.UI/Views/WheelSpin/WheelEditor.History.cs
 create mode 100644 SubathonManager.UI/Views/WheelSpin/WheelEditor.ImportExport.cs

diff --git a/SubathonManager.Core/CsvUtils.cs b/SubathonManager.Core/CsvUtils.cs
new file mode 100644
index 0000000..6a1eda0
--- /dev/null
+++ b/SubathonManager.Core/CsvUtils.cs
@@ -0,0 +1,127 @@
+using System.Globalization;
+using System.Text;
+
+namespace SubathonManager.Core;
+
+public static class CsvUtils {
+    public const string TimestampFormat = "yyyy-MM-dd HH:mm:ss";
+
+    public static string ExportFolder => Path.Combine(Config.DataFolder, "exports");
+
+    public static string Escape(object? value) {
+        string? text = value switch {
+            null => null,
+            string s => s,
+            DateTime dt => dt.ToString(TimestampFormat, CultureInfo.InvariantCulture),
+            DateTimeOffset dto => dto.ToString(TimestampFormat, CultureInfo.InvariantCulture),
+            IFormattable f => f.ToString(null, CultureInfo.InvariantCulture),
+            _ => value.ToString()
+        };
+
+        if (string.IsNullOrWhiteSpace(text)) return "";
+        if (text.Contains(',') || text.Contains('"') || text.Contains('\n') || text.Contains('\r'))
+            return $"\"{text.Replace("\"", "\"\"")}\"";
+        return text;
+    }
+
+    public static string FormatRow(IEnumerable<object?> cells) {
+        return string.Join(',', cells.Select(Escape));
+    }
+
+    public static string Write<T>(IEnumerable<IEnumerable<object?>> headerRows, IEnumerable<T> rows,
+        Func<T, IEnumerable<object?>> toCells) {
+        var sb = new StringBuilder();
+        foreach (IEnumerable<object?> header in headerRows) sb.AppendLine(FormatRow(header));
+        foreach (T row in rows) sb.AppendLine(FormatRow(toCells(row)));
+        return sb.ToString();
+    }
+
+    public static async Task<string> ExportAsync<T>(string baseName, IEnumerable<IEnumerable<object?>> headerRows,
+        IEnumerable<T> rows, Func<T, IEnumerable<object?>> toCells) {
+        Directory.CreateDirectory(ExportFolder);
+
+        string name = SafeFileName.Sanitize(baseName, fallback: "export");
+        string stamp = DateTime.Now.ToString("yyyyMMdd-HHmmss", CultureInfo.InvariantCulture);
+        string path = Path.Combine(ExportFolder, $"{name}-{stamp}.csv");
+        await File.WriteAllTextAsync(path, Write(headerRows, rows, toCells), Encoding.UTF8);
+        return path;
+    }
+
+    public static async Task<List<string[]>?> ReadFileAsync(string path) {
+        try {
+            string text = await File.ReadAllTextAsync(path, Encoding.UTF8);
+            return ReadRecords(text)
+                .Select(r => r.Fields)
+                .Where(f => !f.All(string.IsNullOrWhiteSpace))
+                .ToList();
+        }
+        catch {
+            return null;
+        }
+    }
+
+    public static List<(int Line, string[] Fields)> ReadRecords(string csv) {
+        var records = new List<(int, string[])>();
+        var fields = new List<string>();
+        var field = new StringBuilder();
+        var inQuotes = false;
+        var line = 1;
+        var recordStart = 1;
+        var any = false;
+
+        if (csv.Length > 0 && csv[0] == (char)0xFEFF) csv = csv[1..];
+
+        for (var i = 0; i < csv.Length; i++) {
+            char c = csv[i];
+            if (inQuotes) {
+                if (c == '"' && i + 1 < csv.Length && csv[i + 1] == '"') {
+                    field.Append('"');
+                    i++;
+                }
+                else if (c == '"') {
+                    inQuotes = false;
+                }
+                else {
+                    if (c == '\n') line++;
+                    if (c != '\r') field.Append(c);
+                }
+
+                continue;
+            }
+
+            switch (c) {
+                case '"':
+                    inQuotes = true;
+                    any = true;
+                    break;
+                case ',':
+                    fields.Add(field.ToString());
+                    field.Clear();
+                    any = true;
+                    break;
+                case '\r':
+                    break;
+                case '\n':
+                    fields.Add(field.ToString());
+                    field.Clear();
+                    if (any || fields.Count > 1 || fields[0].Length > 0) records.Add((recordStart, fields.ToArray()));
+                    fields.Clear();
+                    any = false;
+                    line++;
+                    recordStart = line;
+                    break;
+                default:
+                    field.Append(c);
+                    any = true;
+                    break;
+            }
+        }
+
+        if (any || field.Length > 0) {
+            fields.Add(field.ToString());
+            records.Add((recordStart, fields.ToArray()));
+        }
+
+        return records;
+    }
+}
diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
new file mode 100644
index 0000000..b4ad1c3
--- /dev/null
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -0,0 +1,367 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
+
+namespace SubathonManager.Core.Enums;
+
+public enum ActionStepType {
+    [ActionStepMeta(Label = "Wait", Group = "Flow", DurationLabel = "Wait for:")]
+    Wait = 0,
+
+    [ActionStepMeta(Label = "Add Time", Group = "Subathon", DurationLabel = "Time to add:")]
+    AddTime = 100,
+
+    [ActionStepMeta(Label = "Subtract Time", Group = "Subathon", DurationLabel = "Time to remove:")]
+    SubtractTime = 101,
+
+    [ActionStepMeta(Label = "Multiplier", Group = "Subathon",
+        Operations = [ActionOperation.PointsAndTime, ActionOperation.Points, ActionOperation.Time],
+        ValueLabel = "Multiplier (x):", DurationLabel = "Lasts for (blank = until stopped):")]
+    SetMultiplier = 102,
+
+    [ActionStepMeta(Label = "Add Rerolls", Group = "Subathon", ValueLabel = "Rerolls to add:")]
+    Reroll = 103,
+
+    [ActionStepMeta(Label = "Expression", Group = "VTube Studio",
+        Operations = [ActionOperation.On, ActionOperation.Off, ActionOperation.Toggle],
+        TargetLabel = "Expression file:")]
+    VtsExpression = 200,
+
+    [ActionStepMeta(Label = "Parameter", Group = "VTube Studio",
+        Operations = [ActionOperation.Hold, ActionOperation.Set, ActionOperation.Release, ActionOperation.Restore],
+        TargetLabel = "Parameter:", ValueLabel = "Set value to:",
+        ValueOperations = [ActionOperation.Hold, ActionOperation.Set])]
+    VtsParameter = 201,
+
+    [ActionStepMeta(Label = "Hotkey", Group = "VTube Studio", Operations = [ActionOperation.Trigger],
+        TargetLabel = "Hotkey:")]
+    VtsHotkey = 202,
+
+    [ActionStepMeta(Label = "Run Command", Group = "Mix It Up", Operations = [ActionOperation.Run],
+        TargetLabel = "Command:", BodyLabel = "Special identifiers (one name=value per line, read as $name in MIU):",
+        AllowsVariables = true)]
+    MixItUpCommand = 300,
+
+    // in a scene
+    [ActionStepMeta(Label = "Source", Group = "OBS",
+        Operations = [ActionOperation.Show, ActionOperation.Hide, ActionOperation.Toggle],
+        TargetLabel = "Source:", ScopeLabel = "Scene:")]
+    ObsSourceVisibility = 400,
+
+    // on a source
+    [ActionStepMeta(Label = "Filter", Group = "OBS",
+        Operations = [ActionOperation.Enable, ActionOperation.Disable, ActionOperation.Toggle],
+        TargetLabel = "Filter:", ScopeLabel = "On source:")]
+    ObsFilter = 401,
+
+    [ActionStepMeta(Label = "Audio", Group = "OBS",
+        Operations = [ActionOperation.Mute, ActionOperation.Unmute, ActionOperation.Toggle],
+        TargetLabel = "Input:")]
+    ObsAudio = 402,
+
+    [ActionStepMeta(Label = "Media", Group = "OBS",
+        Operations = [ActionOperation.Play, ActionOperation.Pause, ActionOperation.Restart, ActionOperation.Stop],
+        TargetLabel = "Input:")]
+    ObsMedia = 403,
+
+    // "name=value" per line, sent as the action's arguments, found as %name%
+    [ActionStepMeta(Label = "Run Action", Group = "Streamer.bot", Operations = [ActionOperation.Run],
+        TargetLabel = "Action:", BodyLabel = "Arguments (one name=value per line):", AllowsVariables = true)]
+    StreamerBotAction = 500,
+
+    [ActionStepMeta(Label = "GET Request", Group = "Web", TargetLabel = "URL:", AllowsVariables = true)]
+    HttpGet = 600,
+
+    // body is sent as-is
+    [ActionStepMeta(Label = "POST Request", Group = "Web", TargetLabel = "URL:", BodyLabel = "Body:",
+        AllowsVariables = true)]
+    HttpPost = 601
+}
+
+public enum ActionOperation {
+    None,
+    On,
+    Off,
+    Toggle,
+    Hold,
+    Set,
+    Release,
+    Restore,
+    Trigger,
+    Run,
+    PointsAndTime,
+    Points,
+    Time,
+    Show,
+    Hide,
+    Enable,
+    Disable,
+    Mute,
+    Unmute,
+    Play,
+    Pause,
+    Restart,
+    Stop
+}
+
+public enum ActionRunResult {
+    Done,
+    Paused,
+    Cancelled,
+    Skipped
+}
+
+public enum ActionRepeatMode {
+    Restart,
+    Parallel,
+    Skip
+}
+
+public enum ActionVariable {
+    [ActionVariableMeta(Token = "seconds_remaining", Group = "Timer", ValueType = "number",
+        Description = "Whole seconds left on the timer")]
+    SecondsRemaining,
+
+    [ActionVariableMeta(Token = "time_remaining", Group = "Timer", ValueType = "text",
+        Description = "Time left as hours:minutes:seconds, e.g. 26:04:59")]
+    TimeRemaining,
+
+    [ActionVariableMeta(Token = "seconds_elapsed", Group = "Timer", ValueType = "number",
+        Description = "Whole seconds the timer has run")]
+    SecondsElapsed,
+
+    [ActionVariableMeta(Token = "timer_paused", Group = "Timer", ValueType = "true/false",
+        Description = "Whether the timer is paused")]
+    TimerPaused,
+
+    [ActionVariableMeta(Token = "timer_locked", Group = "Timer", ValueType = "true/false",
+        Description = "Whether the subathon is locked to new events")]
+    TimerLocked,
+
+    [ActionVariableMeta(Token = "timer_reversed", Group = "Timer", ValueType = "true/false",
+        Description = "Whether the timer counts up instead of down")]
+    TimerReversed,
+
+    [ActionVariableMeta(Token = "multiplier_active", Group = "Multiplier", ValueType = "true/false",
+        Description = "Whether a multiplier is running")]
+    MultiplierActive,
+
+    [ActionVariableMeta(Token = "multiplier_amount", Group = "Multiplier", ValueType = "number",
+        Description = "Current multiplier, 1 when none is running")]
+    MultiplierAmount,
+
+    [ActionVariableMeta(Token = "multiplier_seconds_remaining", Group = "Multiplier", ValueType = "number",
+        Description = "Seconds until the multiplier ends, 0 when it has no end or none is running")]
+    MultiplierSecondsRemaining,
+
+    [ActionVariableMeta(Token = "multiplier_points", Group = "Multiplier", ValueType = "true/false",
+        Description = "Whether the multiplier applies to points")]
+    MultiplierPoints,
+
+    [ActionVariableMeta(Token = "multiplier_time", Group = "Multiplier", ValueType = "true/false",
+        Description = "Whether the multiplier applies to time")]
+    MultiplierTime,
+
+    [ActionVariableMeta(Token = "points", Group = "Points & Money", ValueType = "number",
+        Description = "Current subathon points")]
+    Points,
+
+    [ActionVariableMeta(Token = "money", Group = "Points & Money", ValueType = "number",
+        Description = "Money raised this subathon, to 2 decimals")]
+    Money,
+
+    [ActionVariableMeta(Token = "currency", Group = "Points & Money", ValueType = "text",
+        Description = "The subathon's currency code, e.g. USD")]
+    Currency,
+
+    // should always match subathon currency, but included just in case / to open up config reading
+    [ActionVariableMeta(Token = "default_currency", Group = "Points & Money", ValueType = "text",
+        Description = "The primary currency from settings")]
+    DefaultCurrency,
+
+    [ActionVariableMeta(Token = "goal_text", Group = "Goals", ValueType = "text",
+        Description = "The goal currently being worked towards, empty once all are done")]
+    GoalText,
+
+    [ActionVariableMeta(Token = "goal_points", Group = "Goals", ValueType = "number",
+        Description = "Points (or money) needed for the current goal")]
+    GoalPoints,
+
+    [ActionVariableMeta(Token = "goal_index", Group = "Goals", ValueType = "number",
+        Description = "Position of the current goal in the list, starting at 1; 0 when all are done")]
+    GoalIndex,
+
+    [ActionVariableMeta(Token = "goal_count", Group = "Goals", ValueType = "number",
+        Description = "How many goals the active list has")]
+    GoalCount,
+
+    // should match points or money, but whatever is relevant for goals list
+    [ActionVariableMeta(Token = "goal_progress", Group = "Goals", ValueType = "number",
+        Description = "Points (or whole money) counted towards goals")]
+    GoalProgress,
+
+    [ActionVariableMeta(Token = "last_goal_text", Group = "Goals", ValueType = "text",
+        Description = "The most recently completed goal, empty if none yet")]
+    LastGoalText,
+
+    [ActionVariableMeta(Token = "last_goal_points", Group = "Goals", ValueType = "number",
+        Description = "Points (or money) of the most recently completed goal")]
+    LastGoalPoints,
+
+    [ActionVariableMeta(Token = "goal_list_name", Group = "Goals", ValueType = "text",
+        Description = "Name of the active goal list")]
+    GoalListName,
+
+    [ActionVariableMeta(Token = "goal_type", Group = "Goals", ValueType = "text",
+        Description = "What the active goal list counts: Points or Money")]
+    GoalType,
+
+    [ActionVariableMeta(Token = "user", Group = "Action", ValueType = "text",
+        Description = "Who started the action run, e.g. WheelSpin, a chat user, SYSTEM or CustomAction")]
+    User,
+
+    [ActionVariableMeta(Token = "source", Group = "Action", ValueType = "text",
+        Description = "What source started the run, e.g. WheelSpin")]
+    Source,
+
+    [ActionVariableMeta(Token = "label", Group = "Action", ValueType = "text",
+        Description = "Name of what started the run, e.g. the wheel item's text")]
+    Label,
+
+    [ActionVariableMeta(Token = "now", Group = "Action", ValueType = "text",
+        Description = "Local date and time the step ran, e.g. 2026-10-02 18:30:00")]
+    Now
+}
+
+[ExcludeFromCodeCoverage]
+public static partial class ActionStepTypeHelper {
+    private static ActionStepMetaAttribute? Meta(ActionStepType type) {
+        return EnumMetaCache.Get<ActionStepMetaAttribute>(type);
+    }
+
+    public static string GetLabel(this ActionStepType type) {
+        return Meta(type)?.Label ?? $"{type}";
+    }
+
+    public static string GetGroup(this ActionStepType type) {
+        return Meta(type)?.Group ?? "";
+    }
+
+    public static IReadOnlyList<ActionOperation> GetOps(this ActionStepType type) {
+        return Meta(type)?.Operations ?? [];
+    }
+
+    public static ActionOperation DefaultOp(this ActionStepType type) {
+        IReadOnlyList<ActionOperation> ops = type.GetOps();
+        return ops.Count > 0 ? ops[0] : ActionOperation.None;
+    }
+
+    public static string? GetTargetLabel(this ActionStepType type) {
+        return Meta(type)?.TargetLabel;
+    }
+
+    public static string? GetScopeLabel(this ActionStepType type) {
+        return Meta(type)?.ScopeLabel;
+    }
+
+    public static string? GetValueLabel(this ActionStepType type) {
+        return Meta(type)?.ValueLabel;
+    }
+
+    public static string? GetDurationLabel(this ActionStepType type) {
+        return Meta(type)?.DurationLabel;
+    }
+
+    public static string? GetBodyLabel(this ActionStepType type) {
+        return Meta(type)?.BodyLabel;
+    }
+
+    public static bool HasTarget(this ActionStepType type) {
+        return type.GetTargetLabel() != null;
+    }
+
+    public static bool HasScope(this ActionStepType type) {
+        return type.GetScopeLabel() != null;
+    }
+
+    public static bool HasDuration(this ActionStepType type) {
+        return type.GetDurationLabel() != null;
+    }
+
+    public static bool HasBody(this ActionStepType type) {
+        return type.GetBodyLabel() != null;
+    }
+
+    public static bool HasValue(this ActionStepType type, ActionOperation operation) {
+        ActionStepMetaAttribute? meta = Meta(type);
+        if (meta?.ValueLabel == null) return false;
+        return meta.ValueOperations.Length == 0 || meta.ValueOperations.Contains(operation);
+    }
+
+    public static bool AllowsVariables(this ActionStepType type) {
+        return Meta(type)?.AllowsVariables ?? false;
+    }
+
+    public static string GetOpLabel(this ActionOperation operation) {
+        return operation switch {
+            ActionOperation.None => "Do Nothing",
+            ActionOperation.PointsAndTime => "Points & Time",
+            ActionOperation.Play => "Play / Resume",
+            _ => $"{operation}"
+        };
+    }
+
+    public static bool IsAvailable(this ActionStepType type) {
+        return type switch {
+            ActionStepType.VtsExpression or ActionStepType.VtsParameter or ActionStepType.VtsHotkey
+                => FeatureFlags.VTubeStudioEnabled,
+            _ => true
+        };
+    }
+
+    ////////////////// variable work
+
+    private static readonly Dictionary<string, ActionVariable> ByToken = Enum.GetValues<ActionVariable>()
+        .ToDictionary(v => v.GetToken(), v => v, StringComparer.OrdinalIgnoreCase);
+
+    public static string GetToken(this ActionVariable variable) {
+        return EnumMetaCache.Get<ActionVariableMetaAttribute>(variable)?.Token ?? $"{variable}".ToLowerInvariant();
+    }
+
+    public static string GetGroup(this ActionVariable variable) {
+        return EnumMetaCache.Get<ActionVariableMetaAttribute>(variable)?.Group ?? "";
+    }
+
+    public static string GetValueType(this ActionVariable variable) {
+        return EnumMetaCache.Get<ActionVariableMetaAttribute>(variable)?.ValueType ?? "text";
+    }
+
+    public static string GetDescription(this ActionVariable variable) {
+        return EnumMetaCache.Get<ActionVariableMetaAttribute>(variable)?.Description ?? "";
+    }
+
+    public static string GetPlaceholder(this ActionVariable variable) {
+        return $"%{variable.GetToken()}%";
+    }
+
+    public static bool TryParseToken(string token, out ActionVariable variable) {
+        return ByToken.TryGetValue(token, out variable);
+    }
+
+    public static IEnumerable<ActionVariable> FindVariables(string? text) {
+        if (string.IsNullOrEmpty(text)) yield break;
+        foreach (Match match in TokenRegex().Matches(text))
+            if (TryParseToken(match.Groups[1].Value, out ActionVariable variable))
+                yield return variable;
+    }
+
+    public static string ReplaceVariables(string? text, IReadOnlyDictionary<ActionVariable, string> values) {
+        if (string.IsNullOrEmpty(text)) return text ?? "";
+        return TokenRegex().Replace(text, m =>
+            TryParseToken(m.Groups[1].Value, out ActionVariable variable) && values.TryGetValue(variable, out string? value)
+                ? value
+                : m.Value);
+    }
+
+    [GeneratedRegex("%([A-Za-z0-9_]+)%")]
+    private static partial Regex TokenRegex();
+}
diff --git a/SubathonManager.Core/Enums/EnumExtensions.cs b/SubathonManager.Core/Enums/EnumExtensions.cs
index 6624d78..888bcc8 100644
--- a/SubathonManager.Core/Enums/EnumExtensions.cs
+++ b/SubathonManager.Core/Enums/EnumExtensions.cs
@@ -116,7 +116,35 @@ public class CommandMetaAttribute : EnumMetaAttribute {
 public class WheelSpinActionMetaAttribute : EnumMetaAttribute {
     public bool IsCommand { get; init; } = false;
     public bool HasAction { get; init; } = true;
-    public bool IsDoneImmediately { get; init; } = false;
+    public bool AutoRun { get; init; } = false;
+
+    public string QuickLabel { get; init; } = "M";
+}
+
+[ExcludeFromCodeCoverage]
+public class ActionStepMetaAttribute : EnumMetaAttribute {
+    public string Group { get; init; } = "";
+    public ActionOperation[] Operations { get; init; } = [];
+
+    // editor labels
+    public string? TargetLabel { get; init; }
+    public string? ScopeLabel { get; init; }
+    public string? ValueLabel { get; init; }
+    public string? DurationLabel { get; init; }
+    public string? BodyLabel { get; init; }
+
+    // operations which have parameter vals
+    public ActionOperation[] ValueOperations { get; init; } = [];
+
+    // %variables% in config will be accepted
+    public bool AllowsVariables { get; init; }
+}
+
+[ExcludeFromCodeCoverage]
+public class ActionVariableMetaAttribute : EnumMetaAttribute {
+    public string Token { get; init; } = "";
+    public string Group { get; init; } = "";
+    public string ValueType { get; init; } = "text";
 }
 
 public static class EnumMetaCache {
diff --git a/SubathonManager.Core/Enums/SubathonCommandType.cs b/SubathonManager.Core/Enums/SubathonCommandType.cs
index 3748e3c..f784c8b 100644
--- a/SubathonManager.Core/Enums/SubathonCommandType.cs
+++ b/SubathonManager.Core/Enums/SubathonCommandType.cs
@@ -60,7 +60,11 @@ public enum SubathonCommandType {
     SubtractSpins,
 
     [CommandMeta(Description = "Spin the Wheel", IsControlType = true)]
-    SpinWheel
+    SpinWheel,
+
+    // param is full action
+    [CommandMeta(Description = "Run Custom Action", RequiresParameter = true, IsControlType = true)]
+    RunAction
 }
 
 [ExcludeFromCodeCoverage]
diff --git a/SubathonManager.Core/Enums/WheelSpinEnums.cs b/SubathonManager.Core/Enums/WheelSpinEnums.cs
index 2ceb7f5..70b3c50 100644
--- a/SubathonManager.Core/Enums/WheelSpinEnums.cs
+++ b/SubathonManager.Core/Enums/WheelSpinEnums.cs
@@ -1,29 +1,40 @@
 using System.Diagnostics.CodeAnalysis;
+using SubathonManager.Core.Objects;
 
 namespace SubathonManager.Core.Enums;
 
 public enum WheelSpinActionType {
-    [WheelSpinActionMeta(HasAction = false, Label = "Manual / Other")]
+    [WheelSpinActionMeta(HasAction = false, Label = "Manual / Other", QuickLabel = "M")]
     Manual = 0,
 
-    [WheelSpinActionMeta(IsCommand = true, IsDoneImmediately = true, Label = "Add Time")]
+    [WheelSpinActionMeta(IsCommand = true, AutoRun = true, Label = "Add Time", QuickLabel = "+Time")]
     AddTime = SubathonCommandType.AddTime,
 
-    [WheelSpinActionMeta(IsCommand = true, IsDoneImmediately = true, Label = "Subtract Time")]
+    [WheelSpinActionMeta(IsCommand = true, AutoRun = true, Label = "Subtract Time", QuickLabel = "-Time")]
     SubtractTime = SubathonCommandType.SubtractTime,
 
-    [WheelSpinActionMeta(IsCommand = true, Label = "Multiplier")]
+    [WheelSpinActionMeta(IsCommand = true, Label = "Multiplier",  QuickLabel = "Mult")]
     SetMultiplier = SubathonCommandType.SetMultiplier,
 
-    [WheelSpinActionMeta(IsDoneImmediately = true, Label = "Add Rerolls")]
+    [WheelSpinActionMeta(AutoRun = true, Label = "Add Rerolls",  QuickLabel = "Reroll")]
     Reroll = 1000,
 
-    [WheelSpinActionMeta(Label = "VTube Studio")]
-    VTubeStudio = 1001
+    [WheelSpinActionMeta(AutoRun = true, Label = "VTube Studio", QuickLabel = "VTS")]
+    VTubeStudio = 1001,
+
+    [WheelSpinActionMeta(AutoRun = true, Label = "OBS",  QuickLabel = "OBS")]
+    OBS = 1002,
+
+    [WheelSpinActionMeta(AutoRun = true, Label = "Custom Action", QuickLabel = "Custom")]
+    CustomAction = 1003
 }
 
 [ExcludeFromCodeCoverage]
 public static class WheelSpinActionTypeHelper {
+
+    public static string GetQuickLabel(this WheelSpinActionType type) {
+        return EnumMetaCache.Get<WheelSpinActionMetaAttribute>(type)?.QuickLabel ?? $"{type}";
+    }
     public static string GetLabel(this WheelSpinActionType type) {
         return EnumMetaCache.Get<WheelSpinActionMetaAttribute>(type)?.Label ?? $"{type}";
     }
@@ -36,8 +47,8 @@ public static bool IsCommand(this WheelSpinActionType type) {
         return EnumMetaCache.Get<WheelSpinActionMetaAttribute>(type)?.IsCommand ?? false;
     }
 
-    public static bool IsDoneImmediately(this WheelSpinActionType type) {
-        return EnumMetaCache.Get<WheelSpinActionMetaAttribute>(type)?.IsDoneImmediately ?? false;
+    public static bool IsAutoRun(this WheelSpinActionType type) {
+        return EnumMetaCache.Get<WheelSpinActionMetaAttribute>(type)?.AutoRun ?? false;
     }
 
     public static bool IsAvailable(this WheelSpinActionType type) {
@@ -47,7 +58,7 @@ public static bool IsAvailable(this WheelSpinActionType type) {
     }
 
     public static bool HasPlayAction(this WheelSpinActionType type) {
-        return type.IsAvailable() && (type.IsCommand() || type == WheelSpinActionType.VTubeStudio);
+        return type.IsAvailable() && type.HasAction() && type != WheelSpinActionType.Reroll;
     }
 
     public static SubathonCommandType ToCommandType(this WheelSpinActionType type) {
@@ -55,10 +66,64 @@ public static SubathonCommandType ToCommandType(this WheelSpinActionType type) {
             return SubathonCommandType.Unknown;
         return (SubathonCommandType)(int)type;
     }
+
+    public static ActionGraph? BuildActionGraph(this WheelSpinActionType type, string? parameter) {
+        parameter = (parameter ?? "").Trim();
+        switch (type) {
+            case WheelSpinActionType.AddTime:
+            case WheelSpinActionType.SubtractTime: {
+                TimeSpan duration = Utils.ParseDurationString(parameter);
+                if (duration <= TimeSpan.Zero) return null;
+                return ActionGraph.Sequence(new ActionStep {
+                    Type = type == WheelSpinActionType.AddTime ? ActionStepType.AddTime : ActionStepType.SubtractTime,
+                    Seconds = duration.TotalSeconds
+                });
+            }
+            case WheelSpinActionType.SetMultiplier: {
+                string[] parts = parameter.Split('|');
+                if (parts.Length < 4 || !Utils.TryParseAmount(parts[0], out double amount)) return null;
+                TimeSpan duration = Utils.ParseDurationString(parts[1]);
+                bool.TryParse(parts[2], out bool points);
+                bool.TryParse(parts[3], out bool time);
+                return ActionGraph.Sequence(new ActionStep {
+                    Type = ActionStepType.SetMultiplier,
+                    Operation = points == time ? ActionOperation.PointsAndTime : points ? ActionOperation.Points : ActionOperation.Time,
+                    Value = amount,
+                    Seconds = duration > TimeSpan.Zero ? duration.TotalSeconds : null
+                });
+            }
+            case WheelSpinActionType.Reroll:
+                if (!int.TryParse(parameter, out int count) || count < 1) return null;
+                return ActionGraph.Sequence(new ActionStep { Type = ActionStepType.Reroll, Value = count });
+            case WheelSpinActionType.VTubeStudio:
+                return VTSWheelAction.TryParse(parameter, out VTSWheelAction? vts) ? vts.ToActionGraph() : null;
+            case WheelSpinActionType.OBS:
+                return ActionGraph.TryParse(parameter, out ActionGraph? graph) && graph.Nodes.Count > 0 ? graph : null;
+            default:
+                return null;
+        }
+    }
+
+    public static string RepeatKey(this WheelSpinActionType type, string? parameter, Guid itemId) {
+        switch (type) {
+            case WheelSpinActionType.VTubeStudio when VTSWheelAction.TryParse(parameter, out VTSWheelAction? vts):
+                return vts.TimerKey;
+            case WheelSpinActionType.OBS when ActionGraph.TryParse(parameter, out ActionGraph? graph)
+                                              && graph.Nodes.Count > 0: {
+                ActionStep first = graph.Nodes[0].Step;
+                return $"obs-{first.Type}-{first.Scope}-{first.Target}".ToLowerInvariant();
+            }
+            case WheelSpinActionType.CustomAction:
+                return $"custom-action-{parameter}".ToLowerInvariant();
+            default:
+                return $"wheel-item-{itemId}";
+        }
+    }
 }
 
 public enum WheelSpinHistoryStatus {
     Pending,
     Done,
-    Cancelled
+    Cancelled,
+    Running
 }
\ No newline at end of file
diff --git a/SubathonManager.Core/Events/ActionEvents.cs b/SubathonManager.Core/Events/ActionEvents.cs
new file mode 100644
index 0000000..6755ad1
--- /dev/null
+++ b/SubathonManager.Core/Events/ActionEvents.cs
@@ -0,0 +1,13 @@
+using System.Diagnostics.CodeAnalysis;
+using SubathonManager.Core.Models;
+
+namespace SubathonManager.Core.Events;
+
+[ExcludeFromCodeCoverage]
+public static class ActionEvents {
+    public static event Action<SubathonEvent>? CustomActionRunRequested;
+
+    public static void RaiseCustomActionRunRequested(SubathonEvent ev) {
+        CustomActionRunRequested?.Invoke(ev);
+    }
+}
diff --git a/SubathonManager.Core/Interfaces/IActionStepRunner.cs b/SubathonManager.Core/Interfaces/IActionStepRunner.cs
new file mode 100644
index 0000000..075766e
--- /dev/null
+++ b/SubathonManager.Core/Interfaces/IActionStepRunner.cs
@@ -0,0 +1,10 @@
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+
+namespace SubathonManager.Core.Interfaces;
+
+public interface IActionStepRunner {
+    IReadOnlyCollection<ActionStepType> StepTypes { get; }
+
+    Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress, CancellationToken ct);
+}
diff --git a/SubathonManager.Core/Models/Wheels.cs b/SubathonManager.Core/Models/Wheels.cs
index 2b50e3e..e43d352 100644
--- a/SubathonManager.Core/Models/Wheels.cs
+++ b/SubathonManager.Core/Models/Wheels.cs
@@ -73,4 +73,7 @@ public class WheelSpinHistory {
     public DateTime UpdatedAt { get; set; } = DateTime.Now;
 
     public WheelSpinHistoryStatus Status { get; set; } = WheelSpinHistoryStatus.Pending;
+
+    // ActionRunProgress json - which steps ran, so resume picks it up
+    public string? ActionProgress { get; set; }
 }
\ No newline at end of file
diff --git a/SubathonManager.Core/Objects/ActionGraph.cs b/SubathonManager.Core/Objects/ActionGraph.cs
new file mode 100644
index 0000000..9fc8859
--- /dev/null
+++ b/SubathonManager.Core/Objects/ActionGraph.cs
@@ -0,0 +1,335 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using SubathonManager.Core.Enums;
+
+namespace SubathonManager.Core.Objects;
+
+public sealed class ActionStep {
+    public ActionStepType Type { get; set; } = ActionStepType.Wait;
+    public ActionOperation Operation { get; set; } = ActionOperation.None;
+
+    public string Target { get; set; } = "";
+    public string? TargetName { get; set; }
+    public string? Scope { get; set; }
+    public double? Value { get; set; }
+    public double? Seconds { get; set; }
+    public string? Body { get; set; }
+
+    [JsonIgnore]
+    public TimeSpan Duration => Seconds is > 0.0 ? TimeSpan.FromSeconds(Seconds.Value) : TimeSpan.Zero;
+
+    public bool IsValid(out string error) {
+        error = "";
+        IReadOnlyList<ActionOperation> ops = Type.GetOps();
+        if (ops.Count > 0 && !ops.Contains(Operation)) {
+            error = $"{Type.GetLabel()} cannot use '{Operation}'";
+            return false;
+        }
+
+        switch (Type) {
+            case ActionStepType.Wait:
+            case ActionStepType.AddTime:
+            case ActionStepType.SubtractTime:
+                if (Duration > TimeSpan.Zero) return true;
+                error = $"{Type.GetLabel()} needs a duration";
+                return false;
+            case ActionStepType.SetMultiplier:
+                if (Value is > 0.0) return true;
+                error = "Multiplier needs an amount above 0";
+                return false;
+            case ActionStepType.Reroll:
+                if (Value is >= 1.0) return true;
+                error = "Rerolls need a count of at least 1";
+                return false;
+            case ActionStepType.VtsParameter when Type.HasValue(Operation) && Value == null:
+                error = "Pick a value to set the parameter to";
+                return false;
+            case ActionStepType.HttpGet or ActionStepType.HttpPost when !LooksLikeUrl(Target):
+                error = "The URL needs to start with http:// or https://";
+                return false;
+        }
+
+        if (Type.HasScope() && string.IsNullOrWhiteSpace(Scope)) {
+            error = $"Pick the {Type.GetScopeLabel()!.TrimEnd(':').ToLowerInvariant()} first";
+            return false;
+        }
+
+        if (Type.HasTarget() && string.IsNullOrWhiteSpace(Target)) {
+            error = $"{Type.GetGroup()} {Type.GetLabel()} needs a {Type.GetTargetLabel()!.TrimEnd(':').ToLowerInvariant()}";
+            return false;
+        }
+
+        return true;
+    }
+
+    private static bool LooksLikeUrl(string url) {
+        url = url.Trim();
+        return url.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+               || url.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
+               || url.StartsWith('%');
+    }
+
+    public string Describe() {
+        string target = string.IsNullOrWhiteSpace(TargetName) ? Target : TargetName;
+        string value = Value?.ToString(CultureInfo.InvariantCulture) ?? "?";
+        string duration = Utils.FormatShortDuration(Duration);
+        string applies = Operation switch {
+            ActionOperation.Points => "points",
+            ActionOperation.Time => "time",
+            _ => "points & time"
+        };
+
+        // messy for all but cant think of how else to maintain rn
+        return Type switch {
+            ActionStepType.Wait => $"Wait {duration}",
+            ActionStepType.AddTime => $"Add {duration}",
+            ActionStepType.SubtractTime => $"Subtract {duration}",
+            ActionStepType.SetMultiplier =>
+                $"x{value} {applies} {(Duration > TimeSpan.Zero ? $"for {duration}" : "until stopped")}",
+            ActionStepType.Reroll => $"+{value} reroll{(Value is 1.0 ? "" : "s")}",
+            ActionStepType.VtsExpression => $"{target} {Operation}",
+            ActionStepType.VtsParameter => Operation switch {
+                ActionOperation.Hold => $"{target} = {value} (held)",
+                ActionOperation.Set => $"{target} = {value}",
+                ActionOperation.Restore => $"Restore {target}",
+                _ => $"Release {target}"
+            },
+            ActionStepType.VtsHotkey => $"Hotkey \"{target}\"",
+            ActionStepType.MixItUpCommand => $"MixItUp \"{target}\"",
+            ActionStepType.ObsSourceVisibility => $"{Operation} \"{target}\" in \"{Scope}\"",
+            ActionStepType.ObsFilter => $"{Operation} filter \"{target}\" on \"{Scope}\"",
+            ActionStepType.ObsAudio or ActionStepType.ObsMedia => $"{Operation} \"{target}\"",
+            ActionStepType.StreamerBotAction => $"Streamer.bot \"{target}\"",
+            ActionStepType.HttpGet => $"GET {ShortUrl(Target)}",
+            ActionStepType.HttpPost => $"POST {ShortUrl(Target)}",
+            _ => Type.GetLabel()
+        };
+    }
+
+    public IEnumerable<(string Name, string Value)> BodyArguments() {
+        return ParseArguments(Body);
+    }
+
+    public static IEnumerable<(string Name, string Value)> ParseArguments(string? body) {
+        if (string.IsNullOrWhiteSpace(body)) yield break;
+        foreach (string raw in body.Split('\n')) {
+            string line = raw.Trim();
+            int split = line.IndexOf('=');
+            if (split <= 0) continue;
+            yield return (line[..split].Trim(), line[(split + 1)..].Trim());
+        }
+    }
+
+    private static string ShortUrl(string url) {
+        // save space on node cards via trimming urls
+        string trimmed = url.Trim();
+        int scheme = trimmed.IndexOf("://", StringComparison.Ordinal);
+        if (scheme >= 0) trimmed = trimmed[(scheme + 3)..];
+        return trimmed.Length > 48 ? $"{trimmed[..45]}..." : trimmed;
+    }
+}
+
+public sealed class ActionNode {
+    public string Id { get; set; } = "";
+    public ActionStep Step { get; set; } = new();
+    public double X { get; set; }
+    public double Y { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    public bool Disabled { get; set; }
+}
+
+public sealed class ActionEdge {
+    public string From { get; set; } = "";
+    public string To { get; set; } = "";
+}
+
+public sealed class ActionGraph {
+    public static readonly JsonSerializerOptions JsonOptions = new() {
+        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Converters = { new JsonStringEnumConverter() }
+    };
+
+    public ActionRepeatMode OnRepeat { get; set; } = ActionRepeatMode.Restart;
+    public List<ActionNode> Nodes { get; set; } = [];
+    public List<ActionEdge> Edges { get; set; } = [];
+
+    public static ActionGraph Sequence(params ActionStep[] steps) {
+        var graph = new ActionGraph();
+        for (var i = 0; i < steps.Length; i++) {
+            var id = $"{i + 1}";
+            graph.Nodes.Add(new ActionNode { Id = id, Step = steps[i], X = i * 220 });
+            if (i > 0) graph.Edges.Add(new ActionEdge { From = $"{i}", To = id });
+        }
+
+        return graph;
+    }
+
+    public IEnumerable<string> Incoming(string nodeId) {
+        return Edges.Where(e => e.To == nodeId).Select(e => e.From);
+    }
+
+    public IEnumerable<string> Outgoing(string nodeId) {
+        return Edges.Where(e => e.From == nodeId).Select(e => e.To);
+    }
+
+    public bool WouldLoop(string from, string to) {
+        if (from == to) return true;
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        var stack = new Stack<string>([to]);
+        while (stack.TryPop(out string? id)) {
+            if (id == from) return true;
+            if (!seen.Add(id)) continue;
+            foreach (string next in Outgoing(id)) stack.Push(next);
+        }
+
+        return false;
+    }
+
+    public bool IsValid(out string error) {
+        error = "";
+        var ids = new HashSet<string>(StringComparer.Ordinal);
+        foreach (ActionNode node in Nodes) {
+            if (string.IsNullOrWhiteSpace(node.Id) || !ids.Add(node.Id)) {
+                error = $"Duplicate or empty node id '{node.Id}'";
+                return false;
+            }
+
+            if (!node.Disabled && !node.Step.IsValid(out string stepError)) {
+                error = stepError;
+                return false;
+            }
+        }
+
+        foreach (ActionEdge edge in Edges) {
+            if (ids.Contains(edge.From) && ids.Contains(edge.To) && edge.From != edge.To) continue;
+            error = $"Connection {edge.From} -> {edge.To} is not between two different steps";
+            return false;
+        }
+
+        Dictionary<string, int> inDegree = ids.ToDictionary(id => id, id => Incoming(id).Count());
+        var queue = new Queue<string>(inDegree.Where(kv => kv.Value == 0).Select(kv => kv.Key));
+        var visited = 0;
+        while (queue.TryDequeue(out string? id)) {
+            visited++;
+            foreach (string next in Outgoing(id))
+                if (--inDegree[next] == 0)
+                    queue.Enqueue(next);
+        }
+
+        if (visited == ids.Count) return true;
+        error = "Steps are connected in a loop";
+        return false;
+    }
+
+    public string Describe() {
+        if (Nodes.Count == 0) return "No steps";
+        bool linear = Nodes.All(n => Incoming(n.Id).Count() <= 1 && Outgoing(n.Id).Count() <= 1)
+                      && Nodes.Count(n => !Incoming(n.Id).Any()) == 1;
+        if (!linear) return $"{Nodes.Count} steps";
+
+        var ordered = new List<ActionNode>();
+        ActionNode? current = Nodes.First(n => !Incoming(n.Id).Any());
+        while (current != null && ordered.Count < Nodes.Count) {
+            ordered.Add(current);
+            string? nextId = Outgoing(current.Id).FirstOrDefault();
+            current = nextId == null ? null : Nodes.FirstOrDefault(n => n.Id == nextId);
+        }
+
+        return string.Join(" -> ", ordered.Select(n => n.Disabled ? $"({n.Step.Describe()}, off)" : n.Step.Describe()));
+    }
+
+    public string ToJson() {
+        return JsonSerializer.Serialize(this, JsonOptions);
+    }
+
+    public static bool TryParse(string? json, [NotNullWhen(true)] out ActionGraph? graph) {
+        graph = null;
+        if (string.IsNullOrWhiteSpace(json)) return false;
+        try {
+            graph = JsonSerializer.Deserialize<ActionGraph>(json, JsonOptions);
+            return graph != null;
+        }
+        catch (JsonException) {
+            return false;
+        }
+    }
+}
+
+
+public sealed class CustomAction {
+    public const int CurrentFormatVersion = 1;
+    public const string FileExtension = ".sma";
+
+    private static readonly JsonSerializerOptions FileOptions = new(ActionGraph.JsonOptions) { WriteIndented = true };
+
+    public int FormatVersion { get; set; } = CurrentFormatVersion;
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string Name { get; set; } = "New Action";
+    public string? Author { get; set; }
+    public string? Description { get; set; }
+    public string Version { get; set; } = "1.0.0";
+    public ActionGraph Graph { get; set; } = new();
+
+    public string ToJson() {
+        return JsonSerializer.Serialize(this, FileOptions);
+    }
+
+    public CustomAction Clone() {
+        return TryParse(ToJson(), out CustomAction? copy) ? copy : new CustomAction();
+    }
+
+    public static bool TryParse(string? json, [NotNullWhen(true)] out CustomAction? action) {
+        action = null;
+        if (string.IsNullOrWhiteSpace(json)) return false;
+        try {
+            action = JsonSerializer.Deserialize<CustomAction>(json, FileOptions);
+            return action != null && action.Id != Guid.Empty;
+        }
+        catch (JsonException) {
+            return false;
+        }
+    }
+}
+
+public sealed record ActionContext(SubathonEventSource Source, string User, string RepeatKey, string? Label = null);
+
+public sealed class ActionRunProgress {
+    private readonly Lock _lock = new();
+    public HashSet<string> Done { get; set; } = [];
+    public Dictionary<string, double> Values { get; set; } = [];
+
+    public bool IsDone(string nodeId) {
+        lock (_lock) return Done.Contains(nodeId);
+    }
+
+    public void MarkDone(string nodeId) {
+        lock (_lock) Done.Add(nodeId);
+    }
+
+    public bool TryGetValue(string key, out double value) {
+        lock (_lock) return Values.TryGetValue(key, out value);
+    }
+
+    public void Remember(string key, double value) {
+        lock (_lock) Values.TryAdd(key, value);
+    }
+
+    public string ToJson() {
+        lock (_lock) return JsonSerializer.Serialize(this, ActionGraph.JsonOptions);
+    }
+
+    public static ActionRunProgress Parse(string? json) {
+        if (string.IsNullOrWhiteSpace(json)) return new ActionRunProgress();
+        try {
+            return JsonSerializer.Deserialize<ActionRunProgress>(json, ActionGraph.JsonOptions)
+                   ?? new ActionRunProgress();
+        }
+        catch (JsonException) {
+            return new ActionRunProgress();
+        }
+    }
+}
diff --git a/SubathonManager.Core/Objects/VTSWheelAction.cs b/SubathonManager.Core/Objects/VTSWheelAction.cs
index 57449b1..a9c6aa0 100644
--- a/SubathonManager.Core/Objects/VTSWheelAction.cs
+++ b/SubathonManager.Core/Objects/VTSWheelAction.cs
@@ -163,13 +163,59 @@ public string Describe() {
             _ => AfterHotkey.ToString()
         };
 
-        return $"{Target} {initial} for {FormatDuration(Duration)} then {after}";
+        return $"{Target} {initial} for {Utils.FormatShortDuration(Duration)} then {after}";
     }
 
-    private static string FormatDuration(TimeSpan duration) {
-        if (duration.TotalHours >= 1) return $"{(int)duration.TotalHours}h{duration.Minutes:00}m";
-        if (duration.TotalMinutes >= 1) return $"{(int)duration.TotalMinutes}m{duration.Seconds:00}s";
-        return $"{(int)duration.TotalSeconds}s";
+    // migration path
+    public ActionGraph ToActionGraph() {
+        ActionStepType type = Kind switch {
+            VtsTargetKind.Parameter => ActionStepType.VtsParameter,
+            VtsTargetKind.Hotkey => ActionStepType.VtsHotkey,
+            _ => ActionStepType.VtsExpression
+        };
+
+        var initial = new ActionStep {
+            Type = type,
+            Target = Target.Trim(),
+            Operation = Kind switch {
+                VtsTargetKind.Expression => ToToggleOp(ToggleAction),
+                VtsTargetKind.Parameter => ActionOperation.Hold,
+                _ => ActionOperation.Trigger
+            },
+            Value = Kind == VtsTargetKind.Parameter ? Value : null
+        };
+
+        // held parameter with no duration stays held until something else releases it
+        if (!HasRevert) return ActionGraph.Sequence(initial);
+
+        var after = new ActionStep { Type = type, Target = initial.Target };
+        switch (Kind) {
+            case VtsTargetKind.Expression:
+                after.Operation = ToToggleOp(AfterToggle);
+                break;
+            case VtsTargetKind.Parameter:
+                after.Operation = AfterParameter switch {
+                    VtsParameterAfterAction.ResetToOriginal => ActionOperation.Restore,
+                    VtsParameterAfterAction.SetNewValue => ActionOperation.Set,
+                    _ => ActionOperation.Release
+                };
+                after.Value = AfterParameter == VtsParameterAfterAction.SetNewValue ? AfterValue : null;
+                break;
+            default:
+                after.Operation = ActionOperation.Trigger;
+                break;
+        }
+
+        var wait = new ActionStep { Type = ActionStepType.Wait, Seconds = Duration.TotalSeconds };
+        return ActionGraph.Sequence(initial, wait, after);
+
+        static ActionOperation ToToggleOp(VtsToggleAction action) {
+            return action switch {
+                VtsToggleAction.Off => ActionOperation.Off,
+                VtsToggleAction.Toggle => ActionOperation.Toggle,
+                _ => ActionOperation.On
+            };
+        }
     }
 
     private static bool TryParseNumber(string text, out double value) {
diff --git a/SubathonManager.Core/ScheduleCsv.cs b/SubathonManager.Core/ScheduleCsv.cs
index f7dd546..56c6f10 100644
--- a/SubathonManager.Core/ScheduleCsv.cs
+++ b/SubathonManager.Core/ScheduleCsv.cs
@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Text;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Models;
 
@@ -19,31 +18,28 @@ public static class ScheduleCsv {
     ];
 
     public static string Write(IEnumerable<ScheduleItem> items) {
-        var sb = new StringBuilder();
-        sb.AppendLine(string.Join(',', Columns));
-        foreach (ScheduleItem item in items)
-            sb.AppendLine(string.Join(',',
-                item.Date.ToString(DateFormat, CultureInfo.InvariantCulture),
-                item.Kind.ToString(),
-                item.StartMinute is { } s ? ScheduleItem.FormatMinute(s) : "",
-                item.EndMinute is { } e ? ScheduleItem.FormatMinute(e) : "",
-                Utils.EscapeCsv(item.Title),
-                Utils.EscapeCsv(item.Description),
-                item.IsDone ? "true" : "false"));
-        return sb.ToString();
+        return CsvUtils.Write([Columns], items, item => [
+            item.Date.ToString(DateFormat, CultureInfo.InvariantCulture),
+            item.Kind,
+            item.StartMinute is { } s ? ScheduleItem.FormatMinute(s) : "",
+            item.EndMinute is { } e ? ScheduleItem.FormatMinute(e) : "",
+            item.Title,
+            item.Description,
+            item.IsDone ? "true" : "false"
+        ]);
     }
 
     public static ParseResult Parse(string csv) {
         var items = new List<ScheduleItem>();
         var errors = new List<string>();
 
-        List<(int line, List<string> fields)> records = ReadRecords(csv);
+        List<(int Line, string[] Fields)> records = CsvUtils.ReadRecords(csv);
         if (records.Count == 0) {
             errors.Add("File is empty.");
             return new ParseResult(items, errors);
         }
 
-        Dictionary<string, int> index = records[0].fields
+        Dictionary<string, int> index = records[0].Fields
             .Select((name, i) => (name: name.Trim(), i))
             .GroupBy(x => x.name, StringComparer.OrdinalIgnoreCase)
             .ToDictionary(g => g.Key, g => g.First().i, StringComparer.OrdinalIgnoreCase);
@@ -53,11 +49,11 @@ public static ParseResult Parse(string csv) {
                 errors.Add($"Missing required column \"{required}\".");
         if (errors.Count > 0) return new ParseResult(items, errors);
 
-        string Field(List<string> fields, string column) {
-            return index.TryGetValue(column, out int i) && i < fields.Count ? fields[i] : "";
+        string Field(string[] fields, string column) {
+            return index.TryGetValue(column, out int i) && i < fields.Length ? fields[i] : "";
         }
 
-        foreach ((int line, List<string> fields) in records.Skip(1)) {
+        foreach ((int line, string[] fields) in records.Skip(1)) {
             if (fields.All(string.IsNullOrWhiteSpace)) continue;
 
             string dateRaw = Field(fields, nameof(ScheduleItem.Date)).Trim();
@@ -152,71 +148,6 @@ private static bool IsSameSlot(ScheduleItem a, ScheduleItem b) {
                a.StartMinute == b.StartMinute && a.EndMinute == b.EndMinute;
     }
 
-    private static List<(int line, List<string> fields)> ReadRecords(string csv) {
-        var records = new List<(int, List<string>)>();
-        var fields = new List<string>();
-        var field = new StringBuilder();
-        var inQuotes = false;
-        var line = 1;
-        var recordStart = 1;
-        var any = false;
-
-        if (csv.Length > 0 && csv[0] == (char)0xFEFF) csv = csv[1..];
-
-        for (var i = 0; i < csv.Length; i++) {
-            char c = csv[i];
-            if (inQuotes) {
-                if (c == '"' && i + 1 < csv.Length && csv[i + 1] == '"') {
-                    field.Append('"');
-                    i++;
-                }
-                else if (c == '"') {
-                    inQuotes = false;
-                }
-                else {
-                    if (c == '\n') line++;
-                    if (c != '\r') field.Append(c);
-                }
-
-                continue;
-            }
-
-            switch (c) {
-                case '"':
-                    inQuotes = true;
-                    any = true;
-                    break;
-                case ',':
-                    fields.Add(field.ToString());
-                    field.Clear();
-                    any = true;
-                    break;
-                case '\r':
-                    break;
-                case '\n':
-                    fields.Add(field.ToString());
-                    field.Clear();
-                    if (any || fields.Count > 1 || fields[0].Length > 0) records.Add((recordStart, fields));
-                    fields = [];
-                    any = false;
-                    line++;
-                    recordStart = line;
-                    break;
-                default:
-                    field.Append(c);
-                    any = true;
-                    break;
-            }
-        }
-
-        if (any || field.Length > 0) {
-            fields.Add(field.ToString());
-            records.Add((recordStart, fields));
-        }
-
-        return records;
-    }
-
     public sealed record ParseResult(List<ScheduleItem> Items, List<string> Errors);
 
     public sealed record ImportPlan(List<ScheduleItem> ToAdd, List<ScheduleItem> ToUpdate, int Unchanged);
diff --git a/SubathonManager.Core/Utils.cs b/SubathonManager.Core/Utils.cs
index 3973681..fb04e08 100644
--- a/SubathonManager.Core/Utils.cs
+++ b/SubathonManager.Core/Utils.cs
@@ -21,6 +21,7 @@ public static class Utils {
 
     public static string? PendingOverlayImportPath { get; set; }
     public static string? PendingWidgetPackImportPath { get; set; }
+    public static string? PendingActionImportPath { get; set; }
 
     public static IEnumerable<IntegrationConnection> GetAllConnections() {
         return ConnectionDetails.Values;
@@ -119,6 +120,13 @@ private static TimeSpan ParseLetterDurationString(string input) {
         return new TimeSpan(days, hours, minutes, seconds);
     }
 
+    public static string FormatShortDuration(TimeSpan duration) {
+        if (duration.TotalHours >= 1) return $"{(int)duration.TotalHours}h{duration.Minutes:00}m";
+        if (duration.TotalMinutes >= 1) return $"{(int)duration.TotalMinutes}m{duration.Seconds:00}s";
+        if (duration.TotalSeconds >= 1) return $"{(int)duration.TotalSeconds}s";
+        return $"{(int)duration.TotalMilliseconds}ms";
+    }
+
     public static Guid TryParseGuid(string? value) {
         if (value != null && Guid.TryParse(value, out Guid g)) return g;
         return CreateGuidFromUniqueString(value ?? Guid.NewGuid().ToString());
@@ -196,16 +204,6 @@ public static string TryParseCurrency(string amountString) {
         return currency;
     }
 
-    public static string EscapeCsv(string? value) {
-        if (string.IsNullOrWhiteSpace(value)) return "";
-        if (value.Contains(',') || value.Contains('"') || value.Contains('\n') || value.Contains('\r')) {
-            value = value.Replace("\"", "\"\"");
-            return $"\"{value}\"";
-        }
-
-        return value;
-    }
-
     public static string DescribeTokenPointRate(string? pointsPer100, string unitPlural, string? unitSingular = null) {
         if (!decimal.TryParse(pointsPer100, NumberStyles.Float, CultureInfo.InvariantCulture, out decimal points))
             return "";
diff --git a/SubathonManager.Data/ActionVariableResolver.cs b/SubathonManager.Data/ActionVariableResolver.cs
new file mode 100644
index 0000000..988ff58
--- /dev/null
+++ b/SubathonManager.Data/ActionVariableResolver.cs
@@ -0,0 +1,114 @@
+using System.Globalization;
+using Microsoft.EntityFrameworkCore;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+
+namespace SubathonManager.Data;
+
+public static class ActionVariableResolver {
+
+    public static async Task<string> FillAsync(IDbContextFactory<AppDbContext> factory, string? template,
+        ActionContext? ctx = null, IConfig? config = null) {
+        List<ActionVariable> used = ActionStepTypeHelper.FindVariables(template).Distinct().ToList();
+        if (used.Count == 0) return template ?? "";
+        Dictionary<ActionVariable, string> values = await ResolveAsync(factory, used, ctx, config);
+        return ActionStepTypeHelper.ReplaceVariables(template, values);
+    }
+
+    public static async Task<Dictionary<ActionVariable, string>> ResolveAsync(IDbContextFactory<AppDbContext> factory,
+        IEnumerable<ActionVariable> variables, ActionContext? ctx = null, IConfig? config = null) {
+        List<ActionVariable> wanted = variables.Distinct().ToList();
+        var values = new Dictionary<ActionVariable, string>();
+        if (wanted.Count == 0) return values;
+
+        SubathonData? subathon = null;
+        SubathonGoalSet? goals = null;
+        if (wanted.Any(v => v.GetGroup() != "Action")) {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            subathon = await db.SubathonDatas.Include(s => s.Multiplier).AsNoTracking()
+                .FirstOrDefaultAsync(s => s.IsActive);
+            if (wanted.Any(v => v.GetGroup() == "Goals"))
+                goals = await db.SubathonGoalSets.Include(g => g.Goals).AsNoTracking()
+                    .FirstOrDefaultAsync(g => g.IsActive);
+        }
+
+        // could get from subathondata, but sending both for verbosity
+        string defaultCurrency = (config?.Get("Currency", "Primary", "USD") ?? "USD").Trim();
+        GoalState goal = GoalState.From(goals, subathon);
+
+        foreach (ActionVariable variable in wanted)
+            values[variable] = variable switch {
+                ActionVariable.User => ctx?.User ?? "",
+                ActionVariable.Source => ctx != null ? $"{ctx.Source}" : "",
+                ActionVariable.Label => ctx?.Label ?? "",
+                ActionVariable.Now => DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),
+                ActionVariable.DefaultCurrency => defaultCurrency,
+                ActionVariable.GoalText => goal.Current?.Text ?? "",
+                ActionVariable.GoalPoints => Number(goal.Current?.Points ?? 0),
+                ActionVariable.GoalIndex => Number(goal.CurrentIndex),
+                ActionVariable.GoalCount => Number(goal.Count),
+                ActionVariable.GoalProgress => Number(goal.Progress),
+                ActionVariable.LastGoalText => goal.Last?.Text ?? "",
+                ActionVariable.LastGoalPoints => Number(goal.Last?.Points ?? 0),
+                ActionVariable.GoalListName => goals?.Name ?? "",
+                ActionVariable.GoalType => $"{goals?.Type ?? GoalsType.Points}",
+                _ => subathon == null ? "" : FromSubathon(variable, subathon, defaultCurrency)
+            };
+
+        return values;
+    }
+
+    private static string FromSubathon(ActionVariable variable, SubathonData subathon, string defaultCurrency) {
+        MultiplierData multiplier = subathon.Multiplier;
+        bool running = multiplier.IsRunning();
+        TimeSpan remaining = subathon.TimeRemainingRounded();
+
+        return variable switch {
+            ActionVariable.SecondsRemaining => Number((long)remaining.TotalSeconds),
+            ActionVariable.TimeRemaining =>
+                $"{(long)remaining.TotalHours:00}:{remaining.Minutes:00}:{remaining.Seconds:00}",
+            ActionVariable.SecondsElapsed => Number(subathon.MillisecondsElapsed / 1000),
+            ActionVariable.TimerPaused => Bool(subathon.IsPaused),
+            ActionVariable.TimerLocked => Bool(subathon.IsLocked),
+            ActionVariable.TimerReversed => Bool(subathon.IsSubathonReversed()),
+            ActionVariable.MultiplierActive => Bool(running),
+            ActionVariable.MultiplierAmount => running
+                ? multiplier.Multiplier.ToString(CultureInfo.InvariantCulture) : "1",
+            ActionVariable.MultiplierSecondsRemaining => Number(running && multiplier is
+                { Duration: { } duration, Started: { } started }
+                ? Math.Max(0, (long)(started + duration - DateTime.Now).TotalSeconds) : 0),
+            ActionVariable.MultiplierPoints => Bool(running && multiplier.ApplyToPoints),
+            ActionVariable.MultiplierTime => Bool(running && multiplier.ApplyToSeconds),
+            ActionVariable.Points => Number(subathon.Points),
+            ActionVariable.Money => subathon.GetRoundedMoneySumWithCents().ToString("0.00", CultureInfo.InvariantCulture),
+            ActionVariable.Currency => string.IsNullOrWhiteSpace(subathon.Currency) ? defaultCurrency : subathon.Currency,
+            _ => ""
+        };
+    }
+
+    private static string Number(long value) {
+        return value.ToString(CultureInfo.InvariantCulture);
+    }
+
+    private static string Bool(bool value) {
+        return value ? "true" : "false";
+    }
+
+    private readonly record struct GoalState(SubathonGoal? Current, SubathonGoal? Last, int CurrentIndex, 
+        int Count, long Progress) {
+
+        public static GoalState From(SubathonGoalSet? set, SubathonData? subathon) {
+            if (set == null || subathon == null) return default;
+
+            List<SubathonGoal> ordered = set.Goals.OrderBy(g => g.Points).ToList();
+            long progress = set.Type == GoalsType.Money ? subathon.GetRoundedMoneySum() : subathon.Points;
+            int next = ordered.FindIndex(g => g.Points > progress);
+
+            SubathonGoal? last = ordered.LastOrDefault(g => g.Points <= progress);
+            return new GoalState(next >= 0 ? ordered[next] : null, last, next >= 0 ? next + 1 : 0, ordered.Count,
+                progress);
+        }
+    }
+}
diff --git a/SubathonManager.Data/DbContext.cs b/SubathonManager.Data/DbContext.cs
index f547d4a..f00a813 100644
--- a/SubathonManager.Data/DbContext.cs
+++ b/SubathonManager.Data/DbContext.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
 using System.Numerics;
-using System.Text;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using SubathonManager.Core;
@@ -298,75 +296,44 @@ public static async Task<List<SubathonEvent>> GetSubathonCurrencyEvents(AppDbCon
         return events;
     }
 
-    public static async Task ActiveEventsToCsv(AppDbContext db) {
+    public static async Task<string?> ActiveEventsToCsv(AppDbContext db) {
         SubathonData? subathon = await db.SubathonDatas.AsNoTracking().FirstOrDefaultAsync(s => s.IsActive);
-        if (subathon == null) return;
+        if (subathon == null) return null;
         List<SubathonEvent> events = await db.SubathonEvents.Where(ev => ev.SubathonId == subathon.Id)
             .ToListAsync();
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-        var filepath = $"{exportDir}/subathon-{subathon.Id}.csv";
-
-        var sb = new StringBuilder();
-        sb.AppendLine(
-            "Id,Source,Type,Command,User,Seconds Value,Points Value,Value,Currency,Amount,Multiplier Seconds,Multiplier Points,Processed,Final Seconds Added,Final Points Added,Timestamp,Secondary Value,Event Meta Type, Event Meta Common Type");
-        foreach (SubathonEvent e in events) {
-            string val = e.Value;
-            string? commonMeta = string.IsNullOrWhiteSpace(e.EventTypeMeta) ? "" : e.EventTypeMeta;
-            if (e.EventType is SubathonEventType.TwitchGiftSub or SubathonEventType.TwitchSub) {
-                val = e.Value switch {
-                    "1000" => "T1",
-                    "2000" => "T2",
-                    "3000" => "T3",
-                    _ => val
-                };
-                commonMeta = val;
-            }
-
-            if (e.EventType == SubathonEventType.GoAffProOrder
-                && GoAffProOrderHelper.TryGetStore(e.EventTypeMeta, out GoAffProStore? store))
-                commonMeta = store.InternalName;
-
-            sb.AppendLine(string.Join(",",
-                e.Id,
-                Utils.EscapeCsv(e.Source.ToString()),
-                Utils.EscapeCsv(e.EventType.ToString()),
-                Utils.EscapeCsv(e.Command.ToString()),
-                Utils.EscapeCsv(e.User),
-                e.SecondsValue,
-                e.PointsValue,
-                Utils.EscapeCsv(val),
-                Utils.EscapeCsv(e.Currency),
-                e.Amount,
-                e.MultiplierSeconds,
-                e.MultiplierPoints,
-                e.ProcessedToSubathon,
-                e.GetFinalSecondsValueRaw(),
-                e.GetFinalPointsValue(),
-                e.EventTimestamp.ToString("yyyy-MM-dd HH:mm:ss"),
-                Utils.EscapeCsv(e.SecondaryValue),
-                Utils.EscapeCsv(e.EventTypeMeta),
-                Utils.EscapeCsv(commonMeta)
-            ));
-        }
+        return await CsvUtils.ExportAsync($"subathon-{subathon.Id}",
+            [[
+                "Id", "Source", "Type", "Command", "User", "Seconds Value", "Points Value", "Value", "Currency",
+                "Amount", "Multiplier Seconds", "Multiplier Points", "Processed", "Final Seconds Added",
+                "Final Points Added", "Timestamp", "Secondary Value", "Event Meta Type", "Event Meta Common Type"
+            ]],
+            events, e => {
+                string val = e.Value;
+                string? commonMeta = string.IsNullOrWhiteSpace(e.EventTypeMeta) ? "" : e.EventTypeMeta;
+                switch (e.EventType) {
+                    case SubathonEventType.TwitchGiftSub or SubathonEventType.TwitchSub:
+                        val = e.Value switch {
+                            "1000" => "T1",
+                            "2000" => "T2",
+                            "3000" => "T3",
+                            _ => val
+                        };
+                        commonMeta = val;
+                        break;
+                    case SubathonEventType.GoAffProOrder
+                        when GoAffProOrderHelper.TryGetStore(e.EventTypeMeta, out GoAffProStore? store):
+                        commonMeta = store.InternalName;
+                        break;
+                }
 
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            bool isTest =
-                AppDomain.CurrentDomain.GetAssemblies()
-                    .Any(a => a.FullName!.StartsWith("xunit", StringComparison.OrdinalIgnoreCase));
-            if (!isTest)
-                Process.Start(new ProcessStartInfo {
-                    FileName = exportDir,
-                    UseShellExecute = true,
-                    Verb = "open"
-                });
-        }
-        catch {
-            /**/
-        }
+                return [
+                    e.Id, e.Source, e.EventType, e.Command, e.User, e.SecondsValue, e.PointsValue, val, e.Currency,
+                    e.Amount, e.MultiplierSeconds, e.MultiplierPoints, e.ProcessedToSubathon,
+                    e.GetFinalSecondsValueRaw(), e.GetFinalPointsValue(), e.EventTimestamp, e.SecondaryValue,
+                    e.EventTypeMeta, commonMeta
+                ];
+            });
     }
 
     public static async Task PauseAllTimers(AppDbContext db) {
diff --git a/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.Designer.cs b/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.Designer.cs
new file mode 100644
index 0000000..5af09ec
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.Designer.cs
@@ -0,0 +1,1143 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SubathonManager.Data;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261002031525_updateActinsAndWheelStuff")]
+    partial class updateActinsAndWheelStuff
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("CssVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.GoAffProStore", b =>
+                {
+                    b.Property<int>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SiteId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.HasIndex("SiteId")
+                        .IsUnique();
+
+                    b.ToTable("GoAffProStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("JsVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.Property<string>("ProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Valid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("JuniperProducts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Property<Guid>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.ToTable("JuniperStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MakeShipTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Orders")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ProductType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Sales")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShopifyProductId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MakeShipTrackings");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("ApplyToPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplyToSeconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<TimeSpan?>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FromHypeTrain")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("Multiplier")
+                        .HasColumnType("REAL");
+
+                    b.Property<DateTime?>("Started")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubathonId")
+                        .IsUnique();
+
+                    b.ToTable("MultiplierDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Routes");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ScheduleItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EndMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StartMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Date");
+
+                    b.ToTable("ScheduleItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.StateValue", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("StateValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<DateTime?>("CapDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPaused")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsCumulative")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsElapsed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneySum")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ReversedTime")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Amount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Command")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CurrentPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CurrentTime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EventTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventTypeMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("MultiplierPoints")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("MultiplierSeconds")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("PointsValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ProcessedToSubathon")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecondaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("SecondsValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TertiaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WasReversed")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id", "Source");
+
+                    b.HasIndex("SubathonId");
+
+                    b.ToTable("SubathonEvents");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<Guid?>("GoalSetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GoalSetId");
+
+                    b.ToTable("SubathonGoals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonGoalSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("CompletionDuration")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("FilterEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FilterMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FilterSubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPrompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("BaselineCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("SnapshotTargetValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPromptRuns");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("Cooldown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("RandomOffset")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonPromptSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonValue", b =>
+                {
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Meta")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(1);
+
+                    b.Property<double>("Points")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("Seconds")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("EventType", "Meta");
+
+                    b.ToTable("SubathonValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Weight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.ToTable("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("ActionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Parameter")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelItemId")
+                        .IsUnique();
+
+                    b.ToTable("WheelSpinActions");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.HasIndex("WheelItemId");
+
+                    b.ToTable("WheelSpinHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CountThreshold")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneyThreshold")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("SpinsToAdd")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TierValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSpinTriggers");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinsAdded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SubathonEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SubathonEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TriggerSource")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TriggerUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("TriggeredAt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("WheelSpinTriggerHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HtmlPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RouteId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("X")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("Y")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Z")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RouteId");
+
+                    b.ToTable("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WidgetCatalogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Entry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileModifiedTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Group")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastSeenUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewCachePath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewImage")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackPath")
+                        .IsUnique();
+
+                    b.ToTable("WidgetCatalogEntries");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("CssVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("JsVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.JuniperStore", "Store")
+                        .WithMany("Products")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithOne("Multiplier")
+                        .HasForeignKey("SubathonManager.Core.Models.MultiplierData", "SubathonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithMany()
+                        .HasForeignKey("SubathonId");
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonGoalSet", "LinkedGoalSet")
+                        .WithMany("Goals")
+                        .HasForeignKey("GoalSetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedGoalSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany("Prompts")
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPrompt", "LinkedPrompt")
+                        .WithMany()
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany()
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("LinkedPrompt");
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany("WheelItems")
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithOne("Action")
+                        .HasForeignKey("SubathonManager.Core.Models.WheelSpinAction", "WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany()
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithMany()
+                        .HasForeignKey("WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSpinTrigger", "Trigger")
+                        .WithMany("History")
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Route", "Route")
+                        .WithMany("Widgets")
+                        .HasForeignKey("RouteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Route");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Navigation("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Navigation("Multiplier")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Navigation("Goals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Navigation("Prompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Navigation("Action");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Navigation("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Navigation("History");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Navigation("CssVariables");
+
+                    b.Navigation("JsVariables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.cs b/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.cs
new file mode 100644
index 0000000..2b4c3c1
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261002031525_updateActinsAndWheelStuff.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class updateActinsAndWheelStuff : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ActionProgress",
+                table: "WheelSpinHistories",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ActionProgress",
+                table: "WheelSpinHistories");
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
index 638541d..9b631e4 100644
--- a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class AppDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "10.0.11");
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
 
             modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
                 {
@@ -711,6 +711,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("TEXT");
 
diff --git a/SubathonManager.Integration/MixItUpService.cs b/SubathonManager.Integration/MixItUpService.cs
index 8854386..72d1761 100644
--- a/SubathonManager.Integration/MixItUpService.cs
+++ b/SubathonManager.Integration/MixItUpService.cs
@@ -22,7 +22,7 @@ public class MixItUpService(
     ILogger<MixItUpService>? logger,
     IConfig config,
     IHttpClientFactory httpClientFactory,
-    ITimerService timerService) : IAppService, IDisposable {
+    ITimerService timerService) : IAppService, IDisposable, IActionStepRunner {
 
     public const string ConfigSection = "MixItUp";
     public const string DefaultApiUrl = "http://localhost:8911/api/v2";
@@ -222,10 +222,31 @@ public async Task<bool> RunCommandAsync(Guid commandId, IReadOnlyDictionary<stri
             return false;
         }
         catch (Exception ex) {
-            logger?.LogDebug("[MixItUp] Running command {CommandId} failed: {Message}", commandId, ex.Message);
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("[MixItUp] Running command {CommandId} failed: {Message}", commandId, ex.Message);
             return false;
         }
     }
+    
+    public IReadOnlyCollection<ActionStepType> StepTypes { get; } = [ActionStepType.MixItUpCommand];
+
+    public async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        CancellationToken ct) {
+        if (!Enabled || !Guid.TryParse(step.Target, out Guid commandId)) return false;
+        var identifiers = new Dictionary<string, string> {
+            [$"{IdentifierPrefix}trigger"] = "action",
+            [$"{IdentifierPrefix}user"] = ctx.User,
+            [$"{IdentifierPrefix}source"] = $"{ctx.Source}",
+            [$"{IdentifierPrefix}label"] = ctx.Label ?? ""
+        };
+
+        foreach ((string name, string value) in step.BodyArguments()) {
+            string key = name.TrimStart('$').ToLowerInvariant();
+            if (key.Length > 0) identifiers[key] = value;
+        }
+
+        return await RunCommandAsync(commandId, identifiers, ct);
+    }
 
     public async Task<IReadOnlyList<MixItUpCommandInfo>?> GetCommandsAsync(CancellationToken ct = default) {
         var result = new List<MixItUpCommandInfo>();
diff --git a/SubathonManager.Integration/OBSService.cs b/SubathonManager.Integration/OBSService.cs
index f8aac0d..80e6b08 100644
--- a/SubathonManager.Integration/OBSService.cs
+++ b/SubathonManager.Integration/OBSService.cs
@@ -31,7 +31,7 @@ public sealed record ObsBrowserSourceCard(
     Guid? RouteId);
 
 [ExcludeFromCodeCoverage]
-public class OBSService : IAppService {
+public class OBSService : IAppService, IActionStepRunner {
     private const string HelperHotkeyName = "subathonmanager_apply_tweaks";
     private const string HelperVersionHotkeyPrefix = "subathonmanager_version_";
     private const string ManagedMarkerKey = "subathon_managed";
@@ -724,4 +724,167 @@ public async Task AddBrowserSource(
         await TryApplyHelperTweaksAsync();
         BrowserSourcesChanged?.Invoke();
     }
+
+    ////////////////////////// action steps
+    
+    public IReadOnlyCollection<ActionStepType> StepTypes { get; } = [
+        ActionStepType.ObsSourceVisibility, 
+        ActionStepType.ObsFilter,
+        ActionStepType.ObsAudio,
+        ActionStepType.ObsMedia
+    ];
+
+    public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        CancellationToken ct) {
+        if (!_obs.IsConnected) return Task.FromResult(false);
+        return Task.Run(() => {
+            try {
+                return RunStep(step);
+            }
+            catch (Exception ex) {
+                _logger?.LogWarning(ex, "[OBSService] Action \"{Step}\" failed", step.Describe());
+                return false;
+            }
+        }, ct);
+    }
+
+    private bool RunStep(ActionStep step) {
+        switch (step.Type) {
+            case ActionStepType.ObsSourceVisibility: {
+                (string scene, int id)? item = FindSceneItem(step.Scope ?? "", step.Target, []);
+                if (item == null) {
+                    _logger?.LogWarning("[OBSService] Source \"{Source}\" not found in \"{Scene}\"", step.Target,
+                        step.Scope);
+                    return false;
+                }
+
+                bool visible = step.Operation switch {
+                    ActionOperation.Show => true,
+                    ActionOperation.Hide => false,
+                    _ => !(_obs.SendRequest("GetSceneItemEnabled", new JObject {
+                        ["sceneName"] = item.Value.scene, ["sceneItemId"] = item.Value.id
+                    })?["sceneItemEnabled"]?.Value<bool>() ?? false)
+                };
+                _obs.SendRequest("SetSceneItemEnabled", new JObject {
+                    ["sceneName"] = item.Value.scene, ["sceneItemId"] = item.Value.id, ["sceneItemEnabled"] = visible
+                });
+                return true;
+            }
+
+            case ActionStepType.ObsFilter: {
+                var filter = new JObject { ["sourceName"] = step.Scope, ["filterName"] = step.Target };
+                bool enabled = step.Operation switch {
+                    ActionOperation.Enable => true,
+                    ActionOperation.Disable => false,
+                    _ => !(_obs.SendRequest("GetSourceFilter", filter)?["filterEnabled"]?.Value<bool>() ?? false)
+                };
+                filter["filterEnabled"] = enabled;
+                _obs.SendRequest("SetSourceFilterEnabled", filter);
+                return true;
+            }
+
+            case ActionStepType.ObsAudio:
+                if (step.Operation == ActionOperation.Toggle)
+                    _obs.SendRequest("ToggleInputMute", new JObject { ["inputName"] = step.Target });
+                else
+                    _obs.SendRequest("SetInputMute", new JObject {
+                        ["inputName"] = step.Target, ["inputMuted"] = step.Operation == ActionOperation.Mute
+                    });
+                return true;
+
+            case ActionStepType.ObsMedia:
+                _obs.SendRequest("TriggerMediaInputAction", new JObject {
+                    ["inputName"] = step.Target,
+                    ["mediaAction"] = step.Operation switch {
+                        ActionOperation.Pause => "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE",
+                        ActionOperation.Restart => "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART",
+                        ActionOperation.Stop => "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP",
+                        _ => "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY"
+                    }
+                });
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    private (string scene, int id)? FindSceneItem(string sceneName, string sourceName, HashSet<string> visited) {
+        if (string.IsNullOrWhiteSpace(sceneName) || !visited.Add(sceneName)) return null;
+        JArray? items = ListSceneItems(sceneName, visited.Count > 1);
+        if (items == null) return null;
+
+        foreach (JToken item in items)
+            if (string.Equals(item["sourceName"]?.ToString(), sourceName, StringComparison.Ordinal))
+                return (sceneName, item["sceneItemId"]?.Value<int>() ?? -1);
+
+        foreach (JToken item in items.Where(i => i["isGroup"]?.Value<bool?>() == true))
+            if (FindSceneItem(item["sourceName"]?.ToString() ?? "", sourceName, visited) is { } nested)
+                return nested;
+
+        return null;
+    }
+
+    private JArray? ListSceneItems(string sceneName, bool isGroup) {
+        try {
+            return _obs.SendRequest(isGroup ? "GetGroupSceneItemList" : "GetSceneItemList",
+                new JObject { ["sceneName"] = sceneName })?["sceneItems"] as JArray;
+        }
+        catch (Exception ex) {
+            if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
+                _logger?.LogDebug(ex, "[OBSService] Failed to list scene items for '{Scene}'", sceneName);
+            return null;
+        }
+    }
+
+    public (List<string> scopes, List<string> targets) GetActionTargets(ActionStepType type, string? scope) {
+        if (!_obs.IsConnected) return ([], []);
+        try {
+            List<(string name, string kind)> inputs = _obs.GetInputList()
+                .Select(i => (i.InputName, i.InputKind)).ToList();
+
+            switch (type) {
+                case ActionStepType.ObsSourceVisibility: {
+                    List<string> scenes = GetScenes();
+                    var sources = new List<string>();
+
+                    if (!string.IsNullOrWhiteSpace(scope)) CollectSourceNames(scope, false, sources, []);
+
+                    return (scenes, sources.Distinct().ToList());
+                }
+                case ActionStepType.ObsFilter: {
+                    List<string> owners = inputs.Select(i => i.name).Concat(GetScenes()).Distinct().ToList();
+
+                    if (string.IsNullOrWhiteSpace(scope)) return (owners, []);
+                    var filters = _obs.SendRequest("GetSourceFilterList", new JObject { ["sourceName"] = scope })?
+                        ["filters"] as JArray;
+
+                    return (owners, filters?.Select(f => f["filterName"]?.ToString() ?? "")
+                        .Where(n => n.Length > 0).ToList() ?? []);
+                }
+                case ActionStepType.ObsMedia:
+                    return ([], inputs.Where(i => i.kind.Contains("ffmpeg") || i.kind.Contains("vlc"))
+                        .Select(i => i.name).ToList());
+                default:
+                    return ([], inputs.Select(i => i.name).ToList());
+            }
+        }
+        catch (Exception ex) {
+            if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
+                _logger?.LogDebug(ex, "[OBSService] Listing action targets failed");
+            return ([], []);
+        }
+    }
+
+    private void CollectSourceNames(string sceneName, bool isGroup, List<string> names, HashSet<string> visited) {
+        if (!visited.Add(sceneName)) return;
+        JArray? items = ListSceneItems(sceneName, isGroup);
+        if (items == null) return;
+        foreach (JToken item in items) {
+            var name = item["sourceName"]?.ToString();
+            if (string.IsNullOrEmpty(name)) continue;
+            names.Add(name);
+            if (item["isGroup"]?.Value<bool?>() == true) CollectSourceNames(name, true, names, visited);
+        }
+    }
 }
\ No newline at end of file
diff --git a/SubathonManager.Integration/PatreonService.cs b/SubathonManager.Integration/PatreonService.cs
index 63c9223..30cf2f8 100644
--- a/SubathonManager.Integration/PatreonService.cs
+++ b/SubathonManager.Integration/PatreonService.cs
@@ -494,6 +494,7 @@ private void BroadcastStatus(string? tunnelBaseUrl) {
         });
     }
 
+    [ExcludeFromCodeCoverage]
     public sealed class ErrorLoggingHandler(ILogger? logger) : DelegatingHandler {
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
             CancellationToken cancellationToken) {
diff --git a/SubathonManager.Integration/StreamerBotService.cs b/SubathonManager.Integration/StreamerBotService.cs
new file mode 100644
index 0000000..1a9a3c9
--- /dev/null
+++ b/SubathonManager.Integration/StreamerBotService.cs
@@ -0,0 +1,152 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http.Json;
+using System.Text.Json;
+using JetBrains.Annotations;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Objects;
+
+namespace SubathonManager.Integration;
+
+[ExcludeFromCodeCoverage]
+public sealed record StreamerBotActionInfo(Guid Id, string Name, string Group) {
+    public string DisplayName => string.IsNullOrWhiteSpace(Group) ? Name : $"{Group} / {Name}";
+}
+
+// Separate from the SB extension
+// Communicates over the HTTP Server api in SB
+public class StreamerBotService(
+    ILogger<StreamerBotService>? logger,
+    IConfig config,
+    IHttpClientFactory httpClientFactory,
+    ITimerService timerService) : IAppService, IActionStepRunner {
+    public const string ConfigSection = "StreamerBot";
+    public const string DefaultHttpUrl = "http://127.0.0.1:7474";
+    public const string ArgumentPrefix = "subathonmanager";
+    public const string HttpService = "Http";
+    private const string HttpCheckTimerKey = "StreamerBot.HttpCheck";
+    private static readonly TimeSpan HttpCheckInterval = TimeSpan.FromSeconds(120);
+
+    private static readonly JsonSerializerOptions JsonOptions = new() { PropertyNameCaseInsensitive = true };
+
+    private bool? _lastHttpStatus;
+    private bool _lastHttpEnabled;
+
+    public bool HttpEnabled => config.GetBool(ConfigSection, "Http.Enabled");
+
+    public string HttpUrl {
+        get {
+            string url = (config.Get(ConfigSection, "Http.Url", DefaultHttpUrl) ?? "").Trim().TrimEnd('/');
+            return string.IsNullOrWhiteSpace(url) ? DefaultHttpUrl : url;
+        }
+    }
+
+    public IReadOnlyCollection<ActionStepType> StepTypes { get; } = [ActionStepType.StreamerBotAction];
+
+    private HttpClient CreateClient() {
+        HttpClient client = httpClientFactory.CreateClient(nameof(StreamerBotService));
+        client.Timeout = TimeSpan.FromSeconds(5);
+        return client;
+    }
+
+    public Task StartAsync(CancellationToken ct = default) {
+        timerService.Register(HttpCheckTimerKey, HttpCheckInterval, () => _ = CheckHttpAsync(ct));
+        _ = Task.Run(() => CheckHttpAsync(ct), ct);
+        return Task.CompletedTask;
+    }
+
+    public Task StopAsync(CancellationToken ct = default) {
+        timerService.Unregister(HttpCheckTimerKey);
+        return Task.CompletedTask;
+    }
+
+    public async Task CheckHttpAsync(CancellationToken ct = default) {
+        if (HttpEnabled) await GetActionsAsync(ct);
+        else ReportHttpStatus(false);
+    }
+
+    private void ReportHttpStatus(bool reachable) {
+        bool enabled = HttpEnabled;
+        if (_lastHttpStatus == reachable && _lastHttpEnabled == enabled) return;
+        _lastHttpStatus = reachable;
+        _lastHttpEnabled = enabled;
+        IntegrationEvents.RaiseConnectionUpdate(new IntegrationConnection {
+            Source = SubathonEventSource.StreamerBot,
+            Service = HttpService,
+            Name = HttpUrl,
+            Status = reachable && enabled,
+            Configured = enabled
+        });
+    }
+
+    public async Task<IReadOnlyList<StreamerBotActionInfo>?> GetActionsAsync(CancellationToken ct = default) {
+        try {
+            using HttpClient client = CreateClient();
+            ActionList? list = await client.GetFromJsonAsync<ActionList>($"{HttpUrl}/GetActions", JsonOptions, ct);
+            ReportHttpStatus(true);
+            return (list?.Actions ?? [])
+                .Where(a => a.Id != Guid.Empty)
+                .Select(a => new StreamerBotActionInfo(a.Id, a.Name ?? "", a.Group ?? ""))
+                .OrderBy(a => a.Group, StringComparer.OrdinalIgnoreCase)
+                .ThenBy(a => a.Name, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+        }
+        catch (Exception ex) {
+            if (!ct.IsCancellationRequested) ReportHttpStatus(false);
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("[StreamerBot] GetActions failed: {Message}", ex.Message);
+            return null;
+        }
+    }
+
+    public async Task<bool> DoActionAsync(Guid actionId, string? actionName, IReadOnlyDictionary<string, string> args,
+        CancellationToken ct = default) {
+        try {
+            var payload = new {
+                action = new { id = actionId, name = actionName },
+                args
+            };
+            using HttpClient client = CreateClient();
+            using HttpResponseMessage response = await client.PostAsJsonAsync($"{HttpUrl}/DoAction", payload, ct);
+            ReportHttpStatus(true);
+            if (response.IsSuccessStatusCode) return true;
+            logger?.LogWarning("[StreamerBot] Running action {Action} failed with {Status}", actionName ?? $"{actionId}",
+                (int)response.StatusCode);
+            return false;
+        }
+        catch (Exception ex) {
+            if (!ct.IsCancellationRequested) ReportHttpStatus(false);
+            logger?.LogWarning("[StreamerBot] Running action {Action} failed: {Message}", actionName ?? $"{actionId}",
+                ex.Message);
+            return false;
+        }
+    }
+
+    public async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        CancellationToken ct) {
+        if (!HttpEnabled || !Guid.TryParse(step.Target, out Guid actionId)) return false;
+
+        var args = new Dictionary<string, string>(StringComparer.Ordinal) {
+            [$"{ArgumentPrefix}trigger"] = "action",
+            [$"{ArgumentPrefix}user"] = ctx.User,
+            [$"{ArgumentPrefix}source"] = $"{ctx.Source}",
+            [$"{ArgumentPrefix}label"] = ctx.Label ?? ""
+        };
+        foreach ((string name, string value) in step.BodyArguments()) args[name] = value;
+
+        return await DoActionAsync(actionId, step.TargetName, args, ct);
+    }
+
+    private sealed class ActionList {
+        public List<ActionEntry>? Actions { get; set; }
+    }
+
+    [UsedImplicitly]
+    private sealed class ActionEntry {
+        public Guid Id { get; set; }
+        public string? Name { get; set; }
+        public string? Group { get; set; }
+    }
+}
diff --git a/SubathonManager.Integration/SubathonManager.Integration.csproj b/SubathonManager.Integration/SubathonManager.Integration.csproj
index 9ae3573..f0498eb 100644
--- a/SubathonManager.Integration/SubathonManager.Integration.csproj
+++ b/SubathonManager.Integration/SubathonManager.Integration.csproj
@@ -14,6 +14,7 @@
         <PackageReference Include="DevTunnels.Client.DependencyInjection" Version="1.1.0"/>
         <PackageReference Include="DevTunnels.Client.Installer" Version="1.1.0"/>
         <PackageReference Include="Fourthwall.Client" Version="0.1.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2026.2.0" />
         <PackageReference Include="KoFi.Client" Version="0.1.1"/>
         <PackageReference Include="Agash.YTLiveChat" Version="4.2.0"/>
         <PackageReference Include="GoAffPro.Client" Version="0.4.1"/>
diff --git a/SubathonManager.Integration/VTSService.cs b/SubathonManager.Integration/VTSService.cs
index d8d99c3..c66cab2 100644
--- a/SubathonManager.Integration/VTSService.cs
+++ b/SubathonManager.Integration/VTSService.cs
@@ -42,9 +42,8 @@ public class VTSService(
     ILogger<VTSService>? logger,
     IConfig config,
     ISecureStorage secureStorage,
-    ITimerService? timerService = null,
     IDbContextFactory<AppDbContext>? dbFactory = null)
-    : IAppService, IDisposable {
+    : IAppService, IDisposable, IActionStepRunner {
     public const string ConfigSection = "VTubeStudio";
     private const string PluginName = "Subathon Manager";
     private const string PluginDeveloper = "WolfwithSword";
@@ -929,140 +928,90 @@ private async Task ApplyModelChangeAsync(string? modelId, string? modelName, Can
         await RefreshAsync(ct);
     }
 
-    public async Task<bool> ExecuteWheelActionAsync(VTSWheelAction action, CancellationToken ct = default) {
-        if (!Connected) {
-            _logger?.LogInformation(
-                "[VTSService] Wheel action skipped: not connected to VTube Studio. Leaving the spin pending");
-            return false;
-        }
-
-        if (!action.IsValid(out string invalid)) {
-            _logger?.LogWarning("[VTSService] Wheel action is not valid: {Error}", invalid);
-            return false;
-        }
-
-        switch (action.Kind) {
-            case VtsTargetKind.Expression:
-                return await RunExpressionWheelActionAsync(action, ct);
-            case VtsTargetKind.Parameter:
-                return await RunParameterWheelActionAsync(action, ct);
-            case VtsTargetKind.Hotkey:
-                return await RunHotkeyWheelActionAsync(action, ct);
-            default:
-                return false;
-        }
-    }
-
-    [ExcludeFromCodeCoverage]
-    private async Task<bool> RunExpressionWheelActionAsync(VTSWheelAction action, CancellationToken ct) {
-        if (!await TargetExistsAsync(action, ct)) return false;
-        if (!await ApplyExpressionActionAsync(action.Target, action.ToggleAction, ct)) return false;
-        ScheduleRevert(action, null);
-        return true;
-    }
-
-    [ExcludeFromCodeCoverage]
-    private async Task<bool> RunParameterWheelActionAsync(VTSWheelAction action, CancellationToken ct) {
-        double? original = await GetParameterValueAsync(action.Target, ct);
-        if (original == null) {
-            _logger?.LogWarning(
-                "[VTSService] Wheel action target parameter \"{Parameter}\" not found on the current model",
-                action.Target);
-            return false;
-        }
-
-        if (!await SetParameterValueAsync(action.Target, action.Value, ct: ct)) return false;
-        ScheduleRevert(action, original);
-        return true;
-    }
-
-    [ExcludeFromCodeCoverage]
-    private async Task<bool> RunHotkeyWheelActionAsync(VTSWheelAction action, CancellationToken ct) {
-        if (!await TargetExistsAsync(action, ct)) return false;
-        if (!await TriggerHotkeyAsync(action.Target, ct: ct)) return false;
-        ScheduleRevert(action, null);
-        return true;
-    }
+    ////////////////////////////// action steps
 
     [ExcludeFromCodeCoverage]
-    private async Task<bool> TargetExistsAsync(VTSWheelAction action, CancellationToken ct) {
+    public async Task<bool> HasTargetAsync(VtsTargetKind kind, string target, CancellationToken ct = default) {
+        if (!Connected || string.IsNullOrWhiteSpace(target)) return false;
         if (Matches()) return true;
 
         await RefreshAsync(ct);
         if (Matches()) return true;
 
-        _logger?.LogWarning(
-            "[VTSService] Wheel action target {Kind} \"{Target}\" is not on the current model ({Model})",
-            action.Kind, action.Target, CurrentModelName ?? "none");
+        _logger?.LogWarning("[VTSService] {Kind} \"{Target}\" is not on the current model ({Model})",
+            kind, target, CurrentModelName ?? "none");
         return false;
 
         bool Matches() {
-            return action.Kind switch {
+            return kind switch {
                 VtsTargetKind.Expression => CachedExpressions.Any(e =>
-                    string.Equals(e.File, action.Target, StringComparison.OrdinalIgnoreCase)),
+                    string.Equals(e.File, target, StringComparison.OrdinalIgnoreCase)),
                 VtsTargetKind.Hotkey => CachedHotkeys.Any(h =>
-                    string.Equals(h.Id, action.Target, StringComparison.OrdinalIgnoreCase)),
+                    string.Equals(h.Id, target, StringComparison.OrdinalIgnoreCase)),
                 VtsTargetKind.Parameter => CachedParameters.Any(p =>
-                    string.Equals(p.Name, action.Target, StringComparison.Ordinal)),
+                    string.Equals(p.Name, target, StringComparison.Ordinal)),
                 _ => false
             };
         }
     }
 
-    [ExcludeFromCodeCoverage]
-    private void ScheduleRevert(VTSWheelAction action, double? originalValue) {
-        if (!action.HasRevert) return;
-
-        if (timerService == null) {
-            _logger?.LogWarning("[VTSService] No timer service available; skipping the wheel action revert.");
-            return;
-        }
-
-        string key = action.TimerKey;
-        timerService.Register(key, action.Duration, async revertCt => {
-            timerService.Unregister(key);
-            await RevertWheelActionAsync(action, originalValue, revertCt);
-        });
-
-        _logger?.LogInformation("[VTSService] Wheel action revert for {Target} scheduled in {Duration}",
-            action.Target, action.Duration);
-    }
+    public IReadOnlyCollection<ActionStepType> StepTypes { get; } =
+        [ActionStepType.VtsExpression, ActionStepType.VtsParameter, ActionStepType.VtsHotkey];
 
     [ExcludeFromCodeCoverage]
-    private async Task RevertWheelActionAsync(VTSWheelAction action, double? originalValue, CancellationToken ct) {
-        if (!Connected) {
-            _logger?.LogInformation("[VTSService] Skipping wheel action revert for {Target}: not connected.",
-                action.Target);
-            return;
-        }
-
-        switch (action.Kind) {
-            case VtsTargetKind.Expression:
-                await ApplyExpressionActionAsync(action.Target, action.AfterToggle, ct);
+    public async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        CancellationToken ct) {
+        if (!Connected) return false;
+
+        switch (step.Type) {
+            case ActionStepType.VtsExpression:
+                return await HasTargetAsync(VtsTargetKind.Expression, step.Target, ct)
+                       && await ApplyExpressionActionAsync(step.Target, step.Operation switch {
+                           ActionOperation.Off => VtsToggleAction.Off,
+                           ActionOperation.Toggle => VtsToggleAction.Toggle,
+                           _ => VtsToggleAction.On
+                       }, ct);
+
+            case ActionStepType.VtsHotkey:
+                return await HasTargetAsync(VtsTargetKind.Hotkey, step.Target, ct)
+                       && await TriggerHotkeyAsync(step.Target, ct: ct);
+
+            case ActionStepType.VtsParameter:
                 break;
 
-            case VtsTargetKind.Parameter:
-                switch (action.AfterParameter) {
-                    case VtsParameterAfterAction.DoNothing:
-                        ReleaseParameter(action.Target);
-                        break;
-                    case VtsParameterAfterAction.ResetToOriginal:
-                        ReleaseParameter(action.Target);
-                        if (originalValue.HasValue)
-                            await SetParameterValueAsync(action.Target, originalValue.Value, hold: false, ct: ct);
-                        break;
-                    case VtsParameterAfterAction.SetNewValue:
-                        ReleaseParameter(action.Target);
-                        await SetParameterValueAsync(action.Target, action.AfterValue, hold: false, ct: ct);
-                        break;
+            default:
+                return false;
+        }
+
+        var originalKey = $"vts-parameter:{step.Target}";
+        switch (step.Operation) {
+            case ActionOperation.Hold:
+            case ActionOperation.Set: {
+                // remember the value from before this run touched it, for a restore if applicable
+                if (!progress.TryGetValue(originalKey, out _)) {
+                    double? original = await GetParameterValueAsync(step.Target, ct);
+                    if (original == null) {
+                        _logger?.LogWarning("[VTSService] Parameter \"{Parameter}\" not found on the current model",
+                            step.Target);
+                        return false;
+                    }
+
+                    progress.Remember(originalKey, original.Value);
                 }
 
-                break;
+                if (step.Operation == ActionOperation.Set) ReleaseParameter(step.Target);
+                return await SetParameterValueAsync(step.Target, step.Value ?? 0,
+                    hold: step.Operation == ActionOperation.Hold, ct: ct);
+            }
 
-            case VtsTargetKind.Hotkey:
-                if (action.AfterHotkey == VtsHotkeyAfterAction.TriggerAgain)
-                    await TriggerHotkeyAsync(action.Target, ct: ct);
-                break;
+            case ActionOperation.Restore:
+                ReleaseParameter(step.Target);
+                return !progress.TryGetValue(originalKey, out double value)
+                       || await SetParameterValueAsync(step.Target, value, hold: false, ct: ct);
+
+            default:
+                ReleaseParameter(step.Target);
+                return true;
         }
     }
 
diff --git a/SubathonManager.Server/WebServer.WebSocket.cs b/SubathonManager.Server/WebServer.WebSocket.cs
index 94d76c7..f54893f 100644
--- a/SubathonManager.Server/WebServer.WebSocket.cs
+++ b/SubathonManager.Server/WebServer.WebSocket.cs
@@ -575,7 +575,8 @@ when json.RootElement.TryGetProperty("data", out JsonElement data): {
                             || !Guid.TryParse(idProp.GetString(), out Guid histId))
                             break;
                         if (!json.RootElement.TryGetProperty("status", out JsonElement statusProp)
-                            || !Enum.TryParse(statusProp.GetString(), true, out WheelSpinHistoryStatus newStatus))
+                            || !Enum.TryParse(statusProp.GetString(), true, out WheelSpinHistoryStatus newStatus)
+                            || newStatus == WheelSpinHistoryStatus.Running)
                             break;
 
                         await using AppDbContext db = await _factory.CreateDbContextAsync();
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
new file mode 100644
index 0000000..233e3bd
--- /dev/null
+++ b/SubathonManager.Services/ActionService.cs
@@ -0,0 +1,557 @@
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Data;
+using SubathonManager.Data.Widgets;
+
+namespace SubathonManager.Services;
+
+public partial class ActionService(
+    IDbContextFactory<AppDbContext> factory,
+    IEnumerable<IActionStepRunner> runners,
+    ILogger<ActionService>? logger = null,
+    string? actionsFolder = null,
+    IConfig? config = null) : IAppService, IDisposable {
+    private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(10) };
+
+    public static string DefaultActionsFolder => Path.GetFullPath("actions");
+    public static string ExportsFolder => Path.GetFullPath(Path.Combine("exports", "actions"));
+
+    private readonly string _folder = actionsFolder ?? DefaultActionsFolder;
+    private readonly ConcurrentDictionary<Guid, (CustomAction Action, string Path)> _library = new();
+
+    private readonly Dictionary<ActionStepType, IActionStepRunner> _runners = runners
+        .SelectMany(r => r.StepTypes.Select(t => (Type: t, Runner: r)))
+        .GroupBy(x => x.Type)
+        .ToDictionary(g => g.Key, g => g.First().Runner);
+
+    private readonly ConcurrentDictionary<Guid, LiveRun> _runs = new();
+    private volatile bool _multiplierActive;
+    private volatile bool _libraryLoaded;
+    public event Action? CustomActionsChanged;
+    
+    public const string LoggedRunMeta = "logged-run";
+
+    public async Task StartAsync(CancellationToken ct = default) {
+        SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
+        WheelEvents.WheelSpinStatusChanged += OnWheelSpinStatusChanged;
+        ActionEvents.CustomActionRunRequested += OnCustomActionRunRequested;
+        await LoadLibraryAsync();
+
+        await using AppDbContext db = await factory.CreateDbContextAsync(ct);
+        await db.WheelSpinHistories
+            .Where(h => h.Status == WheelSpinHistoryStatus.Running)
+            .ExecuteUpdateAsync(s => s.SetProperty(h => h.Status, WheelSpinHistoryStatus.Pending), ct);
+    }
+
+    public Task StopAsync(CancellationToken ct = default) {
+        Dispose();
+        return Task.CompletedTask;
+    }
+
+    public void Dispose() {
+        SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
+        WheelEvents.WheelSpinStatusChanged -= OnWheelSpinStatusChanged;
+        ActionEvents.CustomActionRunRequested -= OnCustomActionRunRequested;
+        foreach (LiveRun run in _runs.Values) run.Cancel();
+        GC.SuppressFinalize(this);
+    }
+
+    public bool IsRunning(Guid runId) {
+        return _runs.ContainsKey(runId);
+    }
+
+    public void Cancel(Guid runId) {
+        if (_runs.TryGetValue(runId, out LiveRun? run)) run.Cancel();
+    }
+
+    public IReadOnlyList<CustomAction> CustomActions =>
+        _library.Values.Select(e => e.Action).OrderBy(a => a.Name, StringComparer.OrdinalIgnoreCase).ToList();
+
+    public CustomAction? FindCustomAction(string name) {
+        string wanted = name.Trim();
+        return _library.Values.Select(e => e.Action)
+            .FirstOrDefault(a => string.Equals(a.Name.Trim(), wanted, StringComparison.OrdinalIgnoreCase));
+    }
+
+    public async Task<ActionRunResult> RunCustomActionAsync(CustomAction action, string user,
+        SubathonEventSource source) {
+        try {
+            return await RunAsync(Guid.NewGuid(), action.Graph,
+                new ActionContext(source, user, $"custom-action-{action.Id}", action.Name));
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] Running {Name} failed", action.Name);
+            return ActionRunResult.Paused;
+        }
+    }
+
+    private static void LogRun(string actionName, ActionContext ctx) {
+        SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
+            Source = ctx.Source,
+            EventTimestamp = DateTime.Now,
+            EventType = SubathonEventType.Command,
+            Command = SubathonCommandType.RunAction,
+            User = ctx.User,
+            Value = $"{SubathonCommandType.RunAction} {actionName}",
+            EventTypeMeta = LoggedRunMeta
+        });
+    }
+
+    public Task<ActionRunResult> RunManuallyAsync(CustomAction action, bool unsavedCopy = false) {
+        var ctx = new ActionContext(SubathonEventSource.Simulated, "CustomAction",
+            unsavedCopy ? $"custom-action-test-{action.Id}" : $"custom-action-{action.Id}", action.Name);
+        LogRun(action.Name, ctx);
+        return RunAsync(Guid.NewGuid(), action.Graph, ctx);
+    }
+
+    private void OnCustomActionRunRequested(SubathonEvent ev) {
+        if (ev.EventTypeMeta == LoggedRunMeta) return;
+        string name = ev.Value?.Trim() ?? "";
+        string prefix = $"{SubathonCommandType.RunAction} ";
+
+        if (name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) name = name[prefix.Length..].Trim();
+        if (FindCustomAction(name) is not { } action) {
+            logger?.LogWarning("[Actions] RunAction asked for \"{Name}\", which is not in the actions library", name);
+            return;
+        }
+
+        string user = string.IsNullOrWhiteSpace(ev.User) ? "SYSTEM" : ev.User;
+        _ = RunCustomActionAsync(action, user, ev.Source);
+    }
+
+    private async Task<ActionStep> FillVariablesAsync(ActionStep step, ActionContext ctx) {
+        string joined = $"{step.Target}\n{step.Scope}\n{step.Body}";
+        List<ActionVariable> used = ActionStepTypeHelper.FindVariables(joined).Distinct().ToList();
+        if (used.Count == 0) return step;
+
+        Dictionary<ActionVariable, string> values = await ActionVariableResolver.ResolveAsync(factory, used, ctx, config);
+        return new ActionStep {
+            Type = step.Type,
+            Operation = step.Operation,
+            Target = ActionStepTypeHelper.ReplaceVariables(step.Target, values),
+            TargetName = step.TargetName,
+            Scope = step.Scope == null ? null : ActionStepTypeHelper.ReplaceVariables(step.Scope, values),
+            Value = step.Value,
+            Seconds = step.Seconds,
+            Body = step.Body == null ? null : ActionStepTypeHelper.ReplaceVariables(step.Body, values)
+        };
+    }
+
+    public CustomAction? GetCustomAction(Guid id) {
+        return _library.TryGetValue(id, out (CustomAction Action, string Path) entry) ? entry.Action : null;
+    }
+
+    public string? GetCustomActionPath(Guid id) {
+        return _library.TryGetValue(id, out (CustomAction Action, string Path) entry) ? entry.Path : null;
+    }
+
+    public async Task LoadLibraryAsync() {
+        Directory.CreateDirectory(_folder);
+        _library.Clear();
+        foreach (string file in Directory.EnumerateFiles(_folder, $"*{CustomAction.FileExtension}",
+                     SearchOption.AllDirectories)) {
+            CustomAction? action = await ReadActionFileAsync(file);
+            if (action == null) continue;
+            if (!_library.TryAdd(action.Id, (action, file)))
+                logger?.LogWarning("[Actions] {File} has the same id as {Other}; ignoring it", file,
+                    _library[action.Id].Path);
+        }
+
+        _libraryLoaded = true;
+        logger?.LogInformation("[Actions] Loaded {Count} custom action(s) from {Folder}", _library.Count, _folder);
+        CustomActionsChanged?.Invoke();
+    }
+
+    public async Task SaveCustomActionAsync(CustomAction action) {
+        string path = _library.TryGetValue(action.Id, out (CustomAction Action, string Path) existing)
+            ? existing.Path
+            : NewActionPath(_folder, action.Name);
+
+        Directory.CreateDirectory(Path.GetDirectoryName(path)!);
+        string temp = $"{path}.tmp";
+        await File.WriteAllTextAsync(temp, action.ToJson());
+        File.Move(temp, path, true);
+
+        _library[action.Id] = (action, path);
+        CustomActionsChanged?.Invoke();
+    }
+
+    public void DeleteCustomAction(Guid id) {
+        if (!_library.TryRemove(id, out (CustomAction Action, string Path) entry)) return;
+        try {
+            File.Delete(entry.Path);
+        }
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "[Actions] Could not delete {File}", entry.Path);
+        }
+
+        CustomActionsChanged?.Invoke();
+    }
+
+    public async Task<(CustomAction Action, bool Replaced)?> ImportCustomActionAsync(string file) {
+        CustomAction? action = await ReadActionFileAsync(file);
+        if (action == null) return null;
+        bool replaced = _library.ContainsKey(action.Id);
+        await SaveCustomActionAsync(action);
+        return (action, replaced);
+    }
+
+    public async Task<CustomAction?> AddCustomActionCopyAsync(string file) {
+        if (!_libraryLoaded) await LoadLibraryAsync();
+        CustomAction? action = await ReadActionFileAsync(file);
+        if (action == null) return null;
+
+        if (_library.ContainsKey(action.Id)) action.Id = Guid.NewGuid();
+        action.Name = UniqueName(action.Name);
+        await SaveCustomActionAsync(action);
+        return action;
+    }
+
+    public async Task<CustomAction> DuplicateCustomActionAsync(CustomAction original) {
+        CustomAction copy = original.Clone();
+        copy.Id = Guid.NewGuid();
+        copy.Name = UniqueName(original.Name);
+        await SaveCustomActionAsync(copy);
+        return copy;
+    }
+
+
+    [GeneratedRegex(@"\s\(Copy \d+\)$", RegexOptions.IgnoreCase)]
+    private static partial Regex CopySuffix();
+
+    private string UniqueName(string name) {
+        var taken = new HashSet<string>(_library.Values.Select(e => e.Action.Name), StringComparer.OrdinalIgnoreCase);
+        if (!taken.Contains(name)) return name;
+
+        string baseName = CopySuffix().Replace(name, "");
+        var n = 1;
+        while (taken.Contains($"{baseName} (Copy {n})")) n++;
+        return $"{baseName} (Copy {n})";
+    }
+
+    public static async Task<string> ExportCustomActionAsync(CustomAction action) {
+        Directory.CreateDirectory(ExportsFolder);
+        string path = Path.Combine(ExportsFolder,
+            $"{WidgetPackPaths.Slug(action.Name)}_{WidgetPackPaths.Slug(action.Version)}{CustomAction.FileExtension}");
+        await File.WriteAllTextAsync(path, action.ToJson());
+        return path;
+    }
+
+    private async Task<CustomAction?> ReadActionFileAsync(string file) {
+        try {
+            if (CustomAction.TryParse(await File.ReadAllTextAsync(file), out CustomAction? action)) return action;
+            logger?.LogWarning("[Actions] {File} is not a valid custom action", file);
+        }
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "[Actions] Could not read {File}", file);
+        }
+
+        return null;
+    }
+
+    private static string NewActionPath(string folder, string name) {
+        string slug = WidgetPackPaths.Slug(name);
+        if (string.IsNullOrEmpty(slug)) slug = "action";
+        string path = Path.Combine(folder, $"{slug}{CustomAction.FileExtension}");
+        for (var i = 2; File.Exists(path); i++)
+            path = Path.Combine(folder, $"{slug}-{i}{CustomAction.FileExtension}");
+        return path;
+    }
+
+    public ActionGraph? ResolveGraph(WheelSpinActionType type, string? parameter) {
+        if (!type.IsAvailable()) return null;
+        if (type != WheelSpinActionType.CustomAction) return type.BuildActionGraph(parameter);
+        return Guid.TryParse(parameter, out Guid id) ? GetCustomAction(id)?.Graph : null;
+    }
+
+    public async Task<ActionRunResult> RunAsync(Guid runId, ActionGraph graph, ActionContext ctx,
+        ActionRunProgress? progress = null, Func<ActionRunProgress, Task>? onProgress = null) {
+        progress ??= new ActionRunProgress();
+
+        if (!graph.IsValid(out string invalid)) {
+            logger?.LogWarning("[Actions] Not running {Label}: {Error}", ctx.Label ?? ctx.RepeatKey, invalid);
+            return ActionRunResult.Paused;
+        }
+
+        List<LiveRun> overlapping = _runs.Values.Where(r => r.RepeatKey == ctx.RepeatKey && r.Id != runId).ToList();
+        if (overlapping.Count > 0 && graph.OnRepeat == ActionRepeatMode.Skip) return ActionRunResult.Skipped;
+        if (graph.OnRepeat == ActionRepeatMode.Restart)
+            foreach (LiveRun previous in overlapping) {
+                previous.Superseded = true;
+                previous.Cancel();
+            }
+
+        var live = new LiveRun(runId, ctx.RepeatKey);
+        if (!_runs.TryAdd(runId, live)) return ActionRunResult.Skipped;
+
+        try {
+            bool finished = await RunGraphAsync(graph, ctx, progress, onProgress, live.Token);
+            if (live.Superseded || finished) return ActionRunResult.Done;
+            return live.Cancelled ? ActionRunResult.Cancelled : ActionRunResult.Paused;
+        }
+        finally {
+            _runs.TryRemove(runId, out _);
+            live.Dispose();
+        }
+    }
+
+    private async Task<bool> RunGraphAsync(ActionGraph graph, ActionContext ctx, ActionRunProgress progress,
+        Func<ActionRunProgress, Task>? onProgress, CancellationToken outerCt) {
+        using var failCts = CancellationTokenSource.CreateLinkedTokenSource(outerCt);
+        CancellationToken ct = failCts.Token;
+
+        Dictionary<string, ActionNode> pending = graph.Nodes
+            .Where(n => !progress.IsDone(n.Id))
+            .ToDictionary(n => n.Id);
+        var running = new Dictionary<Task<bool>, ActionNode>();
+
+        void StartReady() {
+            foreach (ActionNode node in pending.Values.ToList().Where(node => graph.Incoming(node.Id).All(progress.IsDone))) {
+                pending.Remove(node.Id);
+                running[node.Disabled ? Task.Run(() => true, ct) : RunStepAsync(node.Step, ctx, progress, ct)] = node;
+            }
+        }
+
+        StartReady();
+        var failed = false;
+        while (running.Count > 0) {
+            Task<bool> next = await Task.WhenAny(running.Keys);
+            ActionNode node = running[next];
+            running.Remove(next);
+
+            bool ok;
+            try {
+                ok = await next;
+            }
+            catch (OperationCanceledException) {
+                ok = false;
+            }
+            catch (Exception ex) {
+                logger?.LogError(ex, "[Actions] Step {Step} threw", node.Step.Describe());
+                ok = false;
+            }
+
+            if (ok) {
+                progress.MarkDone(node.Id);
+                if (onProgress != null) await onProgress(progress);
+                if (!failed && !ct.IsCancellationRequested) StartReady();
+                continue;
+            }
+
+            if (failed || ct.IsCancellationRequested) continue;
+            failed = true;
+            logger?.LogWarning("[Actions] {Label} paused at \"{Step}\"", ctx.Label ?? ctx.RepeatKey,
+                node.Step.Describe());
+            await failCts.CancelAsync();
+        }
+
+        return !failed && pending.Count == 0 && !outerCt.IsCancellationRequested;
+    }
+
+    private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        CancellationToken ct) {
+        ct.ThrowIfCancellationRequested();
+        if (!step.Type.IsAvailable()) return false;
+
+        if (step.Type.AllowsVariables()) step = await FillVariablesAsync(step, ctx);
+
+        switch (step.Type) {
+            case ActionStepType.HttpGet:
+            case ActionStepType.HttpPost: {
+                using var request = new HttpRequestMessage(
+                    step.Type == ActionStepType.HttpGet ? HttpMethod.Get : HttpMethod.Post, step.Target.Trim());
+                if (step.Type == ActionStepType.HttpPost) {
+                    string body = step.Body ?? "";
+                    string start = body.TrimStart();
+                    string mediaType = start.StartsWith('{') || start.StartsWith('[') ? "application/json" : "text/plain";
+                    request.Content = new StringContent(body, Encoding.UTF8, mediaType);
+                }
+
+                using HttpResponseMessage response =
+                    await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, ct);
+                if (response.IsSuccessStatusCode) return true;
+                logger?.LogWarning("[Actions] {Method} {Url} answered {Status}", request.Method, step.Target,
+                    (int)response.StatusCode);
+                return false;
+            }
+
+            case ActionStepType.Wait:
+                await Task.Delay(step.Duration, ct); // when here, easier to do a delay vs the timerservice callback
+                return true;
+
+            case ActionStepType.AddTime:
+            case ActionStepType.SubtractTime: {
+                SubathonCommandType cmd = step.Type == ActionStepType.AddTime
+                    ? SubathonCommandType.AddTime
+                    : SubathonCommandType.SubtractTime;
+                SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
+                    Source = ctx.Source,
+                    EventTimestamp = DateTime.Now,
+                    Command = cmd,
+                    EventType = SubathonEventType.Command,
+                    User = ctx.User,
+                    Value = $"{cmd} {Utils.FormatShortDuration(step.Duration)}",
+                    SecondsValue = step.Duration.TotalSeconds,
+                    PointsValue = 0
+                });
+                return true;
+            }
+
+            case ActionStepType.SetMultiplier: {
+                if (_multiplierActive) {
+                    logger?.LogInformation("[Actions] A multiplier is already running; holding \"{Step}\"",
+                        step.Describe());
+                    return false;
+                }
+
+                string amount = (step.Value ?? 1).ToString(CultureInfo.InvariantCulture);
+                string duration = step.Duration > TimeSpan.Zero ? $"{(int)step.Duration.TotalSeconds}s" : "xs";
+                bool points = step.Operation is ActionOperation.Points or ActionOperation.PointsAndTime;
+                bool time = step.Operation is ActionOperation.Time or ActionOperation.PointsAndTime;
+                SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
+                    Source = ctx.Source,
+                    EventTimestamp = DateTime.Now,
+                    Command = SubathonCommandType.SetMultiplier,
+                    EventType = SubathonEventType.Command,
+                    User = ctx.User,
+                    Value = $"{amount}|{duration}|{points}|{time}"
+                });
+                _multiplierActive = true;
+                return true;
+            }
+
+            case ActionStepType.Reroll: {
+                var count = (int)(step.Value ?? 0);
+                if (count < 1) return false;
+                int owed = await StateValueHelper.AddIntAsync(factory, StateKeys.WheelSpinsOwed, count);
+                WheelEvents.RaiseSpinsOwedUpdateFromEvent(owed);
+                return true;
+            }
+
+            default:
+                if (_runners.TryGetValue(step.Type, out IActionStepRunner? runner))
+                    return await runner.RunStepAsync(step, ctx, progress, ct);
+                logger?.LogWarning("[Actions] No runner for step type {Type}", step.Type);
+                return false;
+        }
+    }
+
+    public async Task<ActionRunResult> RunWheelSpinAsync(Guid historyId, Func<WheelSpinHistoryStatus,
+        Task>? announce = null) {
+
+        WheelSpinHistory? history = await LoadHistoryAsync(historyId);
+        if (history == null) return ActionRunResult.Skipped;
+
+        WheelSpinAction? action = history.LinkedItem?.Action;
+        ActionGraph? graph = action == null ? null : ResolveGraph(action.ActionType, action.Parameter);
+        if (action == null || graph == null || IsRunning(historyId)) {
+            if (action?.ActionType.HasAction() == true && graph == null)
+                logger?.LogWarning("[Actions] Wheel item \"{Item}\" has no runnable action ({Type}: \"{Parameter}\")",
+                    history.LinkedItem?.Text, action.ActionType, action.Parameter);
+            if (announce != null) await announce(history.Status);
+            return ActionRunResult.Skipped;
+        }
+
+        bool quiet = announce != null && graph.Nodes.All(n => n.Disabled || n.Step.Type != ActionStepType.Wait);
+        if (announce != null && !quiet) await announce(history.Status);
+        await SaveHistoryAsync(history, WheelSpinHistoryStatus.Running, history.ActionProgress, !quiet);
+
+        var ctx = new ActionContext(SubathonEventSource.WheelSpin, "WheelSpin",
+            action.ActionType.RepeatKey(action.Parameter, action.WheelItemId), history.LinkedItem?.Text);
+
+        if (action.ActionType == WheelSpinActionType.CustomAction
+            && Guid.TryParse(action.Parameter, out Guid customId) && GetCustomAction(customId) is { } custom)
+            LogRun(custom.Name, ctx);
+        ActionRunProgress progress = ActionRunProgress.Parse(history.ActionProgress);
+        ActionRunResult result = await RunAsync(historyId, graph, ctx, progress,
+            p => SaveProgressAsync(historyId, p));
+
+        bool keepStatus = result == ActionRunResult.Cancelled
+                          || (result == ActionRunResult.Skipped && IsRunning(historyId));
+
+        history = await LoadHistoryAsync(historyId) ?? history;
+        if (!keepStatus && history.Status == WheelSpinHistoryStatus.Running) {
+            if (result == ActionRunResult.Paused)
+                await SaveHistoryAsync(history, WheelSpinHistoryStatus.Pending, progress.ToJson(), !quiet);
+            else
+                await SaveHistoryAsync(history, WheelSpinHistoryStatus.Done, null, !quiet);
+        }
+
+        if (quiet) await announce!(history.Status);
+        return result;
+    }
+
+    private async Task<WheelSpinHistory?> LoadHistoryAsync(Guid historyId) {
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        return await db.WheelSpinHistories
+            .Include(h => h.LinkedItem).ThenInclude(i => i!.Action)
+            .Include(h => h.LinkedWheel)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(h => h.Id == historyId);
+    }
+
+    private async Task SaveProgressAsync(Guid historyId, ActionRunProgress progress) {
+        string json = progress.ToJson();
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        await db.WheelSpinHistories.Where(h => h.Id == historyId)
+            .ExecuteUpdateAsync(s => s.SetProperty(h => h.ActionProgress, json));
+    }
+
+    private async Task SaveHistoryAsync(WheelSpinHistory history, WheelSpinHistoryStatus status, string? progress,
+        bool raise) {
+        history.Status = status;
+        history.ActionProgress = progress;
+        history.UpdatedAt = DateTime.Now;
+
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        await db.WheelSpinHistories.Where(h => h.Id == history.Id)
+            .ExecuteUpdateAsync(s => s
+                .SetProperty(h => h.Status, status)
+                .SetProperty(h => h.ActionProgress, progress)
+                .SetProperty(h => h.UpdatedAt, history.UpdatedAt));
+
+        if (raise)
+            WheelEvents.RaiseWheelSpinStatusChanged(history, StateValueHelper.Get<int>(db, StateKeys.WheelSpinsOwed));
+    }
+
+    private void OnWheelSpinStatusChanged(WheelSpinHistory history, int _) {
+        if (history.Status != WheelSpinHistoryStatus.Running) Cancel(history.Id);
+    }
+
+    private void OnSubathonDataUpdate(SubathonData data, DateTime _) {
+        _multiplierActive = data.Multiplier?.IsRunning() ?? false;
+    }
+
+    private sealed class LiveRun(Guid id, string repeatKey) : IDisposable {
+        private readonly CancellationTokenSource _cts = new();
+        public Guid Id { get; } = id;
+        public string RepeatKey { get; } = repeatKey;
+        public CancellationToken Token => _cts.Token;
+        public bool Cancelled { get; private set; }
+        public bool Superseded { get; set; }
+
+        public void Cancel() {
+            Cancelled = true;
+            try {
+                _cts.Cancel();
+            }
+            catch (ObjectDisposedException) {
+                /* */
+            }
+        }
+
+        public void Dispose() {
+            _cts.Dispose();
+        }
+    }
+}
diff --git a/SubathonManager.Services/CommandService.cs b/SubathonManager.Services/CommandService.cs
index 30743bd..fe44383 100644
--- a/SubathonManager.Services/CommandService.cs
+++ b/SubathonManager.Services/CommandService.cs
@@ -105,6 +105,17 @@ private static bool ValidateParameters(SubathonEvent subathonEvent, string messa
 
         var isValid = false;
         switch (subathonEvent.Command) {
+            case SubathonCommandType.RunAction: {
+                string name = string.Join(' ', parts[1..]).Trim();
+                if (name.Length == 0) break;
+
+                ActionService? actions = AppServices.Provider?.GetService<ActionService>();
+                if (actions != null && actions.FindCustomAction(name) == null) break;
+
+                subathonEvent.Value = $"{subathonEvent.Command} {name}";
+                isValid = true;
+                break;
+            }
             case SubathonCommandType.AddMoney:
             case SubathonCommandType.SubtractMoney:
                 if (parts.Length >= 3 && Utils.TryParseAmount(parts[1], out double value)) {
diff --git a/SubathonManager.Services/DiscordWebhookService.cs b/SubathonManager.Services/DiscordWebhookService.cs
index a8be49f..5797ba8 100644
--- a/SubathonManager.Services/DiscordWebhookService.cs
+++ b/SubathonManager.Services/DiscordWebhookService.cs
@@ -479,7 +479,8 @@ private void OnWheelSpinResult(WheelSet wheel, WheelItem? item, WheelSpinHistory
     }
 
     private void OnWheelSpinStatusChanged(WheelSpinHistory history, int spinsOwed) {
-        if (string.IsNullOrEmpty(_wheelWebhookUrl) || !_doWheelSpinEvents) return;
+        if (string.IsNullOrEmpty(_wheelWebhookUrl) || !_doWheelSpinEvents
+                                                   || history.Status == WheelSpinHistoryStatus.Running) return;
         _wheelQueue.Enqueue(new WheelLogEntry(history.LinkedWheel?.Name ?? "Unknown", history.LinkedItem, history,
             spinsOwed, true));
     }
diff --git a/SubathonManager.Services/EventService.cs b/SubathonManager.Services/EventService.cs
index 22068f6..472c39a 100644
--- a/SubathonManager.Services/EventService.cs
+++ b/SubathonManager.Services/EventService.cs
@@ -438,6 +438,9 @@ await db.Database.ExecuteSqlRawAsync(
             case SubathonCommandType.SpinWheel:
                 WheelEvents.RaiseWheelSpinRequested();
                 break;
+            case SubathonCommandType.RunAction:
+                ActionEvents.RaiseCustomActionRunRequested(ev);
+                break;
             case SubathonCommandType.AddMoney:
                 ev.EventType = SubathonEventType.DonationAdjustment;
                 break;
diff --git a/SubathonManager.Tests/CoreUnitTests/CsvUtilsTests.cs b/SubathonManager.Tests/CoreUnitTests/CsvUtilsTests.cs
new file mode 100644
index 0000000..6b54f16
--- /dev/null
+++ b/SubathonManager.Tests/CoreUnitTests/CsvUtilsTests.cs
@@ -0,0 +1,91 @@
+using System.Globalization;
+using SubathonManager.Core.Enums;
+
+namespace SubathonManager.Tests.CoreUnitTests;
+
+public class CsvUtilsTests {
+    [Fact]
+    public void Escape_QuotesOnlyWhenNeeded() {
+        Assert.Equal("Test", CsvUtils.Escape("Test"));
+        Assert.Equal(string.Empty, CsvUtils.Escape(string.Empty));
+        Assert.Equal(string.Empty, CsvUtils.Escape("   "));
+        Assert.Equal(string.Empty, CsvUtils.Escape(null));
+        Assert.Equal("\"Test1,Test2\"", CsvUtils.Escape("Test1,Test2"));
+        Assert.Equal("\"\"\"Test1\"\"\"", CsvUtils.Escape("\"Test1\""));
+        Assert.Equal("\"Test\r\nTest2\"", CsvUtils.Escape("Test\r\nTest2"));
+    }
+
+    [Fact]
+    public void Escape_FormatsValuesInvariantRegardlessOfCulture() {
+        CultureInfo original = CultureInfo.CurrentCulture;
+        try {
+            CultureInfo.CurrentCulture = new CultureInfo("de-DE");
+            Assert.Equal("1.5", CsvUtils.Escape(1.5));
+            Assert.Equal("1234.25", CsvUtils.Escape(1234.25m));
+            Assert.Equal("2026-10-03 14:05:09", CsvUtils.Escape(new DateTime(2026, 10, 3, 14, 5, 9)));
+            Assert.Equal("True", CsvUtils.Escape(true));
+            Assert.Equal(nameof(ScheduleItemKind.Event), CsvUtils.Escape(ScheduleItemKind.Event));
+            Assert.Equal(string.Empty, CsvUtils.Escape((int?)null));
+        }
+        finally {
+            CultureInfo.CurrentCulture = original;
+        }
+    }
+
+    [Fact]
+    public void Write_EmitsHeaderRowsThenProjectedRows() {
+        string csv = CsvUtils.Write(
+            [["#Meta=1", "Other=2"], [], ["Name", "Value"]],
+            new[] { ("a,b", 1), ("plain", 2) },
+            r => [r.Item1, r.Item2]);
+
+        Assert.Equal(["#Meta=1,Other=2", "", "Name,Value", "\"a,b\",1", "plain,2"],
+            csv.TrimEnd().Split(Environment.NewLine));
+    }
+
+    [Fact]
+    public void ReadRecords_HandlesQuotedCommasQuotesAndNewlines() {
+        const string csv = "Name,Note\r\n\"a,b\",\"line one\nline \"\"two\"\"\"\r\n\r\nlast,\n";
+
+        List<(int Line, string[] Fields)> records = CsvUtils.ReadRecords(csv);
+
+        Assert.Equal(3, records.Count);
+        Assert.Equal(["Name", "Note"], records[0].Fields);
+        Assert.Equal(["a,b", "line one\nline \"two\""], records[1].Fields);
+        Assert.Equal(2, records[1].Line);
+        Assert.Equal(["last", ""], records[2].Fields);
+        Assert.Equal(5, records[2].Line);
+    }
+
+    [Fact]
+    public void ReadRecords_StripsBom() {
+        List<(int Line, string[] Fields)> records = CsvUtils.ReadRecords((char)0xFEFF + "A,B");
+        Assert.Equal(["A", "B"], records.Single().Fields);
+    }
+
+    [Fact]
+    public async Task ExportAsync_ThenReadFileAsync_RoundTrips() {
+        string path = await CsvUtils.ExportAsync("csv utils test: round/trip",
+            [["Text", "Value"]],
+            [("needs, quoting", 1.5),("multi\nline", 2.0)],
+            r => [r.Item1, r.Item2]);
+        try {
+            Assert.Equal(CsvUtils.ExportFolder, Path.GetDirectoryName(path));
+            Assert.StartsWith("csv utils test_ round_trip-", Path.GetFileName(path));
+
+            List<string[]>? rows = await CsvUtils.ReadFileAsync(path);
+            Assert.NotNull(rows);
+            Assert.Equal(3, rows.Count);
+            Assert.Equal(["needs, quoting", "1.5"], rows[1]);
+            Assert.Equal(["multi\nline", "2"], rows[2]);
+        }
+        finally {
+            File.Delete(path);
+        }
+    }
+
+    [Fact]
+    public async Task ReadFileAsync_ReturnsNullForMissingFile() {
+        Assert.Null(await CsvUtils.ReadFileAsync(Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".csv")));
+    }
+}
diff --git a/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs b/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
index 8790d79..46def99 100644
--- a/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
+++ b/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
@@ -123,14 +123,4 @@ public void ParseCurrency() {
         Assert.Equal("INR", Utils.TryParseCurrency("₹"));
         Assert.Equal("CHF", Utils.TryParseCurrency("₣"));
     }
-
-    [Fact]
-    public void EscapeCsvData() {
-        Assert.Equal("Test", Utils.EscapeCsv("Test"));
-        Assert.Equal(string.Empty, Utils.EscapeCsv(string.Empty));
-        Assert.Equal(string.Empty, Utils.EscapeCsv(null));
-        Assert.Equal("\"Test1,Test2\"", Utils.EscapeCsv("Test1,Test2"));
-        Assert.Equal("\"\"\"Test1\"\"\"", Utils.EscapeCsv("\"Test1\""));
-        Assert.Equal("\"Test\r\nTest2\"", Utils.EscapeCsv("Test\r\nTest2"));
-    }
 }
\ No newline at end of file
diff --git a/SubathonManager.Tests/CoreUnitTests/WheelSpinVtsActionTypeTests.cs b/SubathonManager.Tests/CoreUnitTests/WheelSpinVtsActionTypeTests.cs
index c469c5b..bbb69f8 100644
--- a/SubathonManager.Tests/CoreUnitTests/WheelSpinVtsActionTypeTests.cs
+++ b/SubathonManager.Tests/CoreUnitTests/WheelSpinVtsActionTypeTests.cs
@@ -15,8 +15,9 @@ public void VTubeStudio_IsNotACommand() {
     }
 
     [Fact]
-    public void VTubeStudio_IsNotDoneImmediately() {
-        Assert.False(WheelSpinActionType.VTubeStudio.IsDoneImmediately());
+    public void VTubeStudio_RunsAsSoonAsTheSpinLands() {
+        Assert.True(WheelSpinActionType.VTubeStudio.IsAutoRun());
+        Assert.False(WheelSpinActionType.SetMultiplier.IsAutoRun());
     }
 
     [Fact]
diff --git a/SubathonManager.Tests/DataUnitTests/DbContextTests.cs b/SubathonManager.Tests/DataUnitTests/DbContextTests.cs
index ed8b81b..11a74ee 100644
--- a/SubathonManager.Tests/DataUnitTests/DbContextTests.cs
+++ b/SubathonManager.Tests/DataUnitTests/DbContextTests.cs
@@ -125,11 +125,12 @@ public async Task ActiveEventsToCsv_Writes_File() {
 
         await db.SaveChangesAsync(TestContext.Current.CancellationToken);
 
-        await AppDbContext.ActiveEventsToCsv(db);
+        string? path = await AppDbContext.ActiveEventsToCsv(db);
 
-        string[] files = Directory.GetFiles(Path.Combine(Config.DataFolder, "exports"));
-        Assert.Single(files);
-        File.Delete(files[0]);
+        Assert.NotNull(path);
+        Assert.True(File.Exists(path));
+        Assert.Contains("KoFiDonation", await File.ReadAllTextAsync(path, TestContext.Current.CancellationToken));
+        File.Delete(path);
     }
 
     [Fact]
diff --git a/SubathonManager.Tests/IntegrationUnitTests/VTSServiceTests.cs b/SubathonManager.Tests/IntegrationUnitTests/VTSServiceTests.cs
index eb1b0ef..66240f7 100644
--- a/SubathonManager.Tests/IntegrationUnitTests/VTSServiceTests.cs
+++ b/SubathonManager.Tests/IntegrationUnitTests/VTSServiceTests.cs
@@ -18,8 +18,7 @@ private static VTSService MakeService(
         bool enabled = false,
         string? host = null,
         string? port = null,
-        string? token = null,
-        ITimerService? timerService = null) {
+        string? token = null) {
         var logger = new Mock<ILogger<VTSService>>();
         var storage = new InMemorySecureStorage(token != null
             ? new Dictionary<string, string> { [StorageKeys.VTubeStudioAuthToken] = token }
@@ -30,7 +29,7 @@ private static VTSService MakeService(
         if (host != null) config.Set(VTSService.ConfigSection, "Host", host);
         if (port != null) config.Set(VTSService.ConfigSection, "Port", port);
 
-        return new VTSService(logger.Object, config, storage, timerService);
+        return new VTSService(logger.Object, config, storage);
     }
 
     private static async Task<List<IntegrationConnection>> CaptureConnectionsAsync(Func<Task> trigger) {
@@ -225,41 +224,12 @@ public async Task ApplyExpressionAction_RealActions_FailWhenDisconnected(VtsTogg
         Assert.False(await MakeService().ApplyExpressionActionAsync("a.exp3.json", action, TestContext.Current.CancellationToken));
     }
 
-    [Fact]
-    public async Task ExecuteWheelAction_WhenDisconnected_ReturnsFalse() {
-        VTSService service = MakeService();
-        var action = new VTSWheelAction {
-            Kind = VtsTargetKind.Expression,
-            Target = "cat_ears.exp3.json",
-            ToggleAction = VtsToggleAction.On
-        };
-
-        Assert.False(await service.ExecuteWheelActionAsync(action, TestContext.Current.CancellationToken));
-    }
-
-    [Fact]
-    public async Task ExecuteWheelAction_WithInvalidAction_ReturnsFalse() {
-        VTSService service = MakeService();
-        var action = new VTSWheelAction { Kind = VtsTargetKind.Expression, Target = "" };
-
-        Assert.False(await service.ExecuteWheelActionAsync(action, TestContext.Current.CancellationToken));
-    }
-
-    [Fact]
-    public async Task ExecuteWheelAction_WhenDisconnected_SchedulesNoRevertTimer() {
-        var timer = new RecordingTimerService();
-        VTSService service = MakeService(timerService: timer);
-
-        var action = new VTSWheelAction {
-            Kind = VtsTargetKind.Expression,
-            Target = "cat_ears.exp3.json",
-            ToggleAction = VtsToggleAction.On,
-            Duration = TimeSpan.FromSeconds(30),
-            AfterToggle = VtsToggleAction.Off
-        };
-
-        Assert.False(await service.ExecuteWheelActionAsync(action, TestContext.Current.CancellationToken));
-        Assert.Empty(timer.Registered);
+    [Theory]
+    [InlineData(VtsTargetKind.Expression, "cat_ears.exp3.json")]
+    [InlineData(VtsTargetKind.Hotkey, "hotkey-id")]
+    [InlineData(VtsTargetKind.Parameter, "FaceAngleX")]
+    public async Task HasTarget_WhenDisconnected_ReturnsFalse(VtsTargetKind kind, string target) {
+        Assert.False(await MakeService().HasTargetAsync(kind, target, TestContext.Current.CancellationToken));
     }
 
     [Fact]
@@ -362,27 +332,4 @@ public string GetInstallId() {
             return "test-install";
         }
     }
-
-    private sealed class RecordingTimerService : ITimerService {
-        public List<(string Key, TimeSpan Interval)> Registered { get; } = [];
-        public List<string> Unregistered { get; } = [];
-
-        public IDisposable Register(string key, TimeSpan interval, Func<CancellationToken, Task> callback) {
-            Registered.Add((key, interval));
-            return new Noop();
-        }
-
-        public IDisposable Register(string key, TimeSpan interval, Action callback) {
-            Registered.Add((key, interval));
-            return new Noop();
-        }
-
-        public void Unregister(string key) {
-            Unregistered.Add(key);
-        }
-
-        private sealed class Noop : IDisposable {
-            public void Dispose() { }
-        }
-    }
 }
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
new file mode 100644
index 0000000..0b94eb7
--- /dev/null
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -0,0 +1,513 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Data;
+using SubathonManager.Services;
+using SubathonManager.Tests.Utility;
+
+// ReSharper disable NullableWarningSuppressionIsUsed
+
+namespace SubathonManager.Tests.ServicesUnitTests;
+
+[Collection("GlobalState")]
+public class ActionServiceTests {
+    private static async Task<(ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options,
+        SqliteConnection conn)> SetupAsync() {
+        var dbName = $"test_{Guid.NewGuid():N}";
+        var connectionString = $"DataSource={dbName};Mode=Memory;Cache=Shared;Pooling=False";
+        var connection = new SqliteConnection(connectionString);
+        await connection.OpenAsync();
+
+        DbContextOptions<AppDbContext> options =
+            new DbContextOptionsBuilder<AppDbContext>().UseSqlite(connectionString).Options;
+        await using (var db = new AppDbContext(options)) {
+            await db.Database.EnsureCreatedAsync();
+        }
+
+        var factoryMock = new Mock<IDbContextFactory<AppDbContext>>();
+        factoryMock
+            .Setup(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(() => new AppDbContext(options));
+
+        foreach (string name in new[] { "SubathonEventCreated", "SubathonDataUpdate" })
+            typeof(SubathonEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
+        foreach (string name in new[] { "WheelSpinStatusChanged", "OnSpinsOwedUpdateFromEvent" })
+            typeof(WheelEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
+
+        typeof(ActionEvents).GetField("CustomActionRunRequested", BindingFlags.Static | BindingFlags.NonPublic)
+            ?.SetValue(null, null);
+
+        var runner = new FakeRunner();
+        var service = new ActionService(factoryMock.Object, [runner],
+            actionsFolder: Path.Combine(Path.GetTempPath(), $"sm_actions_{Guid.NewGuid():N}"));
+        await service.StartAsync(TestContext.Current.CancellationToken);
+        return (service, runner, options, connection);
+    }
+
+    private static async Task<WheelSpinHistory> AddSpinAsync(DbContextOptions<AppDbContext> options,
+        WheelSpinActionType type, string parameter, WheelSpinHistoryStatus status = WheelSpinHistoryStatus.Pending) {
+        await using var db = new AppDbContext(options);
+        var wheel = new WheelSet();
+        var item = new WheelItem { Text = "Prize", Enabled = true, LinkedWheel = wheel };
+        item.Action = new WheelSpinAction { ActionType = type, Parameter = parameter, LinkedItem = item };
+        var history = new WheelSpinHistory { LinkedWheel = wheel, LinkedItem = item, Status = status };
+        db.WheelSpinHistories.Add(history);
+        await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+        return history;
+    }
+
+    private static async Task<WheelSpinHistory> ReloadAsync(DbContextOptions<AppDbContext> options, Guid id) {
+        await using var db = new AppDbContext(options);
+        return await db.WheelSpinHistories.AsNoTracking()
+            .FirstAsync(h => h.Id == id, TestContext.Current.CancellationToken);
+    }
+
+    private static ActionStep Hotkey(string target) {
+        return new ActionStep { Type = ActionStepType.VtsHotkey, Operation = ActionOperation.Trigger, Target = target };
+    }
+
+    private static ActionStep Wait(double seconds) {
+        return new ActionStep { Type = ActionStepType.Wait, Seconds = seconds };
+    }
+
+    [Fact]
+    public async Task InstantWheelAction_RunsBeforeTheSpinIsAnnounced_AndLandsDone() {
+        (ActionService service, _, DbContextOptions<AppDbContext> options, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        WheelSpinHistory history = await AddSpinAsync(options, WheelSpinActionType.AddTime, "5m");
+
+        var created = new List<SubathonEvent>();
+        SubathonEvents.SubathonEventCreated += created.Add;
+        var statusEvents = new List<WheelSpinHistoryStatus>();
+        WheelEvents.WheelSpinStatusChanged += (h, _) => statusEvents.Add(h.Status);
+
+        WheelSpinHistoryStatus? announced = null;
+        var commandsAtAnnounce = -1;
+        ActionRunResult result = await service.RunWheelSpinAsync(history.Id, status => {
+            announced = status;
+            commandsAtAnnounce = created.Count;
+            return Task.CompletedTask;
+        });
+
+        Assert.Equal(ActionRunResult.Done, result);
+        Assert.Equal(WheelSpinHistoryStatus.Done, announced);
+        Assert.Equal(1, commandsAtAnnounce);
+        Assert.Empty(statusEvents);
+
+        SubathonEvent ev = Assert.Single(created);
+        Assert.Equal(SubathonCommandType.AddTime, ev.Command);
+        Assert.Equal(SubathonEventSource.WheelSpin, ev.Source);
+        Assert.Equal(300, ev.SecondsValue);
+        Assert.Equal(WheelSpinHistoryStatus.Done, (await ReloadAsync(options, history.Id)).Status);
+    }
+
+    [Fact]
+    public async Task VtsChain_IsAnnouncedPending_RunsThroughRunning_AndFinishesDone() {
+        (ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
+            await SetupAsync();
+        await using SqliteConnection _ = conn;
+        var vts = new VTSWheelAction {
+            Kind = VtsTargetKind.Hotkey, Target = "spin", Duration = TimeSpan.FromSeconds(1),
+            AfterHotkey = VtsHotkeyAfterAction.TriggerAgain
+        };
+        WheelSpinHistory history = await AddSpinAsync(options, WheelSpinActionType.VTubeStudio,
+            vts.ToParameterString());
+
+        var statusEvents = new ConcurrentQueue<WheelSpinHistoryStatus>();
+        WheelEvents.WheelSpinStatusChanged += (h, _) => statusEvents.Enqueue(h.Status);
+
+        WheelSpinHistoryStatus? announced = null;
+        ActionRunResult result = await service.RunWheelSpinAsync(history.Id, status => {
+            announced = status;
+            return Task.CompletedTask;
+        });
+
+        Assert.Equal(ActionRunResult.Done, result);
+        Assert.Equal(WheelSpinHistoryStatus.Pending, announced);
+        Assert.Equal([WheelSpinHistoryStatus.Running, WheelSpinHistoryStatus.Done], statusEvents.ToArray());
+        Assert.Equal(["spin", "spin"], runner.Ran.ToArray());
+
+        WheelSpinHistory saved = await ReloadAsync(options, history.Id);
+        Assert.Equal(WheelSpinHistoryStatus.Done, saved.Status);
+        Assert.Null(saved.ActionProgress);
+    }
+
+    [Fact]
+    public async Task Branches_RunInParallel_AndAJoinWaitsForEveryInput() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        //////////////////////////////////////////
+        //      +-> wait 0.3s -> slow --+
+        // start                        +-> join
+        //      +-> fast ---------------+
+        //////////////////////////////////////////
+        var graph = new ActionGraph {
+            Nodes = [
+                new ActionNode { Id = "start", Step = Hotkey("start") },
+                new ActionNode { Id = "wait", Step = Wait(0.3) },
+                new ActionNode { Id = "slow", Step = Hotkey("slow") },
+                new ActionNode { Id = "fast", Step = Hotkey("fast") },
+                new ActionNode { Id = "join", Step = Hotkey("join") }
+            ],
+            Edges = [
+                new ActionEdge { From = "start", To = "wait" },
+                new ActionEdge { From = "wait", To = "slow" },
+                new ActionEdge { From = "start", To = "fast" },
+                new ActionEdge { From = "slow", To = "join" },
+                new ActionEdge { From = "fast", To = "join" }
+            ]
+        };
+
+        ActionRunResult result = await service.RunAsync(Guid.NewGuid(), graph,
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "branches"));
+
+        Assert.Equal(ActionRunResult.Done, result);
+        Assert.Equal(["start", "fast", "slow", "join"], runner.Ran.ToArray());
+    }
+
+    [Fact]
+    public async Task FailedStep_PausesTheRun_AndResumeContinuesFromThatStep() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        runner.FailOnce.Add("flaky");
+
+        var graph = new ActionGraph {
+            Nodes = [
+                new ActionNode { Id = "1", Step = Hotkey("first") },
+                new ActionNode { Id = "2", Step = Hotkey("flaky") },
+                new ActionNode { Id = "3", Step = Hotkey("last") },
+                new ActionNode { Id = "4", Step = Wait(0.5) },
+                new ActionNode { Id = "5", Step = Hotkey("late") }
+            ],
+            Edges = [
+                new ActionEdge { From = "1", To = "2" },
+                new ActionEdge { From = "2", To = "3" },
+                new ActionEdge { From = "1", To = "4" },
+                new ActionEdge { From = "4", To = "5" }
+            ]
+        };
+        var ctx = new ActionContext(SubathonEventSource.WheelSpin, "test", "resume");
+        var progress = new ActionRunProgress();
+
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(), graph, ctx, progress));
+        Assert.Equal(["1"], progress.Done.Order());
+        Assert.Equal(["first"], runner.Ran.ToArray());
+
+        progress = ActionRunProgress.Parse(progress.ToJson());
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), graph, ctx, progress));
+        Assert.Equal(["first", "flaky", "last", "late"], runner.Ran.ToArray());
+    }
+
+    [Fact]
+    public async Task MarkingARunningSpinDone_StopsTheChain_AndKeepsTheNewStatus() {
+        (ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
+            await SetupAsync();
+        await using SqliteConnection _ = conn;
+        var vts = new VTSWheelAction {
+            Kind = VtsTargetKind.Hotkey, Target = "spin", Duration = TimeSpan.FromSeconds(30),
+            AfterHotkey = VtsHotkeyAfterAction.TriggerAgain
+        };
+        WheelSpinHistory history = await AddSpinAsync(options, WheelSpinActionType.VTubeStudio,
+            vts.ToParameterString());
+
+        Task<ActionRunResult> run = service.RunWheelSpinAsync(history.Id);
+        for (var i = 0; i < 100 && !service.IsRunning(history.Id); i++) await Task.Delay(10, TestContext.Current.CancellationToken);
+        Assert.True(service.IsRunning(history.Id));
+
+        await using (var db = new AppDbContext(options)) {
+            WheelSpinHistory tracked = await db.WheelSpinHistories.FirstAsync(h => h.Id == history.Id,
+                TestContext.Current.CancellationToken);
+
+            tracked.Status = WheelSpinHistoryStatus.Done;
+            await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+            WheelEvents.RaiseWheelSpinStatusChanged(tracked, 0);
+        }
+
+        Assert.Equal(ActionRunResult.Cancelled, await run);
+        Assert.Equal(["spin"], runner.Ran.ToArray());
+        Assert.Equal(WheelSpinHistoryStatus.Done, (await ReloadAsync(options, history.Id)).Status);
+    }
+
+    [Fact]
+    public async Task RepeatOnTheSameKey_RestartsTheChain_SoOnlyTheNewestRevertFires() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        ActionGraph graph = ActionGraph.Sequence(Hotkey("on"), Wait(0.4), Hotkey("off"));
+        var ctx = new ActionContext(SubathonEventSource.WheelSpin, "test", "same-target");
+
+        Task<ActionRunResult> first = service.RunAsync(Guid.NewGuid(), graph, ctx);
+        await Task.Delay(100, TestContext.Current.CancellationToken);
+        Task<ActionRunResult> second = service.RunAsync(Guid.NewGuid(), graph, ctx);
+
+        Assert.Equal(ActionRunResult.Done, await first);
+        Assert.Equal(ActionRunResult.Done, await second);
+        Assert.Equal(["on", "on", "off"], runner.Ran.ToArray());
+    }
+
+    [Fact]
+    public async Task Startup_ReturnsRunsInterruptedByARestartToPending() {
+        (ActionService service, _, DbContextOptions<AppDbContext> options, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        WheelSpinHistory history = await AddSpinAsync(options, WheelSpinActionType.VTubeStudio, "",
+            WheelSpinHistoryStatus.Running);
+
+        await service.StartAsync(TestContext.Current.CancellationToken);
+
+        Assert.Equal(WheelSpinHistoryStatus.Pending, (await ReloadAsync(options, history.Id)).Status);
+    }
+
+    [Fact]
+    public void VtsParameterAction_ConvertsToAChain_ThatSurvivesJson() {
+        var vts = new VTSWheelAction {
+            Kind = VtsTargetKind.Parameter, Target = "FaceAngleX", Value = 30,
+            Duration = TimeSpan.FromSeconds(10), AfterParameter = VtsParameterAfterAction.ResetToOriginal
+        };
+
+        Assert.True(ActionGraph.TryParse(vts.ToActionGraph().ToJson(), out ActionGraph? graph));
+        Assert.True(graph.IsValid(out _));
+        Assert.Equal([ActionOperation.Hold, ActionOperation.None, ActionOperation.Restore], graph.Nodes.Select(n => n.Step.Operation));
+        Assert.Equal("FaceAngleX = 30 (held) -> Wait 10s -> Restore FaceAngleX", graph.Describe());
+
+        graph.Edges.Add(new ActionEdge { From = "3", To = "1" });
+        Assert.False(graph.IsValid(out string error));
+        Assert.Contains("loop", error);
+    }
+
+    [Fact]
+    public void ObsWheelParameter_IsTheGraph_AndRepeatsShareAKeyPerTarget() {
+        var show = new ActionStep {
+            Type = ActionStepType.ObsSourceVisibility, Operation = ActionOperation.Show, Target = "Hat", Scope = "Main"
+        };
+        var hide = new ActionStep {
+            Type = ActionStepType.ObsSourceVisibility, Operation = ActionOperation.Hide, Target = "Hat", Scope = "Main"
+        };
+        string longer = ActionGraph.Sequence(show, Wait(30), hide).ToJson();
+        string shorter = ActionGraph.Sequence(show, Wait(5), hide).ToJson();
+
+        ActionGraph? graph = WheelSpinActionType.OBS.BuildActionGraph(longer);
+        Assert.NotNull(graph);
+        Assert.True(graph.IsValid(out _));
+        Assert.Equal("Show \"Hat\" in \"Main\" -> Wait 30s -> Hide \"Hat\" in \"Main\"", graph.Describe());
+        Assert.Equal(WheelSpinActionType.OBS.RepeatKey(longer, Guid.NewGuid()),
+            WheelSpinActionType.OBS.RepeatKey(shorter, Guid.NewGuid()));
+
+        show.Scope = null;
+        Assert.False(ActionGraph.Sequence(show).IsValid(out string error));
+        Assert.Contains("scene", error);
+        Assert.Null(WheelSpinActionType.OBS.BuildActionGraph("not json"));
+    }
+
+    [Fact]
+    public async Task CustomActions_LiveAsFiles_KeepTheirIdentity_AndRunFromAWheelItem() {
+        (ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
+            await SetupAsync();
+        await using SqliteConnection _ = conn;
+        string folder = Path.Combine(Path.GetTempPath(), $"sm_actions_{Guid.NewGuid():N}");
+        try {
+            var editor = new ActionService(null!, [runner], actionsFolder: folder);
+            await editor.LoadLibraryAsync();
+            var action = new CustomAction {
+                Name = "Hat Bit", Graph = ActionGraph.Sequence(Hotkey("on"), Hotkey("off"))
+            };
+            await editor.SaveCustomActionAsync(action);
+
+            action.Name = "Hat Bit (long)";
+            await editor.SaveCustomActionAsync(action);
+            string file = Assert.Single(Directory.GetFiles(folder, $"*{CustomAction.FileExtension}"));
+            Assert.Equal("hat-bit.sma", Path.GetFileName(file));
+            var reopened = new ActionService(null!, [runner], actionsFolder: folder);
+            await reopened.LoadLibraryAsync();
+            Assert.Equal("Hat Bit (long)", reopened.GetCustomAction(action.Id)?.Name);
+
+            (CustomAction Action, bool Replaced)? imported = await service.ImportCustomActionAsync(file);
+            Assert.False(imported?.Replaced);
+            WheelSpinHistory history = await AddSpinAsync(options, WheelSpinActionType.CustomAction,
+                action.Id.ToString());
+            var logged = new List<SubathonEvent>();
+            SubathonEvents.SubathonEventCreated += logged.Add;
+            Assert.Equal(ActionRunResult.Done, await service.RunWheelSpinAsync(history.Id));
+            Assert.Equal(["on", "off"], runner.Ran.ToArray());
+
+            SubathonEvent record = Assert.Single(logged);
+            Assert.Equal(SubathonCommandType.RunAction, record.Command);
+            Assert.Equal("WheelSpin", record.User);
+            Assert.Equal("RunAction Hat Bit (long)", record.Value);
+            ActionEvents.RaiseCustomActionRunRequested(record);
+            await Task.Delay(100, TestContext.Current.CancellationToken);
+            Assert.Equal(2, runner.Ran.Count);
+
+            imported = await service.ImportCustomActionAsync(file);
+            Assert.True(imported?.Replaced);
+            Assert.Single(service.CustomActions);
+        }
+        finally {
+            if (Directory.Exists(folder)) Directory.Delete(folder, true);
+        }
+    }
+
+    [Fact]
+    public async Task OpeningASmaFromOutside_AlwaysAddsACopy_RenamingClashes() {
+        string folder = Path.Combine(Path.GetTempPath(), $"sm_actions_{Guid.NewGuid():N}");
+        string outside = Path.Combine(Path.GetTempPath(), $"sm_shared_{Guid.NewGuid():N}.sma");
+        try {
+            var original = new CustomAction { Name = "Hat Bit", Graph = ActionGraph.Sequence(Hotkey("on")) };
+            await File.WriteAllTextAsync(outside, original.ToJson(), TestContext.Current.CancellationToken);
+
+            var service = new ActionService(null!, [new FakeRunner()], actionsFolder: folder);
+            CustomAction? first = await service.AddCustomActionCopyAsync(outside);
+            CustomAction? second = await service.AddCustomActionCopyAsync(outside);
+            CustomAction? third = await service.AddCustomActionCopyAsync(outside);
+
+            Assert.Equal("Hat Bit", first?.Name);
+            Assert.Equal(original.Id, first?.Id);
+            Assert.Equal("Hat Bit (Copy 1)", second?.Name);
+            Assert.Equal("Hat Bit (Copy 2)", third?.Name);
+            Assert.Equal(3, new[] { first!.Id, second!.Id, third!.Id }.Distinct().Count());
+
+            CustomAction duplicate = await service.DuplicateCustomActionAsync(third);
+            Assert.Equal("Hat Bit (Copy 3)", duplicate.Name);
+            Assert.NotEqual(third.Id, duplicate.Id);
+            Assert.Equal(4, service.CustomActions.Count);
+
+            var reopened = new ActionService(null!, [new FakeRunner()], actionsFolder: folder);
+            await reopened.LoadLibraryAsync();
+            Assert.Equal(4, reopened.CustomActions.Count);
+            Assert.Null(await service.AddCustomActionCopyAsync(Path.Combine(folder, "missing.sma")));
+        }
+        finally {
+            if (Directory.Exists(folder)) Directory.Delete(folder, true);
+            if (File.Exists(outside)) File.Delete(outside);
+        }
+    }
+
+    [Fact]
+    public async Task DisabledSteps_AreSkipped_AndWhatFollowsStillRuns() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        var graph = new ActionGraph {
+            Nodes = [
+                new ActionNode { Id = "1", Step = Hotkey("first") },
+                new ActionNode { Id = "2", Step = Hotkey("skipped"), Disabled = true },
+                new ActionNode { Id = "3", Step = Hotkey(""), Disabled = true },
+                new ActionNode { Id = "4", Step = Hotkey("last") }
+            ],
+            Edges = [
+                new ActionEdge { From = "1", To = "2" },
+                new ActionEdge { From = "1", To = "3" },
+                new ActionEdge { From = "2", To = "4" },
+                new ActionEdge { From = "3", To = "4" }
+            ]
+        };
+
+        Assert.True(graph.IsValid(out _));
+        Assert.True(ActionGraph.TryParse(graph.ToJson(), out ActionGraph? reloaded));
+        Assert.Equal([false, true, true, false], reloaded.Nodes.Select(n => n.Disabled));
+
+        ActionRunResult result = await service.RunAsync(Guid.NewGuid(), reloaded,
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "disabled"));
+        Assert.Equal(ActionRunResult.Done, result);
+        Assert.Equal(["first", "last"], runner.Ran.ToArray());
+    }
+
+    [Fact]
+    public async Task RunActionCommand_RunsTheNamedAction_AsWhoeverAskedOrSystem() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        await service.SaveCustomActionAsync(new CustomAction {
+            Name = "Hat Bit", Graph = ActionGraph.Sequence(Hotkey("hat"))
+        });
+
+        ActionEvents.RaiseCustomActionRunRequested(new SubathonEvent {
+            Source = SubathonEventSource.Twitch, User = "SomeMod", Value = "  hat bit "
+        });
+        for (var i = 0; i < 100 && runner.Ran.IsEmpty; i++) await Task.Delay(10, TestContext.Current.CancellationToken);
+        Assert.Equal(["hat"], runner.Ran.ToArray());
+        Assert.Equal("SomeMod", runner.LastUser);
+
+        ActionEvents.RaiseCustomActionRunRequested(new SubathonEvent { Value = "RunAction Hat Bit" });
+        for (var i = 0; i < 100 && runner.Ran.Count < 2; i++) await Task.Delay(10, TestContext.Current.CancellationToken);
+        Assert.Equal("SYSTEM", runner.LastUser);
+
+        ActionEvents.RaiseCustomActionRunRequested(new SubathonEvent { Value = "Hat" });
+        await Task.Delay(100, TestContext.Current.CancellationToken);
+        Assert.Equal(2, runner.Ran.Count);
+        Assert.Null(service.FindCustomAction("Hat"));
+    }
+
+    [Fact]
+    public async Task Variables_ResolveFromTheActiveSubathon_AndUnknownTokensAreLeftAlone() {
+        (_, _, DbContextOptions<AppDbContext> options, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        await using (var db = new AppDbContext(options)) {
+            foreach (SubathonData existing in db.SubathonDatas) existing.IsActive = false;
+            foreach (SubathonGoalSet existing in db.SubathonGoalSets) existing.IsActive = false;
+            db.SubathonDatas.Add(new SubathonData {
+                IsActive = true, IsLocked = true, IsPaused = false, Points = 150, MoneySum = 12.5, Currency = "",
+                MillisecondsCumulative = 3_725_000, MillisecondsElapsed = 0,
+                Multiplier = new MultiplierData {
+                    Multiplier = 2, ApplyToPoints = true, ApplyToSeconds = false,
+                    Duration = TimeSpan.FromMinutes(10), Started = DateTime.Now
+                }
+            });
+            db.SubathonGoalSets.Add(new SubathonGoalSet {
+                IsActive = true, Name = "Main", Type = GoalsType.Points,
+                Goals = [
+                    new SubathonGoal { Text = "C", Points = 300 },
+                    new SubathonGoal { Text = "A", Points = 100 },
+                    new SubathonGoal { Text = "B", Points = 200 }
+                ]
+            });
+            await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+        }
+
+        var factory = new Mock<IDbContextFactory<AppDbContext>>();
+        factory.Setup(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(() => new AppDbContext(options));
+        IConfig config = MockConfig.MakeMockConfig(new Dictionary<(string, string), string> {
+            { ("Currency", "Primary"), "CAD" }
+        });
+
+        string filled = await ActionVariableResolver.FillAsync(factory.Object,
+            "%points% %money% %currency% %timer_locked% %timer_paused% %time_remaining% %seconds_remaining% | " +
+            "%goal_text% %goal_index%/%goal_count% last=%last_goal_text% | x%multiplier_amount% " +
+            "pts=%multiplier_points% time=%multiplier_time% | %user% %not_a_variable%",
+            new ActionContext(SubathonEventSource.WheelSpin, "tester", "key"), config);
+
+        Assert.Equal("150 12.50 CAD true false 01:02:05 3725 | B 2/3 last=A | x2 pts=true time=false | " +
+                     "tester %not_a_variable%", filled);
+    }
+
+    [Fact]
+    public void StepArguments_AreNameValueLines() {
+        List<(string Name, string Value)> args = ActionStep
+            .ParseArguments("points=%points%\r\n  bad line \nmessage = hi = there\n=nameless\n").ToList();
+        Assert.Equal(new[] { ("points", "%points%"), ("message", "hi = there") }, args);
+    }
+
+    private sealed class FakeRunner : IActionStepRunner {
+        public ConcurrentQueue<string> Ran { get; } = new();
+        public HashSet<string> FailOnce { get; } = [];
+        public string? LastUser { get; private set; }
+
+        public IReadOnlyCollection<ActionStepType> StepTypes { get; } = [ActionStepType.VtsHotkey];
+
+        public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+            CancellationToken ct) {
+            lock (FailOnce) {
+                if (FailOnce.Remove(step.Target)) return Task.FromResult(false);
+            }
+
+            LastUser = ctx.User;
+            Ran.Enqueue(step.Target);
+            return Task.FromResult(true);
+        }
+    }
+}
diff --git a/SubathonManager.UI/App.axaml b/SubathonManager.UI/App.axaml
index ea09528..9a3b3d8 100644
--- a/SubathonManager.UI/App.axaml
+++ b/SubathonManager.UI/App.axaml
@@ -37,6 +37,7 @@
     <Application.Styles>
         <sty:FluentAvaloniaTheme PreferSystemTheme="False" PreferUserAccentColor="True" />
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
+        <StyleInclude Source="avares://Nodify.Avalonia/Themes/Controls.xaml" />
         <StyleInclude Source="avares://SubathonManager/Themes/TabStyles.axaml" />
         <StyleInclude Source="avares://SubathonManager/Themes/ControlTweaks.axaml" />
     </Application.Styles>
diff --git a/SubathonManager.UI/App.axaml.cs b/SubathonManager.UI/App.axaml.cs
index 5526cb2..40a6c61 100644
--- a/SubathonManager.UI/App.axaml.cs
+++ b/SubathonManager.UI/App.axaml.cs
@@ -140,7 +140,9 @@ public override void OnFrameworkInitializationCompleted() {
 
             var window = new MainWindow();
             desktop.MainWindow = window;
-            window.Closing += (_, _) => window.CloseEditor();
+            window.Closing += (_, e) => {
+                if (!window.CloseEditor()) e.Cancel = true;
+            };
 
             desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
 
@@ -204,11 +206,15 @@ private void OnActivationReceived(ActivationRequest request) {
                 case ActivationKind.SmwFile:
                     Utils.PendingWidgetPackImportPath = request.Payload;
                     break;
+                case ActivationKind.SmaFile:
+                    Utils.PendingActionImportPath = request.Payload;
+                    break;
                 case ActivationKind.OAuth:
                     AppServices.Provider.GetRequiredService<OAuthService>().HandleCallback(request.Payload);
                     break;
                 default:
-                    _logger?.LogDebug("Activation received with no recognised payload: {Payload}", request.Payload);
+                    if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
+                        _logger?.LogDebug("Activation received with no recognised payload: {Payload}", request.Payload);
                     break;
             }
 
diff --git a/SubathonManager.UI/EditRouteWindow.Handlers.cs b/SubathonManager.UI/EditRouteWindow.Handlers.cs
index 5a93136..ad05e9f 100644
--- a/SubathonManager.UI/EditRouteWindow.Handlers.cs
+++ b/SubathonManager.UI/EditRouteWindow.Handlers.cs
@@ -371,8 +371,15 @@ private void ReloadVars_Click(object? sender, RoutedEventArgs e) {
     }
 
     private async void SaveWidgetButton_Click(object? sender, RoutedEventArgs e) {
+        if (!await SaveSelectedWidgetAsync()) return;
+        SaveWidgetButton.Content = "Saved!";
+        await Task.Delay(1500);
+        SaveWidgetButton.Content = "Save";
+    }
+
+    private async Task<bool> SaveSelectedWidgetAsync() {
         try {
-            if (_selectedWidget == null) return;
+            if (_selectedWidget == null) return true;
             var widgetHelper = new WidgetEntityHelper(_factory, null);
 
             widgetHelper.SyncCssVariables(_selectedWidget);
@@ -426,12 +433,11 @@ private async void SaveWidgetButton_Click(object? sender, RoutedEventArgs e) {
 
             await db.Entry(_selectedWidget).ReloadAsync();
             UpdateSaveButtonBorder(SaveButtonBorder, false);
-            SaveWidgetButton.Content = "Saved!";
-            await Task.Delay(1500);
-            SaveWidgetButton.Content = "Save";
+            return true;
         }
         catch (Exception ex) {
             _logger?.LogError(ex, "Failed to save widget");
+            return false;
         }
     }
 
@@ -1002,12 +1008,14 @@ private async Task FinishWidgetDragAsync() {
     }
 
     private async void SaveRouteButton_Click(object? sender, RoutedEventArgs e) {
-        if (_route == null) return;
-        await SaveCurrentRoute();
+        if (_route == null || !await SaveCurrentRoute()) return;
+        SaveRouteButton.Content = "Saved!";
+        await Task.Delay(1500);
+        SaveRouteButton.Content = "Save";
     }
 
-    private async Task SaveCurrentRoute() {
-        if (_route == null) return;
+    private async Task<bool> SaveCurrentRoute() {
+        if (_route == null) return true;
         try {
             await SaveAllPendingWidgetChangesAsync();
 
@@ -1022,13 +1030,11 @@ private async Task SaveCurrentRoute() {
             UpdateWebViewScale();
             OverlayEvents.RaiseOverlayRefreshRequested(_route.Id);
             RouteSaved?.Invoke();
-
-            SaveRouteButton.Content = "Saved!";
-            await Task.Delay(1500);
-            SaveRouteButton.Content = "Save";
+            return true;
         }
         catch (Exception ex) {
             _logger?.LogError(ex, "Failed to save overlay");
+            return false;
         }
     }
 
diff --git a/SubathonManager.UI/EditRouteWindow.axaml.cs b/SubathonManager.UI/EditRouteWindow.axaml.cs
index f4589cb..566e1fb 100644
--- a/SubathonManager.UI/EditRouteWindow.axaml.cs
+++ b/SubathonManager.UI/EditRouteWindow.axaml.cs
@@ -8,6 +8,8 @@
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
+using Avalonia.Layout;
+using Avalonia.Media;
 using Avalonia.Threading;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -48,6 +50,8 @@ public partial class EditRouteWindow : Window {
     private string _editUrl = string.Empty;
     private bool _hasPendingCssChanges;
     private bool _hasPendingJsChanges;
+    private bool _hasPendingWidgetChanges;
+    private bool _closeConfirmed;
     private string _lastFolder = string.Empty;
     private bool _loadedWebView;
     private Route? _route;
@@ -106,6 +110,7 @@ public EditRouteWindow(Guid routeId) {
         });
 
         Loaded += EditRouteWindow_Loaded;
+        Closing += Window_Closing;
         ObsConnected = ServiceManager.OBS.Connected;
         IntegrationEvents.ConnectionUpdated += OnObsConnectionUpdated;
         Closed += (_, _) => {
@@ -366,6 +371,7 @@ private void PopulateWidgetEditor(Widget? widget) {
 
         Dispatcher.UIThread.Post(() => {
             _suppressCount--;
+            _hasPendingWidgetChanges = realDirty;
             UiHelpers.UpdateButtonPendingBorder(SaveButtonBorder, realDirty);
         }, DispatcherPriority.Background);
     }
@@ -797,6 +803,78 @@ private void ApplyWebViewBgToggle() {
     }
 
 
+    private bool HasUnsavedChanges() {
+        if (_hasPendingWidgetChanges || _hasPendingCssChanges || _hasPendingJsChanges) return true;
+        if (_unsavedCssVars.Count > 0 || _unsavedJsVars.Count > 0) return true;
+        if (_route == null) return false;
+        if ((RouteNameBox.Text ?? string.Empty).Trim() != _route.Name) return true;
+        if (int.TryParse(RouteWidthBox.Text, out int w) && w != _route.Width) return true;
+        return int.TryParse(RouteHeightBox.Text, out int h) && h != _route.Height;
+    }
+
+    private async void Window_Closing(object? sender, WindowClosingEventArgs e) {
+        if (_closeConfirmed || !HasUnsavedChanges()) return;
+        e.Cancel = true;
+
+        bool? save = await ShowUnsavedChangesDialogAsync();
+        if (save == null) return;
+        if (save == true) {
+            if (_hasPendingWidgetChanges && !await SaveSelectedWidgetAsync()) return;
+            if (!await SaveCurrentRoute()) return;
+        }
+
+        _closeConfirmed = true;
+        Close();
+    }
+
+    private async Task<bool?> ShowUnsavedChangesDialogAsync() {
+        var dialog = new Window {
+            Title = "Unsaved changes",
+            SizeToContent = SizeToContent.WidthAndHeight,
+            CanResize = false,
+            ShowInTaskbar = false,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner
+        };
+        dialog.SetDynamicResource(BackgroundProperty, "AppGeneralBackground");
+        WindowIcons.Apply(dialog);
+
+        bool? result = null;
+        Button MakeButton(string text, bool? value, string? cls = null) {
+            var button = new Button { Content = text, MinWidth = 90, Height = 32 };
+            if (cls != null) button.Classes.Add(cls);
+            button.Click += (_, _) => {
+                result = value;
+                dialog.Close();
+            };
+            return button;
+        }
+
+        var buttons = new StackPanel {
+            Orientation = Orientation.Horizontal,
+            Spacing = 8,
+            HorizontalAlignment = HorizontalAlignment.Right
+        };
+        buttons.Children.Add(MakeButton("Cancel", null));
+        buttons.Children.Add(MakeButton("Discard", false, "danger"));
+        buttons.Children.Add(MakeButton("Save", true, "accent"));
+
+        dialog.Content = new StackPanel {
+            Margin = new Thickness(24, 16),
+            Spacing = 16,
+            MaxWidth = 420,
+            Children = {
+                new TextBlock {
+                    Text = $"Save the changes to \"{(RouteNameBox.Text ?? "").Trim()}\" before closing?",
+                    TextWrapping = TextWrapping.Wrap
+                },
+                buttons
+            }
+        };
+
+        await dialog.ShowDialog(this);
+        return result;
+    }
+
     protected override void OnClosed(EventArgs e) {
         WidgetEvents.WidgetPositionUpdated -= OnWidgetPositionUpdated;
         WidgetEvents.WidgetScaleUpdated -= OnWidgetScaleUpdated;
@@ -818,6 +896,7 @@ protected override void OnClosed(EventArgs e) {
     }
 
     private void UpdateSaveButtonBorder(Border border, bool hasPendingChanges) {
+        if (border == SaveButtonBorder) _hasPendingWidgetChanges = hasPendingChanges;
         Dispatcher.UIThread.Post(() => UiHelpers.UpdateButtonPendingBorder(border, hasPendingChanges));
     }
 
diff --git a/SubathonManager.UI/MainWindow.ConnectionStatus.cs b/SubathonManager.UI/MainWindow.ConnectionStatus.cs
index fbbb8c6..affc540 100644
--- a/SubathonManager.UI/MainWindow.ConnectionStatus.cs
+++ b/SubathonManager.UI/MainWindow.ConnectionStatus.cs
@@ -136,6 +136,7 @@ private MenuItem BuildSourceItem(SubathonEventSource source, List<IntegrationCon
             case SubathonEventSource.PallyGG: return BuildPallyItem(connections);
             case SubathonEventSource.DevTunnels: return BuildDevTunnelsItem(connections);
             case SubathonEventSource.OBS: return BuildObsItem(connections);
+            case SubathonEventSource.StreamerBot: return BuildStreamerBotItem(connections);
         }
 
         SubathonSourceGroup sourceGroup = source.GetGroup();
@@ -262,6 +263,22 @@ private MenuItem BuildObsItem(List<IntegrationConnection> connections) {
         return item;
     }
 
+    private MenuItem BuildStreamerBotItem(List<IntegrationConnection> connections) {
+        IntegrationConnection? extension = connections.FirstOrDefault(c => c.Service == "Socket");
+        IntegrationConnection? http = connections.FirstOrDefault(c => c.Service == "Http");
+
+        var item = new MenuItem {
+            Icon = MakeStatusDot(GetAggregateBrush(connections)),
+            StaysOpenOnClick = true
+        };
+        SetParentHeader(item, SubathonEventSource.StreamerBot.GetDescription());
+        item.Items.Add(MakeLeafItem("Extension",
+            extension?.Status == true ? StatusUpBrush : StatusDownBrush, null, SubathonEventSource.StreamerBot));
+        item.Items.Add(MakeLeafItem("HTTP API", LeafBrush(http),
+            http is { Configured: true } ? null : "Not enabled", SubathonEventSource.StreamerBot));
+        return item;
+    }
+
     private static string ShowableDetail(IntegrationConnection connection) {
         if (string.IsNullOrWhiteSpace(connection.Name)) return "";
         if (string.Equals(connection.Name, "None", StringComparison.OrdinalIgnoreCase)) return "";
diff --git a/SubathonManager.UI/MainWindow.Routes.cs b/SubathonManager.UI/MainWindow.Routes.cs
index 54f116c..b295741 100644
--- a/SubathonManager.UI/MainWindow.Routes.cs
+++ b/SubathonManager.UI/MainWindow.Routes.cs
@@ -282,8 +282,9 @@ private async Task<bool> ImportRouteFromFile(string filePath) {
         }
     }
 
-    public void CloseEditor() {
-        if (_editWindow != null) _editWindow.Close();
+    public bool CloseEditor() {
+        _editWindow?.Close();
+        return _editWindow == null;
     }
 
     internal void OpenRouteEditor(Route route) {
@@ -293,14 +294,18 @@ internal void OpenRouteEditor(Route route) {
                 return;
             }
 
-            _editWindow.Close();
+            if (!CloseEditor()) {
+                _editWindow.Activate();
+                return;
+            }
         }
 
-        _editWindow = new EditRouteWindow(route.Id);
+        var editor = new EditRouteWindow(route.Id);
+        _editWindow = editor;
         _editWindow.RouteSaved += LoadRoutes;
         _editWindow.Closed += (_, _) => {
             LoadRoutes();
-            _editWindow = null;
+            if (_editWindow == editor) _editWindow = null;
         };
 
         UiHelpers.CenterOver(_editWindow, this);
diff --git a/SubathonManager.UI/MainWindow.axaml b/SubathonManager.UI/MainWindow.axaml
index c41ea33..104f111 100644
--- a/SubathonManager.UI/MainWindow.axaml
+++ b/SubathonManager.UI/MainWindow.axaml
@@ -6,6 +6,7 @@
         xmlns:views="using:SubathonManager.UI.Views"
         xmlns:prompts="using:SubathonManager.UI.Views.Prompts"
         xmlns:wheel="using:SubathonManager.UI.Views.WheelSpin"
+        xmlns:actions="using:SubathonManager.UI.Views.Actions"
         xmlns:ctl="using:SubathonManager.UI.Controls"
         xmlns:v="using:SubathonManager.UI.Validation"
         xmlns:schedule="clr-namespace:SubathonManager.UI.Views.Schedule"
@@ -517,6 +518,9 @@
             <TabItem Header="Wheel Spin">
                 <wheel:WheelEditor />
             </TabItem>
+            <TabItem x:Name="ActionsTabItem" Header="Actions">
+                <actions:ActionsView x:Name="ActionsPage" />
+            </TabItem>
             <TabItem x:Name="ScheduleTabItem" Header="Schedule">
                 <schedule:ScheduleView x:Name="SchedulePage" />
             </TabItem>
diff --git a/SubathonManager.UI/MainWindow.axaml.cs b/SubathonManager.UI/MainWindow.axaml.cs
index f4fe58a..4d3c647 100644
--- a/SubathonManager.UI/MainWindow.axaml.cs
+++ b/SubathonManager.UI/MainWindow.axaml.cs
@@ -4,6 +4,7 @@
 using Avalonia.Interactivity;
 using Microsoft.Extensions.Logging;
 using SubathonManager.Core;
+using SubathonManager.Core.Objects;
 using SubathonManager.Data.Widgets;
 using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
@@ -39,6 +40,7 @@ public MainWindow() {
             await MaybeShowTelemetryPromptAsync();
             await ImportPendingOverlayAsync();
             await CollectPendingWidgetPackAsync();
+            await ImportPendingActionAsync();
         };
     }
 
@@ -72,6 +74,31 @@ public void HandlePendingActivation(ActivationKind kind) {
             case ActivationKind.SmwFile:
                 _ = CollectPendingWidgetPackAsync();
                 break;
+            case ActivationKind.SmaFile:
+                _ = ImportPendingActionAsync();
+                break;
+        }
+    }
+
+    private async Task ImportPendingActionAsync() {
+        string? path = Utils.PendingActionImportPath;
+        Utils.PendingActionImportPath = null;
+        if (string.IsNullOrWhiteSpace(path)) return;
+
+        try {
+            if (path.StartsWith("http", StringComparison.OrdinalIgnoreCase)) {
+                using var client = new HttpClient();
+                string json = await client.GetStringAsync(path);
+                path = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid():N}{CustomAction.FileExtension}");
+                await File.WriteAllTextAsync(path, json);
+            }
+
+            CustomAction? added = await ServiceManager.Actions.AddCustomActionCopyAsync(path);
+            MainWindowTabs.SelectedItem = ActionsTabItem;
+            ActionsPage.ShowAdded(added, path);
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "Failed to add custom action {Path}", path);
         }
     }
 
diff --git a/SubathonManager.UI/Platform/IPlatformIntegration.cs b/SubathonManager.UI/Platform/IPlatformIntegration.cs
index 3d8053e..04158c3 100644
--- a/SubathonManager.UI/Platform/IPlatformIntegration.cs
+++ b/SubathonManager.UI/Platform/IPlatformIntegration.cs
@@ -13,5 +13,6 @@ public enum ActivationKind {
     Unknown,
     SmoFile,
     SmwFile,
-    OAuth
+    OAuth,
+    SmaFile
 }
\ No newline at end of file
diff --git a/SubathonManager.UI/Platform/PosixPlatformIntegration.cs b/SubathonManager.UI/Platform/PosixPlatformIntegration.cs
index 6843917..1561398 100644
--- a/SubathonManager.UI/Platform/PosixPlatformIntegration.cs
+++ b/SubathonManager.UI/Platform/PosixPlatformIntegration.cs
@@ -8,6 +8,7 @@ public sealed class PosixPlatformIntegration : PlatformIntegrationBase {
     private const string OverlayMime = "application/x-subathonmanager-overlay";
     private const string WidgetMime = "application/x-subathonmanager-widget";
     private const string CollectionMime = "application/x-subathonmanager-widget-collection";
+    private const string ActionMime = "application/x-subathonmanager-action";
     private const string DesktopFileName = "subathonmanager.desktop";
     private const string MimePackageFileName = "subathonmanager-overlay.xml";
     private const string IconName = "subathonmanager";
@@ -64,7 +65,7 @@ private static void RegisterLinux() {
             "NoDisplay=false\n" +
             "Categories=Utility;\n" +
             "StartupWMClass=SubathonManager\n" +
-            $"MimeType={OverlayMime};{WidgetMime};{CollectionMime};{SchemeMime};\n";
+            $"MimeType={OverlayMime};{WidgetMime};{CollectionMime};{ActionMime};{SchemeMime};\n";
 
         string mimeContent =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
@@ -84,6 +85,11 @@ private static void RegisterLinux() {
             $"    <icon name=\"{IconName}\"/>\n" +
             "    <glob pattern=\"*.smwc\"/>\n" +
             "  </mime-type>\n" +
+            $"  <mime-type type=\"{ActionMime}\">\n" +
+            "    <comment>Subathon Manager Action</comment>\n" +
+            $"    <icon name=\"{IconName}\"/>\n" +
+            "    <glob pattern=\"*.sma\"/>\n" +
+            "  </mime-type>\n" +
             "</mime-info>\n";
 
         bool desktopChanged = WriteIfChanged(desktopPath, desktopContent);
@@ -101,6 +107,7 @@ private static void RegisterLinux() {
         Run("xdg-mime", "default", DesktopFileName, OverlayMime);
         Run("xdg-mime", "default", DesktopFileName, WidgetMime);
         Run("xdg-mime", "default", DesktopFileName, CollectionMime);
+        Run("xdg-mime", "default", DesktopFileName, ActionMime);
     }
 
     private static bool InstallHicolorIcons(string appDir, string dataHome) {
diff --git a/SubathonManager.UI/Platform/ProtocolParser.cs b/SubathonManager.UI/Platform/ProtocolParser.cs
index c7c3f0d..1a69e2a 100644
--- a/SubathonManager.UI/Platform/ProtocolParser.cs
+++ b/SubathonManager.UI/Platform/ProtocolParser.cs
@@ -1,6 +1,7 @@
 using System.Collections.Specialized;
 using System.Web;
 using SubathonManager.Core;
+using SubathonManager.Core.Objects;
 
 namespace SubathonManager.UI.Platform;
 
@@ -24,6 +25,11 @@ public static ActivationRequest Parse(string[] args) {
             return new ActivationRequest(ActivationKind.SmwFile, arg);
         }
 
+        if (arg.EndsWith(CustomAction.FileExtension, StringComparison.OrdinalIgnoreCase) && File.Exists(arg)) {
+            Utils.PendingActionImportPath = arg;
+            return new ActivationRequest(ActivationKind.SmaFile, arg);
+        }
+
         if (!arg.StartsWith("subathonmanager://"))
             return new ActivationRequest(ActivationKind.Unknown, arg);
 
@@ -48,6 +54,9 @@ public static ActivationRequest Parse(string[] args) {
             case ActivationKind.SmwFile:
                 Utils.PendingWidgetPackImportPath = url;
                 return new ActivationRequest(ActivationKind.SmwFile, url);
+            case ActivationKind.SmaFile:
+                Utils.PendingActionImportPath = url;
+                return new ActivationRequest(ActivationKind.SmaFile, url);
             default:
                 return new ActivationRequest(ActivationKind.Unknown, arg);
         }
@@ -63,6 +72,8 @@ private static ActivationKind ClassifyPack(string value) {
         if (path.EndsWith(".smw", StringComparison.OrdinalIgnoreCase) ||
             path.EndsWith(".smwc", StringComparison.OrdinalIgnoreCase))
             return ActivationKind.SmwFile;
+        if (path.EndsWith(CustomAction.FileExtension, StringComparison.OrdinalIgnoreCase))
+            return ActivationKind.SmaFile;
         return ActivationKind.Unknown;
     }
 
@@ -70,6 +81,7 @@ private static ActivationKind ClassifyHost(string host) {
         return host.ToLowerInvariant() switch {
             "overlay" or "smo" => ActivationKind.SmoFile,
             "widget" or "widgets" or "smw" or "smwc" or "collection" => ActivationKind.SmwFile,
+            "action" or "actions" or "sma" => ActivationKind.SmaFile,
             _ => ActivationKind.Unknown
         };
     }
diff --git a/SubathonManager.UI/Platform/WindowsPlatformIntegration.cs b/SubathonManager.UI/Platform/WindowsPlatformIntegration.cs
index 0345355..60e79b5 100644
--- a/SubathonManager.UI/Platform/WindowsPlatformIntegration.cs
+++ b/SubathonManager.UI/Platform/WindowsPlatformIntegration.cs
@@ -48,6 +48,15 @@ public override void RegisterFileAssociations() {
             "", $"\"{exePath}\" \"%1\"");
         EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\.smwc\OpenWithProgids",
             "SubathonManager.WidgetCollection", "");
+
+        EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\.sma", "", "SubathonManager.Action");
+        EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\SubathonManager.Action", "",
+            "Subathon Manager Action");
+        EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\SubathonManager.Action\DefaultIcon", "",
+            $"{exePath},0");
+        EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\SubathonManager.Action\shell\open\command", "",
+            $"\"{exePath}\" \"%1\"");
+        EnsureRegistryValue(@"HKEY_CURRENT_USER\Software\Classes\.sma\OpenWithProgids", "SubathonManager.Action", "");
     }
 
     private static void EnsureRegistryValue(string keyPath, string name, string expectedValue) {
diff --git a/SubathonManager.UI/Services/ServiceManager.cs b/SubathonManager.UI/Services/ServiceManager.cs
index b8129db..73eaa48 100644
--- a/SubathonManager.UI/Services/ServiceManager.cs
+++ b/SubathonManager.UI/Services/ServiceManager.cs
@@ -71,6 +71,8 @@ private static IServiceProvider Provider {
     public static OBSService OBS => Provider.GetRequiredService<OBSService>();
     public static VTSService VTubeStudio => Provider.GetRequiredService<VTSService>();
     public static MixItUpService MixItUp => Provider.GetRequiredService<MixItUpService>();
+    public static StreamerBotService StreamerBot => Provider.GetRequiredService<StreamerBotService>();
+    public static ActionService Actions => Provider.GetRequiredService<ActionService>();
 
     public static WebServer Server => Provider.GetRequiredService<WebServer>();
 
@@ -80,6 +82,11 @@ private static IServiceProvider Provider {
     public async Task StartIntegrationsAsync() {
         await StartAsync<OBSService>();
         if (FeatureFlags.VTubeStudioEnabled) await StartAsync<VTSService>();
+        await StartAsync<MixItUpService>();
+        await StartAsync<StreamerBotService>();
+        await StartAsync<ActionService>();
+        await StartAsync<DevTunnelsService>(); // shared tunnel infrastructure; must start before webhook integrations
+        
         await StartAsync<TwitchService>();
         await StartAsync<YouTubeService>();
         await StartAsync<PicartoService>();
@@ -91,12 +98,10 @@ public async Task StartIntegrationsAsync() {
         await StartAsync<MakeShipService>();
         await StartAsync<JuniperService>();
         await StartAsync<TangiaService>();
-        await StartAsync<DevTunnelsService>(); // shared tunnel infrastructure; must start before webhook integrations
         await StartAsync<KoFiService>();
         await StartAsync<FourthWallService>();
         await StartAsync<PatreonService>();
         await StartAsync<ThroneService>();
-        await StartAsync<MixItUpService>();
         await StartAsync<PallyService>();
         await StartAsync<TiltifyService>();
         await StartAsync<DiscordWebhookService>();
@@ -118,7 +123,9 @@ public async Task StopIntegrationsAsync() {
         await StopAsync<TangiaService>();
         await StopAsync<KoFiService>();
         await StopAsync<ThroneService>();
+        await StopAsync<ActionService>();
         await StopAsync<MixItUpService>();
+        await StopAsync<StreamerBotService>();
         await StopAsync<PallyService>();
         await StopAsync<TiltifyService>();
         await StopAsync<FourthWallService>();
@@ -154,7 +161,9 @@ public async Task StartAsync<T>(CancellationToken ct = default, bool fireAndForg
             else
                 await service.StartAsync(ct);
             _running.Add(typeof(T));
-            logger?.LogDebug("{Service} started", typeof(T).Name);
+            
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("{Service} started", typeof(T).Name);
         }
         finally {
             lk.Release();
@@ -171,7 +180,8 @@ public async Task StopAsync<T>(CancellationToken ct = default) where T : IAppSer
             if (service != null)
                 await service.StopAsync(ct);
             _running.Remove(typeof(T));
-            logger?.LogDebug("{Service} stopped", typeof(T).Name);
+            if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+                logger?.LogDebug("{Service} stopped", typeof(T).Name);
         }
         finally {
             lk.Release();
diff --git a/SubathonManager.UI/Services/ServiceRegistration.cs b/SubathonManager.UI/Services/ServiceRegistration.cs
index 3a9add9..394ff47 100644
--- a/SubathonManager.UI/Services/ServiceRegistration.cs
+++ b/SubathonManager.UI/Services/ServiceRegistration.cs
@@ -32,6 +32,7 @@ public static void SetupCoreServices(this IServiceCollection services) {
         services.AddSingleton<WebServer>();
         services.AddSingleton<PromptOrchestratorService>();
         services.AddSingleton<WheelSpinTriggerService>();
+        services.AddSingleton<ActionService>();
         services.AddSingleton<TelemetryService>();
 
         services.AddHttpClient(nameof(OAuthService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
@@ -84,8 +85,6 @@ public static void AddIntegrations(this IServiceCollection services) {
         services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<PatreonService>());
         services.AddSingleton<ThroneService>();
         services.AddSingleton<IWebhookIntegration>(sp => sp.GetRequiredService<ThroneService>());
-        services.AddSingleton<PallyService>();
-        services.AddSingleton<TiltifyService>();
 
         // Stream Extensions //
         services.AddHttpClient(nameof(TipeeeStreamService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
@@ -96,13 +95,23 @@ public static void AddIntegrations(this IServiceCollection services) {
         services.AddSingleton<TreatStreamService>();
 
         // Other //
+        services.AddSingleton<PallyService>();
+        services.AddSingleton<TiltifyService>();
+        
         services.AddHttpClient(nameof(DiscordWebhookService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
-        ;
         services.AddSingleton<DiscordWebhookService>();
+        
+        // External Software
         services.AddSingleton<OBSService>();
+        services.AddSingleton<IActionStepRunner>(sp => sp.GetRequiredService<OBSService>());
         services.AddSingleton<VTSService>();
+        services.AddSingleton<IActionStepRunner>(sp => sp.GetRequiredService<VTSService>());
         services.AddHttpClient(nameof(MixItUpService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
         services.AddSingleton<MixItUpService>();
+        services.AddSingleton<IActionStepRunner>(sp => sp.GetRequiredService<MixItUpService>());
+        services.AddHttpClient(nameof(StreamerBotService)).SetHandlerLifetime(Timeout.InfiniteTimeSpan);
+        services.AddSingleton<StreamerBotService>();
+        services.AddSingleton<IActionStepRunner>(sp => sp.GetRequiredService<StreamerBotService>());
     }
 
     private static void ConfigureLogging(ILoggingBuilder builder) {
diff --git a/SubathonManager.UI/SubathonManager.UI.csproj b/SubathonManager.UI/SubathonManager.UI.csproj
index c50e367..def4a58 100644
--- a/SubathonManager.UI/SubathonManager.UI.csproj
+++ b/SubathonManager.UI/SubathonManager.UI.csproj
@@ -57,6 +57,7 @@
         <PackageReference Include="FluentAvaloniaUI" Version="3.1.0"/>
 
         <PackageReference Include="FluentIcons.Avalonia" Version="2.1.343"/>
+        <PackageReference Include="Nodify.Avalonia" Version="2.0.0"/>
 
         <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.12"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.6"/>
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
new file mode 100644
index 0000000..df99085
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
@@ -0,0 +1,104 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using Avalonia;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public abstract class ActionEditorVm : INotifyPropertyChanged {
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected void Raise([CallerMemberName] string? name = null) {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+    }
+}
+
+public sealed class ActionNodeVm : ActionEditorVm {
+    public ActionNodeVm(ActionNode node) {
+        Node = node;
+        Input = new ActionConnectorVm(this, true);
+        Output = new ActionConnectorVm(this, false);
+    }
+
+    public ActionNode Node { get; }
+    public ActionConnectorVm Input { get; }
+    public ActionConnectorVm Output { get; }
+
+    public Point Location {
+        get => new(Node.X, Node.Y);
+        set {
+            if (Math.Abs(value.X - Node.X) < 0.1 && Math.Abs(value.Y - Node.Y) < 0.1) return;
+            Node.X = value.X;
+            Node.Y = value.Y;
+            Raise();
+        }
+    }
+
+    public string Title => $"{Node.Step.Type.GetGroup()} - {Node.Step.Type.GetLabel()}";
+    public string Summary => Node.Step.Describe();
+    public bool IsStart { get; private set; }
+    public bool IsEnd { get; private set; }
+
+    public int Branches { get; private set; }
+    public bool HasBranches => Branches > 1;
+    public string BranchLabel => $"{Branches}b";
+
+    public string? Error { get; private set; }
+    public bool HasError => Error != null;
+
+    public bool IsDisabled => Node.Disabled;
+    public double CardOpacity => Node.Disabled ? 0.45 : 1;
+
+    public void Refresh(ActionGraph graph) {
+        Raise(nameof(IsDisabled));
+        Raise(nameof(CardOpacity));
+        IsStart = !graph.Incoming(Node.Id).Any();
+        Branches = graph.Outgoing(Node.Id).Count();
+        IsEnd = Branches == 0;
+        Error = Node.Step.IsValid(out string error) ? null : error;
+        Raise(nameof(Title));
+        Raise(nameof(Summary));
+        Raise(nameof(IsStart));
+        Raise(nameof(IsEnd));
+        Raise(nameof(Branches));
+        Raise(nameof(HasBranches));
+        Raise(nameof(BranchLabel));
+        Raise(nameof(Error));
+        Raise(nameof(HasError));
+    }
+}
+
+public sealed class ActionConnectorVm(ActionNodeVm owner, bool isInput) : ActionEditorVm {
+    private Point _anchor;
+
+    public ActionNodeVm Owner { get; } = owner;
+    public bool IsInput { get; } = isInput;
+
+    public Point Anchor {
+        get => _anchor;
+        set {
+            if (_anchor == value) return;
+            _anchor = value;
+            Raise();
+        }
+    }
+}
+
+public sealed record ActionConnectionVm(ActionEdge Edge, ActionConnectorVm Source, ActionConnectorVm Target);
+
+internal sealed class EditorCommand(Action<object?> execute) : ICommand {
+    public event EventHandler? CanExecuteChanged {
+        add { }
+        remove { }
+    }
+
+    public bool CanExecute(object? parameter) {
+        return true;
+    }
+
+    public void Execute(object? parameter) {
+        execute(parameter);
+    }
+}
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
new file mode 100644
index 0000000..078d029
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
@@ -0,0 +1,332 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Nodify.Avalonia;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionEditorWindow {
+    
+    private const double RightClickSlop = 6;
+    private Point? _rightPressAt;
+
+    private void BuildPalette() {
+        foreach (IGrouping<string, ActionStepType> group in Enum.GetValues<ActionStepType>()
+                     .Where(t => t.IsAvailable()).GroupBy(t => t.GetGroup())) {
+            var buttons = new StackPanel { Spacing = 4 };
+            var section = new Expander {
+                Header = group.Key, IsExpanded = true, HorizontalAlignment = HorizontalAlignment.Stretch,
+                HorizontalContentAlignment = HorizontalAlignment.Stretch, Padding = new Thickness(6, 4),
+                Content = buttons
+            };
+            section.Expanded += (_, _) => {
+                if (PaletteQuery.Length == 0) _collapsedGroups.Remove(group.Key);
+            };
+            section.Collapsed += (_, _) => {
+                if (PaletteQuery.Length == 0) _collapsedGroups.Add(group.Key);
+            };
+
+            foreach (ActionStepType type in group) {
+                var button = new Button {
+                    Content = $"+ {type.GetLabel()}",
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    HorizontalContentAlignment = HorizontalAlignment.Left,
+                    FontSize = 12,
+                    Tag = type
+                };
+                ToolTip.SetTip(button, "Adds an action; with an action selected it is chained after");
+                button.Click += (_, _) => AddStep(type);
+                buttons.Children.Add(button);
+            }
+
+            _paletteSections.Add((group.Key, section, buttons));
+            PalettePanel.Children.Add(section);
+        }
+
+        PaletteSearchBox.TextChanged += (_, _) => FilterPalette();
+        PaletteSearchBox.KeyDown += (_, e) => {
+            if (e.Key != Key.Enter || FirstPaletteMatch() is not { } type) return;
+            AddStep(type);
+            e.Handled = true;
+        };
+    }
+
+    private string PaletteQuery => (PaletteSearchBox.Text ?? "").Trim();
+
+    private static bool PaletteMatches(string group, ActionStepType type, string query) {
+        return group.Contains(query, StringComparison.OrdinalIgnoreCase)
+               || type.GetLabel().Contains(query, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private void FilterPalette() {
+        string query = PaletteQuery;
+        foreach ((string group, Expander section, StackPanel buttons) in _paletteSections) {
+            var any = false;
+            foreach (Button button in buttons.Children.OfType<Button>()) {
+                bool show = query.Length == 0 || PaletteMatches(group, (ActionStepType)button.Tag!, query);
+                button.IsVisible = show;
+                any |= show;
+            }
+
+            section.IsVisible = any;
+            section.IsExpanded = query.Length > 0 || !_collapsedGroups.Contains(group);
+        }
+    }
+
+    private ActionStepType? FirstPaletteMatch() {
+        string query = PaletteQuery;
+        if (query.Length == 0) return null;
+        foreach ((string group, Expander _, StackPanel buttons) in _paletteSections)
+        foreach (Button button in buttons.Children.OfType<Button>())
+            if (PaletteMatches(group, (ActionStepType)button.Tag!, query))
+                return (ActionStepType)button.Tag!;
+        return null;
+    }
+
+    private void AddStep(ActionStepType type) {
+        var step = new ActionStep { Type = type, Operation = type.DefaultOp() };
+        // set defaults
+        switch (type) {
+            case ActionStepType.Wait:
+                step.Seconds = 5;
+                break;
+            case ActionStepType.AddTime:
+            case ActionStepType.SubtractTime:
+                step.Seconds = 60;
+                break;
+            case ActionStepType.SetMultiplier:
+                step.Value = 2;
+                step.Seconds = 600;
+                break;
+            case ActionStepType.Reroll:
+                step.Value = 1;
+                break;
+        }
+
+        int next = Graph.Nodes.Select(n => int.TryParse(n.Id, out int i) ? i : 0).DefaultIfEmpty(0).Max() + 1;
+        var node = new ActionNode { Id = $"{next}", Step = step };
+
+        ActionNode? after = SelectedNode;
+        if (after != null) {
+            node.X = after.X + StepSpacingX;
+            node.Y = after.Y;
+            while (Graph.Nodes.Any(n => Math.Abs(n.X - node.X) < StepSpacingX - 20
+                                        && Math.Abs(n.Y - node.Y) < StepSpacingY - 10))
+                node.Y += StepSpacingY;
+        }
+        else {
+            Point centre = Editor.ViewportLocation
+                           + new Vector(Editor.ViewportSize.Width / 2 - 120, Editor.ViewportSize.Height / 2 - 30);
+            node.X = Math.Round(centre.X / 10) * 10;
+            node.Y = Math.Round(centre.Y / 10) * 10;
+        }
+
+        Graph.Nodes.Add(node);
+        var view = new ActionNodeVm(node);
+        _nodes.Add(view);
+        if (after != null) {
+            var edge = new ActionEdge { From = after.Id, To = node.Id };
+            Graph.Edges.Add(edge);
+            AddConnectionView(edge);
+        }
+
+        RefreshNodes();
+        Editor.SelectedItem = view;
+        MarkDirty();
+        Validate();
+    }
+
+    private void AddConnectionView(ActionEdge edge) {
+        ActionNodeVm? from = _nodes.FirstOrDefault(n => n.Node.Id == edge.From);
+        ActionNodeVm? to = _nodes.FirstOrDefault(n => n.Node.Id == edge.To);
+        if (from != null && to != null) _connections.Add(new ActionConnectionVm(edge, from.Output, to.Input));
+    }
+
+    private void RefreshNodes() {
+        foreach (ActionNodeVm node in _nodes) node.Refresh(Graph);
+    }
+
+    private void OnConnectionCompleted(object? parameter) {
+        if (parameter is not ValueTuple<object, object> { Item1: ActionConnectorVm a, Item2: ActionConnectorVm b }) return;
+        (ActionConnectorVm from, ActionConnectorVm to) = a.IsInput ? (b, a) : (a, b);
+        if (from.IsInput || !to.IsInput || from.Owner == to.Owner) return;
+
+        string fromId = from.Owner.Node.Id, toId = to.Owner.Node.Id;
+        if (Graph.Edges.Any(e => e.From == fromId && e.To == toId)) return;
+        if (Graph.WouldLoop(fromId, toId)) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = "Error: That connection would make a loop";
+            return;
+        }
+
+        var edge = new ActionEdge { From = fromId, To = toId };
+        Graph.Edges.Add(edge);
+        AddConnectionView(edge);
+        RefreshNodes();
+        MarkDirty();
+        Validate();
+    }
+
+    private void RemoveConnections(IReadOnlyCollection<ActionConnectionVm> connections) {
+        if (connections.Count == 0) return;
+        foreach (ActionConnectionVm connection in connections) {
+            Graph.Edges.Remove(connection.Edge);
+            _connections.Remove(connection);
+        }
+
+        RefreshNodes();
+        MarkDirty();
+        Validate();
+    }
+
+    private void Window_KeyDown(object? sender, KeyEventArgs e) {
+        if (e.Key != Key.Delete) return;
+        if (FocusManager?.GetFocusedElement() is TextBox or AutoCompleteBox) return;
+        if (DeleteSelection()) e.Handled = true;
+    }
+
+    private void DeleteStep_Click(object? sender, RoutedEventArgs e) {
+        DeleteSelection();
+    }
+
+    private bool DeleteSelection() {
+        List<ActionConnectionVm> connections =
+            Editor.SelectedConnections?.OfType<ActionConnectionVm>().ToList() ?? [];
+        if (Editor.SelectedConnection is ActionConnectionVm single && !connections.Contains(single))
+            connections.Add(single);
+        List<ActionNodeVm> nodes = Editor.SelectedItems?.OfType<ActionNodeVm>().ToList() ?? [];
+        return DeleteItems(nodes, connections);
+    }
+
+    private bool DeleteItems(List<ActionNodeVm> nodes, List<ActionConnectionVm> connections) {
+        if (connections.Count == 0 && nodes.Count == 0) return false;
+
+        foreach (ActionNodeVm node in nodes)
+            connections.AddRange(_connections.Where(c => c.Source.Owner == node || c.Target.Owner == node)
+                .Except(connections).ToList());
+        foreach (ActionConnectionVm connection in connections) {
+            Graph.Edges.Remove(connection.Edge);
+            _connections.Remove(connection);
+        }
+
+        foreach (ActionNodeVm node in nodes) {
+            Graph.Nodes.Remove(node.Node);
+            _nodes.Remove(node);
+        }
+
+        RefreshNodes();
+        ShowSelection();
+        MarkDirty();
+        Validate();
+        return true;
+    }
+
+    private void AttachNodeMenus() {
+        Editor.AddHandler(PointerPressedEvent, (_, e) => {
+            _rightPressAt = e.GetCurrentPoint(Editor).Properties.IsRightButtonPressed ? e.GetPosition(Editor) : null;
+        }, RoutingStrategies.Tunnel, true);
+
+        Editor.AddHandler(PointerReleasedEvent, (_, e) => {
+            if (e.InitialPressMouseButton != MouseButton.Right || _rightPressAt is not { } start) return;
+            _rightPressAt = null;
+            Point at = e.GetPosition(Editor);
+            if (Math.Abs(at.X - start.X) > RightClickSlop || Math.Abs(at.Y - start.Y) > RightClickSlop) return;
+            if (StepContainerFor(e.Source, at) is not { DataContext: ActionNodeVm clicked } container) {
+                // not an action step right clicked
+                return;
+            }
+
+            if (Editor.SelectedItems is { } selected && !selected.Contains(clicked)) {
+                selected.Clear();
+                selected.Add(clicked);
+            }
+
+            MenuFlyout menu = BuildNodeMenu(clicked);
+            Dispatcher.UIThread.Post(() => menu.ShowAt(container, true));
+        }, RoutingStrategies.Tunnel, true);
+    }
+
+    private ItemContainer? StepContainerFor(object? source, Point editorPoint) {
+        return FindContainer(source as Visual) ?? FindContainer(Editor.InputHitTest(editorPoint) as Visual);
+
+        static ItemContainer? FindContainer(Visual? visual) {
+            while (visual != null && visual is not ItemContainer) visual = visual.GetVisualParent();
+            return visual as ItemContainer;
+        }
+    }
+
+    private MenuFlyout BuildNodeMenu(ActionNodeVm clicked) {
+        List<ActionNodeVm> targets = MenuTargets(clicked);
+        string suffix = targets.Count > 1 ? $" {targets.Count} steps" : "";
+
+        var duplicate = new MenuItem { Header = $"Duplicate{suffix}" };
+        duplicate.Click += (_, _) => DuplicateNodes(targets);
+        var toggle = new MenuItem { Header = $"{(clicked.Node.Disabled ? "Enable" : "Disable")}{suffix}" };
+        toggle.Click += (_, _) => ToggleNodes(targets, !clicked.Node.Disabled);
+        var delete = new MenuItem { Header = $"Delete{suffix}" };
+        delete.Click += (_, _) => DeleteItems(targets, []);
+
+        return new MenuFlyout { Items = { duplicate, toggle, new Separator(), delete } };
+    }
+
+    private List<ActionNodeVm> MenuTargets(ActionNodeVm clicked) {
+        List<ActionNodeVm> selected = Editor.SelectedItems?.OfType<ActionNodeVm>().ToList() ?? [];
+        return selected.Count > 1 && selected.Contains(clicked) ? selected : [clicked];
+    }
+
+    private void ToggleNodes(List<ActionNodeVm> targets, bool disable) {
+        foreach (ActionNodeVm node in targets) node.Node.Disabled = disable;
+        RefreshNodes();
+        MarkDirty();
+        Validate();
+    }
+
+    private void DuplicateNodes(List<ActionNodeVm> targets) {
+        if (targets.Count == 0) return;
+
+        int next = Graph.Nodes.Select(n => int.TryParse(n.Id, out int i) ? i : 0).DefaultIfEmpty(0).Max() + 1;
+        var newIds = new Dictionary<string, string>(StringComparer.Ordinal);
+        var copies = new List<ActionNodeVm>();
+
+        foreach (ActionNodeVm original in targets) {
+            var copy = new ActionNode {
+                Id = $"{next++}",
+                Step = CloneStep(original.Node.Step),
+                X = original.Node.X + 30,
+                Y = original.Node.Y + StepSpacingY,
+                Disabled = original.Node.Disabled
+            };
+            newIds[original.Node.Id] = copy.Id;
+            Graph.Nodes.Add(copy);
+            var view = new ActionNodeVm(copy);
+            _nodes.Add(view);
+            copies.Add(view);
+        }
+
+        foreach (ActionEdge edge in Graph.Edges.ToList()) {
+            if (!newIds.TryGetValue(edge.From, out string? from) || !newIds.TryGetValue(edge.To, out string? to))
+                continue;
+            var copiedEdge = new ActionEdge { From = from, To = to };
+            Graph.Edges.Add(copiedEdge);
+            AddConnectionView(copiedEdge);
+        }
+
+        RefreshNodes();
+        Editor.SelectedItems?.Clear();
+        foreach (ActionNodeVm view in copies) Editor.SelectedItems?.Add(view);
+        MarkDirty();
+        Validate();
+    }
+
+    private static ActionStep CloneStep(ActionStep step) {
+        return System.Text.Json.JsonSerializer.Deserialize<ActionStep>(
+            System.Text.Json.JsonSerializer.Serialize(step, ActionGraph.JsonOptions), ActionGraph.JsonOptions)!;
+    }
+}
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
new file mode 100644
index 0000000..c23d5fc
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -0,0 +1,318 @@
+using System.Globalization;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+using SubathonManager.Integration;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionEditorWindow {
+    private static string ToDurationText(double? seconds) {
+        if (seconds is not > 0.0) return "";
+        TimeSpan span = TimeSpan.FromSeconds(Math.Round(seconds.Value));
+        var text = "";
+        if (span.TotalHours >= 1) text += $"{(int)span.TotalHours}h";
+        if (span.Minutes > 0) text += $"{span.Minutes}m";
+        if (span.Seconds > 0 || text.Length == 0) text += $"{span.Seconds}s";
+        return text;
+    }
+
+    private void ShowSelection() {
+        ActionNode? node = SelectedNode;
+        AboutPanel.IsVisible = node == null;
+        StepPanel.IsVisible = node != null;
+        if (node == null) return;
+
+        ActionStep step = node.Step;
+        ActionStepType type = step.Type;
+        _suppress++;
+        try {
+            StepHeader.Text = $"{type.GetGroup()} - {type.GetLabel()}";
+
+            OpBox.Items.Clear();
+            foreach (ActionOperation op in type.GetOps())
+                OpBox.Items.Add(new ComboBoxItem { Content = op.GetOpLabel(), Tag = op });
+            OpBox.SelectedItem = OpBox.Items.OfType<ComboBoxItem>().FirstOrDefault(i => (ActionOperation?)i.Tag == step.Operation);
+            OpPanel.IsVisible = OpBox.Items.Count > 1;
+
+            ScopePanel.IsVisible = type.HasScope();
+            ScopeLabel.Text = type.GetScopeLabel() ?? "";
+            ScopeBox.Text = step.Scope ?? "";
+
+            TargetPanel.IsVisible = type.HasTarget();
+            TargetLabel.Text = type.GetTargetLabel() ?? "";
+            TargetBox.Text = step.TargetName ?? step.Target;
+
+            ValueLabel.Text = type.GetValueLabel() ?? "";
+            ValueBox.Text = step.Value?.ToString(CultureInfo.InvariantCulture) ?? "";
+
+            DurationLabel.Text = type.GetDurationLabel() ?? "";
+            DurationBox.Text = ToDurationText(step.Seconds);
+
+            BodyPanel.IsVisible = type.HasBody();
+            BodyLabel.Text = type.GetBodyLabel() ?? "";
+            BodyBox.Text = step.Body ?? "";
+            VariablesHint.IsVisible = type.AllowsVariables();
+            RefreshFieldVisibility(step);
+        }
+        finally {
+            _suppress--;
+        }
+
+        _ = LoadTargetSuggestionsAsync();
+    }
+
+    private void RefreshFieldVisibility(ActionStep step) {
+        ValuePanel.IsVisible = step.Type.HasValue(step.Operation);
+        DurationPanel.IsVisible = step.Type.HasDuration();
+        StepError.Text = step.IsValid(out string error) ? "" : error;
+    }
+
+    private void StepField_Changed(object? sender, SelectionChangedEventArgs e) {
+        ApplyStepFields();
+    }
+
+    private void ApplyStepFields() {
+        if (_suppress > 0 || SelectedNode is not { } node) return;
+        ActionStep step = node.Step;
+
+        if ((OpBox.SelectedItem as ComboBoxItem)?.Tag is ActionOperation op) step.Operation = op;
+        step.Scope = step.Type.HasScope() ? (ScopeBox.Text ?? "").Trim() : null;
+
+        if (step.Type.HasTarget()) {
+            string text = (TargetBox.Text ?? "").Trim();
+            if (_targetIds.TryGetValue(text, out string? id)) {
+                step.Target = id;
+                step.TargetName = text;
+            }
+            else if (text != step.TargetName) {
+                // integ disconnected, manually typed
+                step.Target = text;
+                step.TargetName = null;
+            }
+        }
+
+        step.Value = step.Type.HasValue(step.Operation)
+                     && double.TryParse((ValueBox.Text ?? "").Trim(), NumberStyles.Float,
+                         CultureInfo.InvariantCulture, out double value)
+            ? value : null;
+        TimeSpan duration = Utils.ParseDurationString((DurationBox.Text ?? "").Trim());
+        step.Seconds = step.Type.HasDuration() && duration > TimeSpan.Zero ? duration.TotalSeconds : null;
+        step.Body = step.Type.HasBody() && !string.IsNullOrEmpty(BodyBox.Text) ? BodyBox.Text : null;
+
+        RefreshFieldVisibility(step);
+        RefreshNodes();
+        Validate();
+        MarkDirty();
+    }
+
+    private async void RefreshTargets_Click(object? sender, RoutedEventArgs e) {
+        _mixItUpCommands = null;
+        _streamerBotActions = null;
+        if (ServiceManager.VTubeStudio.Connected && SelectedNode?.Step.Type.GetGroup() == "VTube Studio")
+            await ServiceManager.VTubeStudio.RefreshAsync();
+        await LoadTargetSuggestionsAsync();
+    }
+
+    private async Task LoadTargetSuggestionsAsync() {
+        if (SelectedNode is not { } node || !node.Step.Type.HasTarget()) return;
+        ActionStepType type = node.Step.Type;
+        
+        _targetIds.Clear();
+        ScopeBox.ItemsSource = null;
+        TargetBox.ItemsSource = null;
+        TargetHint.Text = "loading...";
+
+        string scope = (ScopeBox.Text ?? "").Trim();
+        var targets = new List<string>();
+        var scopes = new List<string>();
+        var ids = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        string? offline = null;
+
+        try {
+            switch (type) {
+                // ugly switch time \o/
+                case ActionStepType.VtsExpression:
+                case ActionStepType.VtsParameter:
+                case ActionStepType.VtsHotkey: {
+                    VTSService vts = ServiceManager.VTubeStudio;
+                    if (!vts.Connected) {
+                        offline = "VTube Studio not connected";
+                        break;
+                    }
+
+                    if (type == ActionStepType.VtsExpression)
+                        targets.AddRange(vts.CachedExpressions.Select(x => x.File));
+                    else if (type == ActionStepType.VtsParameter)
+                        targets.AddRange(vts.CachedParameters.Select(p => p.Name));
+                    else
+                        foreach (VtsHotkey hotkey in vts.CachedHotkeys) {
+                            string name = string.IsNullOrWhiteSpace(hotkey.Name) ? hotkey.Id : hotkey.Name;
+                            ids[name] = hotkey.Id;
+                            targets.Add(name);
+                        }
+
+                    break;
+                }
+                case ActionStepType.MixItUpCommand: {
+                    MixItUpService mixItUp = ServiceManager.MixItUp;
+                    if (!mixItUp.Enabled) {
+                        offline = "MixItUp not enabled";
+                        break;
+                    }
+
+                    _mixItUpCommands ??= await mixItUp.GetCommandsAsync();
+                    if (_mixItUpCommands == null) {
+                        offline = "MixItUp not reachable";
+                        break;
+                    }
+
+                    foreach (MixItUpCommandInfo command in _mixItUpCommands) {
+                        ids[command.DisplayName] = command.Id.ToString();
+                        targets.Add(command.DisplayName);
+                    }
+                    break;
+                }
+                case ActionStepType.StreamerBotAction: {
+                    StreamerBotService streamerBot = ServiceManager.StreamerBot;
+                    if (!streamerBot.HttpEnabled) {
+                        offline = "Streamer.bot HTTP server not enabled in settings";
+                        break;
+                    }
+
+                    _streamerBotActions ??= await streamerBot.GetActionsAsync();
+                    if (_streamerBotActions == null) {
+                        offline = "Streamer.bot not reachable";
+                        break;
+                    }
+
+                    foreach (StreamerBotActionInfo sbAction in _streamerBotActions) {
+                        ids[sbAction.DisplayName] = sbAction.Id.ToString();
+                        targets.Add(sbAction.DisplayName);
+                    }
+
+                    break;
+                }
+                case ActionStepType.HttpGet:
+                case ActionStepType.HttpPost:
+                    if (SelectedNode?.Id == node.Id)
+                        TargetHint.Text = "variables also work in the URL";
+                    return;
+                default: {
+                    OBSService obs = ServiceManager.OBS;
+                    if (!obs.Connected) {
+                        offline = "OBS not connected";
+                        break;
+                    }
+
+                    (List<string> s, List<string> t) = await Task.Run(() => obs.GetActionTargets(type, scope));
+                    scopes.AddRange(s);
+                    targets.AddRange(t);
+                    break;
+                }
+            }
+        }
+        catch (Exception ex) {
+            if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
+                _logger?.LogDebug(ex, "[ActionEditor] Loading suggestions for {Type} failed", type);
+        }
+
+        if (SelectedNode?.Id != node.Id) return;
+        _targetIds.Clear();
+        foreach (KeyValuePair<string, string> pair in ids) _targetIds[pair.Key] = pair.Value;
+        ScopeBox.ItemsSource = scopes;
+        TargetBox.ItemsSource = targets;
+        TargetHint.Text = offline != null ? $"{offline} - type it by hand" : $"{targets.Count} found";
+    }
+
+    /////////////////////////////// variables check
+
+    private readonly List<(Expander Section, List<(Control Row, ActionVariable Variable)> Rows)> _variableSections = [];
+    
+    private void BuildVariablesPanel() {
+        foreach (IGrouping<string, ActionVariable> group in Enum.GetValues<ActionVariable>().GroupBy(v => v.GetGroup())) {
+            var rows = new StackPanel { Spacing = 2 };
+            var entries = new List<(Control, ActionVariable)>();
+            foreach (ActionVariable variable in group) {
+                Control row = BuildVariableRow(variable);
+                rows.Children.Add(row);
+                entries.Add((row, variable));
+            }
+
+            var section = new Expander {
+                Header = group.Key, IsExpanded = false, HorizontalAlignment = HorizontalAlignment.Stretch,
+                HorizontalContentAlignment = HorizontalAlignment.Stretch, Padding = new Thickness(4, 2),
+                Content = rows
+            };
+            _variableSections.Add((section, entries));
+            VariablesPanel.Children.Add(section);
+        }
+
+        VariableSearchBox.TextChanged += (_, _) => FilterVariables();
+    }
+
+    private Control BuildVariableRow(ActionVariable variable) {
+        string placeholder = variable.GetPlaceholder();
+        var heading = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
+        heading.Children.Add(new TextBlock {
+            Text = placeholder, FontSize = 12, FontWeight = FontWeight.SemiBold,
+            FontFamily = new FontFamily("Consolas, Menlo, monospace") // looks code-y for looking like vars explicitly
+        });
+        var type = new TextBlock {
+            Text = variable.GetValueType(), FontSize = 10, Foreground = Brushes.Gray,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+        Grid.SetColumn(type, 1);
+        heading.Children.Add(type);
+
+        var row = new Button {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            Background = Brushes.Transparent,
+            Padding = new Thickness(6, 4),
+            Content = new StackPanel {
+                Children = {
+                    heading,
+                    new TextBlock {
+                        Text = variable.GetDescription(), FontSize = 11, Foreground = Brushes.Gray,
+                        TextWrapping = TextWrapping.Wrap
+                    }
+                }
+            }
+        };
+        ToolTip.SetTip(row, "Click to copy var name");
+
+        row.Click += async (_, _) => {
+            await UiHelpers.TrySetClipboardTextAsync(placeholder);
+            StatusText.Foreground = Brushes.Gray;
+            StatusText.Text = $"Copied {placeholder}";
+        };
+        return row;
+    }
+
+    private void FilterVariables() {
+        string query = (VariableSearchBox.Text ?? "").Trim().Trim('%');
+        foreach ((Expander section, List<(Control Row, ActionVariable Variable)> rows) in _variableSections) {
+            var any = false;
+            foreach ((Control row, ActionVariable variable) in rows) {
+                bool show = query.Length == 0
+                            || variable.GetToken().Contains(query, StringComparison.OrdinalIgnoreCase)
+                            || variable.GetDescription().Contains(query, StringComparison.OrdinalIgnoreCase)
+                            || variable.GetGroup().Contains(query, StringComparison.OrdinalIgnoreCase);
+                row.IsVisible = show;
+                any |= show;
+            }
+
+            section.IsVisible = any;
+            if (query.Length > 0) section.IsExpanded = true;
+        }
+    }
+}
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
new file mode 100644
index 0000000..6512b7d
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
@@ -0,0 +1,318 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:ctl="using:SubathonManager.UI.Controls"
+        xmlns:val="using:SubathonManager.UI.Validation"
+        xmlns:local="using:SubathonManager.UI.Views.Actions"
+        xmlns:nodify="clr-namespace:Nodify.Avalonia;assembly=Nodify.Avalonia"
+        xmlns:connections="clr-namespace:Nodify.Avalonia.Connections;assembly=Nodify.Avalonia"
+        mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="760"
+        x:Class="SubathonManager.UI.Views.Actions.ActionEditorWindow"
+        Title="Custom Action"
+        Width="1740" Height="900"
+        MinWidth="900" MinHeight="520"
+        WindowStartupLocation="CenterScreen"
+        Background="{DynamicResource AppGeneralBackground}">
+
+    <Window.Resources>
+        <DataTemplate x:Key="SuggestionTemplate" x:DataType="x:String">
+            <TextBlock Text="{Binding}" Width="230" TextTrimming="CharacterEllipsis" ToolTip.Tip="{Binding}" />
+        </DataTemplate>
+
+        <ControlTheme x:Key="StepContainerTheme" x:DataType="local:ActionNodeVm"
+                      TargetType="nodify:ItemContainer"
+                      BasedOn="{StaticResource {x:Type nodify:ItemContainer}}">
+            <Setter Property="Background" Value="{DynamicResource ControlFillColorDefaultBrush}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="SelectedBorderThickness" Value="2" />
+            <Setter Property="Location" Value="{Binding Location, Mode=TwoWay}" />
+            <Style Selector="^:pointerover">
+                <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
+            </Style>
+        </ControlTheme>
+
+        <ControlTheme x:Key="ConnectorLeftTheme" TargetType="connections:Connector"
+                      BasedOn="{StaticResource {x:Type connections:Connector}}">
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border Background="Transparent" Width="14">
+                        <Border Name="PART_Connector" Background="{TemplateBinding Background}"
+                                HorizontalAlignment="Left" Width="3" CornerRadius="1" />
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </ControlTheme>
+
+        <ControlTheme x:Key="ConnectorRightTheme" TargetType="connections:Connector"
+                      BasedOn="{StaticResource {x:Type connections:Connector}}">
+            <Setter Property="Height" Value="28" />
+            <Setter Property="Background" Value="{DynamicResource AccentFillColorDefaultBrush}" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border Background="Transparent" Width="14">
+                        <Border Name="PART_Connector" Background="{TemplateBinding Background}"
+                                HorizontalAlignment="Right" Width="5" CornerRadius="2" />
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </ControlTheme>
+
+        <ControlTheme x:Key="StepConnectionTheme" TargetType="connections:StepConnection"
+                      BasedOn="{StaticResource {x:Type connections:StepConnection}}">
+            <Setter Property="SourceOffset" Value="8,0" />
+            <Setter Property="TargetOffset" Value="8,0" />
+            <Setter Property="Stroke" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
+            <Setter Property="Fill" Value="{DynamicResource AccentFillColorTertiaryBrush}" />
+        </ControlTheme>
+
+        <DataTemplate x:Key="InputConnectorTemplate" x:DataType="local:ActionConnectorVm">
+            <connections:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}" IsConnected="True"
+                                   VerticalAlignment="Center" Theme="{StaticResource ConnectorLeftTheme}"
+                                   ToolTip.Tip="Runs after everything connected has finished" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="OutputConnectorTemplate" x:DataType="local:ActionConnectorVm">
+            <connections:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}" IsConnected="True"
+                                   VerticalAlignment="Center" Theme="{StaticResource ConnectorRightTheme}"
+                                   ToolTip.Tip="Drag onto another step to run it after this one" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="StepTemplate" x:DataType="local:ActionNodeVm">
+            <StackPanel Orientation="Horizontal" Opacity="{Binding CardOpacity}">
+                <ContentControl Content="{Binding Input}" ContentTemplate="{StaticResource InputConnectorTemplate}" />
+                <Grid Width="200" Margin="6,6" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,Auto">
+                    <TextBlock Text="{Binding Title}" FontSize="10" Foreground="Gray"
+                               TextTrimming="CharacterEllipsis" />
+                    
+                    <!--- TODO check col/row spacing -->
+                    <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Spacing="3" Margin="4,0,0,0">
+                        <Border IsVisible="{Binding HasBranches}" Background="#6A4C93" CornerRadius="3" Padding="4,0"
+                                ToolTip.Tip="These steps run at the same time after this one">
+                            <TextBlock Text="{Binding BranchLabel}" FontSize="9" Foreground="White" />
+                        </Border>
+                        <Border IsVisible="{Binding IsStart}" Background="#2E7D32" CornerRadius="3" Padding="4,0">
+                            <TextBlock Text="START" FontSize="9" Foreground="White" />
+                        </Border>
+                        <Border IsVisible="{Binding IsDisabled}" Background="#555555" CornerRadius="3" Padding="4,0"
+                                ToolTip.Tip="Skipped when the action runs; right click to enable">
+                            <TextBlock Text="OFF" FontSize="9" Foreground="White" />
+                        </Border>
+                        <Border IsVisible="{Binding IsEnd}" Background="#8E3B46" CornerRadius="3" Padding="4,0"
+                                ToolTip.Tip="Nothing runs after this step">
+                            <TextBlock Text="END" FontSize="9" Foreground="White" />
+                        </Border>
+                    </StackPanel>
+                    <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Text="{Binding Summary}" FontSize="12"
+                               FontWeight="SemiBold" TextWrapping="Wrap" MaxLines="2"
+                               TextTrimming="CharacterEllipsis" Margin="0,3,0,0" />
+                    <TextBlock Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="0" Text="{Binding Error}"
+                               IsVisible="{Binding HasError}" Foreground="OrangeRed" FontSize="10"
+                               TextWrapping="Wrap" Margin="0,2,0,0" />
+                </Grid>
+                <ContentControl Content="{Binding Output}" ContentTemplate="{StaticResource OutputConnectorTemplate}" />
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="ConnectionTemplate" x:DataType="local:ActionConnectionVm">
+            <connections:StepConnection Source="{Binding Source.Anchor}" Target="{Binding Target.Anchor}"
+                                        Theme="{StaticResource StepConnectionTheme}"
+                                        connections:BaseConnection.IsSelectable="True" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="PendingConnectionTemplate">
+            <connections:PendingConnection AllowOnlyConnectors="True" EnablePreview="True"
+                                           Stroke="{DynamicResource AccentFillColorTertiaryBrush}" />
+        </DataTemplate>
+    </Window.Resources>
+
+    <Grid RowDefinitions="Auto,*,Auto">
+        <Grid Grid.Row="0" Margin="12,10,12,8" ColumnDefinitions="*,Auto">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <TextBox x:Name="NameBox" Width="240" Height="34" FontWeight="SemiBold"
+                         PlaceholderText="Action name" />
+                <TextBox x:Name="AuthorBox" Width="140" Height="34" PlaceholderText="Author" />
+                <TextBox x:Name="VersionBox" Width="80" Height="34" PlaceholderText="1.0.0" />
+                <TextBlock Text="If already running:" FontSize="12" VerticalAlignment="Center" Margin="8,0,0,0" />
+                <ComboBox x:Name="RepeatBox" Width="170" Height="34" SelectionChanged="Repeat_SelectionChanged" />
+            </StackPanel>
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6">
+                <Button Height="34" Click="TestRun_Click"
+                        ToolTip.Tip="Run all steps now (real)">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <ctl:SymIcon Glyph="Play16" />
+                        <TextBlock Text="Test Run" VerticalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+                <Button Height="34" Click="Export_Click" ToolTip.Tip="Save a shareable .sma copy to exports/actions">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <ctl:SymIcon Glyph="ArrowExportUp16" />
+                        <TextBlock Text="Export" VerticalAlignment="Center" />
+                    </StackPanel>
+                </Button>
+                <Border x:Name="SaveButtonBorder" CornerRadius="4" BorderThickness="2" BorderBrush="Transparent">
+                    <Button Height="30" Width="80" Classes="accent" Content="Save" Click="Save_Click" />
+                </Border>
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="1" Margin="12,0,12,0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="230" MinWidth="160" MaxWidth="400" />
+                <ColumnDefinition Width="8" />
+                <ColumnDefinition Width="*" MinWidth="300" />
+                <ColumnDefinition Width="300" />
+            </Grid.ColumnDefinitions>
+            
+            <Border BorderBrush="#333" BorderThickness="1" CornerRadius="8" Padding="8">
+                <Grid RowDefinitions="Auto,*">
+                    <TextBox x:Name="PaletteSearchBox" Height="30" FontSize="12" Margin="0,0,0,6"
+                             PlaceholderText="Search actions"
+                             ToolTip.Tip="Filter the actions below; Enter auto-adds first match" />
+                    <ScrollViewer Grid.Row="1">
+                        <StackPanel x:Name="PalettePanel" Spacing="2" />
+                    </ScrollViewer>
+                </Grid>
+            </Border>
+
+            <GridSplitter Grid.Column="1" Background="Transparent" ResizeDirection="Columns"
+                          ToolTip.Tip="Drag to resize" />
+
+            <Border Grid.Column="2" Margin="0,0,8,0" BorderBrush="#333" BorderThickness="1" CornerRadius="8"
+                    ClipToBounds="True" Background="#181818">
+                <Grid>
+                    <nodify:NodifyEditor x:Name="Editor" Background="Transparent" GridCellSize="10"
+                                         ItemTemplate="{StaticResource StepTemplate}"
+                                         ItemContainerTheme="{StaticResource StepContainerTheme}"
+                                         ConnectionTemplate="{StaticResource ConnectionTemplate}"
+                                         PendingConnectionTemplate="{StaticResource PendingConnectionTemplate}" />
+
+                    <nodify:Minimap x:Name="Minimap" Width="200" Height="130" Margin="10"
+                                    HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                                    ItemsSource="{Binding #Editor.ItemsSource}"
+                                    ViewportLocation="{Binding #Editor.ViewportLocation, Mode=TwoWay}"
+                                    ViewportSize="{Binding #Editor.ViewportSize}">
+                        <nodify:Minimap.ItemTemplate>
+                            <DataTemplate>
+                                <Grid />
+                            </DataTemplate>
+                        </nodify:Minimap.ItemTemplate>
+                        <nodify:Minimap.Styles>
+                            <Style Selector="nodify|MinimapItem" x:DataType="local:ActionNodeVm">
+                                <Setter Property="Location" Value="{Binding Location}" />
+                                <Setter Property="Width" Value="230" />
+                                <Setter Property="Height" Value="70" />
+                            </Style>
+                        </nodify:Minimap.Styles>
+                    </nodify:Minimap>
+                </Grid>
+            </Border>
+
+            <Border Grid.Column="3" BorderBrush="#333" BorderThickness="1" CornerRadius="8" Padding="10">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="3*" MinHeight="140" />
+                        <RowDefinition Height="8" />
+                        <RowDefinition Height="2*" MinHeight="120" />
+                    </Grid.RowDefinitions>
+                <ScrollViewer Grid.Row="0">
+                    <StackPanel>
+                        <StackPanel x:Name="AboutPanel">
+                            <TextBlock Text="About this action" FontSize="13" FontWeight="SemiBold"
+                                       Margin="0,0,0,6" />
+                            <TextBox x:Name="DescriptionBox" Height="110" AcceptsReturn="True"
+                                     TextWrapping="Wrap" PlaceholderText="What it does, what it needs..." />
+                            <!-- todo fiddle with newline -->
+                            <TextBlock FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,10,0,0"
+                                       Text="Add new steps from the left. If you have an action selected, it will chain it, else it will start a new parallel branch.&#x0a;&#x0a;You can drag an arrow to and from steps to create new connections and branches.&#x0a;&#x0a;If an action has multiple inputs, it waits for all paths to complete before running.&#x0a;&#x0a;Select actions or a connection and press Delete to remove them." />
+                        </StackPanel>
+
+                        <StackPanel x:Name="StepPanel" IsVisible="False">
+                            <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,8">
+                                <TextBlock x:Name="StepHeader" FontSize="13" FontWeight="SemiBold"
+                                           VerticalAlignment="Center" />
+                                <Button Grid.Column="1" Padding="6,2" Click="DeleteStep_Click"
+                                        ToolTip.Tip="Remove this action" Foreground="IndianRed">
+                                    <ctl:SymIcon Glyph="Delete16" />
+                                </Button>
+                            </Grid>
+
+                            <StackPanel x:Name="OpPanel" Margin="0,0,0,8">
+                                <TextBlock Text="Do:" FontSize="12" Margin="2,0,0,3" />
+                                <ComboBox x:Name="OpBox" Height="34" HorizontalAlignment="Stretch"
+                                          SelectionChanged="StepField_Changed" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="ScopePanel" Margin="0,0,0,8">
+                                <TextBlock x:Name="ScopeLabel" Text="Scene:" FontSize="12" Margin="2,0,0,3" />
+                                <AutoCompleteBox x:Name="ScopeBox" Height="34" FilterMode="ContainsOrdinal"
+                                                 ItemTemplate="{StaticResource SuggestionTemplate}"
+                                                 MinimumPrefixLength="0" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="TargetPanel" Margin="0,0,0,8">
+                                <Grid ColumnDefinitions="*,Auto">
+                                    <TextBlock x:Name="TargetLabel" Text="Target:" FontSize="12" Margin="2,0,0,3" />
+                                    <TextBlock Grid.Column="1" x:Name="TargetHint" FontSize="10" Foreground="Gray"
+                                               VerticalAlignment="Bottom" Margin="0,0,2,3" />
+                                </Grid>
+                                <Grid ColumnDefinitions="*,Auto">
+                                    <AutoCompleteBox x:Name="TargetBox" Height="34" Margin="0,0,4,0"
+                                                     ItemTemplate="{StaticResource SuggestionTemplate}"
+                                                     FilterMode="ContainsOrdinal" MinimumPrefixLength="0" />
+                                    <Button Grid.Column="1" Height="34" Padding="8,2" Click="RefreshTargets_Click"
+                                            ToolTip.Tip="Reload the list from the connected integration">
+                                        <ctl:SymIcon Glyph="ArrowClockwise16" />
+                                    </Button>
+                                </Grid>
+                            </StackPanel>
+
+                            <StackPanel x:Name="ValuePanel" Margin="0,0,0,8">
+                                <TextBlock x:Name="ValueLabel" Text="Value:" FontSize="12" Margin="2,0,0,3" />
+                                <TextBox x:Name="ValueBox" Height="34"
+                                         val:NumericInputBehaviour.Mode="SignedDecimal" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="DurationPanel" Margin="0,0,0,8">
+                                <TextBlock x:Name="DurationLabel" Text="Duration:" FontSize="12" Margin="2,0,0,3" />
+                                <TextBox x:Name="DurationBox" Height="34" PlaceholderText="e.g. 30s, 5m, 1h30m" />
+                            </StackPanel>
+
+                            <StackPanel x:Name="BodyPanel" Margin="0,0,0,8">
+                                <TextBlock x:Name="BodyLabel" Text="Body:" FontSize="12" Margin="2,0,0,3" />
+                                <TextBox x:Name="BodyBox" Height="120" AcceptsReturn="True" TextWrapping="Wrap"
+                                         FontFamily="Consolas, Menlo, monospace" FontSize="12" />
+                            </StackPanel>
+
+                            <TextBlock x:Name="VariablesHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap"
+                                       Margin="2,0,0,8"
+                                       Text="Variables such as %points% are filled in when this step runs. Click any to copy it" />
+
+                            <TextBlock x:Name="StepError" FontSize="11" Foreground="OrangeRed" TextWrapping="Wrap"
+                                       Margin="2,2,0,0" />
+                        </StackPanel>
+                    </StackPanel>
+                </ScrollViewer>
+
+                <GridSplitter Grid.Row="1" Background="Transparent" ResizeDirection="Rows"
+                              ToolTip.Tip="Drag to resize" />
+
+                <Grid Grid.Row="2" RowDefinitions="Auto,Auto,*">
+                    <TextBlock Text="Variables" FontSize="13" FontWeight="SemiBold" Margin="0,0,0,4" />
+                    <TextBox Grid.Row="1" x:Name="VariableSearchBox" Height="30" FontSize="12" Margin="0,0,0,6"
+                             PlaceholderText="Search variables" />
+                    <ScrollViewer Grid.Row="2">
+                        <StackPanel x:Name="VariablesPanel" Spacing="2" />
+                    </ScrollViewer>
+                </Grid>
+                </Grid>
+            </Border>
+        </Grid>
+
+        <TextBlock Grid.Row="2" x:Name="StatusText" Margin="14,6,14,10" FontSize="11" Foreground="Gray"
+                   TextWrapping="Wrap" />
+    </Grid>
+</Window>
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
new file mode 100644
index 0000000..bb5f1d5
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
@@ -0,0 +1,266 @@
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+using SubathonManager.Integration;
+using SubathonManager.Services;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionEditorWindow : Window {
+    private const double StepSpacingX = 260;
+    private const double StepSpacingY = 90;
+
+    private readonly CustomAction _action;
+    private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<ActionEditorWindow>>();
+    private readonly ObservableCollection<ActionNodeVm> _nodes = [];
+    private readonly ObservableCollection<ActionConnectionVm> _connections = [];
+
+    private readonly Dictionary<string, string> _targetIds = new(StringComparer.OrdinalIgnoreCase);
+    private IReadOnlyList<MixItUpCommandInfo>? _mixItUpCommands;
+    private IReadOnlyList<StreamerBotActionInfo>? _streamerBotActions;
+
+    private bool _dirty;
+    private string _savedState = "";
+    private readonly List<(string Group, Expander Section, StackPanel Buttons)> _paletteSections = [];
+    private readonly HashSet<string> _collapsedGroups = new(StringComparer.Ordinal);
+    private bool _closeConfirmed;
+    private int _suppress;
+
+    private static readonly Dictionary<Guid, ActionEditorWindow> OpenEditors = [];
+
+    public ActionEditorWindow() : this(new CustomAction()) {
+    }
+
+    public event Action<Guid>? Saved;
+
+    public static ActionEditorWindow Open(CustomAction action) {
+        if (OpenEditors.TryGetValue(action.Id, out ActionEditorWindow? existing)) {
+            if (existing.WindowState == WindowState.Minimized) existing.WindowState = WindowState.Normal;
+            existing.Activate();
+            return existing;
+        }
+
+        var editor = new ActionEditorWindow(action);
+        OpenEditors[action.Id] = editor;
+        editor.Closed += (_, _) => OpenEditors.Remove(action.Id);
+        editor.Show();
+        return editor;
+    }
+
+    public ActionEditorWindow(CustomAction action) {
+        InitializeComponent();
+        WindowIcons.Apply(this);
+        _action = action.Clone();
+
+        foreach (ActionNode node in Graph.Nodes) _nodes.Add(new ActionNodeVm(node));
+        foreach (ActionEdge edge in Graph.Edges) AddConnectionView(edge);
+        RefreshNodes();
+
+        Editor.ItemsSource = _nodes;
+        Editor.Connections = _connections;
+        Editor.PendingConnection = new object();
+        Editor.ConnectionCompletedCommand = new EditorCommand(OnConnectionCompleted);
+        Editor.RemoveConnectionCommand = new EditorCommand(p => {
+            if (p is ActionConnectionVm connection) RemoveConnections([connection]);
+        });
+        Editor.DisconnectConnectorCommand = new EditorCommand(p => {
+            if (p is ActionConnectorVm connector)
+                RemoveConnections(_connections.Where(c => c.Source == connector || c.Target == connector).ToList());
+        });
+        Editor.ItemsDragCompletedCommand = new EditorCommand(_ => MarkDirty());
+        Editor.SelectionChanged += (_, _) => ShowSelection();
+
+        BuildPalette();
+        BuildVariablesPanel();
+        AttachNodeMenus();
+        LoadHeader();
+        ShowSelection();
+        Validate();
+
+        foreach (TextBox box in new[] { NameBox, AuthorBox, VersionBox, DescriptionBox })
+            box.TextChanged += (_, _) => {
+                if (_suppress > 0) return;
+                MarkDirty();
+                if (box == NameBox) Title = $"Custom Action - {NameBox.Text}";
+            };
+        foreach (TextBox box in new[] { ValueBox, DurationBox, BodyBox })
+            box.TextChanged += (_, _) => ApplyStepFields();
+        foreach (AutoCompleteBox box in new[] { ScopeBox, TargetBox })
+            box.TextChanged += (_, _) => ApplyStepFields();
+        ScopeBox.LostFocus += (_, _) => _ = LoadTargetSuggestionsAsync();
+        ScopeBox.SelectionChanged += (_, _) => _ = LoadTargetSuggestionsAsync();
+
+        AddHandler(KeyDownEvent, Window_KeyDown, RoutingStrategies.Tunnel);
+        ResetDirty();
+        Opened += (_, _) => {
+            if (_nodes.Count > 0) Editor.FitToScreen();
+            Dispatcher.UIThread.Post(ResetDirty, DispatcherPriority.Background);
+        };
+        Closing += Window_Closing;
+    }
+
+    private ActionGraph Graph => _action.Graph;
+    private ActionNodeVm? SelectedVm =>
+        Editor.SelectedItems is { Count: 1 } ? Editor.SelectedItems[0] as ActionNodeVm : null;
+    private ActionNode? SelectedNode => SelectedVm?.Node;
+
+    private void LoadHeader() {
+        _suppress++;
+        try {
+            Title = $"Custom Action - {_action.Name}";
+            NameBox.Text = _action.Name;
+            AuthorBox.Text = _action.Author ?? "";
+            VersionBox.Text = _action.Version;
+            DescriptionBox.Text = _action.Description ?? "";
+
+            RepeatBox.Items.Clear();
+            foreach ((ActionRepeatMode mode, string label) in new[] {
+                         (ActionRepeatMode.Restart, "Restart it"),
+                         (ActionRepeatMode.Parallel, "Run another in parallel"),
+                         (ActionRepeatMode.Skip, "Ignore the new one")
+                     })
+                RepeatBox.Items.Add(new ComboBoxItem { Content = label, Tag = mode });
+            RepeatBox.SelectedItem = RepeatBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionRepeatMode?)i.Tag == Graph.OnRepeat);
+        }
+        finally {
+            _suppress--;
+        }
+    }
+
+    private void ApplyHeader() {
+        _action.Name = (NameBox.Text ?? "").Trim();
+        _action.Author = string.IsNullOrWhiteSpace(AuthorBox.Text) ? null : AuthorBox.Text.Trim();
+        _action.Version = string.IsNullOrWhiteSpace(VersionBox.Text) ? "1.0.0" : VersionBox.Text.Trim();
+        _action.Description = string.IsNullOrWhiteSpace(DescriptionBox.Text) ? null : DescriptionBox.Text.Trim();
+    }
+
+    private void Repeat_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        if (_suppress > 0 || (RepeatBox.SelectedItem as ComboBoxItem)?.Tag is not ActionRepeatMode mode) return;
+        Graph.OnRepeat = mode;
+        MarkDirty();
+    }
+
+    private void MarkDirty() {
+        _dirty = CurrentState() != _savedState;
+        UiHelpers.UpdateButtonPendingBorder(SaveButtonBorder, _dirty);
+    }
+
+    private void ResetDirty() {
+        _savedState = CurrentState();
+        _dirty = false;
+        UiHelpers.UpdateButtonPendingBorder(SaveButtonBorder, false);
+    }
+
+    private string CurrentState() {
+        ApplyHeader();
+        return _action.ToJson();
+    }
+
+    private void Validate() {
+        if (Graph.IsValid(out string error)) {
+            StatusText.Foreground = Brushes.Gray;
+            StatusText.Text = Graph.Nodes.Count == 0
+                ? "No actions yet - add one from the left"
+                : $"{Graph.Nodes.Count} action(s), {Graph.Edges.Count} connection(s) - ready";
+        }
+        else {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = error;
+        }
+    }
+
+    private async void Save_Click(object? sender, RoutedEventArgs e) {
+        await SaveAsync();
+    }
+
+    private async Task<bool> SaveAsync() {
+        ApplyHeader();
+        if (string.IsNullOrWhiteSpace(_action.Name)) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = "Give the action a name before saving";
+            return false;
+        }
+
+        try {
+            await ServiceManager.Actions.SaveCustomActionAsync(_action.Clone());
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "[ActionEditor] Saving {Name} failed", _action.Name);
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = $"Could not save: {ex.Message}";
+            return false;
+        }
+
+        ResetDirty();
+        Validate();
+        StatusText.Text = Graph.IsValid(out string error) ? "Saved" : $"Save - Will not run until errors are fixed: {error}";
+        Saved?.Invoke(_action.Id);
+
+        return true;
+    }
+
+    private async void TestRun_Click(object? sender, RoutedEventArgs e) {
+        ApplyHeader();
+        if (!Graph.IsValid(out string error)) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = error;
+            return;
+        }
+
+        StatusText.Foreground = Brushes.Gray;
+        StatusText.Text = "Test run started...";
+        CustomAction snapshot = _action.Clone();
+        ActionRunResult result = await ServiceManager.Actions.RunManuallyAsync(snapshot, unsavedCopy: true);
+        StatusText.Text = result switch {
+            ActionRunResult.Done => "Test run finished",
+            ActionRunResult.Skipped => "Test run skipped: one is already running and this action ignores repeats",
+            ActionRunResult.Cancelled => "Test run was cancelled",
+            _ => "Test run stopped at a step that could not run - check the logs"
+        };
+    }
+
+    private async void Export_Click(object? sender, RoutedEventArgs e) {
+        ApplyHeader();
+        try {
+            string path = await ActionService.ExportCustomActionAsync(_action.Clone());
+            StatusText.Foreground = Brushes.Gray;
+            StatusText.Text = $"Exported to {path}";
+            UiHelpers.OpenFolder(Path.GetDirectoryName(path));
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "[ActionEditor] Export failed");
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = $"Export failed: {ex.Message}";
+        }
+    }
+
+    private async void Window_Closing(object? sender, WindowClosingEventArgs e) {
+        if (!_dirty || _closeConfirmed) return;
+        e.Cancel = true;
+
+        var dialog = new FAContentDialog {
+            Title = "Unsaved changes",
+            Content = $"Save the changes to \"{(NameBox.Text ?? "").Trim()}\" before closing?",
+            PrimaryButtonText = "Save",
+            SecondaryButtonText = "Discard",
+            CloseButtonText = "Cancel"
+        };
+        FAContentDialogResult choice = await dialog.ShowAsync(this);
+        if (choice == FAContentDialogResult.None) return;
+        if (choice == FAContentDialogResult.Primary && !await SaveAsync()) return;
+
+        _closeConfirmed = true;
+        Close();
+    }
+}
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml b/SubathonManager.UI/Views/Actions/ActionsView.axaml
new file mode 100644
index 0000000..43bdb11
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml
@@ -0,0 +1,205 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:ctl="using:SubathonManager.UI.Controls"
+             xmlns:local="using:SubathonManager.UI.Views.Actions"
+             mc:Ignorable="d" d:DesignHeight="800" d:DesignWidth="1200"
+             x:Class="SubathonManager.UI.Views.Actions.ActionsView">
+    <TabControl Background="Transparent" BorderThickness="0">
+        <TabItem Header="Actions Manager">
+            <Grid Margin="10" ColumnDefinitions="2*,10,3*" RowDefinitions="Auto,Auto,*">
+                <Grid.Styles>
+                    <Style Selector="Border.actioncard StackPanel.actions">
+                        <Setter Property="Opacity" Value="0" />
+                        <Setter Property="Transitions">
+                            <Transitions>
+                                <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
+                            </Transitions>
+                        </Setter>
+                    </Style>
+                    <Style Selector="Border.actioncard:pointerover StackPanel.actions">
+                        <Setter Property="Opacity" Value="1" />
+                    </Style>
+                    <Style Selector="Border.actioncard.selected">
+                        <Setter Property="BorderBrush" Value="{DynamicResource AccentFillColorDefaultBrush}" />
+                        <Setter Property="BorderThickness" Value="2" />
+                    </Style>
+                    <Style Selector="Button.tile">
+                        <Setter Property="Width" Value="156" />
+                        <Setter Property="Height" Value="44" />
+                        <Setter Property="Margin" Value="0,0,6,8" />
+                        <Setter Property="Padding" Value="8,0" />
+                        <Setter Property="HorizontalContentAlignment" Value="Left" />
+                    </Style>
+                </Grid.Styles>
+
+                <Grid Grid.Row="0" Grid.Column="0" Margin="6,0,2,8" ColumnDefinitions="*,Auto,Auto">
+                    <TextBlock Text="Actions" FontWeight="Bold" FontSize="18" VerticalAlignment="Center" />
+                    <Button Grid.Column="1" Classes="opaquesecondary" Width="130" Padding="2" Margin="0,0,6,0"
+                            Click="Import_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <ctl:SymIcon Glyph="ArrowImport16" VerticalAlignment="Center" />
+                            <TextBlock Text="Import .sma" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                    <Button Grid.Column="2" Classes="opaquesecondary" Width="130" Padding="2" Click="CreateNew_Click">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="6">
+                            <ctl:SymIcon Glyph="Add16" VerticalAlignment="Center" />
+                            <TextBlock Text="Create New" VerticalAlignment="Center" />
+                        </StackPanel>
+                    </Button>
+                </Grid>
+
+                <TextBox Grid.Row="1" Grid.Column="0" x:Name="SearchBox" Height="34" Margin="0,0,0,10"
+                         PlaceholderText="Search by name, author or description" />
+
+                <ScrollViewer Grid.Row="2" Grid.Column="0" VerticalScrollBarVisibility="Auto">
+                    <StackPanel>
+                        <TextBlock x:Name="EmptyText" FontSize="13" Foreground="Gray" Margin="6,4"
+                                   TextWrapping="Wrap" IsVisible="False" />
+                        <ItemsControl x:Name="ActionsList">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate x:DataType="local:ActionCard">
+                                    <Border Classes="actioncard" Classes.selected="{Binding IsSelected}"
+                                            Margin="0,0,0,8" Padding="12"
+                                            BorderThickness="1" CornerRadius="6"
+                                            BorderBrush="{DynamicResource UiBrushBorder}"
+                                            Background="{DynamicResource UiBrushControlBackground}"
+                                            Cursor="Hand"
+                                            Tapped="Card_Tapped" DoubleTapped="Card_DoubleTapped">
+                                        <Grid ColumnDefinitions="*,Auto">
+                                            <StackPanel VerticalAlignment="Center">
+                                                <TextBlock Text="{Binding Name}" TextWrapping="Wrap"
+                                                           FontWeight="SemiBold" FontSize="16" />
+                                                <TextBlock Text="{Binding Detail}" FontSize="11" Foreground="Gray"
+                                                           Margin="0,2,0,0" />
+                                                <TextBlock Text="{Binding Description}" FontSize="12"
+                                                           TextWrapping="Wrap" MaxLines="2"
+                                                           TextTrimming="CharacterEllipsis" Margin="0,4,0,0"
+                                                           IsVisible="{Binding HasDescription}" />
+                                            </StackPanel>
+                                            <StackPanel Grid.Column="1" Classes="actions" Orientation="Horizontal"
+                                                        VerticalAlignment="Top" Margin="10,0,0,0">
+                                                <Button ToolTip.Tip="Run now" Click="Run_Click" Padding="2"
+                                                        Classes="opaquesecondary iconbtn" Width="32" Height="32"
+                                                        Margin="4,0">
+                                                    <ctl:SymIcon Glyph="Play20" />
+                                                </Button>
+                                                <Button ToolTip.Tip="Edit" Click="Edit_Click" Padding="2"
+                                                        Classes="opaquesecondary iconbtn" Width="32" Height="32"
+                                                        Margin="4,0">
+                                                    <ctl:SymIcon Glyph="Edit20" />
+                                                </Button>
+                                                <Button ToolTip.Tip="Duplicate" Click="Duplicate_Click" Padding="2"
+                                                        Classes="opaquesecondary iconbtn" Width="32" Height="32"
+                                                        Margin="4,0">
+                                                    <ctl:SymIcon Glyph="Copy20" />
+                                                </Button>
+                                                <Button ToolTip.Tip="Export .sma" Click="Export_Click" Padding="2"
+                                                        Classes="opaquesecondary iconbtn" Width="32" Height="32"
+                                                        Margin="4,0">
+                                                    <ctl:SymIcon Glyph="ArrowExportUp20" />
+                                                </Button>
+                                                <Button ToolTip.Tip="Delete" Click="Delete_Click" Padding="2"
+                                                        Classes="danger iconbtn" Width="32" Height="32" Margin="4,0">
+                                                    <ctl:SymIcon Glyph="Delete20" />
+                                                </Button>
+                                            </StackPanel>
+                                        </Grid>
+                                    </Border>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </StackPanel>
+                </ScrollViewer>
+
+                <Rectangle Grid.Row="0" Grid.RowSpan="3" Grid.Column="1" Width="2" Fill="#30808080"
+                           Margin="6,4,2,4" VerticalAlignment="Stretch" />
+
+                <Grid Grid.Row="0" Grid.RowSpan="3" Grid.Column="2" Margin="16,2,8,4" RowDefinitions="Auto,*">
+                    <StackPanel Grid.Row="0">
+                        <TextBlock TextWrapping="Wrap" FontSize="16" Margin="2,2,2,4"
+                                   Text="Custom actions can chain from multiple integrations.&#x0a;Double click or press edit to open in the editor. Each action is saved as a .sma file" />
+                        <WrapPanel Orientation="Horizontal" Margin="0,16,0,0">
+                            <Button Classes="tile" Click="OpenActionsFolder_Click"
+                                    ToolTip.Tip="Open the folder your actions are saved in">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <ctl:SymIcon Glyph="FolderOpen20" VerticalAlignment="Center" />
+                                    <TextBlock Text="Open Actions" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </Button>
+                            <Button Classes="tile" Click="OpenExportsFolder_Click"
+                                    ToolTip.Tip="Open the folder exported .sma files are written to">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <ctl:SymIcon Glyph="FolderOpen20" VerticalAlignment="Center" />
+                                    <TextBlock Text="Open Exports" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </Button>
+                            <Button Classes="tile" Click="Reload_Click"
+                                    ToolTip.Tip="Reload the actions folder">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <ctl:SymIcon Glyph="ArrowSync16" VerticalAlignment="Center" />
+                                    <TextBlock Text="Reload Library" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </Button>
+                        </WrapPanel>
+                        <TextBlock x:Name="StatusText" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
+                                   Margin="2,8,2,0" />
+                    </StackPanel>
+    
+                    <TextBlock Grid.Row="1" x:Name="NoSelectionText" Margin="2,24,2,0" FontSize="12"
+                               Foreground="Gray" Text="Select an action to see its details here." />
+    
+                    <Border Grid.Row="1" x:Name="DetailsPanel" IsVisible="False" Margin="0,20,0,0" Padding="16"
+                            VerticalAlignment="Top" CornerRadius="6" BorderThickness="1"
+                            BorderBrush="{DynamicResource UiBrushBorder}"
+                            Background="{DynamicResource UiBrushControlBackground}">
+                        <StackPanel>
+                            <Grid ColumnDefinitions="*,Auto,Auto">
+                                <TextBlock x:Name="DetailTitle" FontSize="20" FontWeight="Bold" TextWrapping="Wrap"
+                                           VerticalAlignment="Center" />
+                                <Button Grid.Column="1" Classes="opaquesecondary" Padding="10,4" Margin="8,0,0,0"
+                                        Click="RunSelected_Click"
+                                        ToolTip.Tip="Run the saved action now. It runs for real: time, multiplier and reroll steps do change the subathon">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <ctl:SymIcon Glyph="Play16" VerticalAlignment="Center" />
+                                        <TextBlock Text="Run Now" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                                <Button Grid.Column="2" Classes="opaquesecondary" Padding="10,4" Margin="6,0,0,0"
+                                        Click="EditSelected_Click">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <ctl:SymIcon Glyph="Edit16" VerticalAlignment="Center" />
+                                        <TextBlock Text="Open in Editor" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Button>
+                            </Grid>
+                            <TextBlock x:Name="DetailMeta" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
+                                       Margin="0,4,0,0" />
+    
+                            <StackPanel Orientation="Horizontal" Spacing="28" Margin="0,14,0,10">
+                                <StackPanel>
+                                    <TextBlock x:Name="DetailSteps" FontSize="24" FontWeight="SemiBold" />
+                                    <TextBlock Text="Steps" FontSize="11" Foreground="Gray" />
+                                </StackPanel>
+                                <StackPanel ToolTip.Tip="Separate paths from a start to an end; a straight chain is 1">
+                                    <TextBlock x:Name="DetailBranches" FontSize="24" FontWeight="SemiBold" />
+                                    <TextBlock Text="Branches" FontSize="11" Foreground="Gray" />
+                                </StackPanel>
+                            </StackPanel>
+    
+                            <TextBlock x:Name="DetailError" FontSize="12" Foreground="OrangeRed" TextWrapping="Wrap"
+                                       Margin="0,0,0,8" />
+                            <TextBlock x:Name="DetailDescription" FontSize="13" TextWrapping="Wrap" />
+                        </StackPanel>
+                    </Border>
+                </Grid>
+            </Grid>
+        </TabItem>
+
+        <TabItem Header="Triggers">
+            <Grid />
+        </TabItem>
+    </TabControl>
+</UserControl>
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
new file mode 100644
index 0000000..5426d45
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -0,0 +1,296 @@
+using System.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+using SubathonManager.Data;
+using SubathonManager.Services;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionsView : UserControl {
+    private readonly IDbContextFactory<AppDbContext> _factory =
+        AppServices.Provider.GetRequiredService<IDbContextFactory<AppDbContext>>();
+
+    private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<ActionsView>>();
+    private List<ActionCard> _cards = [];
+    private Guid? _selectedId;
+
+    public ActionsView() {
+        InitializeComponent();
+        SearchBox.TextChanged += (_, _) => Refresh();
+        Loaded += (_, _) => {
+            ServiceManager.Actions.CustomActionsChanged -= OnLibraryChanged;
+            ServiceManager.Actions.CustomActionsChanged += OnLibraryChanged;
+            Refresh();
+        };
+        Unloaded += (_, _) => ServiceManager.Actions.CustomActionsChanged -= OnLibraryChanged;
+    }
+
+    private void OnLibraryChanged() {
+        Dispatcher.UIThread.Post(Refresh);
+    }
+
+    private void Refresh() {
+        IReadOnlyList<CustomAction> all = ServiceManager.Actions.CustomActions;
+        string query = (SearchBox.Text ?? "").Trim();
+        List<ActionCard> cards = all
+            .Where(a => query.Length == 0
+                        || a.Name.Contains(query, StringComparison.OrdinalIgnoreCase)
+                        || (a.Author?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false)
+                        || (a.Description?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false))
+            .Select(a => new ActionCard(a) { IsSelected = a.Id == _selectedId })
+            .ToList();
+
+        _cards = cards;
+        ActionsList.ItemsSource = cards;
+        EmptyText.IsVisible = cards.Count == 0;
+        EmptyText.Text = all.Count == 0
+            ? "No actions yet. Create one, import a .sma file, or convert a VTube Studio / OBS wheel item"
+            : $"Nothing matches \"{query}\"";
+        ShowDetails();
+    }
+
+    public void ShowAdded(CustomAction? action, string source) {
+        if (action == null) {
+            StatusText.Text = $"{Path.GetFileName(source)} is not a valid custom action";
+            return;
+        }
+
+        SearchBox.Text = "";
+        _selectedId = action.Id;
+        Refresh();
+        StatusText.Text = $"Added \"{action.Name}\" to your actions";
+    }
+
+    private static CustomAction? CardOf(object? sender) {
+        return (sender as Control)?.DataContext is ActionCard card ? card.Action : null;
+    }
+
+    private void Card_Tapped(object? sender, TappedEventArgs e) {
+        if (CardOf(sender) is not { } action) return;
+        _selectedId = action.Id;
+        foreach (ActionCard card in _cards) card.IsSelected = card.Action.Id == action.Id;
+        ShowDetails();
+    }
+
+    private void ShowDetails() {
+        CustomAction? action = _selectedId is { } id ? ServiceManager.Actions.GetCustomAction(id) : null;
+        DetailsPanel.IsVisible = action != null;
+        NoSelectionText.IsVisible = action == null;
+        if (action == null) {
+            _selectedId = null;
+            return;
+        }
+
+        DetailTitle.Text = action.Name;
+
+        var meta = new List<string> { $"v{action.Version}" };
+        if (!string.IsNullOrWhiteSpace(action.Author)) meta.Add($"by {action.Author}");
+        string? path = ServiceManager.Actions.GetCustomActionPath(action.Id);
+        if (path != null && File.Exists(path)) meta.Add($"updated {File.GetLastWriteTime(path):yyyy-MM-dd HH:mm}");
+        DetailMeta.Text = string.Join("  -  ", meta);
+
+        DetailSteps.Text = $"{action.Graph.Nodes.Count}";
+        DetailBranches.Text = $"{CountBranches(action.Graph)}";
+        DetailError.Text = action.Graph.IsValid(out string error) ? "" : $"Needs fixing: {error}";
+        DetailError.IsVisible = DetailError.Text.Length > 0;
+        DetailDescription.Text = string.IsNullOrWhiteSpace(action.Description) ? "No description." : action.Description;
+    }
+
+    private static int CountBranches(ActionGraph graph) {
+        if (graph.Nodes.Count == 0 || !graph.IsValid(out _)) return 0;
+        var paths = new Dictionary<string, int>(StringComparer.Ordinal);
+
+        int PathsFrom(string id) {
+            if (paths.TryGetValue(id, out int known)) return known;
+            List<string> next = graph.Outgoing(id).ToList();
+            int count = next.Count == 0 ? 1 : next.Sum(PathsFrom);
+            paths[id] = count;
+            return count;
+        }
+
+        return graph.Nodes.Where(n => !graph.Incoming(n.Id).Any()).Sum(n => PathsFrom(n.Id));
+    }
+
+    private async void Run_Click(object? sender, RoutedEventArgs e) {
+        if (CardOf(sender) is { } action) await RunAsync(action);
+    }
+
+    private async void RunSelected_Click(object? sender, RoutedEventArgs e) {
+        if (_selectedId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action) await RunAsync(action);
+    }
+
+    private async Task RunAsync(CustomAction action) {
+        if (!action.Graph.IsValid(out string error) || action.Graph.Nodes.Count == 0) {
+            StatusText.Text = action.Graph.Nodes.Count == 0
+                ? $"\"{action.Name}\" has no steps yet"
+                : $"\"{action.Name}\" can't run yet: {error}";
+            return;
+        }
+
+        StatusText.Text = $"Running \"{action.Name}\"...";
+        ActionRunResult result = await ServiceManager.Actions.RunManuallyAsync(action);
+        StatusText.Text = result switch {
+            ActionRunResult.Done => $"\"{action.Name}\" finished",
+            ActionRunResult.Skipped => $"\"{action.Name}\" is already running and ignores repeats",
+            ActionRunResult.Cancelled => $"\"{action.Name}\" was cancelled",
+            _ => $"\"{action.Name}\" stopped at a step that could not run (is the app connected?) - see the log"
+        };
+    }
+
+    private void EditSelected_Click(object? sender, RoutedEventArgs e) {
+        if (_selectedId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action)
+            OpenEditor(action);
+    }
+
+    private void OpenEditor(CustomAction action) {
+        ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        editor.Saved -= OnEditorSaved;
+        editor.Saved += OnEditorSaved;
+    }
+
+    private void OnEditorSaved(Guid id) {
+        _selectedId = id;
+        Refresh();
+    }
+
+    private void Card_DoubleTapped(object? sender, TappedEventArgs e) {
+        if (CardOf(sender) is { } action) OpenEditor(action);
+    }
+
+    private void Edit_Click(object? sender, RoutedEventArgs e) {
+        if (CardOf(sender) is { } action) OpenEditor(action);
+    }
+
+    private void CreateNew_Click(object? sender, RoutedEventArgs e) {
+        OpenEditor(new CustomAction { Name = "New Action" });
+    }
+
+    private async void Duplicate_Click(object? sender, RoutedEventArgs e) {
+        if (CardOf(sender) is not { } original) return;
+        CustomAction copy = await ServiceManager.Actions.DuplicateCustomActionAsync(original);
+        _selectedId = copy.Id;
+        Refresh();
+        StatusText.Text = $"Duplicated \"{original.Name}\" as \"{copy.Name}\"";
+    }
+
+    private async void Export_Click(object? sender, RoutedEventArgs e) {
+        if (CardOf(sender) is not { } action) return;
+        try {
+            string path = await ActionService.ExportCustomActionAsync(action);
+            StatusText.Text = $"Exported to {path}";
+            UiHelpers.OpenFolder(Path.GetDirectoryName(path));
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "[Actions] Export of {Name} failed", action.Name);
+            StatusText.Text = $"Export failed: {ex.Message}";
+        }
+    }
+
+    private async void Delete_Click(object? sender, RoutedEventArgs e) {
+        if (CardOf(sender) is not { } action) return;
+
+        string id = action.Id.ToString();
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        
+        // TODO when more than just wheel spins, check
+        int uses = await db.WheelSpinActions
+            .CountAsync(a => a.ActionType == WheelSpinActionType.CustomAction && a.Parameter == id);
+
+        var dialog = new FAContentDialog {
+            Title = "Delete action",
+            Content = uses > 0
+                ? $"Delete \"{action.Name}\"? {uses} wheel item(s) use it and will stop running anything until you pick another action."
+                : $"Delete \"{action.Name}\"? Its .sma file is removed from the actions folder.",
+            PrimaryButtonText = "Delete",
+            CloseButtonText = "Cancel"
+        };
+        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
+
+        ServiceManager.Actions.DeleteCustomAction(action.Id);
+        StatusText.Text = $"Deleted \"{action.Name}\"";
+    }
+
+    private async void Import_Click(object? sender, RoutedEventArgs e) {
+        if (TopLevel.GetTopLevel(this) is not { } top) return;
+        IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
+            Title = "Import Custom Action",
+            AllowMultiple = true,
+            FileTypeFilter = [
+                new FilePickerFileType("Subathon Manager Action") { Patterns = [$"*{CustomAction.FileExtension}"] }
+            ]
+        });
+        if (picked.Count == 0) return;
+
+        int added = 0, updated = 0, failed = 0;
+        foreach (IStorageFile file in picked) {
+            (CustomAction Action, bool Replaced)? result =
+                await ServiceManager.Actions.ImportCustomActionAsync(file.Path.LocalPath);
+            if (result == null) failed++;
+            else if (result.Value.Replaced) updated++;
+            else added++;
+        }
+
+        StatusText.Text = $"Imported {added}, updated {updated}" + (failed > 0 ? $", {failed} not valid" : "");
+    }
+
+    private void OpenActionsFolder_Click(object? sender, RoutedEventArgs e) {
+        OpenFolder(ActionService.DefaultActionsFolder);
+    }
+
+    private void OpenExportsFolder_Click(object? sender, RoutedEventArgs e) {
+        OpenFolder(ActionService.ExportsFolder);
+    }
+
+    private async void Reload_Click(object? sender, RoutedEventArgs e) {
+        await ServiceManager.Actions.LoadLibraryAsync();
+        StatusText.Text = $"Loaded {ServiceManager.Actions.CustomActions.Count} action(s)";
+    }
+
+    private void OpenFolder(string path) {
+        try {
+            Directory.CreateDirectory(path);
+            if (!UiHelpers.OpenFolder(path)) _logger?.LogWarning("[Actions] Unable to open {Path}", path);
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "[Actions] Unable to open {Path}", path);
+        }
+    }
+}
+
+public sealed class ActionCard(CustomAction action) : INotifyPropertyChanged {
+    private bool _isSelected;
+
+    public CustomAction Action { get; } = action;
+
+    public bool IsSelected {
+        get => _isSelected;
+        set {
+            if (_isSelected == value) return;
+            _isSelected = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSelected)));
+        }
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public string Name => Action.Name;
+    public string? Description => Action.Description;
+    public bool HasDescription => !string.IsNullOrWhiteSpace(Action.Description);
+
+    public string Detail =>
+        $"{Action.Graph.Nodes.Count} step(s) - v{Action.Version}"
+        + (string.IsNullOrWhiteSpace(Action.Author) ? "" : $" - by {Action.Author}")
+        + (Action.Graph.IsValid(out _) ? "" : " - needs fixing");
+}
diff --git a/SubathonManager.UI/Views/GoalsEditor.axaml.cs b/SubathonManager.UI/Views/GoalsEditor.axaml.cs
index 2403397..d705847 100644
--- a/SubathonManager.UI/Views/GoalsEditor.axaml.cs
+++ b/SubathonManager.UI/Views/GoalsEditor.axaml.cs
@@ -1,4 +1,3 @@
-using System.Text;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -619,28 +618,13 @@ private async void ExportGoalSet_Click(object? sender, RoutedEventArgs e) {
             .FirstOrDefaultAsync(s => s.Id == _activeGoalSet.Id);
         if (set == null) return;
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-
-        string safeName = SafeFileName.Sanitize(set.Name, string.Empty, "goals");
-        var timestamp = DateTime.Now.ToString("yyyyMMdd-HHmmss");
-        string filepath = Path.Combine(exportDir, $"{safeName}-{timestamp}.csv");
-
         string typeHeader = (set.Type ?? GoalsType.Points) == GoalsType.Money ? "Money" : "Points";
 
-        var sb = new StringBuilder();
-        sb.AppendLine($"Goal,Value,{typeHeader}");
-        foreach (SubathonGoal goal in set.Goals.OrderBy(g => g.Points))
-            sb.AppendLine($"{Utils.EscapeCsv(goal.Text)},{goal.Points}");
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
+        string path = await CsvUtils.ExportAsync(SafeFileName.Sanitize(set.Name, string.Empty, "goals"),
+            [["Goal", "Value", typeHeader]],
+            set.Goals.OrderBy(g => g.Points),
+            goal => [goal.Text, goal.Points]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
     }
 
     private async void ImportGoalSet_Click(object? sender, RoutedEventArgs e) {
@@ -656,21 +640,13 @@ private async void ImportGoalSet_Click(object? sender, RoutedEventArgs e) {
         IStorageFile file = picked[0];
         string filePath = file.Path.LocalPath;
 
-        string[] lines;
-        try {
-            lines = await File.ReadAllLinesAsync(filePath, Encoding.UTF8);
-        }
-        catch {
+        List<string[]>? lines = await CsvUtils.ReadFileAsync(filePath);
+        if (lines == null || lines.Count < 1) {
             await ShowInvalidGoalCsvPopup();
             return;
         }
 
-        if (lines.Length < 1) {
-            await ShowInvalidGoalCsvPopup();
-            return;
-        }
-
-        string[] headerCols = ParseCsvLine(lines[0]);
+        string[] headerCols = lines[0];
         if (headerCols.Length < 2) {
             await ShowInvalidGoalCsvPopup();
             return;
@@ -682,9 +658,7 @@ private async void ImportGoalSet_Click(object? sender, RoutedEventArgs e) {
             goalType = GoalsType.Money;
 
         var goals = new List<SubathonGoal>();
-        for (var i = 1; i < lines.Length; i++) {
-            if (string.IsNullOrWhiteSpace(lines[i])) continue;
-            string[] cols = ParseCsvLine(lines[i]);
+        foreach (string[] cols in lines.Skip(1)) {
             if (cols.Length < 2 || !long.TryParse(cols[1].Trim(), out long pts)) {
                 await ShowInvalidGoalCsvPopup();
                 return;
@@ -713,45 +687,6 @@ private async void ImportGoalSet_Click(object? sender, RoutedEventArgs e) {
         LoadAllSets();
     }
 
-    private static string[] ParseCsvLine(string line) {
-        var result = new List<string>();
-        var field = new StringBuilder();
-        var inQuotes = false;
-
-        for (var i = 0; i < line.Length; i++) {
-            char c = line[i];
-            if (inQuotes)
-                switch (c) {
-                    case '"' when i + 1 < line.Length && line[i + 1] == '"':
-                        field.Append('"');
-                        i++;
-                        break;
-                    case '"':
-                        inQuotes = false;
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-            else
-                switch (c) {
-                    case '"':
-                        inQuotes = true;
-                        break;
-                    case ',':
-                        result.Add(field.ToString());
-                        field.Clear();
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-        }
-
-        result.Add(field.ToString());
-        return result.ToArray();
-    }
-
     private async Task ShowInvalidGoalCsvPopup() {
         var dialog = new FAContentDialog {
             Title = "Invalid CSV",
diff --git a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
index fdc638d..352ebbd 100644
--- a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
+++ b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
@@ -1,4 +1,3 @@
-using System.Text;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -83,12 +82,14 @@ private static IEnumerable<EventTypeEntry> BuildEventEntries(SubathonEventType e
         if (e == SubathonEventType.GoAffProOrder)
             return GoAffProStoreRegistry.All().Where(s => s.Enabled)
                 .Select(s => new EventTypeEntry(e, s.EventName, s.SiteId.ToString()));
+
         if (e == SubathonEventType.JuniperMerchSale)
             return JuniperStoreRegistry.AllStores().Where(s => s.Enabled)
                 .SelectMany(s => new[] { new EventTypeEntry(e, "Any Sale", s.RowId.ToString(), s.StoreName) }
                     .Concat(s.Products
                         .OrderBy(p => p.ProductName, StringComparer.OrdinalIgnoreCase)
                         .Select(p => new EventTypeEntry(e, p.ProductName, p.ProductId.ToString(), s.StoreName))));
+
         if (e is SubathonEventType.MakeShipPledge or SubathonEventType.MakeShipSale) {
             bool isPledge = e == SubathonEventType.MakeShipPledge;
             string category = isPledge ? "Pledges" : "Campaign Sales";
@@ -937,38 +938,20 @@ private async void ExportPromptSet_Click(object? sender, RoutedEventArgs e) {
             .FirstOrDefaultAsync(s => s.Id == _activeSet.Id);
         if (set == null) return;
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-
-        string safeName = SafeFileName.Sanitize(set.Name, string.Empty, "prompts");
-        var timestamp = DateTime.Now.ToString("yyyyMMdd-HHmmss");
-        string filepath = Path.Combine(exportDir, $"{safeName}-{timestamp}.csv");
-
-        var sb = new StringBuilder();
-        sb.AppendLine(
-            $"#Interval={(int)set.Interval.TotalMinutes},Offset={(int)set.RandomOffset.TotalMinutes},Cooldown={(int)set.Cooldown.TotalMinutes}");
-        sb.AppendLine("Text,Value,Duration,Quantity,Infinite,Enabled,Type,SubType,EventType,FilterMeta");
-        foreach (SubathonPrompt p in set.Prompts.OrderBy(p => p.Index))
-            sb.AppendLine(string.Join(",",
-                Utils.EscapeCsv(p.Text),
-                p.Value,
-                (int)p.CompletionDuration.TotalMinutes,
-                p.Quantity,
-                p.IsInfinite,
-                p.Enabled,
-                p.Type,
-                p.SubType,
-                p.FilterEventType?.ToString() ?? "",
-                Utils.EscapeCsv(p.FilterMeta ?? "")));
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
+        string path = await CsvUtils.ExportAsync(SafeFileName.Sanitize(set.Name, string.Empty, "prompts"),
+            [
+                [
+                    $"#Interval={(int)set.Interval.TotalMinutes}", $"Offset={(int)set.RandomOffset.TotalMinutes}",
+                    $"Cooldown={(int)set.Cooldown.TotalMinutes}"
+                ],
+                ["Text", "Value", "Duration", "Quantity", "Infinite", "Enabled", "Type", "SubType", "EventType", "FilterMeta"]
+            ],
+            set.Prompts.OrderBy(p => p.Index),
+            p => [
+                p.Text, p.Value, (int)p.CompletionDuration.TotalMinutes, p.Quantity, p.IsInfinite, p.Enabled,
+                p.Type, p.SubType, p.FilterEventType, p.FilterMeta
+            ]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
     }
 
     private async void ImportPromptSet_Click(object? sender, RoutedEventArgs e) {
@@ -983,16 +966,8 @@ private async void ImportPromptSet_Click(object? sender, RoutedEventArgs e) {
         if (picked.Count == 0) return;
         string filePath = picked[0].Path.LocalPath;
 
-        string[] lines;
-        try {
-            lines = await File.ReadAllLinesAsync(filePath, Encoding.UTF8);
-        }
-        catch {
-            await ShowInvalidPromptCsvPopup();
-            return;
-        }
-
-        if (lines.Length < 1) {
+        List<string[]>? lines = await CsvUtils.ReadFileAsync(filePath);
+        if (lines == null || lines.Count < 1) {
             await ShowInvalidPromptCsvPopup();
             return;
         }
@@ -1000,9 +975,9 @@ private async void ImportPromptSet_Click(object? sender, RoutedEventArgs e) {
         var headerIndex = 0;
         int intervalMin = 20, offsetMin = 0, cooldownMin = 20;
 
-        if (lines[0].StartsWith('#')) {
-            foreach (string kv in lines[0][1..].Split(',')) {
-                string[] parts = kv.Split('=');
+        if (lines[0][0].StartsWith('#')) {
+            foreach (string kv in lines[0]) {
+                string[] parts = kv.TrimStart('#').Split('=');
                 if (parts.Length != 2) continue;
                 if (int.TryParse(parts[1].Trim(), out int v)) {
                     if (parts[0].Trim().Equals("Interval", StringComparison.OrdinalIgnoreCase)) intervalMin = v;
@@ -1014,15 +989,13 @@ private async void ImportPromptSet_Click(object? sender, RoutedEventArgs e) {
             headerIndex = 1;
         }
 
-        if (headerIndex >= lines.Length || ParseCsvLine(lines[headerIndex]).Length < 8) {
+        if (headerIndex >= lines.Count || lines[headerIndex].Length < 8) {
             await ShowInvalidPromptCsvPopup();
             return;
         }
 
         var prompts = new List<SubathonPrompt>();
-        for (int i = headerIndex + 1; i < lines.Length; i++) {
-            if (string.IsNullOrWhiteSpace(lines[i])) continue;
-            string[] cols = ParseCsvLine(lines[i]);
+        foreach (string[] cols in lines.Skip(headerIndex + 1)) {
             if (cols.Length < 8
                 || !long.TryParse(cols[1].Trim(), out long value)
                 || !int.TryParse(cols[2].Trim(), out int durMin)
@@ -1104,45 +1077,6 @@ private async void ImportPromptSet_Click(object? sender, RoutedEventArgs e) {
         LoadActiveSet();
     }
 
-    private static string[] ParseCsvLine(string line) {
-        var result = new List<string>();
-        var field = new StringBuilder();
-        var inQuotes = false;
-
-        for (var i = 0; i < line.Length; i++) {
-            char c = line[i];
-            if (inQuotes)
-                switch (c) {
-                    case '"' when i + 1 < line.Length && line[i + 1] == '"':
-                        field.Append('"');
-                        i++;
-                        break;
-                    case '"':
-                        inQuotes = false;
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-            else
-                switch (c) {
-                    case '"':
-                        inQuotes = true;
-                        break;
-                    case ',':
-                        result.Add(field.ToString());
-                        field.Clear();
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-        }
-
-        result.Add(field.ToString());
-        return result.ToArray();
-    }
-
     private static async Task ShowInvalidPromptCsvPopup() {
         var dialog = new FAContentDialog {
             Title = "Invalid CSV",
diff --git a/SubathonManager.UI/Views/Schedule/ScheduleView.Csv.cs b/SubathonManager.UI/Views/Schedule/ScheduleView.Csv.cs
index 3f39faf..f308df6 100644
--- a/SubathonManager.UI/Views/Schedule/ScheduleView.Csv.cs
+++ b/SubathonManager.UI/Views/Schedule/ScheduleView.Csv.cs
@@ -58,7 +58,7 @@ private async void ExportCsv_Click(object? sender, RoutedEventArgs e) {
                 ? $"schedule-{range.Value.from:yyyy-MM-dd}"
                 : $"schedule-{range.Value.from:yyyy-MM-dd}-to-{range.Value.to:yyyy-MM-dd}";
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
+        string exportDir = CsvUtils.ExportFolder;
         Directory.CreateDirectory(exportDir);
         IStorageFolder? startFolder = await top.StorageProvider.TryGetFolderFromPathAsync(exportDir);
 
diff --git a/SubathonManager.UI/Views/SettingsView.Settings.cs b/SubathonManager.UI/Views/SettingsView.Settings.cs
index 66e14f7..0cb4494 100644
--- a/SubathonManager.UI/Views/SettingsView.Settings.cs
+++ b/SubathonManager.UI/Views/SettingsView.Settings.cs
@@ -68,7 +68,8 @@ private void EventsSummary_Click(object? sender, RoutedEventArgs e) {
 
     private async void ExportEvents_Click(object? sender, RoutedEventArgs e) {
         await using AppDbContext db = await _factory.CreateDbContextAsync();
-        await AppDbContext.ActiveEventsToCsv(db);
+        string? path = await AppDbContext.ActiveEventsToCsv(db);
+        if (path != null) UiHelpers.OpenFolder(Path.GetDirectoryName(path));
     }
 
     private void UpdateServerStatus(bool status) {
diff --git a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
index 3a695db..2c9f27d 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml
@@ -54,7 +54,7 @@
             </StackPanel>
             <TextBlock FontSize="11" Margin="4,2,0,0" TextWrapping="Wrap"
                        Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                       Text="New pledges, renewals and paid pledge changes add time; upgrades count the difference. Free members, trials and downgrades do not. Tiers sync on connect" />
+                       Text="New pledges, renewals, and upgrades add based on the amount charged or by tier" />
 
             <Separator Margin="0,8,0,8" />
 
diff --git a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml
index 69cfad4..8707c46 100644
--- a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml
@@ -3,6 +3,7 @@
                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                        xmlns:views="using:SubathonManager.UI.Views"
+                       xmlns:ui2="using:SubathonManager.UI.UiUtils"
                        mc:Ignorable="d"
                        x:Class="SubathonManager.UI.Views.SettingsViews.ExternalSoftware.StreamerBotSettings">
     <StackPanel Orientation="Vertical" Margin="0,0,0,6">
@@ -10,11 +11,29 @@
             <Button Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                     Content="Get StreamerBot Extension" Click="OpenStreamerBotExtension_Click"
                     Width="240" Padding="2" Height="34" Cursor="Hand" />
-            <TextBlock Text="Status:" VerticalAlignment="Center" Margin="14,0,4,0" FontSize="12" />
+            <TextBlock Text="Extension:" VerticalAlignment="Center" Margin="14,0,4,0" FontSize="12" />
             <TextBlock x:Name="StreamerBotStatusText" Text="Disconnected"
                        VerticalAlignment="Center" FontSize="12" />
+            <TextBlock Text="HTTP API:" VerticalAlignment="Center" Margin="14,0,4,0" FontSize="12" />
+            <TextBlock x:Name="HttpApiStatusText" Text="Disconnected"
+                       VerticalAlignment="Center" FontSize="12" />
         </StackPanel>
         <TextBlock x:Name="InfoText" TextWrapping="Wrap" FontSize="12" Margin="2,0,0,4"
                    Text="Import the .sb file into StreamerBot to setup the extension" />
+
+        <TextBlock Text="Run Streamer.bot actions" FontWeight="SemiBold" Margin="0,16,0,4" />
+        <TextBlock TextWrapping="Wrap" FontSize="12" Margin="2,0,0,6"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                   Text="Lets custom actions run Streamer.bot actions. In Streamer.bot open Servers/Clients, HTTP Server, and start it (auto start is recommended). Extension not required." />
+        <CheckBox x:Name="HttpEnabledCheck" Content="Use Streamer.bot's HTTP API" Margin="0,0,0,6" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,6">
+            <TextBlock Text="HTTP Server:" Width="120" VerticalAlignment="Center" />
+            <TextBox x:Name="HttpUrlBox" Width="300" PlaceholderText="http://127.0.0.1:7474"
+                     ui2:TextBoxAssist.Clear="True" />
+            <Button Content="Check Connection" Height="32" Margin="8,0,0,0" Click="CheckHttp_Click"
+                    ToolTip.Tip="Check Streamer.bot and refresh actions list using the address above"
+                    views:SettingsProperties.ExcludeFromUnsaved="True" />
+        </StackPanel>
+        <TextBlock x:Name="HttpStatusText" FontSize="12" Margin="2,0,0,4" TextWrapping="Wrap" />
     </StackPanel>
 </views:SettingsControl>
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml.cs
index 2f69753..624a40c 100644
--- a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/StreamerBotSettings.axaml.cs
@@ -1,12 +1,18 @@
 using System.Diagnostics;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Microsoft.Extensions.DependencyInjection;
 using SubathonManager.Core;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Events;
+using SubathonManager.Core.Interfaces;
 using SubathonManager.Core.Models;
 using SubathonManager.Core.Objects;
 using SubathonManager.Data;
+using SubathonManager.Integration;
+using SubathonManager.UI.Services;
 
 namespace SubathonManager.UI.Views.SettingsViews.ExternalSoftware;
 
@@ -17,13 +23,62 @@ public StreamerBotSettings() {
             IntegrationEvents.ConnectionUpdated -= UpdateStatus;
             IntegrationEvents.ConnectionUpdated += UpdateStatus;
             UpdateStatus(Utils.GetConnection(SubathonEventSource.StreamerBot, "Socket"));
+            UpdateStatus(Utils.GetConnection(SubathonEventSource.StreamerBot, StreamerBotService.HttpService));
         };
         Unloaded += (_, _) => { IntegrationEvents.ConnectionUpdated -= UpdateStatus; };
     }
 
+    public override void Init(SettingsView host) {
+        Host = host;
+        var config = AppServices.Provider.GetRequiredService<IConfig>();
+        SuppressUnsavedChanges(() => {
+            HttpEnabledCheck.IsChecked = config.GetBool(StreamerBotService.ConfigSection, "Http.Enabled");
+            HttpUrlBox.Text = config.Get(StreamerBotService.ConfigSection, "Http.Url", StreamerBotService.DefaultHttpUrl);
+        });
+        RegisterUnsavedChangeHandlers();
+    }
+
+    protected internal override bool UpdateConfigValueSettings() {
+        var config = AppServices.Provider.GetRequiredService<IConfig>();
+        var hasUpdated = false;
+        hasUpdated |= config.SetBool(StreamerBotService.ConfigSection, "Http.Enabled", HttpEnabledCheck.IsChecked);
+        hasUpdated |= config.Set(StreamerBotService.ConfigSection, "Http.Url", (HttpUrlBox.Text ?? "").Trim());
+        if (hasUpdated) _ = ServiceManager.StreamerBot.CheckHttpAsync();
+        return hasUpdated;
+    }
+
+    private async void CheckHttp_Click(object? sender, RoutedEventArgs e) {
+        var config = AppServices.Provider.GetRequiredService<IConfig>();
+        if (config.Set(StreamerBotService.ConfigSection, "Http.Url", (HttpUrlBox.Text ?? "").Trim()))
+            config.Save();
+
+        HttpStatusText.ClearValue(TextBlock.ForegroundProperty);
+        HttpStatusText.Text = "Checking...";
+        IReadOnlyList<StreamerBotActionInfo>? actions = await ServiceManager.StreamerBot.GetActionsAsync();
+        await Dispatcher.UIThread.InvokeAsync(() => {
+            if (actions == null) {
+                HttpStatusText.Foreground = Brushes.OrangeRed;
+                HttpStatusText.Text =
+                    "Couldn't reach Streamer.bot. Check it is running, its HTTP Server is started, and the address is correct";
+                return;
+            }
+
+            HttpStatusText.Text = HttpEnabledCheck.IsChecked == true
+                ? $"Connected - {actions.Count} actions available"
+                : $"Connected - {actions.Count} actions available (tick the box above and save to use them)";
+        });
+    }
+
     internal override void UpdateStatus(IntegrationConnection? connection) {
-        if (connection is not { Source: SubathonEventSource.StreamerBot, Service: "Socket" }) return;
-        Host.UpdateConnectionStatus(connection.Status, StreamerBotStatusText, null);
+        if (connection is not { Source: SubathonEventSource.StreamerBot }) return;
+        if (connection.Service == "Socket") {
+            Host.UpdateConnectionStatus(connection.Status, StreamerBotStatusText, null);
+            return;
+        }
+
+        if (connection.Service != StreamerBotService.HttpService) return;
+        Dispatcher.UIThread.Post(() => HttpApiStatusText.Text =
+            !connection.Configured ? "Disabled" : connection.Status ? "Connected" : "Disconnected");
     }
 
     private void OpenStreamerBotExtension_Click(object? sender, RoutedEventArgs e) {
diff --git a/SubathonManager.UI/Views/SubathonSummaryWindow.Export.cs b/SubathonManager.UI/Views/SubathonSummaryWindow.Export.cs
index deb6319..e10c2ae 100644
--- a/SubathonManager.UI/Views/SubathonSummaryWindow.Export.cs
+++ b/SubathonManager.UI/Views/SubathonSummaryWindow.Export.cs
@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Text;
 using System.Text.Json;
 using Avalonia.Interactivity;
 using Microsoft.EntityFrameworkCore;
@@ -26,15 +25,9 @@ private async void ExportEvents_Click(object? sender, RoutedEventArgs e) {
         SubathonOption? subathon = Selected;
         ResultStatus.Text = $"Exporting {_matched.Count:N0} events...";
 
-        var sb = new StringBuilder();
-        sb.AppendLine(BuildMetaRow(subathon, _lastFilterCells
-            .Append($"Matched Events: {_matched.Count.ToString("N0", CultureInfo.InvariantCulture)}")));
-        sb.AppendLine();
-        sb.AppendLine(string.Join(",",
-            "Id", "Timestamp", "True Source", "Source", "Event Type", "Type Label", "Event Meta", "Command",
-            "User", "Value", "Display Value", "Currency", "Amount", "Seconds Value", "Points Value",
-            "Multiplier Seconds", "Multiplier Points", "Final Seconds Added", "Final Points Added",
-            "Processed", "Was Reversed", "Secondary Value", "Tertiary Value"));
+        List<string> metaRow = BuildMetaRow(subathon, _lastFilterCells
+            .Append($"Matched Events: {_matched.Count.ToString("N0", CultureInfo.InvariantCulture)}"));
+        var events = new List<SubathonEvent>(_matched.Count);
 
         try {
             await using AppDbContext db = await _factory.CreateDbContextAsync();
@@ -51,8 +44,7 @@ private async void ExportEvents_Click(object? sender, RoutedEventArgs e) {
                     .GroupBy(x => new EventKey(x.Id, x.Source))
                     .ToDictionary(g => g.Key, g => g.First());
 
-                foreach (EventKey key in keys.Where(byKey.ContainsKey))
-                    sb.AppendLine(EventToCsvRow(byKey[key]));
+                events.AddRange(keys.Where(byKey.ContainsKey).Select(key => byKey[key]));
             }
         }
         catch (Exception ex) {
@@ -61,40 +53,32 @@ private async void ExportEvents_Click(object? sender, RoutedEventArgs e) {
             return;
         }
 
-        string? path = await WriteExportAsync("filtered_events", subathon?.Id, sb.ToString());
+        string? path = await WriteExportAsync("filtered_events", subathon?.Id,
+            [
+                metaRow, [],
+                [
+                    "Id", "Timestamp", "True Source", "Source", "Event Type", "Type Label", "Event Meta", "Command",
+                    "User", "Value", "Display Value", "Currency", "Amount", "Seconds Value", "Points Value",
+                    "Multiplier Seconds", "Multiplier Points", "Final Seconds Added", "Final Points Added",
+                    "Processed", "Was Reversed", "Secondary Value", "Tertiary Value"
+                ]
+            ],
+            events, EventToCsvRow);
         ResultStatus.Text = path == null
             ? "Could not write the export, check the logs"
             : $"Exported {_matched.Count:N0} events to {Path.GetFileName(path)}";
     }
 
-    private static string EventToCsvRow(SubathonEvent ev) {
+    private static IEnumerable<object?> EventToCsvRow(SubathonEvent ev) {
         string trueSource = ev.EventType.GetTypeTrueSource(ev.EventTypeMeta) ?? ev.Source.ToString();
         var row = new SummaryEventRow(ev, trueSource);
 
-        return string.Join(",",
-            ev.Id,
-            ev.EventTimestamp.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),
-            Utils.EscapeCsv(trueSource),
-            Utils.EscapeCsv(ev.Source.ToString()),
-            Utils.EscapeCsv(ev.EventType.ToString()),
-            Utils.EscapeCsv(ev.EventType.GetLabel()),
-            Utils.EscapeCsv(ev.EventTypeMeta),
-            Utils.EscapeCsv(ev.Command.ToString()),
-            Utils.EscapeCsv(ev.User),
-            Utils.EscapeCsv(ev.Value),
-            Utils.EscapeCsv(row.DisplayValue),
-            Utils.EscapeCsv(ev.Currency),
-            ev.Amount,
-            ev.SecondsValue,
-            ev.PointsValue,
-            ev.MultiplierSeconds,
-            ev.MultiplierPoints,
-            ev.GetFinalSecondsValueRaw(),
-            ev.GetFinalPointsValue(),
-            ev.ProcessedToSubathon,
-            ev.WasReversed,
-            Utils.EscapeCsv(ev.SecondaryValue),
-            Utils.EscapeCsv(ev.TertiaryValue));
+        return [
+            ev.Id, ev.EventTimestamp, trueSource, ev.Source, ev.EventType, ev.EventType.GetLabel(), ev.EventTypeMeta,
+            ev.Command, ev.User, ev.Value, row.DisplayValue, ev.Currency, ev.Amount, ev.SecondsValue,
+            ev.PointsValue, ev.MultiplierSeconds, ev.MultiplierPoints, ev.GetFinalSecondsValueRaw(),
+            ev.GetFinalPointsValue(), ev.ProcessedToSubathon, ev.WasReversed, ev.SecondaryValue, ev.TertiaryValue
+        ];
     }
 
     private async void ExportLeaderboard_Click(object? sender, RoutedEventArgs e) {
@@ -126,20 +110,9 @@ private async void ExportLeaderboard_Click(object? sender, RoutedEventArgs e) {
             _logger?.LogWarning(ex, "[Summary] Could not read leaderboard meta for export");
         }
 
-        var sb = new StringBuilder();
-        sb.AppendLine(BuildMetaRow(Selected, meta));
-        sb.AppendLine();
-        sb.AppendLine(string.Join(",", "Rank", "User", "Value", "Events", "Count"));
-
-        foreach (LeaderboardRow row in _lbRows)
-            sb.AppendLine(string.Join(",",
-                row.Rank,
-                Utils.EscapeCsv(row.User),
-                Utils.EscapeCsv(row.Value),
-                row.Events,
-                row.Count));
-
-        string? path = await WriteExportAsync("filtered_leaderboard", Selected?.Id, sb.ToString());
+        string? path = await WriteExportAsync("filtered_leaderboard", Selected?.Id,
+            [BuildMetaRow(Selected, meta), [], ["Rank", "User", "Value", "Events", "Count"]],
+            _lbRows, row => [row.Rank, row.User, row.Value, row.Events, row.Count]);
         LbStatus.Text = path == null
             ? "Could not write the export, check the logs"
             : $"Exported {_lbRows.Count:N0} rows to {Path.GetFileName(path)}";
@@ -158,7 +131,7 @@ private static void AddJsonMeta(List<string> into, JsonElement root, string prop
         if (text.Length > 0) into.Add($"{label}: {text}");
     }
 
-    private static string BuildMetaRow(SubathonOption? subathon, IEnumerable<string> cells) {
+    private static List<string> BuildMetaRow(SubathonOption? subathon, IEnumerable<string> cells) {
         List<string> all = [
             $"Exported: {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture)}",
             $"Subathon: {subathon?.Name ?? "unknown"}",
@@ -166,20 +139,15 @@ private static string BuildMetaRow(SubathonOption? subathon, IEnumerable<string>
             $"Active: {(subathon?.IsActive == true ? "Yes" : "No")}"
         ];
         all.AddRange(cells);
-        return string.Join(",", all.Select(Utils.EscapeCsv));
+        return all;
     }
 
-    private async Task<string?> WriteExportAsync(string prefix, Guid? subathonId, string content) {
+    private async Task<string?> WriteExportAsync<T>(string prefix, Guid? subathonId,
+        IEnumerable<IEnumerable<object?>> headerRows, IEnumerable<T> rows, Func<T, IEnumerable<object?>> toCells) {
         try {
-            string exportDir = Path.Combine(Config.DataFolder, "exports");
-            Directory.CreateDirectory(exportDir);
-
-            string stamp = DateTime.Now.ToString("yyyyMMdd-HHmmss", CultureInfo.InvariantCulture);
-            string name = subathonId == null ? $"{prefix}-{stamp}.csv" : $"{prefix}-{subathonId}-{stamp}.csv";
-            string path = Path.Combine(exportDir, name);
-
-            await File.WriteAllTextAsync(path, content, Encoding.UTF8);
-            UiHelpers.OpenFolder(exportDir);
+            string path = await CsvUtils.ExportAsync(subathonId == null ? prefix : $"{prefix}-{subathonId}",
+                headerRows, rows, toCells);
+            UiHelpers.OpenFolder(Path.GetDirectoryName(path));
             return path;
         }
         catch (Exception ex) {
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
new file mode 100644
index 0000000..27baeb0
--- /dev/null
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
@@ -0,0 +1,832 @@
+using System.Globalization;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Integration;
+using SubathonManager.Services;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+using SubathonManager.UI.Views.Actions;
+
+// ReSharper disable NullableWarningSuppressionIsUsed
+
+namespace SubathonManager.UI.Views.WheelSpin;
+
+public partial class WheelEditor {
+    #region General
+    private void ShowActionPanelsFor(WheelSpinActionType type) {
+        bool isTime = type is WheelSpinActionType.AddTime or WheelSpinActionType.SubtractTime;
+        bool isMult = type == WheelSpinActionType.SetMultiplier;
+        bool isReroll = type == WheelSpinActionType.Reroll;
+        bool isVts = type == WheelSpinActionType.VTubeStudio && FeatureFlags.VTubeStudioEnabled;
+        TimeParamPanel.IsVisible = isTime;
+        MultiplierParamPanel.IsVisible = isMult;
+        RerollParamPanel.IsVisible = isReroll;
+        VtsParamPanel.IsVisible = isVts;
+        ObsParamPanel.IsVisible = type == WheelSpinActionType.OBS;
+        CustomParamPanel.IsVisible = type == WheelSpinActionType.CustomAction;
+        ConvertToCustomBtn.IsVisible = isVts || type == WheelSpinActionType.OBS;
+        if (CustomParamPanel.IsVisible) UpdateCustomHint();
+        if (isTime) UpdateActionHint(type);
+        if (isVts) {
+            RefreshVtsKindDependentBoxes();
+            LoadVtsTargetSuggestions();
+        }
+
+        if (ObsParamPanel.IsVisible) {
+            RefreshObsKindDependentBoxes();
+            _ = LoadObsSuggestionsAsync();
+        }
+    }
+
+    private void UpdateActionHint(WheelSpinActionType type) {
+        ActionHintText.Text = type switch {
+            WheelSpinActionType.AddTime => "Duration to add. e.g. \"5m\", \"300s\", \"1h30m\".",
+            WheelSpinActionType.SubtractTime => "Duration to subtract. e.g. \"5m\", \"300s\", \"1h30m\".",
+            _ => ""
+        };
+    }
+
+    private void ParseMultiplierParameter(string parameter) {
+        string[] parts = parameter.Split('|');
+        if (parts.Length < 4) return;
+        MultiplierAmountBox.Text = parts[0];
+        MultiplierDurationBox.Text = parts[1] == "xs" ? "" : parts[1];
+        MultiplierPointsCheck.IsChecked = parts[2].Equals("True", StringComparison.OrdinalIgnoreCase);
+        MultiplierTimeCheck.IsChecked = parts[3].Equals("True", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private string BuildMultiplierParameter() {
+        if (!double.TryParse(MultiplierAmountBox.Text, NumberStyles.Float,
+                CultureInfo.InvariantCulture, out double amount))
+            amount = 1.0;
+        TimeSpan duration = Utils.ParseDurationString((MultiplierDurationBox.Text ?? "").Trim());
+        string durationStr = duration == TimeSpan.Zero ? "x" : ((int)duration.TotalSeconds).ToString();
+
+        bool applyPoints = MultiplierPointsCheck.IsChecked ?? false;
+        bool applyTime = MultiplierTimeCheck.IsChecked ?? false;
+        return $"{amount.ToString(CultureInfo.InvariantCulture)}|{durationStr}s|{applyPoints}|{applyTime}";
+    }
+
+    private void Multiplier_Changed(object? sender, RoutedEventArgs e) {
+        bool realChange = DirtySaveGuard.Consume(sender);
+        if (_suppressCount > 0 || !realChange) return;
+        MarkPendingChanges();
+    }
+
+    private void ParseRerollParameter(string parameter) {
+        string[] parts = parameter.Split('|');
+        RerollCountBox.Text = parts.Length >= 1 && int.TryParse(parts[0], out int c) && c >= 1 ? parts[0] : "1";
+    }
+
+    private string BuildRerollParameter() {
+        if (!int.TryParse((RerollCountBox.Text ?? "").Trim(), out int count) || count < 1) count = 1;
+        return count.ToString();
+    }
+
+    private string BuildUiParameter(WheelSpinActionType type) {
+        return type switch {
+            WheelSpinActionType.SetMultiplier => BuildMultiplierParameter(),
+            WheelSpinActionType.Reroll => BuildRerollParameter(),
+            WheelSpinActionType.VTubeStudio => BuildVtsParameter(),
+            WheelSpinActionType.OBS => ReadObsGraph().ToJson(),
+            WheelSpinActionType.CustomAction => SelectedCustomActionId?.ToString() ?? "",
+            _ => (ActionParameterBox.Text ?? "").Trim()
+        };
+    }
+
+    private bool IsCurrentUiActionValid(out string error) {
+        if ((ActionTypeBox.SelectedItem as ComboBoxItem)?.Tag is not WheelSpinActionType selected
+            || !selected.HasAction()) {
+            error = "";
+            return true;
+        }
+
+        if (selected == WheelSpinActionType.OBS) return IsObsBoxesValid(out error);
+        return IsActionValid(selected, BuildUiParameter(selected), out error);
+    }
+
+    private static bool IsActionValid(WheelSpinActionType type, string param, out string error) {
+        if (type is WheelSpinActionType.AddTime or WheelSpinActionType.SubtractTime) {
+            if (string.IsNullOrEmpty(param) || Utils.ParseDurationString(param) == TimeSpan.Zero) {
+                error = "Duration must be non-zero (e.g. 5m, 300s, 1h30m)";
+                return false;
+            }
+
+            error = "";
+            return true;
+        }
+
+        if (type == WheelSpinActionType.Reroll) {
+            string[] parts = param.Split('|');
+            if (parts.Length < 1 || !int.TryParse(parts[0], out int count) || count < 1) {
+                error = "Reroll count must be at least 1";
+                return false;
+            }
+
+            error = "";
+            return true;
+        }
+
+        if (type == WheelSpinActionType.VTubeStudio) {
+            if (!VTSWheelAction.TryParse(param, out VTSWheelAction? vtsAction)) {
+                error = "VTube Studio action parameters are incomplete";
+                return false;
+            }
+
+            return vtsAction.IsValid(out error);
+        }
+
+        if (type == WheelSpinActionType.CustomAction) return IsCustomActionValid(param, out error);
+
+        if (type == WheelSpinActionType.OBS) {
+            ActionGraph? graph = type.BuildActionGraph(param);
+            if (graph != null) return graph.IsValid(out error);
+            error = "OBS action parameters are incomplete";
+            return false;
+        }
+
+        if (type == WheelSpinActionType.SetMultiplier) {
+            string[] parts = param.Split('|');
+            if (parts.Length < 4) {
+                error = "Multiplier parameters are incomplete";
+                return false;
+            }
+
+            if (!double.TryParse(parts[0], NumberStyles.Float,
+                    CultureInfo.InvariantCulture, out double amt) || amt == 0) {
+                error = "Multiplier amount must be a non-zero number";
+                return false;
+            }
+
+            string durStr = parts[1].EndsWith('s') ? parts[1][..^1] : parts[1];
+            if (parts[1] == "xs" || string.IsNullOrEmpty(durStr) || !int.TryParse(durStr, out int ds) || ds <= 0) {
+                error = "Multiplier duration is required and must be non-zero (e.g. 30m or 1h)";
+                return false;
+            }
+
+            bool applyPoints = parts[2].Equals("True", StringComparison.OrdinalIgnoreCase);
+            bool applyTime = parts[3].Equals("True", StringComparison.OrdinalIgnoreCase);
+            if (!applyPoints && !applyTime) {
+                error = "At least one of Time or Points must be selected";
+                return false;
+            }
+        }
+
+        error = "";
+        return true;
+    }
+    #endregion
+
+    #region VTS
+
+    private void PopulateVtsComboBoxes() {
+        VtsKindBox.Items.Clear();
+        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Expression", Tag = VtsTargetKind.Expression });
+        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Parameter", Tag = VtsTargetKind.Parameter });
+        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Hotkey", Tag = VtsTargetKind.Hotkey });
+        VtsKindBox.SelectedIndex = 0;
+
+        VtsToggleActionBox.Items.Clear();
+        foreach (VtsToggleAction a in new[] { VtsToggleAction.On, VtsToggleAction.Off, VtsToggleAction.Toggle })
+            VtsToggleActionBox.Items.Add(new ComboBoxItem { Content = a.ToString(), Tag = a });
+        VtsToggleActionBox.SelectedIndex = 0;
+
+        RefreshVtsKindDependentBoxes();
+    }
+
+    private void VtsKind_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        bool realChange = DirtySaveGuard.Consume(sender);
+        RefreshVtsKindDependentBoxes();
+        LoadVtsTargetSuggestions();
+        if (_suppressCount > 0 || !realChange) return;
+        MarkPendingChanges();
+    }
+
+    private void VtsAfter_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        bool realChange = DirtySaveGuard.Consume(sender);
+        RefreshVtsAfterValueVisibility();
+        UpdateVtsHint();
+        if (_suppressCount > 0 || !realChange) return;
+        MarkPendingChanges();
+    }
+
+    private void RefreshVtsKindDependentBoxes() {
+        VtsTargetKind kind = SelectedVtsKind;
+
+        SuppressChanges(() => {
+            VtsToggleActionPanel.IsVisible = kind == VtsTargetKind.Expression;
+            VtsValuePanel.IsVisible = kind == VtsTargetKind.Parameter;
+
+            object? previous = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag;
+            VtsAfterBox.Items.Clear();
+
+            switch (kind) {
+                case VtsTargetKind.Expression:
+                    foreach (VtsToggleAction a in Enum.GetValues<VtsToggleAction>())
+                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
+                    break;
+                case VtsTargetKind.Parameter:
+                    foreach (VtsParameterAfterAction a in Enum.GetValues<VtsParameterAfterAction>())
+                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
+                    break;
+                case VtsTargetKind.Hotkey:
+                    foreach (VtsHotkeyAfterAction a in Enum.GetValues<VtsHotkeyAfterAction>())
+                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
+                    break;
+            }
+
+            ComboBoxItem? restored = VtsAfterBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => Equals(i.Tag, previous));
+            VtsAfterBox.SelectedItem = restored ?? VtsAfterBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
+
+            VtsTargetBox.PlaceholderText = kind switch {
+                VtsTargetKind.Expression => "e.g. cat_ears.exp3.json",
+                VtsTargetKind.Parameter => "e.g. EyeOpenRight or custom parameter",
+                _ => "hotkey name or id"
+            };
+        });
+
+        RefreshVtsAfterValueVisibility();
+        UpdateVtsHint();
+    }
+
+    private void RefreshVtsAfterValueVisibility() {
+        VtsAfterValuePanel.IsVisible = SelectedVtsKind == VtsTargetKind.Parameter
+                                       && (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag
+                                       as VtsParameterAfterAction? == VtsParameterAfterAction.SetNewValue;
+    }
+
+    private static string LabelFor(VtsToggleAction action) {
+        return action switch {
+            VtsToggleAction.DoNothing => "Do Nothing",
+            _ => action.ToString()
+        };
+    }
+
+    private static string LabelFor(VtsParameterAfterAction action) {
+        return action switch {
+            VtsParameterAfterAction.DoNothing => "Do Nothing / Release",
+            VtsParameterAfterAction.ResetToOriginal => "Reset to Original",
+            VtsParameterAfterAction.SetNewValue => "Change to New Value",
+            _ => action.ToString()
+        };
+    }
+
+    private static string LabelFor(VtsHotkeyAfterAction action) {
+        return action switch {
+            VtsHotkeyAfterAction.DoNothing => "Do Nothing",
+            VtsHotkeyAfterAction.TriggerAgain => "Trigger Again",
+            _ => action.ToString()
+        };
+    }
+
+    private void LoadVtsTargetSuggestions() {
+        VTSService vts = ServiceManager.VTubeStudio;
+        VtsTargetKind kind = SelectedVtsKind;
+
+        if (!vts.Connected) {
+            VtsTargetBox.ItemsSource = null;
+            VtsConnectionHint.Text = "VTube Studio not connected - type the value by hand";
+            return;
+        }
+
+        List<string> suggestions = kind switch {
+            VtsTargetKind.Expression => vts.CachedExpressions.Select(e => e.File).ToList(),
+            VtsTargetKind.Parameter => vts.CachedParameters.Select(pa => pa.Name).ToList(),
+            VtsTargetKind.Hotkey => BuildHotkeySuggestions(vts.CachedHotkeys),
+            _ => []
+        };
+
+        VtsTargetBox.ItemsSource = suggestions;
+        VtsConnectionHint.Text = suggestions.Count > 0
+            ? $"{suggestions.Count} available on \"{vts.CurrentModelName ?? "current model"}\""
+            : "Nothing found on current model";
+    }
+
+    private List<string> BuildHotkeySuggestions(IReadOnlyList<VtsHotkey> hotkeys) {
+        _vtsHotkeyIdsByDisplay.Clear();
+
+        HashSet<string> duplicates = hotkeys
+            .GroupBy(h => h.Name, StringComparer.OrdinalIgnoreCase)
+            .Where(g => g.Count() > 1)
+            .Select(g => g.Key)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        var display = new List<string>(hotkeys.Count);
+        foreach (VtsHotkey hotkey in hotkeys) {
+            string name = string.IsNullOrWhiteSpace(hotkey.Name) ? hotkey.Id : hotkey.Name;
+            string label = duplicates.Contains(name) && hotkey.Id.Length >= 6
+                ? $"{name} ({hotkey.Id[^6..]})"
+                : name;
+            _vtsHotkeyIdsByDisplay[label] = hotkey.Id;
+            display.Add(label);
+        }
+
+        return display;
+    }
+
+    private string DisplayForHotkeyId(string hotkeyId) {
+        foreach (KeyValuePair<string, string> pair in _vtsHotkeyIdsByDisplay.Where(pair => 
+                     string.Equals(pair.Value, hotkeyId, StringComparison.OrdinalIgnoreCase)))
+            return pair.Key;
+
+        return ResolveHotkeyName(hotkeyId) ?? hotkeyId;
+    }
+
+    private static string? ResolveHotkeyName(string? hotkeyId) {
+        if (string.IsNullOrWhiteSpace(hotkeyId)) return null;
+        return ServiceManager.VTubeStudio.CachedHotkeys
+            .FirstOrDefault(h => string.Equals(h.Id, hotkeyId, StringComparison.OrdinalIgnoreCase))?.Name;
+    }
+
+    private string ResolveHotkeyTargetFromBox() {
+        string text = (VtsTargetBox.Text ?? "").Trim();
+        if (text.Length == 0) return "";
+        if (_vtsHotkeyIdsByDisplay.TryGetValue(text, out string? mapped)) return mapped;
+
+        VtsHotkey? byName = ServiceManager.VTubeStudio.CachedHotkeys
+            .FirstOrDefault(h => string.Equals(h.Name, text, StringComparison.OrdinalIgnoreCase));
+        return byName?.Id ?? text;
+    }
+
+    private void OnVtsModelDataChanged() {
+        Dispatcher.UIThread.Post(() => {
+            if (!VtsParamPanel.IsVisible) return;
+            SuppressChanges(LoadVtsTargetSuggestions);
+            UpdateVtsHint();
+        });
+    }
+
+    private void OnVtsConnectionUpdated(IntegrationConnection connection) {
+        if (connection.Source != SubathonEventSource.VTubeStudio) return;
+        OnVtsModelDataChanged();
+    }
+
+    private async void VtsRefreshTargets_Click(object? sender, RoutedEventArgs e) {
+        VTSService vts = ServiceManager.VTubeStudio;
+        if (!vts.Connected) {
+            LoadVtsTargetSuggestions();
+            VtsHintText.Text = "Connect VTubeStudio under Settings -> External Software";
+            return;
+        }
+
+        await vts.RefreshAsync();
+        await Dispatcher.UIThread.InvokeAsync(() => {
+            LoadVtsTargetSuggestions();
+            UpdateVtsHint();
+        });
+    }
+
+    private void UpdateVtsHint() {
+        VTSWheelAction action = ReadVtsBoxes();
+
+        if (!action.IsValid(out string error)) {
+            VtsHintText.Text = error;
+            return;
+        }
+
+        string summary = action.Describe();
+        if (action.Kind == VtsTargetKind.Hotkey && ResolveHotkeyName(action.Target) is { } hotkeyName)
+            summary = $"\"{hotkeyName}\" {summary[action.Target.Length..].TrimStart()}";
+
+        VtsHintText.Text = action.HasRevert
+            ? summary
+            : $"{summary} (no duration set)";
+    }
+
+    private VTSWheelAction ReadVtsBoxes() {
+        VtsTargetKind kind = SelectedVtsKind;
+        var action = new VTSWheelAction {
+            Kind = kind,
+            Target = kind == VtsTargetKind.Hotkey
+                ? ResolveHotkeyTargetFromBox()
+                : (VtsTargetBox.Text ?? "").Trim(),
+            Duration = Utils.ParseDurationString((VtsDurationBox.Text ?? "").Trim())
+        };
+
+        switch (kind) {
+            case VtsTargetKind.Expression:
+                action.ToggleAction = (VtsToggleActionBox.SelectedItem as ComboBoxItem)?.Tag as VtsToggleAction?
+                                      ?? VtsToggleAction.On;
+                action.AfterToggle = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsToggleAction?
+                                     ?? VtsToggleAction.DoNothing;
+                break;
+            case VtsTargetKind.Parameter:
+                action.Value = ParseDoubleOrZero(VtsValueBox.Text);
+                action.AfterParameter = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsParameterAfterAction?
+                                        ?? VtsParameterAfterAction.DoNothing;
+                action.AfterValue = ParseDoubleOrZero(VtsAfterValueBox.Text);
+                break;
+            case VtsTargetKind.Hotkey:
+                action.AfterHotkey = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsHotkeyAfterAction?
+                                     ?? VtsHotkeyAfterAction.DoNothing;
+                break;
+        }
+
+        return action;
+    }
+
+    private static double ParseDoubleOrZero(string? text) {
+        return double.TryParse((text ?? "").Trim(), NumberStyles.Float,
+            CultureInfo.InvariantCulture, out double v) ? v : 0d;
+    }
+
+    private string BuildVtsParameter() {
+        return ReadVtsBoxes().ToParameterString();
+    }
+
+    private void ParseVtsParameter(string parameter) {
+        if (!VTSWheelAction.TryParse(parameter, out VTSWheelAction? action)) {
+            ResetVtsBoxes();
+            return;
+        }
+
+        SuppressChanges(() => {
+            ComboBoxItem? kindItem = VtsKindBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (VtsTargetKind?)i.Tag == action.Kind);
+            VtsKindBox.SelectedItem = kindItem ?? VtsKindBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
+        });
+
+        RefreshVtsKindDependentBoxes();
+        LoadVtsTargetSuggestions();
+
+        SuppressChanges(() => {
+            VtsTargetBox.Text = action.Kind == VtsTargetKind.Hotkey
+                ? DisplayForHotkeyId(action.Target) : action.Target;
+            
+            VtsDurationBox.Text = action.Duration > TimeSpan.Zero
+            
+                ? $"{(int)action.Duration.TotalSeconds}s" : "";
+            VtsValueBox.Text = action.Kind == VtsTargetKind.Parameter
+                ? action.Value.ToString(CultureInfo.InvariantCulture) : "";
+            
+            VtsAfterValueBox.Text = action.Kind == VtsTargetKind.Parameter
+                ? action.AfterValue.ToString(CultureInfo.InvariantCulture) : "";
+
+            ComboBoxItem? toggleItem = VtsToggleActionBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (VtsToggleAction?)i.Tag == action.ToggleAction);
+            if (toggleItem != null) VtsToggleActionBox.SelectedItem = toggleItem;
+
+            object afterTag = action.Kind switch {
+                VtsTargetKind.Expression => action.AfterToggle,
+                VtsTargetKind.Parameter => action.AfterParameter,
+                _ => action.AfterHotkey
+            };
+
+            ComboBoxItem? afterItem = VtsAfterBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => Equals(i.Tag, afterTag));
+            if (afterItem != null) VtsAfterBox.SelectedItem = afterItem;
+        });
+
+        RefreshVtsAfterValueVisibility();
+        UpdateVtsHint();
+    }
+
+    private void ResetVtsBoxes() {
+        SuppressChanges(() => {
+            VtsKindBox.SelectedIndex = 0;
+            VtsTargetBox.Text = "";
+            VtsValueBox.Text = "";
+            VtsDurationBox.Text = "";
+            VtsAfterValueBox.Text = "";
+            if (VtsToggleActionBox.Items.Count > 0) VtsToggleActionBox.SelectedIndex = 0;
+        });
+
+        RefreshVtsKindDependentBoxes();
+    }
+
+    private static string DescribeHistoryAction(WheelSpinAction? action) {
+        if (action == null) return "Manual";
+        if (action.ActionType == WheelSpinActionType.VTubeStudio
+            && VTSWheelAction.TryParse(action.Parameter, out VTSWheelAction? parsed)) {
+            string described = parsed.Describe();
+            if (parsed.Kind == VtsTargetKind.Hotkey && ResolveHotkeyName(parsed.Target) is { } hotkeyName)
+                described = $"\"{hotkeyName}\" {described[parsed.Target.Length..].TrimStart()}";
+
+            return $"VTubeStudio: {described}";
+        }
+
+        if (action.ActionType == WheelSpinActionType.OBS
+            && action.ActionType.BuildActionGraph(action.Parameter) is { } graph)
+            return $"OBS: {graph.Describe()}";
+
+        if (action.ActionType == WheelSpinActionType.CustomAction)
+            return Guid.TryParse(action.Parameter, out Guid id) && ServiceManager.Actions.GetCustomAction(id) is { } custom
+                ? $"Custom: {custom.Name}"
+                : "Custom: (missing from actions library)";
+
+        return $"{action.ActionType}: {action.Parameter}";
+    }
+    
+    #endregion
+
+    #region OBS
+
+    private ActionStepType SelectedObsType =>
+        (ObsKindBox.SelectedItem as ComboBoxItem)?.Tag as ActionStepType? ?? ActionStepType.ObsSourceVisibility;
+
+    private void PopulateObsComboBoxes() {
+        ObsKindBox.Items.Clear();
+        foreach (ActionStepType type in new[] {
+                     ActionStepType.ObsSourceVisibility, ActionStepType.ObsFilter, ActionStepType.ObsAudio,
+                     ActionStepType.ObsMedia
+                 })
+            ObsKindBox.Items.Add(new ComboBoxItem { Content = type.GetLabel(), Tag = type });
+        ObsKindBox.SelectedIndex = 0;
+        RefreshObsKindDependentBoxes();
+    }
+
+    private void ObsKind_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        bool realChange = DirtySaveGuard.Consume(sender);
+        RefreshObsKindDependentBoxes();
+        _ = LoadObsSuggestionsAsync();
+        if (_suppressCount > 0 || !realChange) return;
+        MarkPendingChanges();
+    }
+
+    private void ObsOp_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        bool realChange = DirtySaveGuard.Consume(sender);
+        UpdateObsHint();
+        if (_suppressCount > 0 || !realChange) return;
+        MarkPendingChanges();
+    }
+
+    private void RefreshObsKindDependentBoxes() {
+        ActionStepType type = SelectedObsType;
+        SuppressChanges(() => {
+            ObsScopePanel.IsVisible = type.HasScope();
+            ObsScopeLabel.Text = type.GetScopeLabel() ?? "";
+            ObsTargetLabel.Text = type.GetTargetLabel() ?? "";
+
+            object? previousOp = (ObsOpBox.SelectedItem as ComboBoxItem)?.Tag;
+            object? previousAfter = (ObsAfterBox.SelectedItem as ComboBoxItem)?.Tag;
+            ObsOpBox.Items.Clear();
+            ObsAfterBox.Items.Clear();
+            ObsAfterBox.Items.Add(new ComboBoxItem { Content = ActionOperation.None.GetOpLabel(), Tag = ActionOperation.None });
+            foreach (ActionOperation op in type.GetOps()) {
+                ObsOpBox.Items.Add(new ComboBoxItem { Content = op.GetOpLabel(), Tag = op });
+                ObsAfterBox.Items.Add(new ComboBoxItem { Content = op.GetOpLabel(), Tag = op });
+            }
+
+            ObsOpBox.SelectedItem = ObsOpBox.Items.OfType<ComboBoxItem>().FirstOrDefault(i => Equals(i.Tag, previousOp))
+                                    ?? ObsOpBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
+            ObsAfterBox.SelectedItem = ObsAfterBox.Items.OfType<ComboBoxItem>()
+                                           .FirstOrDefault(i => Equals(i.Tag, previousAfter))
+                                       ?? ObsAfterBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
+        });
+        UpdateObsHint();
+    }
+
+    private async Task LoadObsSuggestionsAsync() {
+        OBSService obs = ServiceManager.OBS;
+        if (!obs.Connected) {
+            ObsScopeBox.ItemsSource = null;
+            ObsTargetBox.ItemsSource = null;
+            ObsConnectionHint.Text = "OBS not connected - type names by hand";
+            return;
+        }
+
+        ActionStepType type = SelectedObsType;
+        string scope = (ObsScopeBox.Text ?? "").Trim();
+        (List<string> scopes, List<string> targets) = await Task.Run(() => obs.GetActionTargets(type, scope));
+        await Dispatcher.UIThread.InvokeAsync(() => {
+            if (SelectedObsType != type) return;
+            ObsScopeBox.ItemsSource = scopes;
+            ObsTargetBox.ItemsSource = targets;
+            ObsConnectionHint.Text = type.HasScope() && scope.Length == 0
+                ? $"Pick {(type == ActionStepType.ObsFilter ? "a source" : "a scene")} to list what is in it"
+                : $"{targets.Count} found";
+        });
+    }
+
+    private async void ObsRefreshTargets_Click(object? sender, RoutedEventArgs e) {
+        await LoadObsSuggestionsAsync();
+    }
+
+    private void OnObsConnectionUpdated(IntegrationConnection connection) {
+        if (connection.Source != SubathonEventSource.OBS) return;
+        Dispatcher.UIThread.Post(() => {
+            if (ObsParamPanel.IsVisible) _ = LoadObsSuggestionsAsync();
+        });
+    }
+
+    private ActionGraph ReadObsGraph() {
+        ActionStepType type = SelectedObsType;
+        string? scope = type.HasScope() ? (ObsScopeBox.Text ?? "").Trim() : null;
+        string target = (ObsTargetBox.Text ?? "").Trim();
+        var first = new ActionStep {
+            Type = type,
+            Operation = (ObsOpBox.SelectedItem as ComboBoxItem)?.Tag as ActionOperation? ?? type.DefaultOp(),
+            Target = target,
+            Scope = scope
+        };
+
+        TimeSpan duration = Utils.ParseDurationString((ObsDurationBox.Text ?? "").Trim());
+        ActionOperation after = (ObsAfterBox.SelectedItem as ComboBoxItem)?.Tag as ActionOperation? ?? ActionOperation.None;
+        if (after == ActionOperation.None || duration <= TimeSpan.Zero) return ActionGraph.Sequence(first);
+
+        return ActionGraph.Sequence(first,
+            new ActionStep { Type = ActionStepType.Wait, Seconds = duration.TotalSeconds },
+            new ActionStep { Type = type, Operation = after, Target = target, Scope = scope });
+    }
+
+    private bool IsObsBoxesValid(out string error) {
+        bool hasAfter = (ObsAfterBox.SelectedItem as ComboBoxItem)?.Tag as ActionOperation? is { } after
+                        && after != ActionOperation.None;
+        if (hasAfter && Utils.ParseDurationString((ObsDurationBox.Text ?? "").Trim()) <= TimeSpan.Zero) {
+            error = "A duration is required for the action after the timer";
+            return false;
+        }
+
+        return ReadObsGraph().IsValid(out error);
+    }
+
+    private void UpdateObsHint() {
+        if (!ObsParamPanel.IsVisible) return;
+        ObsHintText.Text = IsObsBoxesValid(out string error) ? ReadObsGraph().Describe() : error;
+    }
+
+    private void ParseObsParameter(string parameter) {
+        ActionGraph? graph = WheelSpinActionType.OBS.BuildActionGraph(parameter);
+        if (graph == null) {
+            ResetObsBoxes();
+            return;
+        }
+
+        ActionStep first = graph.Nodes[0].Step;
+        ActionStep? wait = graph.Nodes.ElementAtOrDefault(1)?.Step;
+        ActionStep? after = graph.Nodes.ElementAtOrDefault(2)?.Step;
+
+        SuppressChanges(() => ObsKindBox.SelectedItem = ObsKindBox.Items.OfType<ComboBoxItem>()
+            .FirstOrDefault(i => (ActionStepType?)i.Tag == first.Type));
+        RefreshObsKindDependentBoxes();
+
+        SuppressChanges(() => {
+            ObsScopeBox.Text = first.Scope ?? "";
+            ObsTargetBox.Text = first.Target;
+            ObsDurationBox.Text = wait != null && wait.Duration > TimeSpan.Zero
+                ? $"{(int)wait.Duration.TotalSeconds}s"
+                : "";
+            ObsOpBox.SelectedItem = ObsOpBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionOperation?)i.Tag == first.Operation);
+            ObsAfterBox.SelectedItem = ObsAfterBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionOperation?)i.Tag == (after?.Operation ?? ActionOperation.None));
+        });
+
+        _ = LoadObsSuggestionsAsync();
+        UpdateObsHint();
+    }
+
+    private void ResetObsBoxes() {
+        SuppressChanges(() => {
+            ObsKindBox.SelectedIndex = 0;
+            ObsScopeBox.Text = "";
+            ObsTargetBox.Text = "";
+            ObsDurationBox.Text = "";
+        });
+
+        RefreshObsKindDependentBoxes();
+    }
+    
+    #endregion
+
+    #region Custom Action
+    private Guid? SelectedCustomActionId => (CustomActionBox.SelectedItem as ComboBoxItem)?.Tag as Guid?;
+
+    private static bool IsCustomActionValid(string? parameter, out string error) {
+        if (!Guid.TryParse(parameter, out Guid id)) {
+            error = "Pick a custom action, or create one with +";
+            return false;
+        }
+
+        if (ServiceManager.Actions.GetCustomAction(id) is not { } action) {
+            error = "That custom action is missing from the actions library";
+            return false;
+        }
+
+        if (action.Graph.Nodes.Count == 0) {
+            error = $"\"{action.Name}\" has no steps yet";
+            return false;
+        }
+
+        return action.Graph.IsValid(out error);
+    }
+
+    private void PopulateCustomActionBox(Guid? select = null) {
+        Guid? keep = select ?? SelectedCustomActionId;
+        SuppressChanges(() => {
+            CustomActionBox.Items.Clear();
+            foreach (CustomAction action in ServiceManager.Actions.CustomActions)
+                CustomActionBox.Items.Add(new ComboBoxItem { Content = action.Name, Tag = (Guid?)action.Id });
+
+            if (keep is { } id && CustomActionBox.Items.OfType<ComboBoxItem>().All(i => i.Tag as Guid? != id))
+                CustomActionBox.Items.Add(new ComboBoxItem { Content = "(missing from actions library)", Tag = (Guid?)id });
+
+            CustomActionBox.SelectedItem = CustomActionBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => i.Tag as Guid? == keep);
+        });
+        UpdateCustomHint();
+    }
+
+    private void OnCustomActionsChanged() {
+        Dispatcher.UIThread.Post(() => {
+            PopulateCustomActionBox();
+            LoadItemRows();
+        });
+    }
+
+    private void UpdateCustomHint() {
+        CustomHintText.Text = SelectedCustomActionId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action
+            ? IsCustomActionValid(id.ToString(), out string error)
+                ? $"{action.Graph.Describe()}{(string.IsNullOrWhiteSpace(action.Description) ? "" : $"\n{action.Description}")}"
+                : error
+            : $"{ServiceManager.Actions.CustomActions.Count} in the library ({ActionService.DefaultActionsFolder})";
+    }
+
+    private void CustomAction_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        if (_suppressCount > 0) return;
+        UpdateCustomHint();
+        MarkPendingChanges();
+    }
+
+    private void OpenActionEditor(CustomAction action) {
+        Guid? openedFor = _selectedItem?.Id;
+        ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        editor.Saved += id => {
+            if (openedFor == null || _selectedItem?.Id != openedFor || !CustomParamPanel.IsVisible) return;
+            if (SelectedCustomActionId == id) {
+                UpdateCustomHint();
+                return;
+            }
+
+            PopulateCustomActionBox(id);
+            MarkPendingChanges();
+        };
+    }
+
+    private void EditCustomAction_Click(object? sender, RoutedEventArgs e) {
+        if (SelectedCustomActionId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action)
+            OpenActionEditor(action);
+        else
+            OpenActionEditor(new CustomAction { Name = (ItemTextBox.Text ?? "").Trim() });
+    }
+
+    private void NewCustomAction_Click(object? sender, RoutedEventArgs e) {
+        string name = (ItemTextBox.Text ?? "").Trim();
+        OpenActionEditor(new CustomAction { Name = name.Length > 0 ? name : "New Action" });
+    }
+
+    private async void ImportCustomAction_Click(object? sender, RoutedEventArgs e) {
+        if (TopLevel.GetTopLevel(this) is not { } top) return;
+        IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
+            Title = "Import Custom Action",
+            AllowMultiple = false,
+            FileTypeFilter = [
+                new FilePickerFileType("Subathon Manager Action") { Patterns = [$"*{CustomAction.FileExtension}"] }
+            ]
+        });
+        if (picked.Count == 0) return;
+
+        (CustomAction Action, bool Replaced)? imported =
+            await ServiceManager.Actions.ImportCustomActionAsync(picked[0].Path.LocalPath);
+        if (imported is not { } result) {
+            StatusText.Text = "That file is not a valid custom action";
+            return;
+        }
+
+        PopulateCustomActionBox(result.Action.Id);
+        StatusText.Text = result.Replaced
+            ? $"Updated \"{result.Action.Name}\" in the actions library"
+            : $"Imported \"{result.Action.Name}\"";
+        MarkPendingChanges();
+    }
+
+    private async void ConvertToCustom_Click(object? sender, RoutedEventArgs e) {
+        var selected = (ActionTypeBox.SelectedItem as ComboBoxItem)?.Tag as WheelSpinActionType?;
+        ActionGraph? graph = selected switch {
+            WheelSpinActionType.VTubeStudio => ReadVtsBoxes().ToActionGraph(),
+            WheelSpinActionType.OBS => ReadObsGraph(),
+            _ => null
+        };
+        if (graph == null) return;
+
+        string name = (ItemTextBox.Text ?? "").Trim();
+        var action = new CustomAction { Name = name.Length > 0 ? name : "Converted Action", Graph = graph };
+        await ServiceManager.Actions.SaveCustomActionAsync(action);
+
+        SuppressChanges(() => ActionTypeBox.SelectedItem = ActionTypeBox.Items.OfType<ComboBoxItem>()
+            .FirstOrDefault(i => (WheelSpinActionType?)i.Tag == WheelSpinActionType.CustomAction));
+        ShowActionPanelsFor(WheelSpinActionType.CustomAction);
+
+        PopulateCustomActionBox(action.Id);
+        MarkPendingChanges();
+        OpenActionEditor(action);
+    }
+    #endregion
+}
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.History.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.History.cs
new file mode 100644
index 0000000..3deb1f3
--- /dev/null
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.History.cs
@@ -0,0 +1,349 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
+using Microsoft.EntityFrameworkCore;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Models;
+using SubathonManager.Data;
+using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+// ReSharper disable NullableWarningSuppressionIsUsed
+
+namespace SubathonManager.UI.Views.WheelSpin;
+
+public partial class WheelEditor {
+    private async Task LoadHistoryAsync(bool append = false) {
+        if (_historyLoading) return;
+        _historyLoading = true;
+        try {
+            if (!append) {
+                _historyOffset = 0;
+                await Dispatcher.UIThread.InvokeAsync(() => HistoryStack.Children.Clear());
+            }
+
+            if (_activeWheel == null) return;
+
+            await using AppDbContext db = await _factory.CreateDbContextAsync();
+            List<WheelSpinHistory> entries = await db.WheelSpinHistories
+                .Include(h => h.LinkedItem).ThenInclude(i => i!.Action)
+                .Where(h => h.WheelId == _activeWheel.Id
+                            && (_historyFilter == null || h.Status == _historyFilter))
+                .OrderByDescending(h => h.CreatedAt)
+                .Skip(_historyOffset)
+                .Take(HistoryPageSize)
+                .AsNoTracking()
+                .ToListAsync();
+
+            _historyOffset += entries.Count;
+
+            await Dispatcher.UIThread.InvokeAsync(() => {
+                foreach (WheelSpinHistory entry in entries)
+                    HistoryStack.Children.Add(BuildHistoryRow(entry));
+            });
+        }
+        finally {
+            _historyLoading = false;
+        }
+    }
+
+    private void PrependHistoryRow(WheelSpinHistory h) {
+        _historyOffset++;
+        HistoryStack.Children.Insert(0, BuildHistoryRow(h));
+    }
+
+    private Grid BuildHistoryRow(WheelSpinHistory h) {
+        var row = new Grid {
+            Margin = new Thickness(2, 1, 2, 1),
+            MinHeight = 26,
+            Tag = h,
+            ColumnDefinitions = new ColumnDefinitions("78,1.7*,*,70,80")
+        };
+
+        var tsLabel = new TextBlock {
+            Text = h.CreatedAt.ToString("MM/dd HH:mm"),
+            FontSize = 10,
+            Foreground = Brushes.Gray,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+        ToolTip.SetTip(tsLabel, h.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss"));
+
+        var itemLabel = new TextBlock {
+            Text = h.LinkedItem?.Text ?? "(deleted)",
+            FontSize = 11,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            Margin = new Thickness(4, 0, 4, 0)
+        };
+        ToolTip.SetTip(itemLabel, h.LinkedItem?.Text);
+
+        var statusLabel = new TextBlock {
+            Text = h.Status.ToString(),
+            FontSize = 10,
+            FontWeight = FontWeight.SemiBold,
+            Foreground = HistoryStatusBrush(h.Status),
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        var hoverBtns = new StackPanel {
+            Orientation = Orientation.Horizontal,
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Right,
+            Margin = new Thickness(0, 0, 12, 0)
+        };
+
+        void AddBtn(WheelSpinHistoryStatus target, string glyph, string tip) {
+            var btn = new Button {
+                Content = new SymIcon { Glyph = glyph },
+                Width = 22, Height = 22,
+                Padding = new Thickness(1),
+                Margin = new Thickness(1, 0, 0, 0),
+                IsEnabled = h.Status != target,
+                Tag = target
+            };
+            ToolTip.SetTip(btn, tip);
+            btn.Click += async (_, _) => await SetHistoryStatus(h, target);
+            hoverBtns.Children.Add(btn);
+        }
+
+        AddBtn(WheelSpinHistoryStatus.Done, "Checkmark16", "Mark Done");
+        AddBtn(WheelSpinHistoryStatus.Pending, "Clock16", "Mark Pending");
+        AddBtn(WheelSpinHistoryStatus.Cancelled, "Dismiss16", "Mark Cancelled");
+
+        WheelSpinActionType? actionType = h.LinkedItem?.Action?.ActionType;
+        bool hasPlayBtn = actionType.HasValue && actionType.Value.HasPlayAction();
+
+        string actionStr = DescribeHistoryAction(h.LinkedItem?.Action);
+
+        var actionCell = new Grid {
+            Margin = new Thickness(4, 0, 2, 0),
+            ColumnDefinitions = hasPlayBtn ? new ColumnDefinitions("*,Auto") : new ColumnDefinitions("*")
+        };
+
+        var actionLabel = new TextBlock {
+            Text = actionStr,
+            FontSize = 10,
+            Foreground = Brushes.Gray,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis
+        };
+        ToolTip.SetTip(actionLabel, actionStr);
+
+        Grid.SetColumn(actionLabel, 0);
+        actionCell.Children.Add(actionLabel);
+
+        if (hasPlayBtn) {
+            bool isMultiplier = actionType == WheelSpinActionType.SetMultiplier;
+            bool isVts = actionType is WheelSpinActionType.VTubeStudio or WheelSpinActionType.OBS;
+            var playBtn = new Button {
+                Content = new SymIcon { Glyph = "Play16" },
+                Width = 20, Height = 20,
+                Padding = new Thickness(1),
+                Margin = new Thickness(3, 0, 0, 0),
+                IsEnabled = !isMultiplier || !_multiplierActive,
+                IsVisible = h.Status == WheelSpinHistoryStatus.Pending,
+                Tag = isMultiplier ? "MultiplierPlayBtn" : null
+            };
+            ToolTip.SetTip(playBtn, isMultiplier
+                ? "Apply multiplier (disabled while one is active)"
+                : isVts
+                    ? $"Run the {actionType?.GetLabel()} action, or resuming where it stopped"
+                    : "Apply command");
+            playBtn.Click += async (_, _) => await ExecuteHistoryAction(h, playBtn);
+            Grid.SetColumn(playBtn, 1);
+            actionCell.Children.Add(playBtn);
+        }
+
+        Grid.SetColumn(tsLabel, 0);
+        Grid.SetColumn(itemLabel, 1);
+        Grid.SetColumn(actionCell, 2);
+        Grid.SetColumn(statusLabel, 3);
+        Grid.SetColumn(hoverBtns, 4);
+
+        row.Children.Add(tsLabel);
+        row.Children.Add(itemLabel);
+        row.Children.Add(actionCell);
+        row.Children.Add(statusLabel);
+        row.Children.Add(hoverBtns);
+
+        return row;
+    }
+
+    private static IBrush HistoryStatusBrush(WheelSpinHistoryStatus status) {
+        return status switch {
+            WheelSpinHistoryStatus.Done => Brushes.MediumSeaGreen,
+            WheelSpinHistoryStatus.Pending => Brushes.CornflowerBlue,
+            WheelSpinHistoryStatus.Running => Brushes.Goldenrod,
+            WheelSpinHistoryStatus.Cancelled => Brushes.IndianRed,
+            _ => Brushes.Gray
+        };
+    }
+
+    private async Task SetHistoryStatus(WheelSpinHistory h, WheelSpinHistoryStatus newStatus) {
+        h.Status = newStatus;
+        h.UpdatedAt = DateTime.Now;
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        WheelSpinHistory? tracked = await db.WheelSpinHistories.FindAsync(h.Id);
+        if (tracked == null) return;
+        tracked.Status = newStatus;
+        tracked.UpdatedAt = h.UpdatedAt;
+        await db.SaveChangesAsync();
+
+        h.LinkedWheel ??= _activeWheel;
+        WheelEvents.RaiseWheelSpinStatusChanged(h, _spinsOwed);
+    }
+
+    private void OnWheelSpinStatusChanged(WheelSpinHistory history, int spinsOwed) {
+        Dispatcher.UIThread.Post(() => {
+            Grid? row = HistoryStack.Children.OfType<Grid>()
+                .FirstOrDefault(g => g.Tag is WheelSpinHistory h && h.Id == history.Id);
+            if (row == null) return;
+
+            if (row.Tag is WheelSpinHistory rowHistory)
+                rowHistory.Status = history.Status;
+
+            TextBlock? statusLabel = row.Children.OfType<TextBlock>()
+                .FirstOrDefault(c => Grid.GetColumn(c) == 3);
+            StackPanel? hoverBtns = row.Children.OfType<StackPanel>()
+                .FirstOrDefault(c => Grid.GetColumn(c) == 4);
+
+            if (statusLabel != null) {
+                statusLabel.Text = history.Status.ToString();
+                statusLabel.Foreground = HistoryStatusBrush(history.Status);
+            }
+
+            if (hoverBtns != null)
+                foreach (Button btn in hoverBtns.Children.OfType<Button>())
+                    btn.IsEnabled = btn.Tag is WheelSpinHistoryStatus s && s != history.Status;
+
+            Grid? actionCell = row.Children.OfType<Grid>().FirstOrDefault(c => Grid.GetColumn(c) == 2);
+            if (actionCell == null) return;
+            bool pending = history.Status == WheelSpinHistoryStatus.Pending;
+            foreach (Button playBtn in actionCell.Children.OfType<Button>()) {
+                playBtn.IsVisible = pending;
+                playBtn.IsEnabled = pending && (playBtn.Tag?.ToString() != "MultiplierPlayBtn" || !_multiplierActive);
+            }
+        });
+    }
+
+    private void RaiseWheelDataChanged() {
+        if (_activeWheel == null) return;
+        WheelEvents.RaiseWheelDataChanged(_activeWheel, _spinsOwed);
+    }
+
+    private void OnSubathonDataUpdate(SubathonData data, DateTime _) {
+        _multiplierActive = data.Multiplier?.IsRunning() ?? false;
+
+        if (Interlocked.CompareExchange(ref _multiplierRefreshQueued, 1, 0) != 0) return;
+        Dispatcher.UIThread.Post(() => {
+            Interlocked.Exchange(ref _multiplierRefreshQueued, 0);
+            RefreshMultiplierButtons(_multiplierActive);
+        }, DispatcherPriority.Background);
+    }
+
+    private void RefreshMultiplierButtons(bool multiplierActive) {
+        foreach (Grid row in HistoryStack.Children.OfType<Grid>()) {
+            if (row.Tag is not WheelSpinHistory h) continue;
+            bool isPending = h.Status == WheelSpinHistoryStatus.Pending;
+            foreach (Grid cell in row.Children.OfType<Grid>())
+            foreach (Button btn in cell.Children.OfType<Button>())
+                if (btn.Tag?.ToString() == "MultiplierPlayBtn")
+                    btn.IsEnabled = isPending && !multiplierActive;
+        }
+    }
+
+    private async Task ExecuteHistoryAction(WheelSpinHistory h, Button playBtn) {
+        await Dispatcher.UIThread.InvokeAsync(() => {
+            playBtn.IsEnabled = false;
+            playBtn.IsVisible = false;
+        });
+
+        WheelSpinActionType? actionType = h.LinkedItem?.Action?.ActionType;
+        if (actionType == null) return;
+
+        ActionRunResult result = await ServiceManager.Actions.RunWheelSpinAsync(h.Id);
+        if (result == ActionRunResult.Skipped && !ServiceManager.Actions.IsRunning(h.Id))
+            await Dispatcher.UIThread.InvokeAsync(() => {
+                playBtn.IsVisible = h.Status == WheelSpinHistoryStatus.Pending;
+                playBtn.IsEnabled = playBtn.IsVisible;
+            });
+
+        if (actionType == WheelSpinActionType.SetMultiplier && result == ActionRunResult.Done) {
+            _multiplierActive = true;
+            await Dispatcher.UIThread.InvokeAsync(() => RefreshMultiplierButtons(true));
+        }
+    }
+
+    private void HistoryFilter_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        if (_activeWheel == null) return;
+        var selection =  (HistoryFilterBox.SelectedItem as ComboBoxItem)?.Tag?.ToString();
+        if (Enum.TryParse(selection ?? "", out WheelSpinHistoryStatus statusEnum))
+            _historyFilter = statusEnum;
+        else 
+            _historyFilter = null;
+        _ = LoadHistoryAsync();
+    }
+
+    private void HistoryScroller_ScrollChanged(object? sender, ScrollChangedEventArgs e) {
+        if (_historyLoading) return;
+        double scrollable = HistoryScroller.Extent.Height - HistoryScroller.Viewport.Height;
+        if (scrollable > 0 && scrollable - HistoryScroller.Offset.Y < 100)
+            _ = LoadHistoryAsync(true);
+    }
+
+    private async void ExportHistory_Click(object? sender, RoutedEventArgs e) {
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        List<WheelSpinHistory> histories = await db.WheelSpinHistories
+            .Include(h => h.LinkedWheel)
+            .Include(h => h.LinkedItem).ThenInclude(i => i!.Action)
+            .OrderByDescending(h => h.CreatedAt)
+            .AsNoTracking()
+            .ToListAsync();
+
+        string path = await CsvUtils.ExportAsync("wheel-history",
+            [[
+                "Id", "Wheel Id", "Wheel Name", "Item Id", "Item Text", "Action Type", "Parameter", "Status",
+                "Created At", "Updated At"
+            ]],
+            histories,
+            h => [
+                h.Id, h.WheelId, h.LinkedWheel?.Name, h.WheelItemId, h.LinkedItem?.Text,
+                h.LinkedItem?.Action?.ActionType.ToString() ?? "Manual", h.LinkedItem?.Action?.Parameter, h.Status,
+                h.CreatedAt, h.UpdatedAt
+            ]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
+    }
+
+    private async void DeleteAllSpinHistory_Click(object? sender, RoutedEventArgs e) {
+        if (_activeWheel == null) return;
+        Guid wheelId = _activeWheel.Id;
+
+        var dialog = new FAContentDialog {
+            Title = "Delete Spin History",
+            PrimaryButtonText = "Delete",
+            CloseButtonText = "Cancel",
+            Content = new TextBlock {
+                Text = $"Are you sure you want to delete all spin history for \"{_activeWheel.Name}\"?",
+                TextWrapping = TextWrapping.Wrap,
+                Width = 320,
+                Margin = new Thickness(4)
+            }
+        };
+
+        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        await db.WheelSpinHistories.Where(h => h.WheelId == wheelId).ExecuteDeleteAsync();
+
+        await Dispatcher.UIThread.InvokeAsync(async () => await LoadHistoryAsync());
+    }
+}
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.ImportExport.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.ImportExport.cs
new file mode 100644
index 0000000..1a6a5fe
--- /dev/null
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.ImportExport.cs
@@ -0,0 +1,135 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Platform.Storage;
+using FluentAvalonia.UI.Controls;
+using Microsoft.EntityFrameworkCore;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
+using SubathonManager.Data;
+using SubathonManager.UI.UiUtils;
+
+// ReSharper disable NullableWarningSuppressionIsUsed
+
+namespace SubathonManager.UI.Views.WheelSpin;
+
+public partial class WheelEditor {
+    
+    private async void ExportWheel_Click(object? sender, RoutedEventArgs e) {
+        if (_activeWheel == null) return;
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        WheelSet? wheel = await db.WheelSets
+            .Include(w => w.WheelItems).ThenInclude(i => i.Action)
+            .AsNoTracking()
+            .FirstOrDefaultAsync(w => w.Id == _activeWheel.Id);
+
+        if (wheel == null) return;
+
+        string path = await CsvUtils.ExportAsync(SafeFileName.Sanitize(wheel.Name, string.Empty, "wheel"),
+            [["Text", "Weight", "Quantity", "Infinite", "Enabled", "ActionType", "ActionParameter"]],
+            wheel.WheelItems.OrderBy(i => i.Index),
+            item => [
+                item.Text, item.Weight, item.Quantity, item.IsInfinite, item.Enabled,
+                item.Action?.ActionType ?? WheelSpinActionType.Manual, item.Action?.Parameter
+            ]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
+    }
+
+    private async void ImportWheel_Click(object? sender, RoutedEventArgs e) {
+        var top = TopLevel.GetTopLevel(this);
+        if (top == null) return;
+
+        IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
+            Title = "Import Wheel",
+            AllowMultiple = false,
+            FileTypeFilter = [new FilePickerFileType("CSV Files") { Patterns = ["*.csv"] }]
+        });
+        if (picked.Count == 0) return;
+        string filePath = picked[0].Path.LocalPath;
+
+        List<string[]>? lines = await CsvUtils.ReadFileAsync(filePath);
+        if (lines == null || lines.Count < 1 || lines[0].Length < 5) {
+            await ShowInvalidWheelCsvPopup();
+            return;
+        }
+
+        var items =
+            new List<(string Text, int Weight, int Qty, bool Infinite, bool Enabled, 
+                WheelSpinActionType ActionType, string ActionParam)>();
+
+        foreach (string[] cols in lines.Skip(1)) {
+            if (cols.Length < 5
+                || !int.TryParse(cols[1].Trim(), out int weight)
+                || !int.TryParse(cols[2].Trim(), out int qty)
+                || !bool.TryParse(cols[3].Trim(), out bool infinite)
+                || !bool.TryParse(cols[4].Trim(), out bool enabled)) {
+                await ShowInvalidWheelCsvPopup();
+                return;
+            }
+
+            string actionTypeStr = cols.Length > 5 ? cols[5].Trim() : "";
+            var actionType = WheelSpinActionType.Manual;
+            if (!string.IsNullOrEmpty(actionTypeStr) && !Enum.TryParse(actionTypeStr, out actionType)) {
+                await ShowInvalidWheelCsvPopup();
+                return;
+            }
+
+            string actionParam = cols.Length > 6 ? cols[6] : "";
+            items.Add((cols[0], weight, qty, infinite, enabled, actionType, actionParam));
+        }
+
+        string wheelName = Path.GetFileNameWithoutExtension(filePath);
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        foreach (WheelSet w in db.WheelSets)
+            w.IsActive = false;
+
+        var newWheel = new WheelSet { Name = wheelName, IsActive = true };
+        db.WheelSets.Add(newWheel);
+        await db.SaveChangesAsync();
+
+        for (var idx = 0; idx < items.Count; idx++) {
+            (string text, int weight, int qty, bool infinite, bool enabled, WheelSpinActionType actionType,
+                string actionParam) = items[idx];
+
+            var newItem = new WheelItem {
+                Text = text,
+                Weight = weight,
+                Quantity = qty,
+                IsInfinite = infinite,
+                Enabled = enabled,
+                Index = idx,
+                WheelId = newWheel.Id
+            };
+            db.WheelItems.Add(newItem);
+            await db.SaveChangesAsync();
+
+            db.WheelSpinActions.Add(new WheelSpinAction {
+                ActionType = actionType,
+                Parameter = actionParam,
+                WheelItemId = newItem.Id
+            });
+        }
+
+        await db.SaveChangesAsync();
+
+        LoadActiveWheel();
+    }
+
+    private static async Task ShowInvalidWheelCsvPopup() {
+        var dialog = new FAContentDialog {
+            Title = "Invalid CSV",
+            CloseButtonText = "OK",
+            Content = new TextBlock {
+                Text = "The selected file is not a valid wheel CSV and could not be imported",
+                TextWrapping = TextWrapping.Wrap,
+                Width = 300,
+                Margin = new Thickness(4)
+            }
+        };
+        await dialog.ShowAsync();
+    }
+}
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml b/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml
index 13b3fff..f523f55 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml
@@ -95,6 +95,7 @@
                                       SelectionChanged="HistoryFilter_SelectionChanged">
                                 <ComboBoxItem Content="All" Tag="All" FontSize="10" />
                                 <ComboBoxItem Content="Pending" Tag="Pending" FontSize="10" />
+                                <ComboBoxItem Content="Running" Tag="Running" FontSize="10" />
                                 <ComboBoxItem Content="Completed" Tag="Done" FontSize="10" />
                                 <ComboBoxItem Content="Cancelled" Tag="Cancelled" FontSize="10" />
                             </ComboBox>
@@ -344,6 +345,101 @@
                                                     <TextBlock x:Name="VtsHintText" FontSize="11" Foreground="Gray"
                                                                TextWrapping="Wrap" Margin="2,2,0,0" />
                                                 </StackPanel>
+
+                                                <StackPanel x:Name="ObsParamPanel" IsVisible="False">
+                                                    <Grid Margin="0,0,0,8" ColumnDefinitions="Auto,10,*">
+                                                        <StackPanel>
+                                                            <TextBlock Text="Target:" FontSize="12"
+                                                                       Margin="2,0,0,3" />
+                                                            <ComboBox x:Name="ObsKindBox" Height="36" Width="130"
+                                                                      SelectionChanged="ObsKind_SelectionChanged" />
+                                                        </StackPanel>
+                                                        <StackPanel Grid.Column="2" x:Name="ObsScopePanel">
+                                                            <TextBlock x:Name="ObsScopeLabel" Text="Scene:"
+                                                                       FontSize="12" Margin="2,0,0,3" />
+                                                            <AutoCompleteBox x:Name="ObsScopeBox" Height="36"
+                                                                             FilterMode="ContainsOrdinal"
+                                                                             MinimumPrefixLength="0" />
+                                                        </StackPanel>
+                                                    </Grid>
+
+                                                    <StackPanel Margin="0,0,0,8">
+                                                        <Grid ColumnDefinitions="*,Auto">
+                                                            <TextBlock x:Name="ObsTargetLabel" Text="Source:"
+                                                                       FontSize="12" Margin="2,0,0,3" />
+                                                            <TextBlock Grid.Column="1" x:Name="ObsConnectionHint"
+                                                                       FontSize="10" Margin="0,0,2,3"
+                                                                       VerticalAlignment="Bottom" Foreground="Gray" />
+                                                        </Grid>
+                                                        <Grid ColumnDefinitions="*,Auto">
+                                                            <AutoCompleteBox x:Name="ObsTargetBox" Height="36"
+                                                                             Margin="0,0,4,0"
+                                                                             FilterMode="ContainsOrdinal"
+                                                                             MinimumPrefixLength="0" />
+                                                            <Button Grid.Column="1" Height="36" Padding="8,2"
+                                                                    Click="ObsRefreshTargets_Click"
+                                                                    ToolTip.Tip="Reload the lists from OBS">
+                                                                <ctl:SymIcon Glyph="ArrowClockwise16" />
+                                                            </Button>
+                                                        </Grid>
+                                                    </StackPanel>
+
+                                                    <Grid Margin="0,0,0,8" ColumnDefinitions="Auto,10,Auto">
+                                                        <StackPanel>
+                                                            <TextBlock Text="When Rolled:" FontSize="12"
+                                                                       Margin="2,0,0,3" />
+                                                            <ComboBox x:Name="ObsOpBox" Height="36" Width="130"
+                                                                      SelectionChanged="ObsOp_SelectionChanged" />
+                                                        </StackPanel>
+                                                        <StackPanel Grid.Column="2">
+                                                            <TextBlock Text="Duration:" FontSize="12"
+                                                                       Margin="0,0,0,3" />
+                                                            <TextBox x:Name="ObsDurationBox" Height="36" Width="230"
+                                                                     PlaceholderText="e.g. 30s (blank = no revert)" />
+                                                        </StackPanel>
+                                                    </Grid>
+
+                                                    <StackPanel Margin="0,0,0,8">
+                                                        <TextBlock Text="After Timer:" FontSize="12"
+                                                                   Margin="2,0,0,3" />
+                                                        <ComboBox x:Name="ObsAfterBox" Height="36" Width="180"
+                                                                  SelectionChanged="ObsOp_SelectionChanged" />
+                                                    </StackPanel>
+
+                                                    <TextBlock x:Name="ObsHintText" FontSize="11" Foreground="Gray"
+                                                               TextWrapping="Wrap" Margin="2,2,0,0" />
+                                                </StackPanel>
+
+                                                <StackPanel x:Name="CustomParamPanel" IsVisible="False">
+                                                    <TextBlock Text="Custom Action:" FontSize="12" Margin="2,0,0,3" />
+                                                    <Grid ColumnDefinitions="*,Auto,Auto,Auto">
+                                                        <ComboBox x:Name="CustomActionBox" Height="36"
+                                                                  HorizontalAlignment="Stretch" Margin="0,0,4,0"
+                                                                  SelectionChanged="CustomAction_SelectionChanged" />
+                                                        <Button Grid.Column="1" Height="36" Padding="8,2"
+                                                                Margin="0,0,4,0" Click="EditCustomAction_Click"
+                                                                ToolTip.Tip="Open the selected action in the editor">
+                                                            <ctl:SymIcon Glyph="Edit16" />
+                                                        </Button>
+                                                        <Button Grid.Column="2" Height="36" Padding="8,2"
+                                                                Margin="0,0,4,0" Click="NewCustomAction_Click"
+                                                                ToolTip.Tip="Create a new custom action">
+                                                            <ctl:SymIcon Glyph="Add16" />
+                                                        </Button>
+                                                        <Button Grid.Column="3" Height="36" Padding="8,2"
+                                                                Click="ImportCustomAction_Click"
+                                                                ToolTip.Tip="Import a .sma file into the actions library">
+                                                            <ctl:SymIcon Glyph="ArrowDownload16" />
+                                                        </Button>
+                                                    </Grid>
+                                                    <TextBlock x:Name="CustomHintText" FontSize="11" Foreground="Gray"
+                                                               TextWrapping="Wrap" Margin="2,4,0,0" />
+                                                </StackPanel>
+
+                                                <Button x:Name="ConvertToCustomBtn" IsVisible="False" Margin="0,4,0,0"
+                                                        Content="Convert to Custom Action"
+                                                        Click="ConvertToCustom_Click"
+                                                        ToolTip.Tip="Copy this action into the node editor, where more actions can be chained" />
                                             </StackPanel>
                                         </StackPanel>
                                     </Border>
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml.cs
index 5bd018b..e2a20f6 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml.cs
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.axaml.cs
@@ -1,14 +1,10 @@
-using System.Globalization;
-using System.Text;
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
-using Avalonia.Platform.Storage;
 using Avalonia.Threading;
-using FluentAvalonia.UI.Controls;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -17,9 +13,7 @@
 using SubathonManager.Core.Events;
 using SubathonManager.Core.Interfaces;
 using SubathonManager.Core.Models;
-using SubathonManager.Core.Objects;
 using SubathonManager.Data;
-using SubathonManager.Integration;
 using SubathonManager.UI.Controls;
 using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
@@ -27,7 +21,6 @@
 // ReSharper disable NullableWarningSuppressionIsUsed
 
 namespace SubathonManager.UI.Views.WheelSpin;
-
 public partial class WheelEditor : UserControl {
     private const int HistoryPageSize = 10;
     private const int SpinCooldownMs = 6000;
@@ -60,6 +53,7 @@ public WheelEditor() {
         _logger = AppServices.Provider.GetRequiredService<ILogger<WheelEditor>>();
         InitializeComponent();
         PopulateActionTypeComboBox();
+        PopulateObsComboBoxes();
         if (FeatureFlags.VTubeStudioEnabled) PopulateVtsComboBoxes();
         LoadActiveWheel();
         LoadGlobalState();
@@ -75,6 +69,9 @@ public WheelEditor() {
             SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
             WheelEvents.OnSpinsOwedUpdateFromEvent += AdjustSpinsBoxByEvent;
             WheelEvents.WheelSpinStatusChanged += OnWheelSpinStatusChanged;
+            IntegrationEvents.ConnectionUpdated += OnObsConnectionUpdated;
+            ServiceManager.Actions.CustomActionsChanged += OnCustomActionsChanged;
+            PopulateCustomActionBox();
             if (FeatureFlags.VTubeStudioEnabled) {
                 ServiceManager.VTubeStudio.ModelDataChanged += OnVtsModelDataChanged;
                 IntegrationEvents.ConnectionUpdated += OnVtsConnectionUpdated;
@@ -85,6 +82,8 @@ public WheelEditor() {
             SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
             WheelEvents.OnSpinsOwedUpdateFromEvent -= AdjustSpinsBoxByEvent;
             WheelEvents.WheelSpinStatusChanged -= OnWheelSpinStatusChanged;
+            IntegrationEvents.ConnectionUpdated -= OnObsConnectionUpdated;
+            ServiceManager.Actions.CustomActionsChanged -= OnCustomActionsChanged;
             if (FeatureFlags.VTubeStudioEnabled) {
                 ServiceManager.VTubeStudio.ModelDataChanged -= OnVtsModelDataChanged;
                 IntegrationEvents.ConnectionUpdated -= OnVtsConnectionUpdated;
@@ -437,14 +436,7 @@ private Grid BuildItemRow(WheelItem item) {
         Grid.SetColumn(qtyElement, 3);
 
         string actionText = item.Action == null
-            ? "M"
-            : item.Action.ActionType switch {
-                WheelSpinActionType.AddTime => "+Time",
-                WheelSpinActionType.SubtractTime => "-Time",
-                WheelSpinActionType.SetMultiplier => "Mult",
-                WheelSpinActionType.Reroll => "Reroll",
-                _ => "M"
-            };
+            ? "M" : item.Action.ActionType.GetQuickLabel();
         var actionLabel = new TextBlock {
             Text = actionText,
             FontSize = 11,
@@ -452,9 +444,7 @@ private Grid BuildItemRow(WheelItem item) {
             HorizontalAlignment = HorizontalAlignment.Center,
             Foreground = item.Action != null ? Brushes.MediumSeaGreen : Brushes.Gray
         };
-        ToolTip.SetTip(actionLabel, item.Action != null
-            ? $"{item.Action.ActionType}: {item.Action.Parameter}"
-            : "No action");
+        ToolTip.SetTip(actionLabel, item.Action != null ? DescribeHistoryAction(item.Action) : "No action");
         Grid.SetColumn(actionLabel, 4);
 
         var deleteBtn = new Button {
@@ -482,7 +472,8 @@ private Grid BuildItemRow(WheelItem item) {
     private async void OnRowEnabledToggled(WheelItem item, CheckBox checkBox, bool enabled) {
         if (_suppressCount > 0) return;
 
-        if (enabled && !IsItemActionValid(item, out string err)) {
+        if (enabled && item.Action != null
+                    && !IsActionValid(item.Action.ActionType, item.Action.Parameter, out string err)) {
             SuppressChanges(() => checkBox.IsChecked = false);
             StatusText.Text = $"Cannot enable: {err}";
             return;
@@ -531,6 +522,13 @@ private void SelectItem(WheelItem item, Grid? clickedRow = null) {
                     case WheelSpinActionType.VTubeStudio:
                         ParseVtsParameter(item.Action!.Parameter);
                         break;
+                    case WheelSpinActionType.OBS:
+                        ParseObsParameter(item.Action!.Parameter);
+                        break;
+                    case WheelSpinActionType.CustomAction:
+                        PopulateCustomActionBox(Guid.TryParse(item.Action!.Parameter, out Guid customId)
+                            ? customId : null);
+                        break;
                     default:
                         ActionParameterBox.Text = item.Action!.Parameter;
                         break;
@@ -544,6 +542,7 @@ private void SelectItem(WheelItem item, Grid? clickedRow = null) {
                 MultiplierPointsCheck.IsChecked = false;
                 RerollCountBox.Text = "";
                 ResetVtsBoxes();
+                ResetObsBoxes();
             }
         });
 
@@ -573,67 +572,6 @@ private void ActionType_SelectionChanged(object? sender, SelectionChangedEventAr
         MarkPendingChanges();
     }
 
-    private void ShowActionPanelsFor(WheelSpinActionType type) {
-        bool isTime = type is WheelSpinActionType.AddTime or WheelSpinActionType.SubtractTime;
-        bool isMult = type == WheelSpinActionType.SetMultiplier;
-        bool isReroll = type == WheelSpinActionType.Reroll;
-        bool isVts = type == WheelSpinActionType.VTubeStudio && FeatureFlags.VTubeStudioEnabled;
-        TimeParamPanel.IsVisible = isTime;
-        MultiplierParamPanel.IsVisible = isMult;
-        RerollParamPanel.IsVisible = isReroll;
-        VtsParamPanel.IsVisible = isVts;
-        if (isTime) UpdateActionHint(type);
-        if (isVts) {
-            RefreshVtsKindDependentBoxes();
-            LoadVtsTargetSuggestions();
-        }
-    }
-
-    private void UpdateActionHint(WheelSpinActionType type) {
-        ActionHintText.Text = type switch {
-            WheelSpinActionType.AddTime => "Duration to add. e.g. \"5m\", \"300s\", \"1h30m\".",
-            WheelSpinActionType.SubtractTime => "Duration to subtract. e.g. \"5m\", \"300s\", \"1h30m\".",
-            _ => ""
-        };
-    }
-
-    private void ParseMultiplierParameter(string parameter) {
-        string[] parts = parameter.Split('|');
-        if (parts.Length < 4) return;
-        MultiplierAmountBox.Text = parts[0];
-        MultiplierDurationBox.Text = parts[1] == "xs" ? "" : parts[1];
-        MultiplierPointsCheck.IsChecked = parts[2].Equals("True", StringComparison.OrdinalIgnoreCase);
-        MultiplierTimeCheck.IsChecked = parts[3].Equals("True", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private string BuildMultiplierParameter() {
-        if (!double.TryParse(MultiplierAmountBox.Text,
-                NumberStyles.Float,
-                CultureInfo.InvariantCulture, out double amount))
-            amount = 1.0;
-        TimeSpan duration = Utils.ParseDurationString((MultiplierDurationBox.Text ?? "").Trim());
-        string durationStr = duration == TimeSpan.Zero ? "x" : ((int)duration.TotalSeconds).ToString();
-        bool applyPoints = MultiplierPointsCheck.IsChecked ?? false;
-        bool applyTime = MultiplierTimeCheck.IsChecked ?? false;
-        return $"{amount.ToString(CultureInfo.InvariantCulture)}|{durationStr}s|{applyPoints}|{applyTime}";
-    }
-
-    private void Multiplier_Changed(object? sender, RoutedEventArgs e) {
-        bool realChange = DirtySaveGuard.Consume(sender);
-        if (_suppressCount > 0 || !realChange) return;
-        MarkPendingChanges();
-    }
-
-    private void ParseRerollParameter(string parameter) {
-        string[] parts = parameter.Split('|');
-        RerollCountBox.Text = parts.Length >= 1 && int.TryParse(parts[0], out int c) && c >= 1 ? parts[0] : "1";
-    }
-
-    private string BuildRerollParameter() {
-        if (!int.TryParse((RerollCountBox.Text ?? "").Trim(), out int count) || count < 1) count = 1;
-        return count.ToString();
-    }
-
     private void ItemInfinite_Changed(object? sender, RoutedEventArgs e) {
         bool realChange = DirtySaveGuard.Consume(sender);
         if (_suppressCount > 0 || !realChange) return;
@@ -716,12 +654,7 @@ private async Task SaveAsync(object? sender, RoutedEventArgs? e) {
                 if (storedTypeIsHidden) isCommandAction = false;
 
                 if (isCommandAction) {
-                    string param = desiredActionType!.Value switch {
-                        WheelSpinActionType.SetMultiplier => BuildMultiplierParameter(),
-                        WheelSpinActionType.Reroll => BuildRerollParameter(),
-                        WheelSpinActionType.VTubeStudio => BuildVtsParameter(),
-                        _ => (ActionParameterBox.Text ?? "").Trim()
-                    };
+                    string param = BuildUiParameter(desiredActionType!.Value);
 
                     if (trackedItem.Action == null) {
                         db.WheelSpinActions.Add(new WheelSpinAction {
@@ -924,12 +857,11 @@ private async Task RunSingleSpinAsync() {
         }
 
         if (item != null) {
+            WheelSet wheel = _activeWheel;
             var histEntry = new WheelSpinHistory {
-                WheelId = _activeWheel.Id,
+                WheelId = wheel.Id,
                 WheelItemId = item.Id,
-                Status = item.Action?.ActionType.IsDoneImmediately() ?? false
-                    ? WheelSpinHistoryStatus.Done
-                    : WheelSpinHistoryStatus.Pending,
+                Status = WheelSpinHistoryStatus.Pending,
                 CreatedAt = DateTime.Now,
                 UpdatedAt = DateTime.Now
             };
@@ -937,34 +869,36 @@ private async Task RunSingleSpinAsync() {
             dbH.WheelSpinHistories.Add(histEntry);
             await dbH.SaveChangesAsync();
             histEntry.LinkedItem = item;
-            histEntry.LinkedWheel = _activeWheel;
-            await Dispatcher.UIThread.InvokeAsync(() => PrependHistoryRow(histEntry));
-            WheelEvents.RaiseWheelSpinResult(_activeWheel, item, histEntry, _spinsOwed);
-
-            if (item.Action is { ActionType: WheelSpinActionType.VTubeStudio } vtsAction
-                && WheelSpinActionType.VTubeStudio.IsAvailable())
-                await TryRunVtsActionAsync(histEntry, vtsAction);
-
-            if (item.Action?.ActionType.IsDoneImmediately() ?? false)
-                switch (item.Action.ActionType) {
-                    case WheelSpinActionType.AddTime:
-                    case WheelSpinActionType.SubtractTime: {
-                        TimeSpan duration = Utils.ParseDurationString(item.Action.Parameter);
-                        if (duration == TimeSpan.Zero) break;
-                        SubathonCommandType cmd = item.Action.ActionType.ToCommandType();
-                        SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
-                            Source = SubathonEventSource.WheelSpin,
-                            EventTimestamp = DateTime.Now,
-                            Command = cmd,
-                            EventType = SubathonEventType.Command,
-                            User = "WheelSpin",
-                            Value = $"{cmd} {item.Action.Parameter}",
-                            SecondsValue = duration.TotalSeconds,
-                            PointsValue = 0
+            histEntry.LinkedWheel = wheel;
+
+            async Task Announce(WheelSpinHistoryStatus status) {
+                histEntry.Status = status;
+                _spinsOwed = await StateValueHelper.GetAsync<int>(_factory, StateKeys.WheelSpinsOwed);
+                await Dispatcher.UIThread.InvokeAsync(() => PrependHistoryRow(histEntry));
+                WheelEvents.RaiseWheelSpinResult(wheel, item, histEntry, _spinsOwed);
+            }
+
+            if (item.Action?.ActionType.IsAutoRun() == true) {
+                var announced = new TaskCompletionSource();
+                _ = Task.Run(async () => {
+                    try {
+                        await ServiceManager.Actions.RunWheelSpinAsync(histEntry.Id, async status => {
+                            await Announce(status);
+                            announced.TrySetResult();
                         });
-                        break;
                     }
-                }
+                    catch (Exception ex) {
+                        _logger?.LogError(ex, "[WheelSpin] Running the action for \"{Item}\" failed", item.Text);
+                    }
+                    finally {
+                        announced.TrySetResult();
+                    }
+                });
+                await announced.Task;
+            }
+            else {
+                await Announce(histEntry.Status);
+            }
         }
 
         if (item is { IsInfinite: false }) {
@@ -979,12 +913,6 @@ private async Task RunSingleSpinAsync() {
             await Dispatcher.UIThread.InvokeAsync(LoadItemRows);
         }
 
-        if (item?.Action?.ActionType == WheelSpinActionType.Reroll)
-            if (int.TryParse(item.Action.Parameter, out int rerollCount) && rerollCount >= 1) {
-                _spinsOwed = await StateValueHelper.AddIntAsync(_factory, StateKeys.WheelSpinsOwed, rerollCount);
-                SuppressChanges(() => SpinsOwedBox.Text = _spinsOwed.ToString());
-            }
-
         RaiseWheelDataChanged();
     }
 
@@ -1027,7 +955,7 @@ private void AttachChangeHandlers() {
         foreach (TextBox? box in new[] {
                      ItemTextBox, ItemWeightBox, ItemQuantityBox, ActionParameterBox,
                      MultiplierAmountBox, MultiplierDurationBox, RerollCountBox,
-                     VtsValueBox, VtsDurationBox, VtsAfterValueBox
+                     VtsValueBox, VtsDurationBox, VtsAfterValueBox, ObsDurationBox
                  }) {
             box.TextChanged += OnFieldChanged;
             DirtySaveGuard.Rebase(box);
@@ -1039,6 +967,22 @@ private void AttachChangeHandlers() {
         };
         DirtySaveGuard.Rebase(VtsTargetBox);
 
+        ObsDurationBox.TextChanged += (_, _) => UpdateObsHint();
+        foreach (AutoCompleteBox box in new[] { ObsScopeBox, ObsTargetBox }) {
+            box.TextChanged += (s, _) => {
+                UpdateObsHint();
+                if (!DirtySaveGuard.Consume(s)) return;
+                MarkPendingChanges();
+            };
+            DirtySaveGuard.Rebase(box);
+        }
+
+        ObsScopeBox.LostFocus += (_, _) => _ = LoadObsSuggestionsAsync();
+        ObsScopeBox.SelectionChanged += (_, _) => _ = LoadObsSuggestionsAsync();
+        DirtySaveGuard.Rebase(ObsKindBox);
+        DirtySaveGuard.Rebase(ObsOpBox);
+        DirtySaveGuard.Rebase(ObsAfterBox);
+
         DirtySaveGuard.Rebase(ActionTypeBox);
         DirtySaveGuard.Rebase(VtsKindBox);
         DirtySaveGuard.Rebase(VtsToggleActionBox);
@@ -1054,1076 +998,10 @@ private void OnFieldChanged(object? sender, TextChangedEventArgs e) {
         MarkPendingChanges();
     }
 
-    private bool IsCurrentUiActionValid(out string error) {
-        if ((ActionTypeBox.SelectedItem as ComboBoxItem)?.Tag is not WheelSpinActionType selected
-            || !selected.HasAction()) {
-            error = "";
-            return true;
-        }
-
-        if (selected is WheelSpinActionType.AddTime or WheelSpinActionType.SubtractTime) {
-            string paramText = (ActionParameterBox.Text ?? "").Trim();
-            if (string.IsNullOrEmpty(paramText) || Utils.ParseDurationString(paramText) == TimeSpan.Zero) {
-                error = "Duration must be non-zero (e.g. 5m, 300s, 1h30m).";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        if (selected == WheelSpinActionType.Reroll) {
-            if (!int.TryParse((RerollCountBox.Text ?? "").Trim(), out int count) || count < 1) {
-                error = "Reroll count must be at least 1";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        if (selected == WheelSpinActionType.VTubeStudio) {
-            VTSWheelAction action = ReadVtsBoxes();
-            if (!action.IsValid(out string vtsError)) {
-                error = vtsError;
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        if (selected == WheelSpinActionType.SetMultiplier) {
-            if (!double.TryParse((MultiplierAmountBox.Text ?? "").Trim(),
-                    NumberStyles.Float,
-                    CultureInfo.InvariantCulture, out double amt) || amt == 0) {
-                error = "Multiplier amount must be a non-zero number";
-                return false;
-            }
-
-            string durText = (MultiplierDurationBox.Text ?? "").Trim();
-            if (string.IsNullOrEmpty(durText) || Utils.ParseDurationString(durText) == TimeSpan.Zero) {
-                error = "Multiplier duration is required and must be non-zero (e.g. 30m or 1h)";
-                return false;
-            }
-
-            if (!(MultiplierTimeCheck.IsChecked ?? false) && !(MultiplierPointsCheck.IsChecked ?? false)) {
-                error = "At least one of Time or Points must be selected";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        error = "";
-        return true;
-    }
-
-    private static bool IsItemActionValid(WheelItem item, out string error) {
-        if (item.Action == null) {
-            error = "";
-            return true;
-        }
-
-        WheelSpinActionType type = item.Action.ActionType;
-        string param = item.Action.Parameter;
-
-        if (type is WheelSpinActionType.AddTime or WheelSpinActionType.SubtractTime) {
-            if (string.IsNullOrEmpty(param) || Utils.ParseDurationString(param) == TimeSpan.Zero) {
-                error = "Time parameter must be a non-zero duration";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        if (type == WheelSpinActionType.Reroll) {
-            string[] parts = param.Split('|');
-            if (parts.Length < 1 || !int.TryParse(parts[0], out int count) || count < 1) {
-                error = "Reroll count must be at least 1";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        if (type == WheelSpinActionType.VTubeStudio) {
-            if (!VTSWheelAction.TryParse(param, out VTSWheelAction? vtsAction)) {
-                error = "VTube Studio action parameters are incomplete";
-                return false;
-            }
-
-            return vtsAction.IsValid(out error);
-        }
-
-        if (type == WheelSpinActionType.SetMultiplier) {
-            string[] parts = param.Split('|');
-            if (parts.Length < 4) {
-                error = "Multiplier parameters are incomplete";
-                return false;
-            }
-
-            if (!double.TryParse(parts[0], NumberStyles.Float,
-                    CultureInfo.InvariantCulture, out double amt) || amt == 0) {
-                error = "Multiplier amount is missing or zero";
-                return false;
-            }
-
-            string durStr = parts[1].EndsWith("s") ? parts[1][..^1] : parts[1];
-            if (parts[1] == "xs" || string.IsNullOrEmpty(durStr) || !int.TryParse(durStr, out int ds) || ds <= 0) {
-                error = "Multiplier duration is required and must be non-zero";
-                return false;
-            }
-
-            bool applyPoints = parts[2].Equals("True", StringComparison.OrdinalIgnoreCase);
-            bool applyTime = parts[3].Equals("True", StringComparison.OrdinalIgnoreCase);
-            if (!applyPoints && !applyTime) {
-                error = "At least one of Time or Points must be selected";
-                return false;
-            }
-
-            error = "";
-            return true;
-        }
-
-        error = "";
-        return true;
-    }
-
     private void UpdateRowEnabledCheckbox(Guid itemId, bool enabled) {
         Grid? row = ItemsStack.Children.OfType<Grid>()
             .FirstOrDefault(g => g.Tag is WheelItem wi && wi.Id == itemId);
         CheckBox? cb = row?.Children.OfType<CheckBox>().FirstOrDefault();
         if (cb != null) SuppressChanges(() => cb.IsChecked = enabled);
     }
-
-    private async Task LoadHistoryAsync(bool append = false) {
-        if (_historyLoading) return;
-        _historyLoading = true;
-        try {
-            if (!append) {
-                _historyOffset = 0;
-                await Dispatcher.UIThread.InvokeAsync(() => HistoryStack.Children.Clear());
-            }
-
-            if (_activeWheel == null) return;
-
-            await using AppDbContext db = await _factory.CreateDbContextAsync();
-            List<WheelSpinHistory> entries = await db.WheelSpinHistories
-                .Include(h => h.LinkedItem).ThenInclude(i => i!.Action)
-                .Where(h => h.WheelId == _activeWheel.Id
-                            && (_historyFilter == null || h.Status == _historyFilter))
-                .OrderByDescending(h => h.CreatedAt)
-                .Skip(_historyOffset)
-                .Take(HistoryPageSize)
-                .AsNoTracking()
-                .ToListAsync();
-
-            _historyOffset += entries.Count;
-
-            await Dispatcher.UIThread.InvokeAsync(() => {
-                foreach (WheelSpinHistory entry in entries)
-                    HistoryStack.Children.Add(BuildHistoryRow(entry));
-            });
-        }
-        finally {
-            _historyLoading = false;
-        }
-    }
-
-    private void PrependHistoryRow(WheelSpinHistory h) {
-        _historyOffset++;
-        HistoryStack.Children.Insert(0, BuildHistoryRow(h));
-    }
-
-    private Grid BuildHistoryRow(WheelSpinHistory h) {
-        var row = new Grid {
-            Margin = new Thickness(2, 1, 2, 1),
-            MinHeight = 26,
-            Tag = h,
-            ColumnDefinitions = new ColumnDefinitions("78,1.7*,*,70,80")
-        };
-
-        var tsLabel = new TextBlock {
-            Text = h.CreatedAt.ToString("MM/dd HH:mm"),
-            FontSize = 10,
-            Foreground = Brushes.Gray,
-            VerticalAlignment = VerticalAlignment.Center
-        };
-        ToolTip.SetTip(tsLabel, h.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss"));
-
-        var itemLabel = new TextBlock {
-            Text = h.LinkedItem?.Text ?? "(deleted)",
-            FontSize = 11,
-            VerticalAlignment = VerticalAlignment.Center,
-            TextTrimming = TextTrimming.CharacterEllipsis,
-            Margin = new Thickness(4, 0, 4, 0)
-        };
-        ToolTip.SetTip(itemLabel, h.LinkedItem?.Text);
-
-        var statusLabel = new TextBlock {
-            Text = h.Status.ToString(),
-            FontSize = 10,
-            FontWeight = FontWeight.SemiBold,
-            Foreground = HistoryStatusBrush(h.Status),
-            VerticalAlignment = VerticalAlignment.Center,
-            HorizontalAlignment = HorizontalAlignment.Center
-        };
-
-        var hoverBtns = new StackPanel {
-            Orientation = Orientation.Horizontal,
-            VerticalAlignment = VerticalAlignment.Center,
-            HorizontalAlignment = HorizontalAlignment.Right,
-            Margin = new Thickness(0, 0, 12, 0)
-        };
-
-        void AddBtn(WheelSpinHistoryStatus target, string glyph, string tip) {
-            var btn = new Button {
-                Content = new SymIcon { Glyph = glyph },
-                Width = 22, Height = 22,
-                Padding = new Thickness(1),
-                Margin = new Thickness(1, 0, 0, 0),
-                IsEnabled = h.Status != target,
-                Tag = target
-            };
-            ToolTip.SetTip(btn, tip);
-            btn.Click += async (_, _) => await SetHistoryStatus(h, target);
-            hoverBtns.Children.Add(btn);
-        }
-
-        AddBtn(WheelSpinHistoryStatus.Done, "Checkmark16", "Mark Done");
-        AddBtn(WheelSpinHistoryStatus.Pending, "Clock16", "Mark Pending");
-        AddBtn(WheelSpinHistoryStatus.Cancelled, "Dismiss16", "Mark Cancelled");
-
-        WheelSpinActionType? actionType = h.LinkedItem?.Action?.ActionType;
-        bool hasPlayBtn = h.Status == WheelSpinHistoryStatus.Pending
-                          && actionType.HasValue && actionType.Value.HasPlayAction();
-
-        string actionStr = DescribeHistoryAction(h.LinkedItem?.Action);
-
-        var actionCell = new Grid {
-            Margin = new Thickness(4, 0, 2, 0),
-            ColumnDefinitions = hasPlayBtn ? new ColumnDefinitions("*,Auto") : new ColumnDefinitions("*")
-        };
-
-        var actionLabel = new TextBlock {
-            Text = actionStr,
-            FontSize = 10,
-            Foreground = Brushes.Gray,
-            VerticalAlignment = VerticalAlignment.Center,
-            TextTrimming = TextTrimming.CharacterEllipsis
-        };
-        ToolTip.SetTip(actionLabel, actionStr);
-
-        Grid.SetColumn(actionLabel, 0);
-        actionCell.Children.Add(actionLabel);
-
-        if (hasPlayBtn) {
-            bool isMultiplier = actionType == WheelSpinActionType.SetMultiplier;
-            bool isVts = actionType == WheelSpinActionType.VTubeStudio;
-            var playBtn = new Button {
-                Content = new SymIcon { Glyph = "Play16" },
-                Width = 20, Height = 20,
-                Padding = new Thickness(1),
-                Margin = new Thickness(3, 0, 0, 0),
-                IsEnabled = !isMultiplier || !_multiplierActive,
-                Tag = isMultiplier ? "MultiplierPlayBtn" : null
-            };
-            ToolTip.SetTip(playBtn, isMultiplier
-                ? "Apply multiplier (disabled while one is active)"
-                : isVts
-                    ? "Run the VTube Studio action (needs VTube Studio connected)"
-                    : "Apply command");
-            playBtn.Click += async (_, _) => await ExecuteHistoryAction(h, playBtn);
-            Grid.SetColumn(playBtn, 1);
-            actionCell.Children.Add(playBtn);
-        }
-
-        Grid.SetColumn(tsLabel, 0);
-        Grid.SetColumn(itemLabel, 1);
-        Grid.SetColumn(actionCell, 2);
-        Grid.SetColumn(statusLabel, 3);
-        Grid.SetColumn(hoverBtns, 4);
-
-        row.Children.Add(tsLabel);
-        row.Children.Add(itemLabel);
-        row.Children.Add(actionCell);
-        row.Children.Add(statusLabel);
-        row.Children.Add(hoverBtns);
-
-        return row;
-    }
-
-    private static IBrush HistoryStatusBrush(WheelSpinHistoryStatus status) {
-        return status switch {
-            WheelSpinHistoryStatus.Done => Brushes.MediumSeaGreen,
-            WheelSpinHistoryStatus.Pending => Brushes.CornflowerBlue,
-            WheelSpinHistoryStatus.Cancelled => Brushes.IndianRed,
-            _ => Brushes.Gray
-        };
-    }
-
-    private async Task SetHistoryStatus(WheelSpinHistory h, WheelSpinHistoryStatus newStatus) {
-        h.Status = newStatus;
-        h.UpdatedAt = DateTime.Now;
-
-        await using AppDbContext db = await _factory.CreateDbContextAsync();
-        WheelSpinHistory? tracked = await db.WheelSpinHistories.FindAsync(h.Id);
-        if (tracked == null) return;
-        tracked.Status = newStatus;
-        tracked.UpdatedAt = h.UpdatedAt;
-        await db.SaveChangesAsync();
-
-        h.LinkedWheel ??= _activeWheel;
-        WheelEvents.RaiseWheelSpinStatusChanged(h, _spinsOwed);
-    }
-
-    private void OnWheelSpinStatusChanged(WheelSpinHistory history, int spinsOwed) {
-        Dispatcher.UIThread.Post(() => {
-            Grid? row = HistoryStack.Children.OfType<Grid>()
-                .FirstOrDefault(g => g.Tag is WheelSpinHistory h && h.Id == history.Id);
-            if (row == null) return;
-
-            if (row.Tag is WheelSpinHistory rowHistory)
-                rowHistory.Status = history.Status;
-
-            TextBlock? statusLabel = row.Children.OfType<TextBlock>()
-                .FirstOrDefault(c => Grid.GetColumn(c) == 3);
-            StackPanel? hoverBtns = row.Children.OfType<StackPanel>()
-                .FirstOrDefault(c => Grid.GetColumn(c) == 4);
-
-            if (statusLabel != null) {
-                statusLabel.Text = history.Status.ToString();
-                statusLabel.Foreground = HistoryStatusBrush(history.Status);
-            }
-
-            if (hoverBtns != null)
-                foreach (Button btn in hoverBtns.Children.OfType<Button>())
-                    btn.IsEnabled = btn.Tag is WheelSpinHistoryStatus s && s != history.Status;
-
-            Grid? actionCell = row.Children.OfType<Grid>().FirstOrDefault(c => Grid.GetColumn(c) == 2);
-            if (actionCell == null) return;
-            foreach (Button playBtn in actionCell.Children.OfType<Button>())
-                playBtn.IsVisible = history.Status == WheelSpinHistoryStatus.Pending;
-        });
-    }
-
-    private void RaiseWheelDataChanged() {
-        if (_activeWheel == null) return;
-        WheelEvents.RaiseWheelDataChanged(_activeWheel, _spinsOwed);
-    }
-
-    private void OnSubathonDataUpdate(SubathonData data, DateTime _) {
-        _multiplierActive = data.Multiplier?.IsRunning() ?? false;
-
-        if (Interlocked.CompareExchange(ref _multiplierRefreshQueued, 1, 0) != 0) return;
-        Dispatcher.UIThread.Post(() => {
-            Interlocked.Exchange(ref _multiplierRefreshQueued, 0);
-            RefreshMultiplierButtons(_multiplierActive);
-        }, DispatcherPriority.Background);
-    }
-
-    private void RefreshMultiplierButtons(bool multiplierActive) {
-        foreach (Grid row in HistoryStack.Children.OfType<Grid>()) {
-            if (row.Tag is not WheelSpinHistory h) continue;
-            bool isPending = h.Status == WheelSpinHistoryStatus.Pending;
-            foreach (Grid cell in row.Children.OfType<Grid>())
-            foreach (Button btn in cell.Children.OfType<Button>())
-                if (btn.Tag?.ToString() == "MultiplierPlayBtn")
-                    btn.IsEnabled = isPending && !multiplierActive;
-        }
-    }
-
-    private async Task ExecuteHistoryAction(WheelSpinHistory h, Button playBtn) {
-        await Dispatcher.UIThread.InvokeAsync(() => {
-            playBtn.IsEnabled = false;
-            playBtn.IsVisible = false;
-        });
-
-        WheelSpinAction? action = h.LinkedItem?.Action;
-        if (action == null) return;
-
-        switch (action.ActionType) {
-            case WheelSpinActionType.AddTime:
-            case WheelSpinActionType.SubtractTime: {
-                TimeSpan duration = Utils.ParseDurationString(action.Parameter);
-                if (duration == TimeSpan.Zero) return;
-                SubathonCommandType cmd = action.ActionType.ToCommandType();
-                SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
-                    Source = SubathonEventSource.WheelSpin,
-                    EventTimestamp = DateTime.Now,
-                    Command = cmd,
-                    EventType = SubathonEventType.Command,
-                    User = "WheelSpin",
-                    Value = $"{cmd} {action.Parameter}",
-                    SecondsValue = duration.TotalSeconds,
-                    PointsValue = 0
-                });
-                break;
-            }
-            case WheelSpinActionType.SetMultiplier: {
-                SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
-                    Source = SubathonEventSource.WheelSpin,
-                    EventTimestamp = DateTime.Now,
-                    Command = SubathonCommandType.SetMultiplier,
-                    EventType = SubathonEventType.Command,
-                    User = "WheelSpin",
-                    Value = action.Parameter
-                });
-
-                _multiplierActive = true;
-                await Dispatcher.UIThread.InvokeAsync(() => RefreshMultiplierButtons(true));
-                break;
-            }
-            case WheelSpinActionType.VTubeStudio: {
-                bool ran = await TryRunVtsActionAsync(h, action);
-                if (!ran)
-                    await Dispatcher.UIThread.InvokeAsync(() => {
-                        playBtn.IsVisible = true;
-                        playBtn.IsEnabled = true;
-                    });
-                return;
-            }
-        }
-
-        if (h.Status != WheelSpinHistoryStatus.Done)
-            await SetHistoryStatus(h, WheelSpinHistoryStatus.Done);
-    }
-
-    private void HistoryFilter_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
-        if (_activeWheel == null) return;
-        _historyFilter = (HistoryFilterBox.SelectedItem as ComboBoxItem)?.Tag?.ToString() switch {
-            "Pending" => WheelSpinHistoryStatus.Pending,
-            "Done" => WheelSpinHistoryStatus.Done,
-            "Cancelled" => WheelSpinHistoryStatus.Cancelled,
-            _ => null
-        };
-        _ = LoadHistoryAsync();
-    }
-
-    private void HistoryScroller_ScrollChanged(object? sender, ScrollChangedEventArgs e) {
-        if (_historyLoading) return;
-        double scrollable = HistoryScroller.Extent.Height - HistoryScroller.Viewport.Height;
-        if (scrollable > 0 && scrollable - HistoryScroller.Offset.Y < 100)
-            _ = LoadHistoryAsync(true);
-    }
-
-    private async void ExportHistory_Click(object? sender, RoutedEventArgs e) {
-        await using AppDbContext db = await _factory.CreateDbContextAsync();
-        List<WheelSpinHistory> histories = await db.WheelSpinHistories
-            .Include(h => h.LinkedWheel)
-            .Include(h => h.LinkedItem).ThenInclude(i => i!.Action)
-            .OrderByDescending(h => h.CreatedAt)
-            .AsNoTracking()
-            .ToListAsync();
-
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-        string filepath = Path.Combine(exportDir, $"wheel-history-{DateTime.Now:yyyyMMdd-HHmmss}.csv");
-
-        var sb = new StringBuilder();
-        sb.AppendLine("Id,Wheel Id,Wheel Name,Item Id,Item Text,Action Type,Parameter,Status,Created At,Updated At");
-        foreach (WheelSpinHistory h in histories)
-            sb.AppendLine(string.Join(",",
-                h.Id,
-                h.WheelId,
-                Utils.EscapeCsv(h.LinkedWheel?.Name ?? ""),
-                h.WheelItemId,
-                Utils.EscapeCsv(h.LinkedItem?.Text ?? ""),
-                Utils.EscapeCsv(h.LinkedItem?.Action?.ActionType.ToString() ?? "Manual"),
-                Utils.EscapeCsv(h.LinkedItem?.Action?.Parameter ?? ""),
-                Utils.EscapeCsv(h.Status.ToString()),
-                h.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss"),
-                h.UpdatedAt.ToString("yyyy-MM-dd HH:mm:ss")));
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
-    }
-
-    private async void DeleteAllSpinHistory_Click(object? sender, RoutedEventArgs e) {
-        if (_activeWheel == null) return;
-        Guid wheelId = _activeWheel.Id;
-
-        var dialog = new FAContentDialog {
-            Title = "Delete Spin History",
-            PrimaryButtonText = "Delete",
-            CloseButtonText = "Cancel",
-            Content = new TextBlock {
-                Text = $"Are you sure you want to delete all spin history for \"{_activeWheel.Name}\"?",
-                TextWrapping = TextWrapping.Wrap,
-                Width = 320,
-                Margin = new Thickness(4)
-            }
-        };
-
-        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
-
-        await using AppDbContext db = await _factory.CreateDbContextAsync();
-        await db.WheelSpinHistories.Where(h => h.WheelId == wheelId).ExecuteDeleteAsync();
-
-        await Dispatcher.UIThread.InvokeAsync(async () => await LoadHistoryAsync());
-    }
-
-    private async void ExportWheel_Click(object? sender, RoutedEventArgs e) {
-        if (_activeWheel == null) return;
-
-        await using AppDbContext db = await _factory.CreateDbContextAsync();
-        WheelSet? wheel = await db.WheelSets
-            .Include(w => w.WheelItems).ThenInclude(i => i.Action)
-            .AsNoTracking()
-            .FirstOrDefaultAsync(w => w.Id == _activeWheel.Id);
-        if (wheel == null) return;
-
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-
-        string safeName = SafeFileName.Sanitize(wheel.Name, string.Empty, "wheel");
-        var timestamp = DateTime.Now.ToString("yyyyMMdd-HHmmss");
-        string filepath = Path.Combine(exportDir, $"{safeName}-{timestamp}.csv");
-
-        var sb = new StringBuilder();
-        sb.AppendLine("Text,Weight,Quantity,Infinite,Enabled,ActionType,ActionParameter");
-        foreach (WheelItem item in wheel.WheelItems.OrderBy(i => i.Index))
-            sb.AppendLine(string.Join(",",
-                Utils.EscapeCsv(item.Text),
-                item.Weight,
-                item.Quantity,
-                item.IsInfinite,
-                item.Enabled,
-                item.Action?.ActionType.ToString() ?? $"{WheelSpinActionType.Manual}",
-                Utils.EscapeCsv(item.Action?.Parameter ?? "")));
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
-    }
-
-    private async void ImportWheel_Click(object? sender, RoutedEventArgs e) {
-        var top = TopLevel.GetTopLevel(this);
-        if (top == null) return;
-
-        IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
-            Title = "Import Wheel",
-            AllowMultiple = false,
-            FileTypeFilter = new[] { new FilePickerFileType("CSV Files") { Patterns = new[] { "*.csv" } } }
-        });
-        if (picked.Count == 0) return;
-        string filePath = picked[0].Path.LocalPath;
-
-        string[] lines;
-        try {
-            lines = await File.ReadAllLinesAsync(filePath, Encoding.UTF8);
-        }
-        catch {
-            await ShowInvalidWheelCsvPopup();
-            return;
-        }
-
-        if (lines.Length < 1) {
-            await ShowInvalidWheelCsvPopup();
-            return;
-        }
-
-        string[] headerCols = ParseWheelCsvLine(lines[0]);
-        if (headerCols.Length < 5) {
-            await ShowInvalidWheelCsvPopup();
-            return;
-        }
-
-        var items =
-            new List<(string Text, int Weight, int Qty, bool Infinite, bool Enabled, WheelSpinActionType ActionType,
-                string ActionParam)>();
-        for (var i = 1; i < lines.Length; i++) {
-            if (string.IsNullOrWhiteSpace(lines[i])) continue;
-            string[] cols = ParseWheelCsvLine(lines[i]);
-            if (cols.Length < 5
-                || !int.TryParse(cols[1].Trim(), out int weight)
-                || !int.TryParse(cols[2].Trim(), out int qty)
-                || !bool.TryParse(cols[3].Trim(), out bool infinite)
-                || !bool.TryParse(cols[4].Trim(), out bool enabled)) {
-                await ShowInvalidWheelCsvPopup();
-                return;
-            }
-
-            string actionTypeStr = cols.Length > 5 ? cols[5].Trim() : "";
-            var actionType = WheelSpinActionType.Manual;
-            if (!string.IsNullOrEmpty(actionTypeStr) && !Enum.TryParse(actionTypeStr, out actionType)) {
-                await ShowInvalidWheelCsvPopup();
-                return;
-            }
-
-            string actionParam = cols.Length > 6 ? cols[6] : "";
-            items.Add((cols[0], weight, qty, infinite, enabled, actionType, actionParam));
-        }
-
-        string wheelName = Path.GetFileNameWithoutExtension(filePath);
-
-        await using AppDbContext db = await _factory.CreateDbContextAsync();
-        foreach (WheelSet w in db.WheelSets)
-            w.IsActive = false;
-
-        var newWheel = new WheelSet { Name = wheelName, IsActive = true };
-        db.WheelSets.Add(newWheel);
-        await db.SaveChangesAsync();
-
-        for (var idx = 0; idx < items.Count; idx++) {
-            (string text, int weight, int qty, bool infinite, bool enabled, WheelSpinActionType actionType,
-                string actionParam) = items[idx];
-            var newItem = new WheelItem {
-                Text = text,
-                Weight = weight,
-                Quantity = qty,
-                IsInfinite = infinite,
-                Enabled = enabled,
-                Index = idx,
-                WheelId = newWheel.Id
-            };
-            db.WheelItems.Add(newItem);
-            await db.SaveChangesAsync();
-
-            db.WheelSpinActions.Add(new WheelSpinAction {
-                ActionType = actionType,
-                Parameter = actionParam,
-                WheelItemId = newItem.Id
-            });
-        }
-
-        await db.SaveChangesAsync();
-
-        LoadActiveWheel();
-    }
-
-    private static string[] ParseWheelCsvLine(string line) {
-        var result = new List<string>();
-        var field = new StringBuilder();
-        var inQuotes = false;
-
-        for (var i = 0; i < line.Length; i++) {
-            char c = line[i];
-            if (inQuotes)
-                switch (c) {
-                    case '"' when i + 1 < line.Length && line[i + 1] == '"':
-                        field.Append('"');
-                        i++;
-                        break;
-                    case '"':
-                        inQuotes = false;
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-            else
-                switch (c) {
-                    case '"':
-                        inQuotes = true;
-                        break;
-                    case ',':
-                        result.Add(field.ToString());
-                        field.Clear();
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-        }
-
-        result.Add(field.ToString());
-        return result.ToArray();
-    }
-
-    private static async Task ShowInvalidWheelCsvPopup() {
-        var dialog = new FAContentDialog {
-            Title = "Invalid CSV",
-            CloseButtonText = "OK",
-            Content = new TextBlock {
-                Text = "The selected file is not a valid wheel CSV and could not be imported.",
-                TextWrapping = TextWrapping.Wrap,
-                Width = 300,
-                Margin = new Thickness(4)
-            }
-        };
-        await dialog.ShowAsync();
-    }
-
-    // VTS stuff, maybe move out?
-    private void PopulateVtsComboBoxes() {
-        VtsKindBox.Items.Clear();
-        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Expression", Tag = VtsTargetKind.Expression });
-        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Parameter", Tag = VtsTargetKind.Parameter });
-        VtsKindBox.Items.Add(new ComboBoxItem { Content = "Hotkey", Tag = VtsTargetKind.Hotkey });
-        VtsKindBox.SelectedIndex = 0;
-
-        VtsToggleActionBox.Items.Clear();
-        foreach (VtsToggleAction a in new[] { VtsToggleAction.On, VtsToggleAction.Off, VtsToggleAction.Toggle })
-            VtsToggleActionBox.Items.Add(new ComboBoxItem { Content = a.ToString(), Tag = a });
-        VtsToggleActionBox.SelectedIndex = 0;
-
-        RefreshVtsKindDependentBoxes();
-    }
-
-    private void VtsKind_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
-        bool realChange = DirtySaveGuard.Consume(sender);
-        RefreshVtsKindDependentBoxes();
-        LoadVtsTargetSuggestions();
-        if (_suppressCount > 0 || !realChange) return;
-        MarkPendingChanges();
-    }
-
-    private void VtsAfter_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
-        bool realChange = DirtySaveGuard.Consume(sender);
-        RefreshVtsAfterValueVisibility();
-        UpdateVtsHint();
-        if (_suppressCount > 0 || !realChange) return;
-        MarkPendingChanges();
-    }
-
-    private void RefreshVtsKindDependentBoxes() {
-        VtsTargetKind kind = SelectedVtsKind;
-
-        SuppressChanges(() => {
-            VtsToggleActionPanel.IsVisible = kind == VtsTargetKind.Expression;
-            VtsValuePanel.IsVisible = kind == VtsTargetKind.Parameter;
-
-            object? previous = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag;
-            VtsAfterBox.Items.Clear();
-
-            switch (kind) {
-                case VtsTargetKind.Expression:
-                    foreach (VtsToggleAction a in Enum.GetValues<VtsToggleAction>())
-                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
-                    break;
-                case VtsTargetKind.Parameter:
-                    foreach (VtsParameterAfterAction a in Enum.GetValues<VtsParameterAfterAction>())
-                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
-                    break;
-                case VtsTargetKind.Hotkey:
-                    foreach (VtsHotkeyAfterAction a in Enum.GetValues<VtsHotkeyAfterAction>())
-                        VtsAfterBox.Items.Add(new ComboBoxItem { Content = LabelFor(a), Tag = a });
-                    break;
-            }
-
-            ComboBoxItem? restored = VtsAfterBox.Items.OfType<ComboBoxItem>()
-                .FirstOrDefault(i => Equals(i.Tag, previous));
-            VtsAfterBox.SelectedItem = restored ?? VtsAfterBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
-
-            VtsTargetBox.PlaceholderText = kind switch {
-                VtsTargetKind.Expression => "e.g. cat_ears.exp3.json",
-                VtsTargetKind.Parameter => "e.g. EyeOpenRight or custom parameter",
-                _ => "hotkey name or id"
-            };
-        });
-
-        RefreshVtsAfterValueVisibility();
-        UpdateVtsHint();
-    }
-
-    private void RefreshVtsAfterValueVisibility() {
-        VtsAfterValuePanel.IsVisible = SelectedVtsKind == VtsTargetKind.Parameter
-                                       && (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag
-                                       as VtsParameterAfterAction? == VtsParameterAfterAction.SetNewValue;
-    }
-
-    private static string LabelFor(VtsToggleAction action) {
-        return action switch {
-            VtsToggleAction.DoNothing => "Do Nothing",
-            _ => action.ToString()
-        };
-    }
-
-    private static string LabelFor(VtsParameterAfterAction action) {
-        return action switch {
-            VtsParameterAfterAction.DoNothing => "Do Nothing / Release",
-            VtsParameterAfterAction.ResetToOriginal => "Reset to Original",
-            VtsParameterAfterAction.SetNewValue => "Change to New Value",
-            _ => action.ToString()
-        };
-    }
-
-    private static string LabelFor(VtsHotkeyAfterAction action) {
-        return action switch {
-            VtsHotkeyAfterAction.DoNothing => "Do Nothing",
-            VtsHotkeyAfterAction.TriggerAgain => "Trigger Again",
-            _ => action.ToString()
-        };
-    }
-
-    private void LoadVtsTargetSuggestions() {
-        VTSService vts = ServiceManager.VTubeStudio;
-        VtsTargetKind kind = SelectedVtsKind;
-
-        if (!vts.Connected) {
-            VtsTargetBox.ItemsSource = null;
-            VtsConnectionHint.Text = "VTube Studio not connected - type the value by hand";
-            return;
-        }
-
-        List<string> suggestions = kind switch {
-            VtsTargetKind.Expression => vts.CachedExpressions.Select(e => e.File).ToList(),
-            VtsTargetKind.Parameter => vts.CachedParameters.Select(pa => pa.Name).ToList(),
-            VtsTargetKind.Hotkey => BuildHotkeySuggestions(vts.CachedHotkeys),
-            _ => []
-        };
-
-        VtsTargetBox.ItemsSource = suggestions;
-        VtsConnectionHint.Text = suggestions.Count > 0
-            ? $"{suggestions.Count} available on \"{vts.CurrentModelName ?? "current model"}\""
-            : "Nothing found on current model";
-    }
-
-    private List<string> BuildHotkeySuggestions(IReadOnlyList<VtsHotkey> hotkeys) {
-        _vtsHotkeyIdsByDisplay.Clear();
-
-        HashSet<string> duplicates = hotkeys
-            .GroupBy(h => h.Name, StringComparer.OrdinalIgnoreCase)
-            .Where(g => g.Count() > 1)
-            .Select(g => g.Key)
-            .ToHashSet(StringComparer.OrdinalIgnoreCase);
-
-        var display = new List<string>(hotkeys.Count);
-        foreach (VtsHotkey hotkey in hotkeys) {
-            string name = string.IsNullOrWhiteSpace(hotkey.Name) ? hotkey.Id : hotkey.Name;
-            string label = duplicates.Contains(name) && hotkey.Id.Length >= 6
-                ? $"{name} ({hotkey.Id[^6..]})"
-                : name;
-            _vtsHotkeyIdsByDisplay[label] = hotkey.Id;
-            display.Add(label);
-        }
-
-        return display;
-    }
-
-    private string DisplayForHotkeyId(string hotkeyId) {
-        foreach (KeyValuePair<string, string> pair in _vtsHotkeyIdsByDisplay)
-            if (string.Equals(pair.Value, hotkeyId, StringComparison.OrdinalIgnoreCase))
-                return pair.Key;
-
-        return ResolveHotkeyName(hotkeyId) ?? hotkeyId;
-    }
-
-    private static string? ResolveHotkeyName(string? hotkeyId) {
-        if (string.IsNullOrWhiteSpace(hotkeyId)) return null;
-        return ServiceManager.VTubeStudio.CachedHotkeys
-            .FirstOrDefault(h => string.Equals(h.Id, hotkeyId, StringComparison.OrdinalIgnoreCase))?.Name;
-    }
-
-    private string ResolveHotkeyTargetFromBox() {
-        string text = (VtsTargetBox.Text ?? "").Trim();
-        if (text.Length == 0) return "";
-        if (_vtsHotkeyIdsByDisplay.TryGetValue(text, out string? mapped)) return mapped;
-
-        VtsHotkey? byName = ServiceManager.VTubeStudio.CachedHotkeys
-            .FirstOrDefault(h => string.Equals(h.Name, text, StringComparison.OrdinalIgnoreCase));
-        return byName?.Id ?? text;
-    }
-
-    private void OnVtsModelDataChanged() {
-        Dispatcher.UIThread.Post(() => {
-            if (!VtsParamPanel.IsVisible) return;
-            SuppressChanges(LoadVtsTargetSuggestions);
-            UpdateVtsHint();
-        });
-    }
-
-    private void OnVtsConnectionUpdated(IntegrationConnection connection) {
-        if (connection.Source != SubathonEventSource.VTubeStudio) return;
-        OnVtsModelDataChanged();
-    }
-
-    private async void VtsRefreshTargets_Click(object? sender, RoutedEventArgs e) {
-        VTSService vts = ServiceManager.VTubeStudio;
-        if (!vts.Connected) {
-            LoadVtsTargetSuggestions();
-            VtsHintText.Text = "Connect VTubeStudio under Settings -> External Software";
-            return;
-        }
-
-        await vts.RefreshAsync();
-        await Dispatcher.UIThread.InvokeAsync(() => {
-            LoadVtsTargetSuggestions();
-            UpdateVtsHint();
-        });
-    }
-
-    private void UpdateVtsHint() {
-        VTSWheelAction action = ReadVtsBoxes();
-
-        if (!action.IsValid(out string error)) {
-            VtsHintText.Text = error;
-            return;
-        }
-
-        string summary = action.Describe();
-        if (action.Kind == VtsTargetKind.Hotkey && ResolveHotkeyName(action.Target) is { } hotkeyName)
-            summary = $"\"{hotkeyName}\" {summary[action.Target.Length..].TrimStart()}";
-
-        VtsHintText.Text = action.HasRevert
-            ? summary
-            : $"{summary} (no duration set)";
-    }
-
-    private VTSWheelAction ReadVtsBoxes() {
-        VtsTargetKind kind = SelectedVtsKind;
-        var action = new VTSWheelAction {
-            Kind = kind,
-            Target = kind == VtsTargetKind.Hotkey
-                ? ResolveHotkeyTargetFromBox()
-                : (VtsTargetBox.Text ?? "").Trim(),
-            Duration = Utils.ParseDurationString((VtsDurationBox.Text ?? "").Trim())
-        };
-
-        switch (kind) {
-            case VtsTargetKind.Expression:
-                action.ToggleAction = (VtsToggleActionBox.SelectedItem as ComboBoxItem)?.Tag as VtsToggleAction?
-                                      ?? VtsToggleAction.On;
-                action.AfterToggle = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsToggleAction?
-                                     ?? VtsToggleAction.DoNothing;
-                break;
-            case VtsTargetKind.Parameter:
-                action.Value = ParseDoubleOrZero(VtsValueBox.Text);
-                action.AfterParameter = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsParameterAfterAction?
-                                        ?? VtsParameterAfterAction.DoNothing;
-                action.AfterValue = ParseDoubleOrZero(VtsAfterValueBox.Text);
-                break;
-            case VtsTargetKind.Hotkey:
-                action.AfterHotkey = (VtsAfterBox.SelectedItem as ComboBoxItem)?.Tag as VtsHotkeyAfterAction?
-                                     ?? VtsHotkeyAfterAction.DoNothing;
-                break;
-        }
-
-        return action;
-    }
-
-    private static double ParseDoubleOrZero(string? text) {
-        return double.TryParse((text ?? "").Trim(),
-            NumberStyles.Float, CultureInfo.InvariantCulture, out double v)
-            ? v
-            : 0d;
-    }
-
-    private string BuildVtsParameter() {
-        return ReadVtsBoxes().ToParameterString();
-    }
-
-    private void ParseVtsParameter(string parameter) {
-        if (!VTSWheelAction.TryParse(parameter, out VTSWheelAction? action)) {
-            ResetVtsBoxes();
-            return;
-        }
-
-        SuppressChanges(() => {
-            ComboBoxItem? kindItem = VtsKindBox.Items.OfType<ComboBoxItem>()
-                .FirstOrDefault(i => (VtsTargetKind?)i.Tag == action.Kind);
-            VtsKindBox.SelectedItem = kindItem ?? VtsKindBox.Items.OfType<ComboBoxItem>().FirstOrDefault();
-        });
-
-        RefreshVtsKindDependentBoxes();
-        LoadVtsTargetSuggestions();
-
-        SuppressChanges(() => {
-            VtsTargetBox.Text = action.Kind == VtsTargetKind.Hotkey
-                ? DisplayForHotkeyId(action.Target)
-                : action.Target;
-            VtsDurationBox.Text = action.Duration > TimeSpan.Zero
-                ? $"{(int)action.Duration.TotalSeconds}s"
-                : "";
-            VtsValueBox.Text = action.Kind == VtsTargetKind.Parameter
-                ? action.Value.ToString(CultureInfo.InvariantCulture)
-                : "";
-            VtsAfterValueBox.Text = action.Kind == VtsTargetKind.Parameter
-                ? action.AfterValue.ToString(CultureInfo.InvariantCulture)
-                : "";
-
-            ComboBoxItem? toggleItem = VtsToggleActionBox.Items.OfType<ComboBoxItem>()
-                .FirstOrDefault(i => (VtsToggleAction?)i.Tag == action.ToggleAction);
-            if (toggleItem != null) VtsToggleActionBox.SelectedItem = toggleItem;
-
-            object afterTag = action.Kind switch {
-                VtsTargetKind.Expression => action.AfterToggle,
-                VtsTargetKind.Parameter => action.AfterParameter,
-                _ => action.AfterHotkey
-            };
-            ComboBoxItem? afterItem = VtsAfterBox.Items.OfType<ComboBoxItem>()
-                .FirstOrDefault(i => Equals(i.Tag, afterTag));
-            if (afterItem != null) VtsAfterBox.SelectedItem = afterItem;
-        });
-
-        RefreshVtsAfterValueVisibility();
-        UpdateVtsHint();
-    }
-
-    private void ResetVtsBoxes() {
-        SuppressChanges(() => {
-            VtsKindBox.SelectedIndex = 0;
-            VtsTargetBox.Text = "";
-            VtsValueBox.Text = "";
-            VtsDurationBox.Text = "";
-            VtsAfterValueBox.Text = "";
-            if (VtsToggleActionBox.Items.Count > 0) VtsToggleActionBox.SelectedIndex = 0;
-        });
-
-        RefreshVtsKindDependentBoxes();
-    }
-
-    private async Task<bool> TryRunVtsActionAsync(WheelSpinHistory history, WheelSpinAction action) {
-        if (!VTSWheelAction.TryParse(action.Parameter, out VTSWheelAction? parsed)) {
-            _logger?.LogWarning("[WheelSpin] VTubeStudio action parameter could not be parsed: \"{Parameter}\"",
-                action.Parameter);
-            return false;
-        }
-
-        VTSService vts = ServiceManager.VTubeStudio;
-        if (!vts.Connected) {
-            _logger?.LogWarning(
-                "[WheelSpin] VTubeStudio is not connected; leaving \"{Item}\" pending", history.LinkedItem?.Text ?? "item");
-            return false;
-        }
-
-        bool ok;
-        try {
-            ok = await vts.ExecuteWheelActionAsync(parsed);
-        }
-        catch (Exception ex) {
-            _logger?.LogWarning(ex, "[WheelSpin] VTubeStudio action failed");
-            return false;
-        }
-
-        if (!ok) {
-            _logger?.LogWarning("[WheelSpin] VTubeStudio rejected the action; leaving the spin pending");
-            return false;
-        }
-
-        _logger?.LogDebug("[WheelSpin] VTubeStudio action applied: {Summary}", parsed.Describe());
-        if (history.Status != WheelSpinHistoryStatus.Done)
-            await SetHistoryStatus(history, WheelSpinHistoryStatus.Done);
-        return true;
-    }
-
-    private static string DescribeHistoryAction(WheelSpinAction? action) {
-        if (action == null) return "Manual";
-        if (action.ActionType == WheelSpinActionType.VTubeStudio
-            && VTSWheelAction.TryParse(action.Parameter, out VTSWheelAction? parsed)) {
-            string described = parsed.Describe();
-            if (parsed.Kind == VtsTargetKind.Hotkey && ResolveHotkeyName(parsed.Target) is { } hotkeyName)
-                described = $"\"{hotkeyName}\" {described[parsed.Target.Length..].TrimStart()}";
-
-            return $"VTubeStudio: {described}";
-        }
-
-        return $"{action.ActionType}: {action.Parameter}";
-    }
-}
\ No newline at end of file
+}
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs b/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
index eb268f6..2cd2cbf 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
+++ b/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
@@ -1,5 +1,4 @@
 using System.Globalization;
-using System.Text;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -1022,68 +1021,29 @@ private async void ExportHistoryToCsv_Click(object? sender, RoutedEventArgs e) {
             .OrderByDescending(h => h.TriggeredAt)
             .ToListAsync();
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-        string filepath = Path.Combine(exportDir, $"wheel-trigger-history-{DateTime.Now:yyyyMMdd-HHmmss}.csv");
-
-        var sb = new StringBuilder();
-        sb.AppendLine(
-            "Id,TriggerId,TriggerEventType,TriggeredAt,TriggerUser,TriggerSource,SpinsAdded,SubathonEventId,SubathonEventType");
-        foreach (WheelSpinTriggerHistory h in rows) {
-            string eventLabel = h.Trigger != null
-                ? BuildTriggerEventLabel(h.Trigger)
-                : h.SubathonEventType?.GetLabel() ?? "";
-            string user = h.TriggerUser?.Replace("\"", "\"\"") ?? "";
-            sb.AppendLine(
-                $"{h.Id}," +
-                $"{h.TriggerId}," +
-                $"{eventLabel}," +
-                $"{h.TriggeredAt:yyyy-MM-dd HH:mm:ss}," +
-                $"\"{user}\"," +
-                $"{h.TriggerSource}," +
-                $"{h.SpinsAdded}," +
-                $"{h.SubathonEventId?.ToString() ?? ""}," +
-                $"{h.SubathonEventType?.ToString() ?? ""}");
-        }
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
+        string path = await CsvUtils.ExportAsync("wheel-trigger-history",
+            [[
+                "Id", "TriggerId", "TriggerEventType", "TriggeredAt", "TriggerUser", "TriggerSource", "SpinsAdded",
+                "SubathonEventId", "SubathonEventType"
+            ]],
+            rows,
+            h => [
+                h.Id, h.TriggerId,
+                h.Trigger != null ? BuildTriggerEventLabel(h.Trigger) : h.SubathonEventType?.GetLabel(),
+                h.TriggeredAt, h.TriggerUser, h.TriggerSource, h.SpinsAdded, h.SubathonEventId, h.SubathonEventType
+            ]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
     }
 
     private async void ExportTriggers_Click(object? sender, RoutedEventArgs e) {
         await using AppDbContext db = await _factory.CreateDbContextAsync();
         List<WheelSpinTrigger> triggers = await db.WheelSpinTriggers.AsNoTracking().ToListAsync();
 
-        string exportDir = Path.Combine(Config.DataFolder, "exports");
-        Directory.CreateDirectory(exportDir);
-        string filepath = Path.Combine(exportDir, $"wheel-triggers-{DateTime.Now:yyyyMMdd-HHmmss}.csv");
-
-        var sb = new StringBuilder();
-        sb.AppendLine("Enabled,SpinsToAdd,EventType,TierValue,CountThreshold,MoneyThreshold,Currency");
-        foreach (WheelSpinTrigger t in triggers)
-            sb.AppendLine(string.Join(",",
-                t.IsEnabled,
-                t.SpinsToAdd,
-                t.EventType,
-                Utils.EscapeCsv(t.TierValue ?? ""),
-                t.CountThreshold?.ToString() ?? "",
-                t.MoneyThreshold?.ToString("G") ?? "",
-                Utils.EscapeCsv(t.Currency ?? "")));
-
-        await File.WriteAllTextAsync(filepath, sb.ToString(), Encoding.UTF8);
-
-        try {
-            UiHelpers.OpenFolder(exportDir);
-        }
-        catch {
-            /**/
-        }
+        string path = await CsvUtils.ExportAsync("wheel-triggers",
+            [["Enabled", "SpinsToAdd", "EventType", "TierValue", "CountThreshold", "MoneyThreshold", "Currency"]],
+            triggers,
+            t => [t.IsEnabled, t.SpinsToAdd, t.EventType, t.TierValue, t.CountThreshold, t.MoneyThreshold, t.Currency]);
+        UiHelpers.OpenFolder(Path.GetDirectoryName(path));
     }
 
     private async void ImportTriggers_Click(object? sender, RoutedEventArgs e) {
@@ -1093,36 +1053,19 @@ private async void ImportTriggers_Click(object? sender, RoutedEventArgs e) {
         IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
             Title = "Import Triggers",
             AllowMultiple = false,
-            FileTypeFilter = new[] { new FilePickerFileType("CSV Files") { Patterns = new[] { "*.csv" } } }
+            FileTypeFilter = [new FilePickerFileType("CSV Files") { Patterns = ["*.csv"] }]
         });
         if (picked.Count == 0) return;
         string filePath = picked[0].Path.LocalPath;
 
-        string[] lines;
-        try {
-            lines = await File.ReadAllLinesAsync(filePath, Encoding.UTF8);
-        }
-        catch {
-            await ShowInvalidTriggerCsvPopup();
-            return;
-        }
-
-        if (lines.Length < 1) {
-            await ShowInvalidTriggerCsvPopup();
-            return;
-        }
-
-        string[] headerCols = ParseTriggerCsvLine(lines[0]);
-        if (headerCols.Length < 3) {
+        List<string[]>? lines = await CsvUtils.ReadFileAsync(filePath);
+        if (lines == null || lines.Count < 1 || lines[0].Length < 3) {
             await ShowInvalidTriggerCsvPopup();
             return;
         }
 
         var parsed = new List<WheelSpinTrigger>();
-        for (var i = 1; i < lines.Length; i++) {
-            if (string.IsNullOrWhiteSpace(lines[i])) continue;
-            string[] cols = ParseTriggerCsvLine(lines[i]);
-
+        foreach (string[] cols in lines.Skip(1)) {
             if (cols.Length < 3
                 || !bool.TryParse(cols[0].Trim(), out bool enabled)
                 || !int.TryParse(cols[1].Trim(), out int spins)) {
@@ -1197,45 +1140,6 @@ private async void ImportTriggers_Click(object? sender, RoutedEventArgs e) {
         WheelEvents.RaiseWheelSpinTriggersChanged();
     }
 
-    private static string[] ParseTriggerCsvLine(string line) {
-        var result = new List<string>();
-        var field = new StringBuilder();
-        var inQuotes = false;
-
-        for (var i = 0; i < line.Length; i++) {
-            char c = line[i];
-            if (inQuotes)
-                switch (c) {
-                    case '"' when i + 1 < line.Length && line[i + 1] == '"':
-                        field.Append('"');
-                        i++;
-                        break;
-                    case '"':
-                        inQuotes = false;
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-            else
-                switch (c) {
-                    case '"':
-                        inQuotes = true;
-                        break;
-                    case ',':
-                        result.Add(field.ToString());
-                        field.Clear();
-                        break;
-                    default:
-                        field.Append(c);
-                        break;
-                }
-        }
-
-        result.Add(field.ToString());
-        return result.ToArray();
-    }
-
     private static async Task ShowInvalidTriggerCsvPopup() {
         var dialog = new FAContentDialog {
             Title = "Invalid CSV",
diff --git a/external/linux/install.sh b/external/linux/install.sh
index 6b89f0e..e3b4a37 100755
--- a/external/linux/install.sh
+++ b/external/linux/install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Registers Linux binary as the handler for subathonmanager:// links
-# and .smo + .smw files
+# and .smo, .smw, .smwc + .sma files
 # The app should self-register this already on launch, however, this is to manually set it up if desired or remove it.
 #
 # Usage:
@@ -20,6 +20,7 @@ SCHEME="x-scheme-handler/subathonmanager"
 OVERLAY="application/x-subathonmanager-overlay"
 WIDGET="application/x-subathonmanager-widget"
 COLLECTION="application/x-subathonmanager-widget-collection"
+ACTION="application/x-subathonmanager-action"
 ICON_NAME="subathonmanager"
 ICON_SIZES="48 64 128 256"
 
@@ -74,7 +75,7 @@ Terminal=false
 NoDisplay=false
 Categories=Utility;
 StartupWMClass=SubathonManager
-MimeType=$OVERLAY;$WIDGET;$COLLECTION;$SCHEME;
+MimeType=$OVERLAY;$WIDGET;$COLLECTION;$ACTION;$SCHEME;
 EOF
 
 cat > "$MIME_XML" <<EOF
@@ -95,6 +96,11 @@ cat > "$MIME_XML" <<EOF
     <icon name="$ICON_NAME"/>
     <glob pattern="*.smwc"/>
   </mime-type>
+  <mime-type type="$ACTION">
+    <comment>Subathon Manager Action</comment>
+    <icon name="$ICON_NAME"/>
+    <glob pattern="*.sma"/>
+  </mime-type>
 </mime-info>
 EOF
 
@@ -104,6 +110,7 @@ xdg-mime default subathonmanager.desktop "$SCHEME"
 xdg-mime default subathonmanager.desktop "$OVERLAY"
 xdg-mime default subathonmanager.desktop "$WIDGET"
 xdg-mime default subathonmanager.desktop "$COLLECTION"
+xdg-mime default subathonmanager.desktop "$ACTION"
 
 echo "installed:"
 echo "  $DESKTOP  ->  $BIN"
diff --git a/external/linux/subathonmanager-smo.xml b/external/linux/subathonmanager-smo.xml
index 870dee6..a13883b 100644
--- a/external/linux/subathonmanager-smo.xml
+++ b/external/linux/subathonmanager-smo.xml
@@ -15,4 +15,9 @@
     <icon name="subathonmanager"/>
     <glob pattern="*.smwc"/>
   </mime-type>
+  <mime-type type="application/x-subathonmanager-action">
+    <comment>Subathon Manager Action</comment>
+    <icon name="subathonmanager"/>
+    <glob pattern="*.sma"/>
+  </mime-type>
 </mime-info>
diff --git a/external/macos/Info.plist b/external/macos/Info.plist
index fc2eedb..7c644a3 100644
--- a/external/macos/Info.plist
+++ b/external/macos/Info.plist
@@ -85,6 +85,20 @@
                 <string>com.wolfwithsword.subathonmanager.widgetcollection</string>
             </array>
         </dict>
+        <dict>
+            <key>CFBundleTypeName</key>
+            <string>Subathon Manager Action</string>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleTypeIconFile</key>
+            <string>icon</string>
+            <key>LSHandlerRank</key>
+            <string>Owner</string>
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>com.wolfwithsword.subathonmanager.action</string>
+            </array>
+        </dict>
     </array>
 
     <key>UTExportedTypeDeclarations</key>
@@ -144,6 +158,26 @@
                 </array>
             </dict>
         </dict>
+        <dict>
+            <key>UTTypeIdentifier</key>
+            <string>com.wolfwithsword.subathonmanager.action</string>
+            <key>UTTypeDescription</key>
+            <string>Subathon Manager Action</string>
+            <key>UTTypeIconFile</key>
+            <string>icon</string>
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.json</string>
+                <string>public.data</string>
+            </array>
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>sma</string>
+                </array>
+            </dict>
+        </dict>
     </array>
 </dict>
 </plist>

From fcaa4d1f8772471e654fefcf08c5360b7bbab27b Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sun, 4 Oct 2026 21:51:54 -0300
Subject: [PATCH 05/23] actions: if else, globals, secrets #338

---
 SubathonManager.Core/Enums/ActionEnums.cs     |  250 +++-
 SubathonManager.Core/Enums/EnumExtensions.cs  |   13 +-
 SubathonManager.Core/Models/ActionGlobal.cs   |   21 +
 SubathonManager.Core/Objects/ActionGraph.cs   |  221 +++-
 SubathonManager.Core/Security/StorageKeys.cs  |    3 +
 SubathonManager.Data/DbContext.cs             |   20 +-
 ...32544_addActionsGlobalsSecrets.Designer.cs | 1174 +++++++++++++++++
 ...20261003232544_addActionsGlobalsSecrets.cs |   39 +
 .../Migrations/AppDbContextModelSnapshot.cs   |   31 +
 SubathonManager.Services/ActionService.cs     |  460 ++++++-
 .../ServicesUnitTests/ActionServiceTests.cs   |  223 +++-
 .../Views/Actions/ActionEditorViewModels.cs   |   23 +-
 .../Views/Actions/ActionEditorWindow.Graph.cs |   59 +-
 .../Actions/ActionEditorWindow.Properties.cs  |  285 +++-
 .../Views/Actions/ActionEditorWindow.axaml    |  238 ++--
 .../Views/Actions/ActionEditorWindow.axaml.cs |   63 +-
 .../Views/Actions/ActionsView.Globals.cs      |  400 ++++++
 .../Views/Actions/ActionsView.axaml           |   70 +-
 .../Views/Actions/ActionsView.axaml.cs        |   26 +-
 19 files changed, 3337 insertions(+), 282 deletions(-)
 create mode 100644 SubathonManager.Core/Models/ActionGlobal.cs
 create mode 100644 SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.Designer.cs
 create mode 100644 SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionsView.Globals.cs

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index b4ad1c3..0424e21 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -1,4 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.RegularExpressions;
 
 namespace SubathonManager.Core.Enums;
@@ -7,6 +10,22 @@ public enum ActionStepType {
     [ActionStepMeta(Label = "Wait", Group = "Flow", DurationLabel = "Wait for:")]
     Wait = 0,
 
+    [ActionStepMeta(Label = "If / Else", Group = "Flow",
+        Operations = [
+            ActionOperation.IsEqual, ActionOperation.NotEqual, ActionOperation.MoreThan, ActionOperation.LessThan,
+            ActionOperation.AtLeast, ActionOperation.AtMost, ActionOperation.Contains, ActionOperation.NotContains,
+            ActionOperation.IsEmpty, ActionOperation.NotEmpty
+        ],
+        ScopeLabel = "Check:", OperationLabel = "Comparison:", TargetLabel = "Against:",
+        NoTargetOperations = [ActionOperation.IsEmpty, ActionOperation.NotEmpty], AllowsVariables = true)]
+    Condition = 1,
+
+    [ActionStepMeta(Label = "Set Global", Group = "Flow",
+        Operations = [ActionOperation.Set, ActionOperation.Adjust, ActionOperation.Toggle],
+        TargetLabel = "Global:", BodyLabel = "Value:", NoBodyOperations = [ActionOperation.Toggle],
+        AllowsVariables = true)]
+    SetGlobal = 2,
+
     [ActionStepMeta(Label = "Add Time", Group = "Subathon", DurationLabel = "Time to add:")]
     AddTime = 100,
 
@@ -68,12 +87,14 @@ public enum ActionStepType {
         TargetLabel = "Action:", BodyLabel = "Arguments (one name=value per line):", AllowsVariables = true)]
     StreamerBotAction = 500,
 
-    [ActionStepMeta(Label = "GET Request", Group = "Web", TargetLabel = "URL:", AllowsVariables = true)]
+    [ActionStepMeta(Label = "GET Request", Group = "Web", TargetLabel = "URL:",
+        DurationLabel = "Timeout (blank = 10s):",
+        AllowsVariables = true, IsWebRequest = true)]
     HttpGet = 600,
 
     // body is sent as-is
     [ActionStepMeta(Label = "POST Request", Group = "Web", TargetLabel = "URL:", BodyLabel = "Body:",
-        AllowsVariables = true)]
+        DurationLabel = "Timeout (blank = 10s):", AllowsVariables = true, IsWebRequest = true)]
     HttpPost = 601
 }
 
@@ -100,7 +121,39 @@ public enum ActionOperation {
     Play,
     Pause,
     Restart,
-    Stop
+    Stop,
+
+    // If / Else comparisons
+    IsEqual,
+    NotEqual,
+    MoreThan,
+    LessThan,
+    AtLeast,
+    AtMost,
+    Contains,
+    NotContains,
+    IsEmpty,
+    NotEmpty,
+
+    // Set/Adjust Global on a number
+    Adjust
+}
+
+public enum ActionStoreKind {
+    Global,
+    Secret
+}
+
+public enum ActionValueType {
+    Text,
+    Number,
+    Boolean
+}
+
+public enum ActionHttpAuth {
+    None,
+    Bearer,
+    Basic
 }
 
 public enum ActionRunResult {
@@ -234,6 +287,13 @@ public enum ActionVariable {
 
 [ExcludeFromCodeCoverage]
 public static partial class ActionStepTypeHelper {
+    public const int MaxNameLength = 64;
+
+    ////////////////// variable work
+
+    private static readonly Dictionary<string, ActionVariable> ByToken = Enum.GetValues<ActionVariable>()
+        .ToDictionary(v => v.GetToken(), v => v, StringComparer.OrdinalIgnoreCase);
+
     private static ActionStepMetaAttribute? Meta(ActionStepType type) {
         return EnumMetaCache.Get<ActionStepMetaAttribute>(type);
     }
@@ -275,10 +335,22 @@ public static ActionOperation DefaultOp(this ActionStepType type) {
         return Meta(type)?.BodyLabel;
     }
 
+    public static string GetOperationLabel(this ActionStepType type) {
+        return Meta(type)?.OperationLabel ?? "Do:";
+    }
+
     public static bool HasTarget(this ActionStepType type) {
         return type.GetTargetLabel() != null;
     }
 
+    public static bool NeedsTarget(this ActionStepType type, ActionOperation operation) {
+        return type.HasTarget() && !(Meta(type)?.NoTargetOperations.Contains(operation) ?? false);
+    }
+
+    public static bool IsWebRequest(this ActionStepType type) {
+        return Meta(type)?.IsWebRequest ?? false;
+    }
+
     public static bool HasScope(this ActionStepType type) {
         return type.GetScopeLabel() != null;
     }
@@ -291,6 +363,10 @@ public static bool HasBody(this ActionStepType type) {
         return type.GetBodyLabel() != null;
     }
 
+    public static bool NeedsBody(this ActionStepType type, ActionOperation operation) {
+        return type.HasBody() && !(Meta(type)?.NoBodyOperations.Contains(operation) ?? false);
+    }
+
     public static bool HasValue(this ActionStepType type, ActionOperation operation) {
         ActionStepMetaAttribute? meta = Meta(type);
         if (meta?.ValueLabel == null) return false;
@@ -306,10 +382,86 @@ public static string GetOpLabel(this ActionOperation operation) {
             ActionOperation.None => "Do Nothing",
             ActionOperation.PointsAndTime => "Points & Time",
             ActionOperation.Play => "Play / Resume",
+            ActionOperation.IsEqual => "Equals",
+            ActionOperation.NotEqual => "Not Equals",
+            ActionOperation.MoreThan => "Greater Than",
+            ActionOperation.LessThan => "Less Than",
+            ActionOperation.AtLeast => "Greater or Equal to",
+            ActionOperation.AtMost => "Less or Equal to",
+            ActionOperation.Contains => "Contains",
+            ActionOperation.NotContains => "Does Not Contain",
+            ActionOperation.IsEmpty => "Is Empty",
+            ActionOperation.NotEmpty => "Is Not Empty",
+            ActionOperation.Set => "Set To",
+            ActionOperation.Adjust => "Add/Subtract (numbers)",
             _ => $"{operation}"
         };
     }
 
+    public static string GetLabel(this ActionValueType type) {
+        return type switch {
+            ActionValueType.Number => "number",
+            ActionValueType.Boolean => "true/false",
+            _ => "text"
+        };
+    }
+
+    public static string DefaultValue(this ActionValueType type) {
+        return type switch {
+            ActionValueType.Number => "0",
+            ActionValueType.Boolean => "false",
+            _ => ""
+        };
+    }
+
+    public static string? NormalizeValue(this ActionValueType type, string? raw) {
+        raw ??= "";
+        return type switch {
+            ActionValueType.Number =>
+                double.TryParse(raw.Trim(), NumberStyles.Float, CultureInfo.InvariantCulture, out double number)
+                && double.IsFinite(number)
+                    ? number.ToString(CultureInfo.InvariantCulture)
+                    : null,
+            ActionValueType.Boolean => raw.Trim().ToLowerInvariant() switch {
+                "true" or "yes" or "on" or "1" => "true",
+                "false" or "no" or "off" or "0" => "false",
+                _ => null
+            },
+            _ => raw
+        };
+    }
+
+    public static string? ConvertValue(string? value, ActionValueType from, ActionValueType to) {
+        if (value == null) return null;
+        if (from == ActionValueType.Boolean && to == ActionValueType.Number) return value == "true" ? "1" : "0";
+        return to.NormalizeValue(value);
+    }
+
+    public static bool Compare(string left, ActionOperation operation, string right) {
+        left = left.Trim();
+        right = right.Trim();
+        bool numbers = double.TryParse(left, NumberStyles.Float, CultureInfo.InvariantCulture, out double l)
+                       & double.TryParse(right, NumberStyles.Float, CultureInfo.InvariantCulture, out double r);
+        int order = numbers ? l.CompareTo(r) : string.Compare(left, right, StringComparison.OrdinalIgnoreCase);
+
+        return operation switch {
+            // any
+            ActionOperation.IsEqual => order == 0,
+            ActionOperation.NotEqual => order != 0,
+            // num
+            ActionOperation.MoreThan => order > 0,
+            ActionOperation.LessThan => order < 0,
+            ActionOperation.AtLeast => order >= 0,
+            ActionOperation.AtMost => order <= 0,
+            // strings
+            ActionOperation.Contains => left.Contains(right, StringComparison.OrdinalIgnoreCase),
+            ActionOperation.NotContains => !left.Contains(right, StringComparison.OrdinalIgnoreCase),
+            ActionOperation.IsEmpty => left.Length == 0,
+            ActionOperation.NotEmpty => left.Length > 0,
+            _ => false
+        };
+    }
+
     public static bool IsAvailable(this ActionStepType type) {
         return type switch {
             ActionStepType.VtsExpression or ActionStepType.VtsParameter or ActionStepType.VtsHotkey
@@ -318,11 +470,6 @@ ActionStepType.VtsExpression or ActionStepType.VtsParameter or ActionStepType.Vt
         };
     }
 
-    ////////////////// variable work
-
-    private static readonly Dictionary<string, ActionVariable> ByToken = Enum.GetValues<ActionVariable>()
-        .ToDictionary(v => v.GetToken(), v => v, StringComparer.OrdinalIgnoreCase);
-
     public static string GetToken(this ActionVariable variable) {
         return EnumMetaCache.Get<ActionVariableMetaAttribute>(variable)?.Token ?? $"{variable}".ToLowerInvariant();
     }
@@ -357,11 +504,92 @@ public static IEnumerable<ActionVariable> FindVariables(string? text) {
     public static string ReplaceVariables(string? text, IReadOnlyDictionary<ActionVariable, string> values) {
         if (string.IsNullOrEmpty(text)) return text ?? "";
         return TokenRegex().Replace(text, m =>
-            TryParseToken(m.Groups[1].Value, out ActionVariable variable) && values.TryGetValue(variable, out string? value)
+            TryParseToken(m.Groups[1].Value, out ActionVariable variable) &&
+            values.TryGetValue(variable, out string? value)
                 ? value
                 : m.Value);
     }
 
-    [GeneratedRegex("%([A-Za-z0-9_]+)%")]
+    public static IEnumerable<string> FindTokens(string? text) {
+        if (string.IsNullOrEmpty(text)) yield break;
+        foreach (Match match in TokenRegex().Matches(text)) yield return match.Groups[1].Value;
+    }
+
+    public static string ReplaceTokens(string? text, Func<string, string?> resolve) {
+        if (string.IsNullOrEmpty(text)) return text ?? "";
+        return TokenRegex().Replace(text, m => resolve(m.Groups[1].Value) ?? m.Value);
+    }
+
+    public static bool IsValidName(string? name) {
+        return !string.IsNullOrEmpty(name) && name.Length <= MaxNameLength && NameRegex().IsMatch(name);
+    }
+
+    public static string TokenPrefix(this ActionStoreKind kind) {
+        return $"{kind}".ToLower();
+    }
+
+    public static bool TryGetStoreRef(string token, out ActionStoreKind kind, out string name) {
+        foreach (ActionStoreKind candidate in Enum.GetValues<ActionStoreKind>()) {
+            var prefix = $"{candidate.TokenPrefix()}.";
+            if (!token.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) continue;
+            kind = candidate;
+            name = token[prefix.Length..];
+            return IsValidName(name);
+        }
+
+        kind = default;
+        name = "";
+        return false;
+    }
+
+    public static IEnumerable<(ActionStoreKind Kind, string Name)> FindStoreRefs(string? text) {
+        foreach (string token in FindTokens(text))
+            if (TryGetStoreRef(token, out ActionStoreKind kind, out string name))
+                yield return (kind, name);
+    }
+
+    public static string StorePlaceholder(ActionStoreKind kind, string name) {
+        return $"%{kind.TokenPrefix()}.{name}%";
+    }
+
+    public static string TokenRoot(string token) {
+        int cut = token.IndexOfAny(['.', '[']);
+        return cut < 0 ? token : token[..cut];
+    }
+
+    public static string ReadJsonPath(string json, string path) {
+        JsonNode? node;
+        try {
+            node = JsonNode.Parse(json);
+        }
+        catch (JsonException) {
+            return "";
+        }
+
+        foreach (Match part in PathPartRegex().Matches(path)) {
+            if (part.Groups[1].Success)
+                node = node is JsonObject obj ? obj[part.Groups[1].Value] : null;
+            else
+                node = node is JsonArray array && int.TryParse(part.Groups[2].Value, out int index) &&
+                       index < array.Count
+                    ? array[index]
+                    : null;
+            if (node == null) return "";
+        }
+
+        return node switch {
+            null => "",
+            JsonValue value when value.TryGetValue(out string? text) => text,
+            _ => node.ToJsonString()
+        };
+    }
+
+    [GeneratedRegex(@"%([A-Za-z0-9_]+(?:\.[A-Za-z0-9_]+|\[\d+\])*)%")]
     private static partial Regex TokenRegex();
-}
+
+    [GeneratedRegex("^[A-Za-z0-9_]+$")]
+    private static partial Regex NameRegex();
+
+    [GeneratedRegex(@"\.([A-Za-z0-9_]+)|\[(\d+)\]")]
+    private static partial Regex PathPartRegex();
+}
\ No newline at end of file
diff --git a/SubathonManager.Core/Enums/EnumExtensions.cs b/SubathonManager.Core/Enums/EnumExtensions.cs
index 888bcc8..58ad7ef 100644
--- a/SubathonManager.Core/Enums/EnumExtensions.cs
+++ b/SubathonManager.Core/Enums/EnumExtensions.cs
@@ -94,7 +94,7 @@ public class EventTypeMetaAttribute : EnumMetaAttribute {
     public bool IsOther { get; init; }
     public bool HasValueConfig { get; init; } = true;
 
-    public bool HasCommissionData{ get; init; }
+    public bool HasCommissionData { get; init; }
 
     public SubathonEventSource Source { get; set; } = SubathonEventSource.Unknown;
 }
@@ -133,9 +133,20 @@ public class ActionStepMetaAttribute : EnumMetaAttribute {
     public string? DurationLabel { get; init; }
     public string? BodyLabel { get; init; }
 
+    public string? OperationLabel { get; init; }
+
     // operations which have parameter vals
     public ActionOperation[] ValueOperations { get; init; } = [];
 
+    // operations which do not use the target, e.g. "is empty"
+    public ActionOperation[] NoTargetOperations { get; init; } = [];
+
+    // operations which do not use the body, e.g. toggling a global
+    public ActionOperation[] NoBodyOperations { get; init; } = [];
+
+    // headers, auth, timeout and an output variable for the response, precanned
+    public bool IsWebRequest { get; init; }
+
     // %variables% in config will be accepted
     public bool AllowsVariables { get; init; }
 }
diff --git a/SubathonManager.Core/Models/ActionGlobal.cs b/SubathonManager.Core/Models/ActionGlobal.cs
new file mode 100644
index 0000000..ed6b7b4
--- /dev/null
+++ b/SubathonManager.Core/Models/ActionGlobal.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+using SubathonManager.Core.Enums;
+
+namespace SubathonManager.Core.Models;
+
+[ExcludeFromCodeCoverage]
+public class ActionGlobal {
+    public ActionStoreKind Kind { get; set; }
+    [MaxLength(64)] public string Name { get; set; } = "";
+
+    public ActionValueType ValueType { get; set; } = ActionValueType.Text;
+
+    public string? Value { get; set; }
+
+    // secrets only
+    [MaxLength(128)] public string? StorageKey { get; set; }
+
+    public DateTime CreatedAt { get; set; } = DateTime.Now;
+    public DateTime UpdatedAt { get; set; } = DateTime.Now;
+}
\ No newline at end of file
diff --git a/SubathonManager.Core/Objects/ActionGraph.cs b/SubathonManager.Core/Objects/ActionGraph.cs
index 9fc8859..7667853 100644
--- a/SubathonManager.Core/Objects/ActionGraph.cs
+++ b/SubathonManager.Core/Objects/ActionGraph.cs
@@ -16,9 +16,36 @@ public sealed class ActionStep {
     public double? Value { get; set; }
     public double? Seconds { get; set; }
     public string? Body { get; set; }
-
-    [JsonIgnore]
-    public TimeSpan Duration => Seconds is > 0.0 ? TimeSpan.FromSeconds(Seconds.Value) : TimeSpan.Zero;
+    public string? Headers { get; set; }
+
+    public ActionHttpAuth? Auth { get; set; }
+    public string? AuthUser { get; set; }
+    public string? AuthToken { get; set; }
+    public string? OutputVariable { get; set; }
+
+    [JsonIgnore] public TimeSpan Duration => Seconds is > 0.0 ? TimeSpan.FromSeconds(Seconds.Value) : TimeSpan.Zero;
+
+    [JsonIgnore] public string AllText => string.Join('\n', Target, Scope, Body, Headers, AuthUser, AuthToken);
+
+    private string OutputSuffix => string.IsNullOrEmpty(OutputVariable) ? "" : $" -> %{OutputVariable}%";
+
+    public ActionStep Fill(Func<string, string> fill) {
+        return new ActionStep {
+            Type = Type,
+            Operation = Operation,
+            Target = fill(Target),
+            TargetName = TargetName,
+            Scope = Scope == null ? null : fill(Scope),
+            Value = Value,
+            Seconds = Seconds,
+            Body = Body == null ? null : fill(Body),
+            Headers = Headers == null ? null : fill(Headers),
+            Auth = Auth,
+            AuthUser = AuthUser == null ? null : fill(AuthUser),
+            AuthToken = AuthToken == null ? null : fill(AuthToken),
+            OutputVariable = OutputVariable
+        };
+    }
 
     public bool IsValid(out string error) {
         error = "";
@@ -49,6 +76,30 @@ public bool IsValid(out string error) {
             case ActionStepType.HttpGet or ActionStepType.HttpPost when !LooksLikeUrl(Target):
                 error = "The URL needs to start with http:// or https://";
                 return false;
+            case ActionStepType.SetGlobal when !ActionStepTypeHelper.IsValidName(Target.Trim()):
+                error = "Pick a global by name";
+                return false;
+            case ActionStepType.SetGlobal when Operation == ActionOperation.Adjust && string.IsNullOrWhiteSpace(Body):
+                error = "Give an amount to add (negative to remove)";
+                return false;
+        }
+
+        if (Type.IsWebRequest()) {
+            if (!string.IsNullOrEmpty(OutputVariable) && !IsValidOutputName(OutputVariable)) {
+                error =
+                    $"\"{OutputVariable}\" can't be an output name: use letters, numbers, _, and not a built-in variable's name";
+                return false;
+            }
+
+            if (Auth == ActionHttpAuth.Bearer && string.IsNullOrWhiteSpace(AuthToken)) {
+                error = "Bearer auth needs a token, e.g. %secret.my_token%";
+                return false;
+            }
+
+            if (Auth == ActionHttpAuth.Basic && string.IsNullOrWhiteSpace(AuthUser)) {
+                error = "Basic auth needs a username";
+                return false;
+            }
         }
 
         if (Type.HasScope() && string.IsNullOrWhiteSpace(Scope)) {
@@ -56,14 +107,22 @@ public bool IsValid(out string error) {
             return false;
         }
 
-        if (Type.HasTarget() && string.IsNullOrWhiteSpace(Target)) {
-            error = $"{Type.GetGroup()} {Type.GetLabel()} needs a {Type.GetTargetLabel()!.TrimEnd(':').ToLowerInvariant()}";
+        if (Type.NeedsTarget(Operation) && string.IsNullOrWhiteSpace(Target)) {
+            error =
+                $"{Type.GetGroup()} {Type.GetLabel()} needs a {Type.GetTargetLabel()!.TrimEnd(':').ToLowerInvariant()}";
             return false;
         }
 
         return true;
     }
 
+    public static bool IsValidOutputName(string name) {
+        return ActionStepTypeHelper.IsValidName(name)
+               && !ActionStepTypeHelper.TryParseToken(name, out _)
+               && !Enum.GetValues<ActionStoreKind>()
+                   .Any(k => name.Equals(k.TokenPrefix(), StringComparison.OrdinalIgnoreCase));
+    }
+
     private static bool LooksLikeUrl(string url) {
         url = url.Trim();
         return url.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
@@ -102,8 +161,16 @@ public string Describe() {
             ActionStepType.ObsFilter => $"{Operation} filter \"{target}\" on \"{Scope}\"",
             ActionStepType.ObsAudio or ActionStepType.ObsMedia => $"{Operation} \"{target}\"",
             ActionStepType.StreamerBotAction => $"Streamer.bot \"{target}\"",
-            ActionStepType.HttpGet => $"GET {ShortUrl(Target)}",
-            ActionStepType.HttpPost => $"POST {ShortUrl(Target)}",
+            ActionStepType.Condition => Type.NeedsTarget(Operation)
+                ? $"If {Scope} is {Operation.GetOpLabel().ToLowerInvariant()} {Target}"
+                : $"If {Scope} is {Operation.GetOpLabel().ToLowerInvariant()}",
+            ActionStepType.SetGlobal => Operation switch {
+                ActionOperation.Toggle => $"Toggle %global.{Target}%",
+                ActionOperation.Adjust => $"%global.{Target}% += {Body?.Trim()}",
+                _ => $"%global.{Target}% = {Body?.Trim()}"
+            },
+            ActionStepType.HttpGet => $"GET {ShortUrl(Target)}{OutputSuffix}",
+            ActionStepType.HttpPost => $"POST {ShortUrl(Target)}{OutputSuffix}",
             _ => Type.GetLabel()
         };
     }
@@ -112,11 +179,15 @@ public string Describe() {
         return ParseArguments(Body);
     }
 
-    public static IEnumerable<(string Name, string Value)> ParseArguments(string? body) {
+    public IEnumerable<(string Name, string Value)> HeaderLines() {
+        return ParseArguments(Headers, ':');
+    }
+
+    public static IEnumerable<(string Name, string Value)> ParseArguments(string? body, char separator = '=') {
         if (string.IsNullOrWhiteSpace(body)) yield break;
         foreach (string raw in body.Split('\n')) {
             string line = raw.Trim();
-            int split = line.IndexOf('=');
+            int split = line.IndexOf(separator);
             if (split <= 0) continue;
             yield return (line[..split].Trim(), line[(split + 1)..].Trim());
         }
@@ -139,11 +210,17 @@ public sealed class ActionNode {
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     public bool Disabled { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    public bool IgnoreErrors { get; set; }
 }
 
 public sealed class ActionEdge {
+    public const string ElsePort = "else";
+
     public string From { get; set; } = "";
     public string To { get; set; } = "";
+    public string? Port { get; set; }
 }
 
 public sealed class ActionGraph {
@@ -176,6 +253,26 @@ public IEnumerable<string> Outgoing(string nodeId) {
         return Edges.Where(e => e.From == nodeId).Select(e => e.To);
     }
 
+    public IEnumerable<ActionEdge> IncomingEdges(string nodeId) {
+        return Edges.Where(e => e.To == nodeId);
+    }
+
+    public HashSet<string> OutputVariables() {
+        return Nodes.Where(n => !n.Disabled && !string.IsNullOrEmpty(n.Step.OutputVariable))
+            .Select(n => n.Step.OutputVariable!)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+    }
+
+    public HashSet<string> Upstream(string nodeId) {
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        var stack = new Stack<string>(Incoming(nodeId));
+        while (stack.TryPop(out string? id))
+            if (seen.Add(id))
+                foreach (string previous in Incoming(id))
+                    stack.Push(previous);
+        return seen;
+    }
+
     public bool WouldLoop(string from, string to) {
         if (from == to) return true;
         var seen = new HashSet<string>(StringComparer.Ordinal);
@@ -204,9 +301,30 @@ public bool IsValid(out string error) {
             }
         }
 
+        var links = new HashSet<(string, string)>();
         foreach (ActionEdge edge in Edges) {
-            if (ids.Contains(edge.From) && ids.Contains(edge.To) && edge.From != edge.To) continue;
-            error = $"Connection {edge.From} -> {edge.To} is not between two different steps";
+            if (!ids.Contains(edge.From) || !ids.Contains(edge.To) || edge.From == edge.To) {
+                error = $"Connection {edge.From} -> {edge.To} is not between two different steps";
+                return false;
+            }
+
+            if (!links.Add((edge.From, edge.To))) {
+                error = $"Steps {edge.From} and {edge.To} are connected twice";
+                return false;
+            }
+
+            if (edge.Port == null) continue;
+            if (edge.Port == ActionEdge.ElsePort
+                && Nodes.First(n => n.Id == edge.From).Step.Type == ActionStepType.Condition) continue;
+            error = $"Connection {edge.From} -> {edge.To} uses an output its step does not have";
+            return false;
+        }
+
+        var outputs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (ActionNode node in Nodes.Where(node => !node.Disabled &&
+                                                        !string.IsNullOrEmpty(node.Step.OutputVariable) &&
+                                                        !outputs.Add(node.Step.OutputVariable))) {
+            error = $"More than one step saves its response as %{node.Step.OutputVariable}%";
             return false;
         }
 
@@ -259,7 +377,6 @@ public static bool TryParse(string? json, [NotNullWhen(true)] out ActionGraph? g
     }
 }
 
-
 public sealed class CustomAction {
     public const int CurrentFormatVersion = 1;
     public const string FileExtension = ".sma";
@@ -298,38 +415,102 @@ public static bool TryParse(string? json, [NotNullWhen(true)] out CustomAction?
 public sealed record ActionContext(SubathonEventSource Source, string User, string RepeatKey, string? Label = null);
 
 public sealed class ActionRunProgress {
+    public const int MaxVariableLength = 64 * 1024 * 2;
     private readonly Lock _lock = new();
+
     public HashSet<string> Done { get; set; } = [];
+    public HashSet<string> Skipped { get; set; } = [];
+    public Dictionary<string, string> Ports { get; set; } = [];
+    public Dictionary<string, string> Variables { get; set; } = new(StringComparer.OrdinalIgnoreCase);
+
     public Dictionary<string, double> Values { get; set; } = [];
 
     public bool IsDone(string nodeId) {
-        lock (_lock) return Done.Contains(nodeId);
+        lock (_lock) {
+            return Done.Contains(nodeId);
+        }
     }
 
     public void MarkDone(string nodeId) {
-        lock (_lock) Done.Add(nodeId);
+        lock (_lock) {
+            Done.Add(nodeId);
+        }
+    }
+
+    public bool IsResolved(string nodeId) {
+        lock (_lock) {
+            return Done.Contains(nodeId) || Skipped.Contains(nodeId);
+        }
+    }
+
+    public void MarkSkipped(string nodeId) {
+        lock (_lock) {
+            Skipped.Add(nodeId);
+        }
+    }
+
+    public void SetPort(string nodeId, string? port) {
+        lock (_lock) {
+            if (port == null) Ports.Remove(nodeId);
+            else Ports[nodeId] = port;
+        }
+    }
+
+    public bool IsLive(ActionEdge edge) {
+        lock (_lock) {
+            return Done.Contains(edge.From) && Ports.GetValueOrDefault(edge.From) == edge.Port;
+        }
+    }
+
+    public void SetVariable(string name, string value) {
+        if (value.Length > MaxVariableLength) value = value[..MaxVariableLength];
+        lock (_lock) {
+            Variables[name] = value;
+        }
+    }
+
+    public bool TryReadVariable(string token, out string value) {
+        string root = ActionStepTypeHelper.TokenRoot(token);
+        string? raw;
+        lock (_lock) {
+            if (!Variables.TryGetValue(root, out raw)) {
+                value = "";
+                return false;
+            }
+        }
+
+        value = root.Length == token.Length ? raw : ActionStepTypeHelper.ReadJsonPath(raw, token[root.Length..]);
+        return true;
     }
 
     public bool TryGetValue(string key, out double value) {
-        lock (_lock) return Values.TryGetValue(key, out value);
+        lock (_lock) {
+            return Values.TryGetValue(key, out value);
+        }
     }
 
     public void Remember(string key, double value) {
-        lock (_lock) Values.TryAdd(key, value);
+        lock (_lock) {
+            Values.TryAdd(key, value);
+        }
     }
 
     public string ToJson() {
-        lock (_lock) return JsonSerializer.Serialize(this, ActionGraph.JsonOptions);
+        lock (_lock) {
+            return JsonSerializer.Serialize(this, ActionGraph.JsonOptions);
+        }
     }
 
     public static ActionRunProgress Parse(string? json) {
         if (string.IsNullOrWhiteSpace(json)) return new ActionRunProgress();
         try {
-            return JsonSerializer.Deserialize<ActionRunProgress>(json, ActionGraph.JsonOptions)
-                   ?? new ActionRunProgress();
+            ActionRunProgress progress = JsonSerializer.Deserialize<ActionRunProgress>(json, ActionGraph.JsonOptions)
+                                         ?? new ActionRunProgress();
+            progress.Variables = new Dictionary<string, string>(progress.Variables, StringComparer.OrdinalIgnoreCase);
+            return progress;
         }
         catch (JsonException) {
             return new ActionRunProgress();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.Core/Security/StorageKeys.cs b/SubathonManager.Core/Security/StorageKeys.cs
index d775c50..ae7f5e8 100644
--- a/SubathonManager.Core/Security/StorageKeys.cs
+++ b/SubathonManager.Core/Security/StorageKeys.cs
@@ -3,6 +3,9 @@
 public static class StorageKeys {
     public const string TwitchAccessToken = "SM.Twitch.AccessToken";
 
+    // + lowercase secret name
+    public const string ActionSecretPrefix = "SM.Actions.Secrets.";
+
     public const string FourthWallAccessToken = "SM.FourthWall.AccessToken";
     public const string FourthWallRefreshToken = "SM.FourthWall.RefreshToken";
 
diff --git a/SubathonManager.Data/DbContext.cs b/SubathonManager.Data/DbContext.cs
index f00a813..f4b100d 100644
--- a/SubathonManager.Data/DbContext.cs
+++ b/SubathonManager.Data/DbContext.cs
@@ -50,6 +50,8 @@ public AppDbContext(DbContextOptions<AppDbContext> options)
 
     public DbSet<ScheduleItem> ScheduleItems { get; set; }
 
+    public DbSet<ActionGlobal> ActionGlobals { get; set; }
+
     public DbSet<WidgetCatalogEntry> WidgetCatalogEntries => Set<WidgetCatalogEntry>();
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
@@ -101,6 +103,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
         modelBuilder.Entity<ScheduleItem>()
             .HasIndex(i => i.Date);
 
+        modelBuilder.Entity<ActionGlobal>()
+            .HasKey(g => new { g.Kind, g.Name });
+        modelBuilder.Entity<ActionGlobal>()
+            .Property(g => g.Name)
+            .UseCollation("NOCASE");
+
         modelBuilder.Entity<SubathonGoalSet>()
             .HasMany(s => s.Goals)
             .WithOne(g => g.LinkedGoalSet)
@@ -303,11 +311,13 @@ public static async Task<List<SubathonEvent>> GetSubathonCurrencyEvents(AppDbCon
             .ToListAsync();
 
         return await CsvUtils.ExportAsync($"subathon-{subathon.Id}",
-            [[
-                "Id", "Source", "Type", "Command", "User", "Seconds Value", "Points Value", "Value", "Currency",
-                "Amount", "Multiplier Seconds", "Multiplier Points", "Processed", "Final Seconds Added",
-                "Final Points Added", "Timestamp", "Secondary Value", "Event Meta Type", "Event Meta Common Type"
-            ]],
+            [
+                [
+                    "Id", "Source", "Type", "Command", "User", "Seconds Value", "Points Value", "Value", "Currency",
+                    "Amount", "Multiplier Seconds", "Multiplier Points", "Processed", "Final Seconds Added",
+                    "Final Points Added", "Timestamp", "Secondary Value", "Event Meta Type", "Event Meta Common Type"
+                ]
+            ],
             events, e => {
                 string val = e.Value;
                 string? commonMeta = string.IsNullOrWhiteSpace(e.EventTypeMeta) ? "" : e.EventTypeMeta;
diff --git a/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.Designer.cs b/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.Designer.cs
new file mode 100644
index 0000000..f5cc024
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.Designer.cs
@@ -0,0 +1,1174 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SubathonManager.Data;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261003232544_addActionsGlobalsSecrets")]
+    partial class addActionsGlobalsSecrets
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ActionGlobal", b =>
+                {
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Kind", "Name");
+
+                    b.ToTable("ActionGlobals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("CssVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.GoAffProStore", b =>
+                {
+                    b.Property<int>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SiteId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.HasIndex("SiteId")
+                        .IsUnique();
+
+                    b.ToTable("GoAffProStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("JsVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.Property<string>("ProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Valid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("JuniperProducts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Property<Guid>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.ToTable("JuniperStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MakeShipTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Orders")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ProductType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Sales")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShopifyProductId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MakeShipTrackings");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("ApplyToPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplyToSeconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<TimeSpan?>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FromHypeTrain")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("Multiplier")
+                        .HasColumnType("REAL");
+
+                    b.Property<DateTime?>("Started")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubathonId")
+                        .IsUnique();
+
+                    b.ToTable("MultiplierDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Routes");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ScheduleItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EndMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StartMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Date");
+
+                    b.ToTable("ScheduleItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.StateValue", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("StateValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<DateTime?>("CapDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPaused")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsCumulative")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsElapsed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneySum")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ReversedTime")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Amount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Command")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CurrentPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CurrentTime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EventTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventTypeMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("MultiplierPoints")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("MultiplierSeconds")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("PointsValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ProcessedToSubathon")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecondaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("SecondsValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TertiaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WasReversed")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id", "Source");
+
+                    b.HasIndex("SubathonId");
+
+                    b.ToTable("SubathonEvents");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<Guid?>("GoalSetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GoalSetId");
+
+                    b.ToTable("SubathonGoals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonGoalSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("CompletionDuration")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("FilterEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FilterMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FilterSubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPrompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("BaselineCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("SnapshotTargetValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPromptRuns");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("Cooldown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("RandomOffset")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonPromptSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonValue", b =>
+                {
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Meta")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(1);
+
+                    b.Property<double>("Points")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("Seconds")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("EventType", "Meta");
+
+                    b.ToTable("SubathonValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Weight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.ToTable("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("ActionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Parameter")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelItemId")
+                        .IsUnique();
+
+                    b.ToTable("WheelSpinActions");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.HasIndex("WheelItemId");
+
+                    b.ToTable("WheelSpinHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CountThreshold")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneyThreshold")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("SpinsToAdd")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TierValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSpinTriggers");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinsAdded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SubathonEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SubathonEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TriggerSource")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TriggerUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("TriggeredAt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("WheelSpinTriggerHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HtmlPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RouteId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("X")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("Y")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Z")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RouteId");
+
+                    b.ToTable("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WidgetCatalogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Entry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileModifiedTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Group")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastSeenUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewCachePath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewImage")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackPath")
+                        .IsUnique();
+
+                    b.ToTable("WidgetCatalogEntries");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("CssVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("JsVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.JuniperStore", "Store")
+                        .WithMany("Products")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithOne("Multiplier")
+                        .HasForeignKey("SubathonManager.Core.Models.MultiplierData", "SubathonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithMany()
+                        .HasForeignKey("SubathonId");
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonGoalSet", "LinkedGoalSet")
+                        .WithMany("Goals")
+                        .HasForeignKey("GoalSetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedGoalSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany("Prompts")
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPrompt", "LinkedPrompt")
+                        .WithMany()
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany()
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("LinkedPrompt");
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany("WheelItems")
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithOne("Action")
+                        .HasForeignKey("SubathonManager.Core.Models.WheelSpinAction", "WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany()
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithMany()
+                        .HasForeignKey("WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSpinTrigger", "Trigger")
+                        .WithMany("History")
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Route", "Route")
+                        .WithMany("Widgets")
+                        .HasForeignKey("RouteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Route");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Navigation("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Navigation("Multiplier")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Navigation("Goals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Navigation("Prompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Navigation("Action");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Navigation("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Navigation("History");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Navigation("CssVariables");
+
+                    b.Navigation("JsVariables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.cs b/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.cs
new file mode 100644
index 0000000..280ecbb
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261003232544_addActionsGlobalsSecrets.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class addActionsGlobalsSecrets : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ActionGlobals",
+                columns: table => new
+                {
+                    Kind = table.Column<int>(type: "INTEGER", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", maxLength: 64, nullable: false, collation: "NOCASE"),
+                    ValueType = table.Column<int>(type: "INTEGER", nullable: false),
+                    Value = table.Column<string>(type: "TEXT", nullable: true),
+                    StorageKey = table.Column<string>(type: "TEXT", maxLength: 128, nullable: true),
+                    CreatedAt = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    UpdatedAt = table.Column<DateTime>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ActionGlobals", x => new { x.Kind, x.Name });
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ActionGlobals");
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
index 9b631e4..30d2e2f 100644
--- a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -17,6 +17,37 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
 
+            modelBuilder.Entity("SubathonManager.Core.Models.ActionGlobal", b =>
+                {
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Kind", "Name");
+
+                    b.ToTable("ActionGlobals");
+                });
+
             modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
                 {
                     b.Property<int>("Id")
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
index 233e3bd..30e8add 100644
--- a/SubathonManager.Services/ActionService.cs
+++ b/SubathonManager.Services/ActionService.cs
@@ -1,5 +1,6 @@
 using System.Collections.Concurrent;
 using System.Globalization;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
@@ -10,6 +11,8 @@
 using SubathonManager.Core.Interfaces;
 using SubathonManager.Core.Models;
 using SubathonManager.Core.Objects;
+using SubathonManager.Core.Security;
+using SubathonManager.Core.Security.Interfaces;
 using SubathonManager.Data;
 using SubathonManager.Data.Widgets;
 
@@ -20,13 +23,19 @@ public partial class ActionService(
     IEnumerable<IActionStepRunner> runners,
     ILogger<ActionService>? logger = null,
     string? actionsFolder = null,
-    IConfig? config = null) : IAppService, IDisposable {
-    private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(10) };
+    IConfig? config = null,
+    ISecureStorage? secureStorage = null) : IAppService, IDisposable {
+    public const string LoggedRunMeta = "logged-run";
 
-    public static string DefaultActionsFolder => Path.GetFullPath("actions");
-    public static string ExportsFolder => Path.GetFullPath(Path.Combine("exports", "actions"));
+    // web step saving to %resp% also sets %resp_status%
+    public const string StatusSuffix = "_status";
+
+    private static readonly HttpClient Http = new() { Timeout = Timeout.InfiniteTimeSpan };
+    private static readonly TimeSpan DefaultRequestTimeout = TimeSpan.FromSeconds(15);
+    private static readonly TimeSpan MaxRequestTimeout = TimeSpan.FromMinutes(5);
 
     private readonly string _folder = actionsFolder ?? DefaultActionsFolder;
+    private readonly SemaphoreSlim _globalsLock = new(1, 1);
     private readonly ConcurrentDictionary<Guid, (CustomAction Action, string Path)> _library = new();
 
     private readonly Dictionary<ActionStepType, IActionStepRunner> _runners = runners
@@ -35,11 +44,14 @@ public partial class ActionService(
         .ToDictionary(g => g.Key, g => g.First().Runner);
 
     private readonly ConcurrentDictionary<Guid, LiveRun> _runs = new();
-    private volatile bool _multiplierActive;
     private volatile bool _libraryLoaded;
-    public event Action? CustomActionsChanged;
-    
-    public const string LoggedRunMeta = "logged-run";
+    private volatile bool _multiplierActive;
+
+    public static string DefaultActionsFolder => Path.GetFullPath("actions");
+    public static string ExportsFolder => Path.GetFullPath(Path.Combine("exports", "actions"));
+
+    public IReadOnlyList<CustomAction> CustomActions =>
+        _library.Values.Select(e => e.Action).OrderBy(a => a.Name, StringComparer.OrdinalIgnoreCase).ToList();
 
     public async Task StartAsync(CancellationToken ct = default) {
         SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
@@ -66,6 +78,8 @@ public void Dispose() {
         GC.SuppressFinalize(this);
     }
 
+    public event Action? CustomActionsChanged;
+
     public bool IsRunning(Guid runId) {
         return _runs.ContainsKey(runId);
     }
@@ -74,9 +88,6 @@ public void Cancel(Guid runId) {
         if (_runs.TryGetValue(runId, out LiveRun? run)) run.Cancel();
     }
 
-    public IReadOnlyList<CustomAction> CustomActions =>
-        _library.Values.Select(e => e.Action).OrderBy(a => a.Name, StringComparer.OrdinalIgnoreCase).ToList();
-
     public CustomAction? FindCustomAction(string name) {
         string wanted = name.Trim();
         return _library.Values.Select(e => e.Action)
@@ -117,7 +128,7 @@ public Task<ActionRunResult> RunManuallyAsync(CustomAction action, bool unsavedC
     private void OnCustomActionRunRequested(SubathonEvent ev) {
         if (ev.EventTypeMeta == LoggedRunMeta) return;
         string name = ev.Value?.Trim() ?? "";
-        string prefix = $"{SubathonCommandType.RunAction} ";
+        var prefix = $"{SubathonCommandType.RunAction} ";
 
         if (name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) name = name[prefix.Length..].Trim();
         if (FindCustomAction(name) is not { } action) {
@@ -129,22 +140,248 @@ private void OnCustomActionRunRequested(SubathonEvent ev) {
         _ = RunCustomActionAsync(action, user, ev.Source);
     }
 
-    private async Task<ActionStep> FillVariablesAsync(ActionStep step, ActionContext ctx) {
-        string joined = $"{step.Target}\n{step.Scope}\n{step.Body}";
-        List<ActionVariable> used = ActionStepTypeHelper.FindVariables(joined).Distinct().ToList();
-        if (used.Count == 0) return step;
+    private async Task<ActionStep> FillVariablesAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
+        IReadOnlySet<string> outputs) {
+        List<string> tokens = ActionStepTypeHelper.FindTokens(step.AllText)
+            .Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+        if (tokens.Count == 0) return step;
+
+        List<ActionVariable> builtIns = ActionStepTypeHelper.FindVariables(step.AllText).Distinct().ToList();
+        Dictionary<ActionVariable, string> values = builtIns.Count == 0
+            ? []
+            : await ActionVariableResolver.ResolveAsync(factory, builtIns, ctx, config);
+
+        List<string> globalNames = ActionStepTypeHelper.FindStoreRefs(step.AllText)
+            .Where(r => r.Kind == ActionStoreKind.Global).Select(r => r.Name).ToList();
+        Dictionary<string, string?> globals = globalNames.Count == 0 ? [] : await GetGlobalValuesAsync(globalNames);
+
+        return step.Fill(text => ActionStepTypeHelper.ReplaceTokens(text, token => {
+            if (ActionStepTypeHelper.TryGetStoreRef(token, out ActionStoreKind kind, out string name))
+                return (kind == ActionStoreKind.Secret ? GetSecretValue(name) : globals.GetValueOrDefault(name)) ?? "";
+            if (progress.TryReadVariable(token, out string saved)) return saved;
+
+            string root = ActionStepTypeHelper.TokenRoot(token);
+            if (outputs.Contains(root) || (root.EndsWith(StatusSuffix, StringComparison.OrdinalIgnoreCase)
+                                           && outputs.Contains(root[..^StatusSuffix.Length]))) return "";
+
+            return ActionStepTypeHelper.TryParseToken(token, out ActionVariable variable)
+                   && values.TryGetValue(variable, out string? value)
+                ? value
+                : null;
+        }));
+    }
+
+    ////////////////// globals & secrets
+    public event Action? GlobalsChanged;
+
+    private static string SecretKey(string name) {
+        return $"{StorageKeys.ActionSecretPrefix}{name.ToLowerInvariant()}";
+    }
+
+    public async Task<List<ActionGlobal>> GetGlobalsAsync(ActionStoreKind? kind = null) {
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        return await db.ActionGlobals.AsNoTracking()
+            .Where(g => kind == null || g.Kind == kind)
+            .OrderBy(g => g.Kind).ThenBy(g => g.Name)
+            .ToListAsync();
+    }
+
+    private async Task<Dictionary<string, string?>> GetGlobalValuesAsync(List<string> names) {
+        var wanted = new HashSet<string>(names, StringComparer.OrdinalIgnoreCase);
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        return (await db.ActionGlobals.AsNoTracking().Where(g => g.Kind == ActionStoreKind.Global).ToListAsync())
+            .Where(g => wanted.Contains(g.Name))
+            .ToDictionary(g => g.Name, g => g.Value, StringComparer.OrdinalIgnoreCase);
+    }
+
+    public string? GetSecretValue(string name) {
+        return secureStorage?.Get(SecretKey(name));
+    }
+
+    public async Task<bool> SetSecretAsync(string name, string value) {
+        name = name.Trim();
+        if (!ActionStepTypeHelper.IsValidName(name) || secureStorage == null) return false;
+
+        await _globalsLock.WaitAsync();
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            ActionGlobal? row = await db.ActionGlobals
+                .FirstOrDefaultAsync(g => g.Kind == ActionStoreKind.Secret && g.Name == name);
+            if (row == null)
+                db.ActionGlobals.Add(new ActionGlobal {
+                    Kind = ActionStoreKind.Secret, Name = name, StorageKey = SecretKey(name)
+                });
+            else row.UpdatedAt = DateTime.Now;
+            await db.SaveChangesAsync();
+            if (!secureStorage.Set(SecretKey(name), value)) return false;
+        }
+        finally {
+            _globalsLock.Release();
+        }
+
+        GlobalsChanged?.Invoke();
+        return true;
+    }
+
+    public async Task<string?> SetGlobalAsync(string name, ActionValueType type, string? value) {
+        name = name.Trim();
+        if (!ActionStepTypeHelper.IsValidName(name)) return "Names are letters, numbers, and _ only";
+
+        string? stored = string.IsNullOrEmpty(value) ? type.DefaultValue() : type.NormalizeValue(value);
+        if (stored == null && !string.IsNullOrEmpty(value)) return $"\"{value}\" isn't a {type.GetLabel()} value";
+
+        await _globalsLock.WaitAsync();
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            ActionGlobal? row = await db.ActionGlobals
+                .FirstOrDefaultAsync(g => g.Kind == ActionStoreKind.Global && g.Name == name);
+            if (row == null) {
+                row = new ActionGlobal { Kind = ActionStoreKind.Global, Name = name };
+                db.ActionGlobals.Add(row);
+            }
+
+            row.ValueType = type;
+            row.Value = stored;
+            row.UpdatedAt = DateTime.Now;
+            await db.SaveChangesAsync();
+        }
+        finally {
+            _globalsLock.Release();
+        }
+
+        GlobalsChanged?.Invoke();
+        return null;
+    }
+
+    public async Task<bool> SetGlobalTypeAsync(string name, ActionValueType type) {
+        bool kept;
+        await _globalsLock.WaitAsync();
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            ActionGlobal? row = await db.ActionGlobals
+                .FirstOrDefaultAsync(g => g.Kind == ActionStoreKind.Global && g.Name == name);
+            if (row == null) return false;
+            if (row.ValueType == type) return true;
+
+            string? converted = ActionStepTypeHelper.ConvertValue(row.Value, row.ValueType, type);
+            kept = converted != null || string.IsNullOrEmpty(row.Value);
+            row.Value = converted ?? type.DefaultValue();
+            row.ValueType = type;
+            row.UpdatedAt = DateTime.Now;
+            await db.SaveChangesAsync();
+        }
+        finally {
+            _globalsLock.Release();
+        }
+
+        GlobalsChanged?.Invoke();
+        return kept;
+    }
 
-        Dictionary<ActionVariable, string> values = await ActionVariableResolver.ResolveAsync(factory, used, ctx, config);
-        return new ActionStep {
-            Type = step.Type,
-            Operation = step.Operation,
-            Target = ActionStepTypeHelper.ReplaceVariables(step.Target, values),
-            TargetName = step.TargetName,
-            Scope = step.Scope == null ? null : ActionStepTypeHelper.ReplaceVariables(step.Scope, values),
-            Value = step.Value,
-            Seconds = step.Seconds,
-            Body = step.Body == null ? null : ActionStepTypeHelper.ReplaceVariables(step.Body, values)
-        };
+    public async Task DeleteGlobalAsync(ActionStoreKind kind, string name) {
+        await using AppDbContext db = await factory.CreateDbContextAsync();
+        await db.ActionGlobals.Where(g => g.Kind == kind && g.Name == name).ExecuteDeleteAsync();
+        if (kind == ActionStoreKind.Secret) secureStorage?.Delete(SecretKey(name));
+        GlobalsChanged?.Invoke();
+    }
+
+    private async Task<bool> RunSetGlobalAsync(ActionStep step, CancellationToken ct) {
+        string name = step.Target.Trim();
+        await _globalsLock.WaitAsync(ct);
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync(ct);
+            ActionGlobal? row = await db.ActionGlobals
+                .FirstOrDefaultAsync(g => g.Kind == ActionStoreKind.Global && g.Name == name, ct);
+            if (row == null) {
+                logger?.LogWarning("[Actions] There is no global named \"{Name}\" to set", name);
+                return false;
+            }
+
+            string input = row.ValueType == ActionValueType.Text ? step.Body ?? "" : (step.Body ?? "").Trim();
+            string? next = step.Operation switch {
+                ActionOperation.Toggle when row.ValueType == ActionValueType.Boolean =>
+                    row.Value == "true" ? "false" : "true",
+                ActionOperation.Adjust when row.ValueType == ActionValueType.Number
+                                            && ActionValueType.Number.NormalizeValue(input) is { } amount =>
+                    ActionValueType.Number.NormalizeValue(
+                        (double.Parse(row.Value ?? "0", CultureInfo.InvariantCulture)
+                         + double.Parse(amount, CultureInfo.InvariantCulture)).ToString(CultureInfo.InvariantCulture)),
+                ActionOperation.Set => row.ValueType.NormalizeValue(input),
+                _ => null
+            };
+
+            if (next == null) {
+                logger?.LogWarning("[Actions] Can't {Operation} %global.{Name}% ({Type}) with \"{Value}\"",
+                    step.Operation.GetOpLabel().ToLowerInvariant(), row.Name, row.ValueType.GetLabel(), input);
+                return false;
+            }
+
+            row.Value = next;
+            row.UpdatedAt = DateTime.Now;
+            await db.SaveChangesAsync(ct);
+        }
+        finally {
+            _globalsLock.Release();
+        }
+
+        GlobalsChanged?.Invoke();
+        return true;
+    }
+
+    public async Task<int> EnsureGlobalsAsync(CustomAction action) {
+        var used = new Dictionary<(ActionStoreKind, string), ActionValueType>(new StoreKeyComparer());
+        foreach (ActionNode node in action.Graph.Nodes) {
+            foreach ((ActionStoreKind kind, string name) in ActionStepTypeHelper.FindStoreRefs(node.Step.AllText))
+                used.TryAdd((kind, name), ActionValueType.Text);
+            if (node.Step.Type != ActionStepType.SetGlobal ||
+                !ActionStepTypeHelper.IsValidName(node.Step.Target.Trim()))
+                continue;
+
+            used[(ActionStoreKind.Global, node.Step.Target.Trim())] = node.Step.Operation switch {
+                ActionOperation.Adjust => ActionValueType.Number,
+                ActionOperation.Toggle => ActionValueType.Boolean,
+                _ => ActionValueType.Text
+            };
+        }
+
+        if (used.Count == 0) return 0;
+
+        List<ActionGlobal> added;
+        await _globalsLock.WaitAsync();
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            HashSet<(ActionStoreKind, string)> known = (await db.ActionGlobals.Select(g => new { g.Kind, g.Name })
+                    .ToListAsync())
+                .Select(g => (g.Kind, g.Name)).ToHashSet(new StoreKeyComparer());
+            added = used.Where(u => !known.Contains(u.Key))
+                .Select(u => new ActionGlobal {
+                    Kind = u.Key.Item1, Name = u.Key.Item2, ValueType = u.Value,
+                    Value = u.Key.Item1 == ActionStoreKind.Global ? u.Value.DefaultValue() : null,
+                    StorageKey = u.Key.Item1 == ActionStoreKind.Secret ? SecretKey(u.Key.Item2) : null
+                })
+                .ToList();
+            if (added.Count == 0) return 0;
+            db.ActionGlobals.AddRange(added);
+            await db.SaveChangesAsync();
+        }
+        finally {
+            _globalsLock.Release();
+        }
+
+        logger?.LogInformation("[Actions] \"{Action}\" uses globals / secrets not set up yet: {Names}", action.Name,
+            string.Join(", ", added.Select(g => ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name))));
+        GlobalsChanged?.Invoke();
+        return added.Count;
+    }
+
+    public IReadOnlyList<CustomAction> ActionsUsing(ActionStoreKind kind, string name) {
+        return CustomActions.Where(a => a.Graph.Nodes.Any(n =>
+                ActionStepTypeHelper.FindStoreRefs(n.Step.AllText)
+                    .Any(r => r.Kind == kind && r.Name.Equals(name, StringComparison.OrdinalIgnoreCase))
+                || (kind == ActionStoreKind.Global && n.Step.Type == ActionStepType.SetGlobal
+                                                   && n.Step.Target.Trim().Equals(name,
+                                                       StringComparison.OrdinalIgnoreCase))))
+            .ToList();
     }
 
     public CustomAction? GetCustomAction(Guid id) {
@@ -178,12 +415,19 @@ public async Task SaveCustomActionAsync(CustomAction action) {
             : NewActionPath(_folder, action.Name);
 
         Directory.CreateDirectory(Path.GetDirectoryName(path)!);
-        string temp = $"{path}.tmp";
+        var temp = $"{path}.tmp";
         await File.WriteAllTextAsync(temp, action.ToJson());
         File.Move(temp, path, true);
 
         _library[action.Id] = (action, path);
         CustomActionsChanged?.Invoke();
+
+        try {
+            await EnsureGlobalsAsync(action);
+        }
+        catch (Exception ex) {
+            logger?.LogWarning(ex, "[Actions] Could not add the globals and secrets \"{Name}\" uses", action.Name);
+        }
     }
 
     public void DeleteCustomAction(Guid id) {
@@ -311,15 +555,36 @@ private async Task<bool> RunGraphAsync(ActionGraph graph, ActionContext ctx, Act
         CancellationToken ct = failCts.Token;
 
         Dictionary<string, ActionNode> pending = graph.Nodes
-            .Where(n => !progress.IsDone(n.Id))
+            .Where(n => !progress.IsResolved(n.Id))
             .ToDictionary(n => n.Id);
         var running = new Dictionary<Task<bool>, ActionNode>();
+        HashSet<string> outputs = graph.OutputVariables();
 
         void StartReady() {
-            foreach (ActionNode node in pending.Values.ToList().Where(node => graph.Incoming(node.Id).All(progress.IsDone))) {
-                pending.Remove(node.Id);
-                running[node.Disabled ? Task.Run(() => true, ct) : RunStepAsync(node.Step, ctx, progress, ct)] = node;
-            }
+            bool changed;
+            do {
+                changed = false;
+                foreach (ActionNode node in pending.Values.ToList()) {
+                    List<ActionEdge> incoming = graph.IncomingEdges(node.Id).ToList();
+                    if (!incoming.All(e => progress.IsResolved(e.From))) continue;
+                    pending.Remove(node.Id);
+
+                    if (incoming.Count > 0 && !incoming.Any(progress.IsLive)) {
+                        progress.MarkSkipped(node.Id);
+                        changed = true;
+                        continue;
+                    }
+
+                    running[StartStep(node)] = node;
+                }
+            } while (changed);
+        }
+
+        Task<bool> StartStep(ActionNode node) {
+            if (node.Disabled) return Task.Run(() => true, ct);
+            return node.Step.Type == ActionStepType.Condition
+                ? RunConditionAsync(node, ctx, progress, outputs, ct)
+                : RunStepAsync(node.Step, ctx, progress, outputs, ct);
         }
 
         StartReady();
@@ -341,6 +606,12 @@ void StartReady() {
                 ok = false;
             }
 
+            if (!ok && node.IgnoreErrors && !ct.IsCancellationRequested) {
+                logger?.LogInformation("[Actions] {Label}: \"{Step}\" failed. Ignore Errors = true",
+                    ctx.Label ?? ctx.RepeatKey, node.Step.Describe());
+                ok = true;
+            }
+
             if (ok) {
                 progress.MarkDone(node.Id);
                 if (onProgress != null) await onProgress(progress);
@@ -358,32 +629,35 @@ void StartReady() {
         return !failed && pending.Count == 0 && !outerCt.IsCancellationRequested;
     }
 
+    private async Task<bool> RunConditionAsync(ActionNode node, ActionContext ctx, ActionRunProgress progress,
+        IReadOnlySet<string> outputs, CancellationToken ct) {
+        ct.ThrowIfCancellationRequested();
+        ActionStep step = await FillVariablesAsync(node.Step, ctx, progress, outputs);
+
+        bool result = ActionStepTypeHelper.Compare(step.Scope ?? "", step.Operation, step.Target);
+        progress.SetPort(node.Id, result ? null : ActionEdge.ElsePort);
+
+        if (logger?.IsEnabled(LogLevel.Debug) ?? false)
+            logger.LogDebug("[Actions] {Label}: \"{Step}\" was {Result}", ctx.Label ?? ctx.RepeatKey,
+                node.Step.Describe(), result);
+        return true;
+    }
+
     private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
-        CancellationToken ct) {
+        IReadOnlySet<string> outputs, CancellationToken ct) {
         ct.ThrowIfCancellationRequested();
         if (!step.Type.IsAvailable()) return false;
 
-        if (step.Type.AllowsVariables()) step = await FillVariablesAsync(step, ctx);
+        ActionStep original = step;
+        if (step.Type.AllowsVariables()) step = await FillVariablesAsync(step, ctx, progress, outputs);
 
         switch (step.Type) {
             case ActionStepType.HttpGet:
-            case ActionStepType.HttpPost: {
-                using var request = new HttpRequestMessage(
-                    step.Type == ActionStepType.HttpGet ? HttpMethod.Get : HttpMethod.Post, step.Target.Trim());
-                if (step.Type == ActionStepType.HttpPost) {
-                    string body = step.Body ?? "";
-                    string start = body.TrimStart();
-                    string mediaType = start.StartsWith('{') || start.StartsWith('[') ? "application/json" : "text/plain";
-                    request.Content = new StringContent(body, Encoding.UTF8, mediaType);
-                }
+            case ActionStepType.HttpPost:
+                return await RunWebRequestAsync(step, original, progress, ct);
 
-                using HttpResponseMessage response =
-                    await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, ct);
-                if (response.IsSuccessStatusCode) return true;
-                logger?.LogWarning("[Actions] {Method} {Url} answered {Status}", request.Method, step.Target,
-                    (int)response.StatusCode);
-                return false;
-            }
+            case ActionStepType.SetGlobal:
+                return await RunSetGlobalAsync(step, ct);
 
             case ActionStepType.Wait:
                 await Task.Delay(step.Duration, ct); // when here, easier to do a delay vs the timerservice callback
@@ -414,7 +688,7 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
                     return false;
                 }
 
-                string amount = (step.Value ?? 1).ToString(CultureInfo.InvariantCulture);
+                var amount = (step.Value ?? 1).ToString(CultureInfo.InvariantCulture);
                 string duration = step.Duration > TimeSpan.Zero ? $"{(int)step.Duration.TotalSeconds}s" : "xs";
                 bool points = step.Operation is ActionOperation.Points or ActionOperation.PointsAndTime;
                 bool time = step.Operation is ActionOperation.Time or ActionOperation.PointsAndTime;
@@ -446,9 +720,69 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
         }
     }
 
+    private async Task<bool> RunWebRequestAsync(ActionStep step, ActionStep original, ActionRunProgress progress,
+        CancellationToken ct) {
+        string? output = string.IsNullOrEmpty(step.OutputVariable) ? null : step.OutputVariable;
+        using var timeout = CancellationTokenSource.CreateLinkedTokenSource(ct);
+        timeout.CancelAfter(step.Duration > TimeSpan.Zero
+            ? step.Duration < MaxRequestTimeout ? step.Duration : MaxRequestTimeout
+            : DefaultRequestTimeout);
+
+        try {
+            using var request = new HttpRequestMessage(
+                step.Type == ActionStepType.HttpGet ? HttpMethod.Get : HttpMethod.Post, step.Target.Trim());
+            if (step.Type == ActionStepType.HttpPost) {
+                string body = step.Body ?? "";
+                string start = body.TrimStart();
+                string mediaType = start.StartsWith('{') || start.StartsWith('[') ? "application/json" : "text/plain";
+                request.Content = new StringContent(body, Encoding.UTF8, mediaType);
+            }
+
+            foreach ((string name, string value) in step.HeaderLines()) {
+                if (name.Equals("Content-Type", StringComparison.OrdinalIgnoreCase)) {
+                    if (request.Content != null && MediaTypeHeaderValue.TryParse(value, out MediaTypeHeaderValue? type))
+                        request.Content.Headers.ContentType = type;
+                    continue;
+                }
+
+                if (!request.Headers.TryAddWithoutValidation(name, value))
+                    request.Content?.Headers.TryAddWithoutValidation(name, value);
+            }
+
+            request.Headers.Authorization = step.Auth switch {
+                ActionHttpAuth.Bearer => new AuthenticationHeaderValue("Bearer", step.AuthToken?.Trim()),
+                ActionHttpAuth.Basic => new AuthenticationHeaderValue("Basic",
+                    Convert.ToBase64String(Encoding.UTF8.GetBytes($"{step.AuthUser}:{step.AuthToken}"))),
+                _ => request.Headers.Authorization
+            };
+
+            using HttpResponseMessage response =
+                await Http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, timeout.Token);
+            if (output != null) {
+                progress.SetVariable(output, await response.Content.ReadAsStringAsync(timeout.Token));
+                progress.SetVariable($"{output}{StatusSuffix}", $"{(int)response.StatusCode}");
+            }
+
+            if (response.IsSuccessStatusCode) return true;
+            logger?.LogWarning("[Actions] {Method} {Url} answered {Status}", request.Method, original.Target,
+                (int)response.StatusCode);
+            return false;
+        }
+        catch (Exception ex) when (ex is HttpRequestException or InvalidOperationException or UriFormatException
+                                   || (ex is OperationCanceledException && !ct.IsCancellationRequested)) {
+            if (output != null) {
+                progress.SetVariable(output, "");
+                progress.SetVariable($"{output}{StatusSuffix}", "0");
+            }
+
+            logger?.LogWarning("[Actions] {Type} {Url} failed: {Message}", original.Type.GetLabel(), original.Target,
+                ex is OperationCanceledException ? "timed out" : ex.Message);
+            return false;
+        }
+    }
+
     public async Task<ActionRunResult> RunWheelSpinAsync(Guid historyId, Func<WheelSpinHistoryStatus,
         Task>? announce = null) {
-
         WheelSpinHistory? history = await LoadHistoryAsync(historyId);
         if (history == null) return ActionRunResult.Skipped;
 
@@ -532,6 +866,16 @@ private void OnSubathonDataUpdate(SubathonData data, DateTime _) {
         _multiplierActive = data.Multiplier?.IsRunning() ?? false;
     }
 
+    private sealed class StoreKeyComparer : IEqualityComparer<(ActionStoreKind Kind, string Name)> {
+        public bool Equals((ActionStoreKind Kind, string Name) x, (ActionStoreKind Kind, string Name) y) {
+            return x.Kind == y.Kind && string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public int GetHashCode((ActionStoreKind Kind, string Name) key) {
+            return HashCode.Combine(key.Kind, StringComparer.OrdinalIgnoreCase.GetHashCode(key.Name));
+        }
+    }
+
     private sealed class LiveRun(Guid id, string repeatKey) : IDisposable {
         private readonly CancellationTokenSource _cts = new();
         public Guid Id { get; } = id;
@@ -540,6 +884,10 @@ private sealed class LiveRun(Guid id, string repeatKey) : IDisposable {
         public bool Cancelled { get; private set; }
         public bool Superseded { get; set; }
 
+        public void Dispose() {
+            _cts.Dispose();
+        }
+
         public void Cancel() {
             Cancelled = true;
             try {
@@ -549,9 +897,5 @@ public void Cancel() {
                 /* */
             }
         }
-
-        public void Dispose() {
-            _cts.Dispose();
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
index 0b94eb7..898db49 100644
--- a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -8,6 +8,7 @@
 using SubathonManager.Core.Interfaces;
 using SubathonManager.Core.Models;
 using SubathonManager.Core.Objects;
+using SubathonManager.Core.Security.Interfaces;
 using SubathonManager.Data;
 using SubathonManager.Services;
 using SubathonManager.Tests.Utility;
@@ -19,7 +20,7 @@ namespace SubathonManager.Tests.ServicesUnitTests;
 [Collection("GlobalState")]
 public class ActionServiceTests {
     private static async Task<(ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options,
-        SqliteConnection conn)> SetupAsync() {
+        SqliteConnection conn)> SetupAsync(ISecureStorage? secureStorage = null) {
         var dbName = $"test_{Guid.NewGuid():N}";
         var connectionString = $"DataSource={dbName};Mode=Memory;Cache=Shared;Pooling=False";
         var connection = new SqliteConnection(connectionString);
@@ -46,7 +47,8 @@ public class ActionServiceTests {
 
         var runner = new FakeRunner();
         var service = new ActionService(factoryMock.Object, [runner],
-            actionsFolder: Path.Combine(Path.GetTempPath(), $"sm_actions_{Guid.NewGuid():N}"));
+            actionsFolder: Path.Combine(Path.GetTempPath(), $"sm_actions_{Guid.NewGuid():N}"),
+            secureStorage: secureStorage);
         await service.StartAsync(TestContext.Current.CancellationToken);
         return (service, runner, options, connection);
     }
@@ -89,7 +91,7 @@ public async Task InstantWheelAction_RunsBeforeTheSpinIsAnnounced_AndLandsDone()
         WheelEvents.WheelSpinStatusChanged += (h, _) => statusEvents.Add(h.Status);
 
         WheelSpinHistoryStatus? announced = null;
-        var commandsAtAnnounce = -1;
+        int commandsAtAnnounce = -1;
         ActionRunResult result = await service.RunWheelSpinAsync(history.Id, status => {
             announced = status;
             commandsAtAnnounce = created.Count;
@@ -218,7 +220,8 @@ public async Task MarkingARunningSpinDone_StopsTheChain_AndKeepsTheNewStatus() {
             vts.ToParameterString());
 
         Task<ActionRunResult> run = service.RunWheelSpinAsync(history.Id);
-        for (var i = 0; i < 100 && !service.IsRunning(history.Id); i++) await Task.Delay(10, TestContext.Current.CancellationToken);
+        for (var i = 0; i < 100 && !service.IsRunning(history.Id); i++)
+            await Task.Delay(10, TestContext.Current.CancellationToken);
         Assert.True(service.IsRunning(history.Id));
 
         await using (var db = new AppDbContext(options)) {
@@ -272,7 +275,8 @@ public void VtsParameterAction_ConvertsToAChain_ThatSurvivesJson() {
 
         Assert.True(ActionGraph.TryParse(vts.ToActionGraph().ToJson(), out ActionGraph? graph));
         Assert.True(graph.IsValid(out _));
-        Assert.Equal([ActionOperation.Hold, ActionOperation.None, ActionOperation.Restore], graph.Nodes.Select(n => n.Step.Operation));
+        Assert.Equal([ActionOperation.Hold, ActionOperation.None, ActionOperation.Restore],
+            graph.Nodes.Select(n => n.Step.Operation));
         Assert.Equal("FaceAngleX = 30 (held) -> Wait 10s -> Restore FaceAngleX", graph.Describe());
 
         graph.Edges.Add(new ActionEdge { From = "3", To = "1" });
@@ -433,7 +437,8 @@ await service.SaveCustomActionAsync(new CustomAction {
         Assert.Equal("SomeMod", runner.LastUser);
 
         ActionEvents.RaiseCustomActionRunRequested(new SubathonEvent { Value = "RunAction Hat Bit" });
-        for (var i = 0; i < 100 && runner.Ran.Count < 2; i++) await Task.Delay(10, TestContext.Current.CancellationToken);
+        for (var i = 0; i < 100 && runner.Ran.Count < 2; i++)
+            await Task.Delay(10, TestContext.Current.CancellationToken);
         Assert.Equal("SYSTEM", runner.LastUser);
 
         ActionEvents.RaiseCustomActionRunRequested(new SubathonEvent { Value = "Hat" });
@@ -492,12 +497,211 @@ public void StepArguments_AreNameValueLines() {
         Assert.Equal(new[] { ("points", "%points%"), ("message", "hi = there") }, args);
     }
 
+    [Fact]
+    public async Task IfElse_RunsOnlyTakenSide_JoinOfBothSidesRunsOnce() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        ActionGraph Build() {
+            return new ActionGraph {
+                Nodes = [
+                    new ActionNode { Id = "1", Step = Hotkey("fetch") },
+                    new ActionNode {
+                        Id = "2", Step = new ActionStep {
+                            Type = ActionStepType.Condition, Operation = ActionOperation.MoreThan,
+                            Scope = "%resp.data.items[1].count%", Target = "3"
+                        }
+                    },
+                    new ActionNode { Id = "3", Step = Hotkey("then") },
+                    new ActionNode { Id = "4", Step = Hotkey("then-more") },
+                    new ActionNode { Id = "5", Step = Hotkey("else") },
+                    new ActionNode { Id = "6", Step = Hotkey("join") }
+                ],
+                Edges = [
+                    new ActionEdge { From = "1", To = "2" },
+                    new ActionEdge { From = "2", To = "3" },
+                    new ActionEdge { From = "3", To = "4" },
+                    new ActionEdge { From = "2", To = "5", Port = ActionEdge.ElsePort },
+                    new ActionEdge { From = "4", To = "6" },
+                    new ActionEdge { From = "5", To = "6" }
+                ]
+            };
+        }
+
+        Assert.True(ActionGraph.TryParse(Build().ToJson(), out ActionGraph? reloaded));
+        Assert.Equal(ActionEdge.ElsePort, reloaded.Edges.Single(e => e.To == "5").Port);
+        Assert.DoesNotContain("\"port\"", ActionGraph.Sequence(Hotkey("a"), Hotkey("b")).ToJson());
+
+        runner.SetVariables["fetch"] = ("resp", """{"data":{"items":[{"count":1},{"count":5}]}}""");
+        var progress = new ActionRunProgress();
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), reloaded,
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "if-true"), progress));
+        Assert.Equal(["fetch", "then", "then-more", "join"], runner.Ran.ToArray());
+        Assert.Equal(["5"], progress.Skipped.ToArray());
+
+        runner.Ran.Clear();
+        runner.SetVariables["fetch"] = ("resp", """{"data":{"items":[{"count":1},{"count":2}]}}""");
+        progress = new ActionRunProgress();
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), Build(),
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "if-false"), progress));
+        Assert.Equal(["fetch", "else", "join"], runner.Ran.ToArray());
+        Assert.Equal(["3", "4"], progress.Skipped.Order().ToArray());
+
+        ActionRunProgress resumed = ActionRunProgress.Parse(progress.ToJson());
+        Assert.Equal(ActionEdge.ElsePort, resumed.Ports["2"]);
+        Assert.True(resumed.TryReadVariable("RESP.data.items[0].count", out string count));
+        Assert.Equal("1", count);
+    }
+
+    [Fact]
+    public async Task IgnoreErrors_LetsTheRunCarryOn_WhileOtherFailuresStillPause() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        ActionGraph graph = ActionGraph.Sequence(Hotkey("flaky"), Hotkey("after"));
+        graph.Nodes[0].IgnoreErrors = true;
+        Assert.True(ActionGraph.TryParse(graph.ToJson(), out ActionGraph? reloaded));
+        Assert.True(reloaded.Nodes[0].IgnoreErrors);
+        Assert.DoesNotContain("ignore_errors", ActionGraph.Sequence(Hotkey("a")).ToJson());
+
+        runner.FailOnce.Add("flaky");
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), reloaded,
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "ignore")));
+        Assert.Equal(["after"], runner.Ran.ToArray());
+
+        runner.FailOnce.Add("flaky");
+        reloaded.Nodes[0].IgnoreErrors = false;
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(), reloaded,
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "no-ignore")));
+        Assert.Equal(["after"], runner.Ran.ToArray());
+    }
+
+    [Fact]
+    public async Task Secrets_FillIntoSteps_AreAddedEmptyForSavedActions_AndCanBeDeleted() {
+        var store = new Dictionary<string, string>();
+        var storage = new Mock<ISecureStorage>();
+        storage.Setup(s => s.Set(It.IsAny<string>(), It.IsAny<string>()))
+            .Returns((string key, string value) => {
+                store[key] = value;
+                return true;
+            });
+        storage.Setup(s => s.Get(It.IsAny<string>())).Returns((string key) => store.GetValueOrDefault(key));
+        storage.Setup(s => s.Delete(It.IsAny<string>())).Returns((string key) => store.Remove(key));
+
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync(storage.Object);
+        await using SqliteConnection __ = conn;
+
+        Assert.False(await service.SetSecretAsync("bad name", "x"));
+        Assert.True(await service.SetSecretAsync("Api_Key", "abc123"));
+        Assert.Equal("abc123", service.GetSecretValue("api_key"));
+
+        var step = new ActionStep {
+            Type = ActionStepType.MixItUpCommand, Operation = ActionOperation.Run, Target = "cmd",
+            Body = "key=%secret.API_KEY%\nother=%secret.missing_one%\nleft=%resp.x%"
+        };
+        await service.SaveCustomActionAsync(new CustomAction
+            { Name = "Uses secrets", Graph = ActionGraph.Sequence(step) });
+
+        Assert.Equal(["Api_Key", "missing_one"],
+            (await service.GetGlobalsAsync(ActionStoreKind.Secret)).Select(s => s.Name)
+            .Order(StringComparer.OrdinalIgnoreCase).ToArray());
+        Assert.Null(service.GetSecretValue("missing_one"));
+        Assert.Single(service.ActionsUsing(ActionStoreKind.Secret, "api_key"));
+
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), ActionGraph.Sequence(step),
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "secrets")));
+        Assert.Equal("key=abc123\nother=\nleft=%resp.x%", runner.LastBody);
+
+        await service.DeleteGlobalAsync(ActionStoreKind.Secret, "API_KEY");
+        Assert.Null(service.GetSecretValue("api_key"));
+        Assert.Equal(["missing_one"],
+            (await service.GetGlobalsAsync(ActionStoreKind.Secret)).Select(s => s.Name).ToArray());
+    }
+
+    [Fact]
+    public async Task Globals_AreTyped_SetGlobalStepsCheckTheType_AndTypeChangesConvertOrClear() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        Assert.NotNull(await service.SetGlobalAsync("deaths", ActionValueType.Number, "nope"));
+        Assert.Null(await service.SetGlobalAsync("Deaths", ActionValueType.Number, " 2.50 "));
+        Assert.Null(await service.SetGlobalAsync("hat_on", ActionValueType.Boolean, "yes"));
+        Assert.Null(await service.SetGlobalAsync("greeting", ActionValueType.Text, "hi there "));
+
+        ActionStep Set(string name, ActionOperation op, string? body = null) {
+            return new ActionStep { Type = ActionStepType.SetGlobal, Operation = op, Target = name, Body = body };
+        }
+
+        var report = new ActionStep {
+            Type = ActionStepType.MixItUpCommand, Operation = ActionOperation.Run, Target = "report",
+            Body = "d=%global.deaths%\nh=%global.HAT_ON%\ng=%global.greeting%\nm=%global.missing%"
+        };
+        ActionGraph graph = ActionGraph.Sequence(Set("deaths", ActionOperation.Adjust, "1"),
+            Set("hat_on", ActionOperation.Toggle), Set("greeting", ActionOperation.Set, "%user% says hi"), report);
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), graph,
+            new ActionContext(SubathonEventSource.WheelSpin, "Bob", "globals")));
+        Assert.Equal("d=3.5\nh=false\ng=Bob says hi\nm=", runner.LastBody);
+
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(),
+            ActionGraph.Sequence(Set("hat_on", ActionOperation.Set, "maybe")),
+            new ActionContext(SubathonEventSource.WheelSpin, "Bob", "bad-type")));
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(),
+            ActionGraph.Sequence(Set("greeting", ActionOperation.Adjust, "1")),
+            new ActionContext(SubathonEventSource.WheelSpin, "Bob", "bad-op")));
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(),
+            ActionGraph.Sequence(Set("nobody", ActionOperation.Set, "x")),
+            new ActionContext(SubathonEventSource.WheelSpin, "Bob", "missing")));
+
+        Assert.True(await service.SetGlobalTypeAsync("hat_on", ActionValueType.Number));
+        Assert.False(await service.SetGlobalTypeAsync("greeting", ActionValueType.Number));
+        Assert.True(await service.SetGlobalTypeAsync("deaths", ActionValueType.Text));
+        Dictionary<string, ActionGlobal> globals = (await service.GetGlobalsAsync(ActionStoreKind.Global))
+            .ToDictionary(g => g.Name);
+        Assert.Equal(("0", ActionValueType.Number), (globals["hat_on"].Value, globals["hat_on"].ValueType));
+        Assert.Equal("0", globals["greeting"].Value);
+        Assert.Equal("3.5", globals["Deaths"].Value);
+
+        await service.SaveCustomActionAsync(new CustomAction {
+            Name = "Counter", Graph = ActionGraph.Sequence(Set("wins", ActionOperation.Adjust, "1"), report)
+        });
+        ActionGlobal wins = (await service.GetGlobalsAsync(ActionStoreKind.Global)).Single(g => g.Name == "wins");
+        Assert.Equal(ActionValueType.Number, wins.ValueType);
+        Assert.Contains(await service.GetGlobalsAsync(ActionStoreKind.Global), g => g.Name == "missing");
+        Assert.Single(service.ActionsUsing(ActionStoreKind.Global, "WINS"));
+    }
+
+    [Fact]
+    public void JsonPaths_ReadTextNumbersAndNesting_AndAnythingMissingIsEmpty() {
+        const string json = """{"name":"Bob","n":2.5,"ok":true,"list":[{"a":"x"},{"a":"y"}],"obj":{"k":[1,2]}}""";
+        Assert.Equal("Bob", ActionStepTypeHelper.ReadJsonPath(json, ".name"));
+        Assert.Equal("2.5", ActionStepTypeHelper.ReadJsonPath(json, ".n"));
+        Assert.Equal("true", ActionStepTypeHelper.ReadJsonPath(json, ".ok"));
+        Assert.Equal("y", ActionStepTypeHelper.ReadJsonPath(json, ".list[1].a"));
+        Assert.Equal("[1,2]", ActionStepTypeHelper.ReadJsonPath(json, ".obj.k"));
+        Assert.Equal("", ActionStepTypeHelper.ReadJsonPath(json, ".list[5].a"));
+        Assert.Equal("", ActionStepTypeHelper.ReadJsonPath(json, ".nope"));
+        Assert.Equal("", ActionStepTypeHelper.ReadJsonPath("not json", ".a"));
+
+        Assert.True(ActionStepTypeHelper.Compare("10", ActionOperation.MoreThan, "9"));
+        Assert.False(ActionStepTypeHelper.Compare("10", ActionOperation.MoreThan, "9x"));
+        Assert.True(ActionStepTypeHelper.Compare("True", ActionOperation.IsEqual, "true"));
+        Assert.True(ActionStepTypeHelper.Compare(" ", ActionOperation.IsEmpty, ""));
+
+        Assert.False(ActionStep.IsValidOutputName("points"));
+        Assert.False(ActionStep.IsValidOutputName("secret"));
+        Assert.True(ActionStep.IsValidOutputName("resp_2"));
+    }
+
     private sealed class FakeRunner : IActionStepRunner {
         public ConcurrentQueue<string> Ran { get; } = new();
         public HashSet<string> FailOnce { get; } = [];
         public string? LastUser { get; private set; }
+        public string? LastBody { get; private set; }
+
+        public Dictionary<string, (string Name, string Value)> SetVariables { get; } = [];
 
-        public IReadOnlyCollection<ActionStepType> StepTypes { get; } = [ActionStepType.VtsHotkey];
+        public IReadOnlyCollection<ActionStepType> StepTypes { get; } =
+            [ActionStepType.VtsHotkey, ActionStepType.MixItUpCommand];
 
         public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
             CancellationToken ct) {
@@ -506,8 +710,11 @@ public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProg
             }
 
             LastUser = ctx.User;
+            LastBody = step.Body;
+            if (SetVariables.TryGetValue(step.Target, out (string Name, string Value) set))
+                progress.SetVariable(set.Name, set.Value);
             Ran.Enqueue(step.Target);
             return Task.FromResult(true);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
index df99085..75b8d25 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
@@ -20,12 +20,18 @@ public ActionNodeVm(ActionNode node) {
         Node = node;
         Input = new ActionConnectorVm(this, true);
         Output = new ActionConnectorVm(this, false);
+        ElseOutput = new ActionConnectorVm(this, false, ActionEdge.ElsePort);
     }
 
     public ActionNode Node { get; }
     public ActionConnectorVm Input { get; }
     public ActionConnectorVm Output { get; }
 
+    public ActionConnectorVm ElseOutput { get; }
+
+    public bool IsCondition => Node.Step.Type == ActionStepType.Condition;
+    public bool IgnoresErrors => Node.IgnoreErrors;
+
     public Point Location {
         get => new(Node.X, Node.Y);
         set {
@@ -54,10 +60,14 @@ public Point Location {
     public void Refresh(ActionGraph graph) {
         Raise(nameof(IsDisabled));
         Raise(nameof(CardOpacity));
+        Raise(nameof(IgnoresErrors));
         IsStart = !graph.Incoming(Node.Id).Any();
-        Branches = graph.Outgoing(Node.Id).Count();
-        IsEnd = Branches == 0;
+
+        List<ActionEdge> outgoing = graph.Edges.Where(e => e.From == Node.Id).ToList();
+        Branches = outgoing.GroupBy(e => e.Port).Select(g => g.Count()).DefaultIfEmpty(0).Max();
+        IsEnd = outgoing.Count == 0;
         Error = Node.Step.IsValid(out string error) ? null : error;
+
         Raise(nameof(Title));
         Raise(nameof(Summary));
         Raise(nameof(IsStart));
@@ -70,11 +80,12 @@ public void Refresh(ActionGraph graph) {
     }
 }
 
-public sealed class ActionConnectorVm(ActionNodeVm owner, bool isInput) : ActionEditorVm {
+public sealed class ActionConnectorVm(ActionNodeVm owner, bool isInput, string? port = null) : ActionEditorVm {
     private Point _anchor;
 
     public ActionNodeVm Owner { get; } = owner;
     public bool IsInput { get; } = isInput;
+    public string? Port { get; } = port;
 
     public Point Anchor {
         get => _anchor;
@@ -86,7 +97,9 @@ public Point Anchor {
     }
 }
 
-public sealed record ActionConnectionVm(ActionEdge Edge, ActionConnectorVm Source, ActionConnectorVm Target);
+public sealed record ActionConnectionVm(ActionEdge Edge, ActionConnectorVm Source, ActionConnectorVm Target) {
+    public bool IsElse => Edge.Port == ActionEdge.ElsePort;
+}
 
 internal sealed class EditorCommand(Action<object?> execute) : ICommand {
     public event EventHandler? CanExecuteChanged {
@@ -101,4 +114,4 @@ public bool CanExecute(object? parameter) {
     public void Execute(object? parameter) {
         execute(parameter);
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
index 078d029..c9242e9 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -13,10 +14,11 @@
 namespace SubathonManager.UI.Views.Actions;
 
 public partial class ActionEditorWindow {
-    
     private const double RightClickSlop = 6;
     private Point? _rightPressAt;
 
+    private string PaletteQuery => (PaletteSearchBox.Text ?? "").Trim();
+
     private void BuildPalette() {
         foreach (IGrouping<string, ActionStepType> group in Enum.GetValues<ActionStepType>()
                      .Where(t => t.IsAvailable()).GroupBy(t => t.GetGroup())) {
@@ -58,8 +60,6 @@ private void BuildPalette() {
         };
     }
 
-    private string PaletteQuery => (PaletteSearchBox.Text ?? "").Trim();
-
     private static bool PaletteMatches(string group, ActionStepType type, string query) {
         return group.Contains(query, StringComparison.OrdinalIgnoreCase)
                || type.GetLabel().Contains(query, StringComparison.OrdinalIgnoreCase);
@@ -146,27 +146,38 @@ private void AddStep(ActionStepType type) {
     private void AddConnectionView(ActionEdge edge) {
         ActionNodeVm? from = _nodes.FirstOrDefault(n => n.Node.Id == edge.From);
         ActionNodeVm? to = _nodes.FirstOrDefault(n => n.Node.Id == edge.To);
-        if (from != null && to != null) _connections.Add(new ActionConnectionVm(edge, from.Output, to.Input));
+        if (from == null || to == null) return;
+        _connections.Add(new ActionConnectionVm(edge, edge.Port == ActionEdge.ElsePort ? from.ElseOutput : from.Output,
+            to.Input));
     }
 
     private void RefreshNodes() {
         foreach (ActionNodeVm node in _nodes) node.Refresh(Graph);
+        RefreshRunVariables();
     }
 
     private void OnConnectionCompleted(object? parameter) {
-        if (parameter is not ValueTuple<object, object> { Item1: ActionConnectorVm a, Item2: ActionConnectorVm b }) return;
+        if (parameter is not ValueTuple<object, object> {
+                Item1: ActionConnectorVm a, Item2: ActionConnectorVm b
+            }) return;
         (ActionConnectorVm from, ActionConnectorVm to) = a.IsInput ? (b, a) : (a, b);
         if (from.IsInput || !to.IsInput || from.Owner == to.Owner) return;
+        if (from.Port != null && !from.Owner.IsCondition) return;
 
         string fromId = from.Owner.Node.Id, toId = to.Owner.Node.Id;
-        if (Graph.Edges.Any(e => e.From == fromId && e.To == toId)) return;
+        if (Graph.Edges.Any(e => e.From == fromId && e.To == toId)) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = "Error: Those steps are already connected";
+            return;
+        }
+
         if (Graph.WouldLoop(fromId, toId)) {
             StatusText.Foreground = Brushes.OrangeRed;
             StatusText.Text = "Error: That connection would make a loop";
             return;
         }
 
-        var edge = new ActionEdge { From = fromId, To = toId };
+        var edge = new ActionEdge { From = fromId, To = toId, Port = from.Port };
         Graph.Edges.Add(edge);
         AddConnectionView(edge);
         RefreshNodes();
@@ -229,19 +240,21 @@ private bool DeleteItems(List<ActionNodeVm> nodes, List<ActionConnectionVm> conn
     }
 
     private void AttachNodeMenus() {
-        Editor.AddHandler(PointerPressedEvent, (_, e) => {
-            _rightPressAt = e.GetCurrentPoint(Editor).Properties.IsRightButtonPressed ? e.GetPosition(Editor) : null;
-        }, RoutingStrategies.Tunnel, true);
+        Editor.AddHandler(PointerPressedEvent,
+            (_, e) => {
+                _rightPressAt = e.GetCurrentPoint(Editor).Properties.IsRightButtonPressed
+                    ? e.GetPosition(Editor)
+                    : null;
+            }, RoutingStrategies.Tunnel, true);
 
         Editor.AddHandler(PointerReleasedEvent, (_, e) => {
             if (e.InitialPressMouseButton != MouseButton.Right || _rightPressAt is not { } start) return;
             _rightPressAt = null;
             Point at = e.GetPosition(Editor);
             if (Math.Abs(at.X - start.X) > RightClickSlop || Math.Abs(at.Y - start.Y) > RightClickSlop) return;
-            if (StepContainerFor(e.Source, at) is not { DataContext: ActionNodeVm clicked } container) {
+            if (StepContainerFor(e.Source, at) is not { DataContext: ActionNodeVm clicked } container)
                 // not an action step right clicked
                 return;
-            }
 
             if (Editor.SelectedItems is { } selected && !selected.Contains(clicked)) {
                 selected.Clear();
@@ -270,10 +283,12 @@ private MenuFlyout BuildNodeMenu(ActionNodeVm clicked) {
         duplicate.Click += (_, _) => DuplicateNodes(targets);
         var toggle = new MenuItem { Header = $"{(clicked.Node.Disabled ? "Enable" : "Disable")}{suffix}" };
         toggle.Click += (_, _) => ToggleNodes(targets, !clicked.Node.Disabled);
+        var ignore = new MenuItem { Header = "Ignore Errors" };
+        ignore.Click += (_, _) => SetIgnoreErrors(targets, !clicked.Node.IgnoreErrors);
         var delete = new MenuItem { Header = $"Delete{suffix}" };
         delete.Click += (_, _) => DeleteItems(targets, []);
 
-        return new MenuFlyout { Items = { duplicate, toggle, new Separator(), delete } };
+        return new MenuFlyout { Items = { duplicate, toggle, ignore, new Separator(), delete } };
     }
 
     private List<ActionNodeVm> MenuTargets(ActionNodeVm clicked) {
@@ -281,6 +296,13 @@ private List<ActionNodeVm> MenuTargets(ActionNodeVm clicked) {
         return selected.Count > 1 && selected.Contains(clicked) ? selected : [clicked];
     }
 
+    private void SetIgnoreErrors(List<ActionNodeVm> targets, bool ignore) {
+        foreach (ActionNodeVm node in targets) node.Node.IgnoreErrors = ignore;
+        RefreshNodes();
+        if (SelectedVm is { } selected && targets.Contains(selected)) ShowSelection();
+        MarkDirty();
+    }
+
     private void ToggleNodes(List<ActionNodeVm> targets, bool disable) {
         foreach (ActionNodeVm node in targets) node.Node.Disabled = disable;
         RefreshNodes();
@@ -301,7 +323,8 @@ private void DuplicateNodes(List<ActionNodeVm> targets) {
                 Step = CloneStep(original.Node.Step),
                 X = original.Node.X + 30,
                 Y = original.Node.Y + StepSpacingY,
-                Disabled = original.Node.Disabled
+                Disabled = original.Node.Disabled,
+                IgnoreErrors = original.Node.IgnoreErrors
             };
             newIds[original.Node.Id] = copy.Id;
             Graph.Nodes.Add(copy);
@@ -313,7 +336,7 @@ private void DuplicateNodes(List<ActionNodeVm> targets) {
         foreach (ActionEdge edge in Graph.Edges.ToList()) {
             if (!newIds.TryGetValue(edge.From, out string? from) || !newIds.TryGetValue(edge.To, out string? to))
                 continue;
-            var copiedEdge = new ActionEdge { From = from, To = to };
+            var copiedEdge = new ActionEdge { From = from, To = to, Port = edge.Port };
             Graph.Edges.Add(copiedEdge);
             AddConnectionView(copiedEdge);
         }
@@ -326,7 +349,7 @@ private void DuplicateNodes(List<ActionNodeVm> targets) {
     }
 
     private static ActionStep CloneStep(ActionStep step) {
-        return System.Text.Json.JsonSerializer.Deserialize<ActionStep>(
-            System.Text.Json.JsonSerializer.Serialize(step, ActionGraph.JsonOptions), ActionGraph.JsonOptions)!;
+        return JsonSerializer.Deserialize<ActionStep>(
+            JsonSerializer.Serialize(step, ActionGraph.JsonOptions), ActionGraph.JsonOptions)!;
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
index c23d5fc..28babb3 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -4,17 +4,28 @@
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Threading;
 using Microsoft.Extensions.Logging;
 using SubathonManager.Core;
 using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
 using SubathonManager.Core.Objects;
 using SubathonManager.Integration;
+using SubathonManager.Services;
 using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
 
 namespace SubathonManager.UI.Views.Actions;
 
 public partial class ActionEditorWindow {
+    /////////////////////////////// variables check
+
+    private readonly List<(Expander Section, List<(Control Row, string Search)> Rows)> _variableSections = [];
+    private Expander? _globalSection;
+    private Expander? _runSection;
+    private Expander? _secretSection;
+    private List<ActionGlobal> _stored = [];
+
     private static string ToDurationText(double? seconds) {
         if (seconds is not > 0.0) return "";
         TimeSpan span = TimeSpan.FromSeconds(Math.Round(seconds.Value));
@@ -37,10 +48,12 @@ private void ShowSelection() {
         try {
             StepHeader.Text = $"{type.GetGroup()} - {type.GetLabel()}";
 
+            OpLabel.Text = type.GetOperationLabel();
             OpBox.Items.Clear();
             foreach (ActionOperation op in type.GetOps())
                 OpBox.Items.Add(new ComboBoxItem { Content = op.GetOpLabel(), Tag = op });
-            OpBox.SelectedItem = OpBox.Items.OfType<ComboBoxItem>().FirstOrDefault(i => (ActionOperation?)i.Tag == step.Operation);
+            OpBox.SelectedItem = OpBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionOperation?)i.Tag == step.Operation);
             OpPanel.IsVisible = OpBox.Items.Count > 1;
 
             ScopePanel.IsVisible = type.HasScope();
@@ -57,10 +70,28 @@ private void ShowSelection() {
             DurationLabel.Text = type.GetDurationLabel() ?? "";
             DurationBox.Text = ToDurationText(step.Seconds);
 
-            BodyPanel.IsVisible = type.HasBody();
             BodyLabel.Text = type.GetBodyLabel() ?? "";
             BodyBox.Text = step.Body ?? "";
             VariablesHint.IsVisible = type.AllowsVariables();
+
+            WebPanel.IsVisible = type.IsWebRequest();
+            HeadersBox.Text = step.Headers ?? "";
+
+            AuthBox.Items.Clear();
+            foreach ((ActionHttpAuth auth, string label) in new[] {
+                         (ActionHttpAuth.None, "None"), (ActionHttpAuth.Bearer, "Bearer token"),
+                         (ActionHttpAuth.Basic, "Basic (username & password)")
+                     })
+                AuthBox.Items.Add(new ComboBoxItem { Content = label, Tag = auth });
+
+            AuthBox.SelectedItem = AuthBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionHttpAuth?)i.Tag == (step.Auth ?? ActionHttpAuth.None));
+            AuthUserBox.Text = step.AuthUser ?? "";
+            AuthTokenBox.Text = step.AuthToken ?? "";
+            OutputBox.Text = step.OutputVariable ?? "";
+
+            IgnoreErrorsCheck.IsVisible = type != ActionStepType.Condition;
+            IgnoreErrorsCheck.IsChecked = node.IgnoreErrors;
             RefreshFieldVisibility(step);
         }
         finally {
@@ -71,15 +102,96 @@ private void ShowSelection() {
     }
 
     private void RefreshFieldVisibility(ActionStep step) {
+        TargetPanel.IsVisible = step.Type.NeedsTarget(step.Operation);
         ValuePanel.IsVisible = step.Type.HasValue(step.Operation);
         DurationPanel.IsVisible = step.Type.HasDuration();
+
+        ActionHttpAuth auth = step.Auth ?? ActionHttpAuth.None;
+        AuthUserPanel.IsVisible = auth == ActionHttpAuth.Basic;
+        AuthTokenPanel.IsVisible = auth != ActionHttpAuth.None;
+        AuthTokenLabel.Text = auth == ActionHttpAuth.Basic ? "Password:" : "Token:";
+        AuthTokenWarning.IsVisible = !string.IsNullOrWhiteSpace(step.AuthToken)
+                                     && ActionStepTypeHelper.FindStoreRefs(step.AuthToken)
+                                         .All(r => r.Kind != ActionStoreKind.Secret);
+
+        BodyPanel.IsVisible = step.Type.NeedsBody(step.Operation);
+        if (step.Type == ActionStepType.SetGlobal)
+            BodyLabel.Text = step.Operation == ActionOperation.Adjust
+                ? "Amount to add (negative removes):"
+                : step.Type.GetBodyLabel() ?? "";
+
+        string? output = step.OutputVariable;
+        OutputHint.Text = string.IsNullOrEmpty(output)
+            ? "Name it to use the response in later steps"
+            : $"Later steps can use %{output}% response, %{output}.some.path[0]% to read into JSON, " +
+              $"and %{output}{ActionService.StatusSuffix}% (status code, 0 if it could not connect)";
+
         StepError.Text = step.IsValid(out string error) ? "" : error;
+        StepWarning.Text = SelectedNode is { } node ? string.Join("\n", StepWarnings(node)) : "";
+    }
+
+    private IEnumerable<string> StepWarnings(ActionNode node) {
+        if (!node.Step.Type.AllowsVariables()) yield break;
+
+        HashSet<string> declared = Graph.OutputVariables();
+        HashSet<string> before = Graph.Upstream(node.Id);
+        HashSet<string> available = Graph.Nodes
+            .Where(n => before.Contains(n.Id) && !string.IsNullOrEmpty(n.Step.OutputVariable))
+            .Select(n => n.Step.OutputVariable!)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+        if (node.Step.Type == ActionStepType.SetGlobal && ActionStepTypeHelper.IsValidName(node.Step.Target.Trim())) {
+            string globalName = node.Step.Target.Trim();
+            ActionGlobal? global = FindStored(ActionStoreKind.Global, globalName);
+
+            if (global == null)
+                yield return $"There's no %global.{globalName}% - saving adds it as empty";
+
+            else if ((node.Step.Operation == ActionOperation.Adjust && global.ValueType != ActionValueType.Number)
+                     || (node.Step.Operation == ActionOperation.Toggle && global.ValueType != ActionValueType.Boolean))
+                yield return
+                    $"%global.{global.Name}% is {global.ValueType.GetLabel()} - this step will fail when it runs";
+        }
+
+        foreach (string token in ActionStepTypeHelper.FindTokens(node.Step.AllText)
+                     .Distinct(StringComparer.OrdinalIgnoreCase)) {
+            if (ActionStepTypeHelper.TryGetStoreRef(token, out ActionStoreKind kind, out string name)) {
+                ActionGlobal? stored = FindStored(kind, name);
+
+                if (stored == null)
+                    yield return $"%{token}% isn't created yet - saving adds it as empty";
+
+                else if (kind == ActionStoreKind.Secret
+                             ? string.IsNullOrEmpty(ServiceManager.Actions.GetSecretValue(name))
+                             : string.IsNullOrEmpty(stored.Value))
+                    yield return $"%{token}% has no value yet";
+                continue;
+            }
+
+            string root = OutputRoot(ActionStepTypeHelper.TokenRoot(token));
+            if (declared.Contains(root) && !available.Contains(root))
+                yield return $"%{token}% is saved by a step that doesn't run before this one - it will be empty";
+        }
+    }
+
+    // %resp_status% belongs to %resp%
+    private static string OutputRoot(string root) {
+        return root.EndsWith(ActionService.StatusSuffix, StringComparison.OrdinalIgnoreCase)
+            ? root[..^ActionService.StatusSuffix.Length]
+            : root;
     }
 
     private void StepField_Changed(object? sender, SelectionChangedEventArgs e) {
         ApplyStepFields();
     }
 
+    private void IgnoreErrors_Changed(object? sender, RoutedEventArgs e) {
+        if (_suppress > 0 || SelectedNode is not { } node) return;
+        node.IgnoreErrors = IgnoreErrorsCheck.IsChecked == true;
+        RefreshNodes();
+        MarkDirty();
+    }
+
     private void ApplyStepFields() {
         if (_suppress > 0 || SelectedNode is not { } node) return;
         ActionStep step = node.Step;
@@ -103,11 +215,23 @@ private void ApplyStepFields() {
         step.Value = step.Type.HasValue(step.Operation)
                      && double.TryParse((ValueBox.Text ?? "").Trim(), NumberStyles.Float,
                          CultureInfo.InvariantCulture, out double value)
-            ? value : null;
+            ? value
+            : null;
         TimeSpan duration = Utils.ParseDurationString((DurationBox.Text ?? "").Trim());
         step.Seconds = step.Type.HasDuration() && duration > TimeSpan.Zero ? duration.TotalSeconds : null;
         step.Body = step.Type.HasBody() && !string.IsNullOrEmpty(BodyBox.Text) ? BodyBox.Text : null;
 
+        if (step.Type.IsWebRequest()) {
+            ActionHttpAuth auth = (AuthBox.SelectedItem as ComboBoxItem)?.Tag is ActionHttpAuth picked
+                ? picked
+                : ActionHttpAuth.None;
+            step.Headers = string.IsNullOrWhiteSpace(HeadersBox.Text) ? null : HeadersBox.Text;
+            step.Auth = auth == ActionHttpAuth.None ? null : auth;
+            step.AuthUser = auth == ActionHttpAuth.Basic ? NullIfBlank(AuthUserBox.Text) : null;
+            step.AuthToken = auth != ActionHttpAuth.None ? NullIfBlank(AuthTokenBox.Text) : null;
+            step.OutputVariable = NullIfBlank(OutputBox.Text);
+        }
+
         RefreshFieldVisibility(step);
         RefreshNodes();
         Validate();
@@ -125,7 +249,7 @@ private async void RefreshTargets_Click(object? sender, RoutedEventArgs e) {
     private async Task LoadTargetSuggestionsAsync() {
         if (SelectedNode is not { } node || !node.Step.Type.HasTarget()) return;
         ActionStepType type = node.Step.Type;
-        
+
         _targetIds.Clear();
         ScopeBox.ItemsSource = null;
         TargetBox.ItemsSource = null;
@@ -179,6 +303,7 @@ private async Task LoadTargetSuggestionsAsync() {
                         ids[command.DisplayName] = command.Id.ToString();
                         targets.Add(command.DisplayName);
                     }
+
                     break;
                 }
                 case ActionStepType.StreamerBotAction: {
@@ -206,6 +331,14 @@ private async Task LoadTargetSuggestionsAsync() {
                     if (SelectedNode?.Id == node.Id)
                         TargetHint.Text = "variables also work in the URL";
                     return;
+                case ActionStepType.SetGlobal:
+                    targets.AddRange(_stored.Where(g => g.Kind == ActionStoreKind.Global).Select(g => g.Name));
+                    break;
+                case ActionStepType.Condition:
+                    if (SelectedNode?.Id != node.Id) return;
+                    ScopeBox.ItemsSource = ConditionSuggestions(node);
+                    TargetHint.Text = "value or %variable%";
+                    return;
                 default: {
                     OBSService obs = ServiceManager.OBS;
                     if (!obs.Connected) {
@@ -233,41 +366,126 @@ private async Task LoadTargetSuggestionsAsync() {
         TargetHint.Text = offline != null ? $"{offline} - type it by hand" : $"{targets.Count} found";
     }
 
-    /////////////////////////////// variables check
+    private static string? NullIfBlank(string? text) {
+        return string.IsNullOrWhiteSpace(text) ? null : text.Trim();
+    }
+
+    private List<string> ConditionSuggestions(ActionNode node) {
+        HashSet<string> before = Graph.Upstream(node.Id);
+        var suggestions = new List<string>();
+        foreach (ActionNode previous in
+                 Graph.Nodes.Where(n => before.Contains(n.Id)
+                                        && !string.IsNullOrEmpty(n.Step.OutputVariable))) {
+            suggestions.Add($"%{previous.Step.OutputVariable}%");
+            suggestions.Add($"%{previous.Step.OutputVariable}{ActionService.StatusSuffix}%");
+        }
+
+        suggestions.AddRange(_stored.Where(g => g.Kind == ActionStoreKind.Global)
+            .Select(g => ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name)));
+        suggestions.AddRange(Enum.GetValues<ActionVariable>().Select(v => v.GetPlaceholder()));
+        return suggestions;
+    }
 
-    private readonly List<(Expander Section, List<(Control Row, ActionVariable Variable)> Rows)> _variableSections = [];
-    
     private void BuildVariablesPanel() {
-        foreach (IGrouping<string, ActionVariable> group in Enum.GetValues<ActionVariable>().GroupBy(v => v.GetGroup())) {
-            var rows = new StackPanel { Spacing = 2 };
-            var entries = new List<(Control, ActionVariable)>();
-            foreach (ActionVariable variable in group) {
-                Control row = BuildVariableRow(variable);
-                rows.Children.Add(row);
-                entries.Add((row, variable));
-            }
+        _runSection = AddVariableSection("This Run", []);
+        _globalSection = AddVariableSection("Globals", []);
+        _secretSection = AddVariableSection("Secrets", []);
+        foreach (IGrouping<string, ActionVariable> group in Enum.GetValues<ActionVariable>().GroupBy(v => v.GetGroup()))
+            AddVariableSection(group.Key, group.Select(v =>
+                (v.GetPlaceholder(), v.GetValueType(), v.GetDescription(), $"{v.GetGroup()} {v.GetToken()}")));
+
+        RefreshRunVariables();
+        VariableSearchBox.TextChanged += (_, _) => FilterVariables();
+
+        ServiceManager.Actions.GlobalsChanged += OnGlobalsChanged;
+        Closed += (_, _) => ServiceManager.Actions.GlobalsChanged -= OnGlobalsChanged;
+        _ = LoadStoredAsync();
+    }
+
+    private Expander AddVariableSection(string header,
+        IEnumerable<(string Placeholder, string Type, string Description, string Search)> rows) {
+        var section = new Expander {
+            Header = header, IsExpanded = false, HorizontalAlignment = HorizontalAlignment.Stretch,
+            HorizontalContentAlignment = HorizontalAlignment.Stretch, Padding = new Thickness(4, 2)
+        };
+        _variableSections.Add((section, []));
+        VariablesPanel.Children.Add(section);
+        SetVariableRows(section, rows);
+        return section;
+    }
 
-            var section = new Expander {
-                Header = group.Key, IsExpanded = false, HorizontalAlignment = HorizontalAlignment.Stretch,
-                HorizontalContentAlignment = HorizontalAlignment.Stretch, Padding = new Thickness(4, 2),
-                Content = rows
-            };
-            _variableSections.Add((section, entries));
-            VariablesPanel.Children.Add(section);
+    private void SetVariableRows(Expander section,
+        IEnumerable<(string Placeholder, string Type, string Description, string Search)> rows) {
+        var panel = new StackPanel { Spacing = 2 };
+        var entries = new List<(Control, string)>();
+        foreach ((string placeholder, string type, string description, string search) in rows) {
+            Control row = BuildVariableRow(placeholder, type, description);
+            panel.Children.Add(row);
+            entries.Add((row, $"{placeholder} {description} {search}"));
         }
 
-        VariableSearchBox.TextChanged += (_, _) => FilterVariables();
+        section.Content = panel;
+        int index = _variableSections.FindIndex(s => s.Section == section);
+        _variableSections[index] = (section, entries);
+        FilterVariables();
+    }
+
+    private void RefreshRunVariables() {
+        if (_runSection == null) return;
+        var rows = new List<(string, string, string, string)>();
+        foreach (ActionNode node in Graph.Nodes.Where(n => !string.IsNullOrEmpty(n.Step.OutputVariable))) {
+            string name = node.Step.OutputVariable!;
+            string from = node.Step.Describe();
+            rows.Add(($"%{name}%", "text", $"Response from {from}; add .path or [#] to read into JSON", "this run"));
+            rows.Add(($"%{name}{ActionService.StatusSuffix}%", "number",
+                $"Status code from {from}, 0 if it could not connect", "this run"));
+        }
+
+        SetVariableRows(_runSection, rows);
+    }
+
+    private void OnGlobalsChanged() {
+        Dispatcher.UIThread.Post(() => _ = LoadStoredAsync());
+    }
+
+    private ActionGlobal? FindStored(ActionStoreKind kind, string name) {
+        return _stored.FirstOrDefault(g => g.Kind == kind && g.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private async Task LoadStoredAsync() {
+        try {
+            _stored = await ServiceManager.Actions.GetGlobalsAsync();
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "[ActionEditor] Could not load globals and secrets");
+            return;
+        }
+
+        if (_globalSection != null)
+            SetVariableRows(_globalSection, _stored.Where(g => g.Kind == ActionStoreKind.Global).Select(g => (
+                ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name), g.ValueType.GetLabel(),
+                g.Value == null ? "No value yet" : $"Now: {Shorten(g.Value)}", "global")));
+        if (_secretSection != null)
+            SetVariableRows(_secretSection, _stored.Where(g => g.Kind == ActionStoreKind.Secret).Select(g => (
+                ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name), "secret",
+                "Fetched when the step runs, never saved to the .sma file", "secret")));
+        if (SelectedNode is { } node) RefreshFieldVisibility(node.Step);
+    }
+
+    private static string Shorten(string value) {
+        value = value.ReplaceLineEndings(" ");
+        return value.Length > 60 ? $"{value[..57]}..." : value;
     }
 
-    private Control BuildVariableRow(ActionVariable variable) {
-        string placeholder = variable.GetPlaceholder();
+    private Control BuildVariableRow(string placeholder, string valueType, string description) {
         var heading = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") };
         heading.Children.Add(new TextBlock {
             Text = placeholder, FontSize = 12, FontWeight = FontWeight.SemiBold,
+            TextTrimming = TextTrimming.CharacterEllipsis,
             FontFamily = new FontFamily("Consolas, Menlo, monospace") // looks code-y for looking like vars explicitly
         });
         var type = new TextBlock {
-            Text = variable.GetValueType(), FontSize = 10, Foreground = Brushes.Gray,
+            Text = valueType, FontSize = 10, Foreground = Brushes.Gray,
             VerticalAlignment = VerticalAlignment.Center
         };
         Grid.SetColumn(type, 1);
@@ -282,13 +500,13 @@ private Control BuildVariableRow(ActionVariable variable) {
                 Children = {
                     heading,
                     new TextBlock {
-                        Text = variable.GetDescription(), FontSize = 11, Foreground = Brushes.Gray,
+                        Text = description, FontSize = 11, Foreground = Brushes.Gray,
                         TextWrapping = TextWrapping.Wrap
                     }
                 }
             }
         };
-        ToolTip.SetTip(row, "Click to copy var name");
+        ToolTip.SetTip(row, "Click to copy");
 
         row.Click += async (_, _) => {
             await UiHelpers.TrySetClipboardTextAsync(placeholder);
@@ -300,13 +518,10 @@ private Control BuildVariableRow(ActionVariable variable) {
 
     private void FilterVariables() {
         string query = (VariableSearchBox.Text ?? "").Trim().Trim('%');
-        foreach ((Expander section, List<(Control Row, ActionVariable Variable)> rows) in _variableSections) {
+        foreach ((Expander section, List<(Control Row, string Search)> rows) in _variableSections) {
             var any = false;
-            foreach ((Control row, ActionVariable variable) in rows) {
-                bool show = query.Length == 0
-                            || variable.GetToken().Contains(query, StringComparison.OrdinalIgnoreCase)
-                            || variable.GetDescription().Contains(query, StringComparison.OrdinalIgnoreCase)
-                            || variable.GetGroup().Contains(query, StringComparison.OrdinalIgnoreCase);
+            foreach ((Control row, string search) in rows) {
+                bool show = query.Length == 0 || search.Contains(query, StringComparison.OrdinalIgnoreCase);
                 row.IsVisible = show;
                 any |= show;
             }
@@ -315,4 +530,4 @@ private void FilterVariables() {
             if (query.Length > 0) section.IsExpanded = true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
index 6512b7d..bd8d674 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
@@ -81,13 +81,20 @@
                                    ToolTip.Tip="Drag onto another step to run it after this one" />
         </DataTemplate>
 
+        <DataTemplate x:Key="ElseConnectorTemplate" x:DataType="local:ActionConnectorVm">
+            <connections:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}" IsConnected="True"
+                                   VerticalAlignment="Center" Theme="{StaticResource ConnectorRightTheme}"
+                                   Background="#C77C2E"
+                                   ToolTip.Tip="Runs when the expression is false" />
+        </DataTemplate>
+
         <DataTemplate x:Key="StepTemplate" x:DataType="local:ActionNodeVm">
             <StackPanel Orientation="Horizontal" Opacity="{Binding CardOpacity}">
                 <ContentControl Content="{Binding Input}" ContentTemplate="{StaticResource InputConnectorTemplate}" />
                 <Grid Width="200" Margin="6,6" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,Auto">
                     <TextBlock Text="{Binding Title}" FontSize="10" Foreground="Gray"
                                TextTrimming="CharacterEllipsis" />
-                    
+
                     <!--- TODO check col/row spacing -->
                     <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Spacing="3" Margin="4,0,0,0">
                         <Border IsVisible="{Binding HasBranches}" Background="#6A4C93" CornerRadius="3" Padding="4,0"
@@ -101,6 +108,10 @@
                                 ToolTip.Tip="Skipped when the action runs; right click to enable">
                             <TextBlock Text="OFF" FontSize="9" Foreground="White" />
                         </Border>
+                        <Border IsVisible="{Binding IgnoresErrors}" Background="#9A6B12" CornerRadius="3"
+                                Padding="4,0" ToolTip.Tip="If this step fails the action carries on anyway">
+                            <TextBlock Text="ERR OK" FontSize="9" Foreground="White" />
+                        </Border>
                         <Border IsVisible="{Binding IsEnd}" Background="#8E3B46" CornerRadius="3" Padding="4,0"
                                 ToolTip.Tip="Nothing runs after this step">
                             <TextBlock Text="END" FontSize="9" Foreground="White" />
@@ -113,13 +124,28 @@
                                IsVisible="{Binding HasError}" Foreground="OrangeRed" FontSize="10"
                                TextWrapping="Wrap" Margin="0,2,0,0" />
                 </Grid>
-                <ContentControl Content="{Binding Output}" ContentTemplate="{StaticResource OutputConnectorTemplate}" />
+                <StackPanel VerticalAlignment="Center">
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                        <TextBlock Text="then" IsVisible="{Binding IsCondition}" FontSize="9" Foreground="Gray"
+                                   VerticalAlignment="Center" Margin="0,0,2,0" />
+                        <ContentControl Content="{Binding Output}"
+                                        ContentTemplate="{StaticResource OutputConnectorTemplate}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right"
+                                IsVisible="{Binding IsCondition}">
+                        <TextBlock Text="else" FontSize="9" Foreground="#C77C2E" VerticalAlignment="Center"
+                                   Margin="0,0,2,0" />
+                        <ContentControl Content="{Binding ElseOutput}"
+                                        ContentTemplate="{StaticResource ElseConnectorTemplate}" />
+                    </StackPanel>
+                </StackPanel>
             </StackPanel>
         </DataTemplate>
 
         <DataTemplate x:Key="ConnectionTemplate" x:DataType="local:ActionConnectionVm">
             <connections:StepConnection Source="{Binding Source.Anchor}" Target="{Binding Target.Anchor}"
                                         Theme="{StaticResource StepConnectionTheme}"
+                                        Classes.else="{Binding IsElse}"
                                         connections:BaseConnection.IsSelectable="True" />
         </DataTemplate>
 
@@ -129,6 +155,13 @@
         </DataTemplate>
     </Window.Resources>
 
+    <Window.Styles>
+        <Style Selector="connections|StepConnection.else">
+            <Setter Property="Stroke" Value="#C77C2E" />
+            <Setter Property="Fill" Value="#C77C2E" />
+        </Style>
+    </Window.Styles>
+
     <Grid RowDefinitions="Auto,*,Auto">
         <Grid Grid.Row="0" Margin="12,10,12,8" ColumnDefinitions="*,Auto">
             <StackPanel Orientation="Horizontal" Spacing="8">
@@ -166,7 +199,7 @@
                 <ColumnDefinition Width="*" MinWidth="300" />
                 <ColumnDefinition Width="300" />
             </Grid.ColumnDefinitions>
-            
+
             <Border BorderBrush="#333" BorderThickness="1" CornerRadius="8" Padding="8">
                 <Grid RowDefinitions="Auto,*">
                     <TextBox x:Name="PaletteSearchBox" Height="30" FontSize="12" Margin="0,0,0,6"
@@ -218,96 +251,139 @@
                         <RowDefinition Height="8" />
                         <RowDefinition Height="2*" MinHeight="120" />
                     </Grid.RowDefinitions>
-                <ScrollViewer Grid.Row="0">
-                    <StackPanel>
-                        <StackPanel x:Name="AboutPanel">
-                            <TextBlock Text="About this action" FontSize="13" FontWeight="SemiBold"
-                                       Margin="0,0,0,6" />
-                            <TextBox x:Name="DescriptionBox" Height="110" AcceptsReturn="True"
-                                     TextWrapping="Wrap" PlaceholderText="What it does, what it needs..." />
-                            <!-- todo fiddle with newline -->
-                            <TextBlock FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,10,0,0"
-                                       Text="Add new steps from the left. If you have an action selected, it will chain it, else it will start a new parallel branch.&#x0a;&#x0a;You can drag an arrow to and from steps to create new connections and branches.&#x0a;&#x0a;If an action has multiple inputs, it waits for all paths to complete before running.&#x0a;&#x0a;Select actions or a connection and press Delete to remove them." />
-                        </StackPanel>
-
-                        <StackPanel x:Name="StepPanel" IsVisible="False">
-                            <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,8">
-                                <TextBlock x:Name="StepHeader" FontSize="13" FontWeight="SemiBold"
-                                           VerticalAlignment="Center" />
-                                <Button Grid.Column="1" Padding="6,2" Click="DeleteStep_Click"
-                                        ToolTip.Tip="Remove this action" Foreground="IndianRed">
-                                    <ctl:SymIcon Glyph="Delete16" />
-                                </Button>
-                            </Grid>
-
-                            <StackPanel x:Name="OpPanel" Margin="0,0,0,8">
-                                <TextBlock Text="Do:" FontSize="12" Margin="2,0,0,3" />
-                                <ComboBox x:Name="OpBox" Height="34" HorizontalAlignment="Stretch"
-                                          SelectionChanged="StepField_Changed" />
-                            </StackPanel>
+                    <ScrollViewer Grid.Row="0">
+                        <StackPanel>
+                            <StackPanel x:Name="AboutPanel">
+                                <TextBlock Text="About this action" FontSize="13" FontWeight="SemiBold"
+                                           Margin="0,0,0,6" />
+                                <TextBox x:Name="DescriptionBox" Height="110" AcceptsReturn="True"
+                                         TextWrapping="Wrap" PlaceholderText="Description..." />
 
-                            <StackPanel x:Name="ScopePanel" Margin="0,0,0,8">
-                                <TextBlock x:Name="ScopeLabel" Text="Scene:" FontSize="12" Margin="2,0,0,3" />
-                                <AutoCompleteBox x:Name="ScopeBox" Height="34" FilterMode="ContainsOrdinal"
-                                                 ItemTemplate="{StaticResource SuggestionTemplate}"
-                                                 MinimumPrefixLength="0" />
+                                <TextBlock FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,10,0,0"
+                                           Text="Add new steps from the left. If you have an action selected, it will chain it, else it will start a new parallel branch.&#x0a;&#x0a;You can drag an arrow to and from steps to create new connections and branches.&#x0a;&#x0a;If an action has multiple inputs, it waits for all paths to complete before running.&#x0a;&#x0a;Select actions or a connection and press Delete to remove them." />
                             </StackPanel>
 
-                            <StackPanel x:Name="TargetPanel" Margin="0,0,0,8">
-                                <Grid ColumnDefinitions="*,Auto">
-                                    <TextBlock x:Name="TargetLabel" Text="Target:" FontSize="12" Margin="2,0,0,3" />
-                                    <TextBlock Grid.Column="1" x:Name="TargetHint" FontSize="10" Foreground="Gray"
-                                               VerticalAlignment="Bottom" Margin="0,0,2,3" />
-                                </Grid>
-                                <Grid ColumnDefinitions="*,Auto">
-                                    <AutoCompleteBox x:Name="TargetBox" Height="34" Margin="0,0,4,0"
-                                                     ItemTemplate="{StaticResource SuggestionTemplate}"
-                                                     FilterMode="ContainsOrdinal" MinimumPrefixLength="0" />
-                                    <Button Grid.Column="1" Height="34" Padding="8,2" Click="RefreshTargets_Click"
-                                            ToolTip.Tip="Reload the list from the connected integration">
-                                        <ctl:SymIcon Glyph="ArrowClockwise16" />
+                            <StackPanel x:Name="StepPanel" IsVisible="False">
+                                <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,8">
+                                    <TextBlock x:Name="StepHeader" FontSize="13" FontWeight="SemiBold"
+                                               VerticalAlignment="Center" />
+                                    <Button Grid.Column="1" Padding="6,2" Click="DeleteStep_Click"
+                                            ToolTip.Tip="Remove this action" Foreground="IndianRed">
+                                        <ctl:SymIcon Glyph="Delete16" />
                                     </Button>
                                 </Grid>
-                            </StackPanel>
 
-                            <StackPanel x:Name="ValuePanel" Margin="0,0,0,8">
-                                <TextBlock x:Name="ValueLabel" Text="Value:" FontSize="12" Margin="2,0,0,3" />
-                                <TextBox x:Name="ValueBox" Height="34"
-                                         val:NumericInputBehaviour.Mode="SignedDecimal" />
-                            </StackPanel>
+                                <StackPanel x:Name="ScopePanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="ScopeLabel" Text="Scene:" FontSize="12" Margin="2,0,0,3" />
+                                    <AutoCompleteBox x:Name="ScopeBox" Height="34" FilterMode="ContainsOrdinal"
+                                                     ItemTemplate="{StaticResource SuggestionTemplate}"
+                                                     MinimumPrefixLength="0" />
+                                </StackPanel>
 
-                            <StackPanel x:Name="DurationPanel" Margin="0,0,0,8">
-                                <TextBlock x:Name="DurationLabel" Text="Duration:" FontSize="12" Margin="2,0,0,3" />
-                                <TextBox x:Name="DurationBox" Height="34" PlaceholderText="e.g. 30s, 5m, 1h30m" />
-                            </StackPanel>
+                                <StackPanel x:Name="OpPanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="OpLabel" Text="Do:" FontSize="12" Margin="2,0,0,3" />
+                                    <ComboBox x:Name="OpBox" Height="34" HorizontalAlignment="Stretch"
+                                              SelectionChanged="StepField_Changed" />
+                                </StackPanel>
 
-                            <StackPanel x:Name="BodyPanel" Margin="0,0,0,8">
-                                <TextBlock x:Name="BodyLabel" Text="Body:" FontSize="12" Margin="2,0,0,3" />
-                                <TextBox x:Name="BodyBox" Height="120" AcceptsReturn="True" TextWrapping="Wrap"
-                                         FontFamily="Consolas, Menlo, monospace" FontSize="12" />
-                            </StackPanel>
+                                <StackPanel x:Name="TargetPanel" Margin="0,0,0,8">
+                                    <Grid ColumnDefinitions="*,Auto">
+                                        <TextBlock x:Name="TargetLabel" Text="Target:" FontSize="12" Margin="2,0,0,3" />
+                                        <TextBlock Grid.Column="1" x:Name="TargetHint" FontSize="10" Foreground="Gray"
+                                                   VerticalAlignment="Bottom" Margin="0,0,2,3" />
+                                    </Grid>
+                                    <Grid ColumnDefinitions="*,Auto">
+                                        <AutoCompleteBox x:Name="TargetBox" Height="34" Margin="0,0,4,0"
+                                                         ItemTemplate="{StaticResource SuggestionTemplate}"
+                                                         FilterMode="ContainsOrdinal" MinimumPrefixLength="0" />
+                                        <Button Grid.Column="1" Height="34" Padding="8,2" Click="RefreshTargets_Click"
+                                                ToolTip.Tip="Reload the list from the connected integration">
+                                            <ctl:SymIcon Glyph="ArrowClockwise16" />
+                                        </Button>
+                                    </Grid>
+                                </StackPanel>
 
-                            <TextBlock x:Name="VariablesHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap"
-                                       Margin="2,0,0,8"
-                                       Text="Variables such as %points% are filled in when this step runs. Click any to copy it" />
+                                <StackPanel x:Name="ValuePanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="ValueLabel" Text="Value:" FontSize="12" Margin="2,0,0,3" />
+                                    <TextBox x:Name="ValueBox" Height="34"
+                                             val:NumericInputBehaviour.Mode="SignedDecimal" />
+                                </StackPanel>
 
-                            <TextBlock x:Name="StepError" FontSize="11" Foreground="OrangeRed" TextWrapping="Wrap"
-                                       Margin="2,2,0,0" />
-                        </StackPanel>
-                    </StackPanel>
-                </ScrollViewer>
+                                <StackPanel x:Name="DurationPanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="DurationLabel" Text="Duration:" FontSize="12" Margin="2,0,0,3" />
+                                    <TextBox x:Name="DurationBox" Height="34" PlaceholderText="e.g. 30s, 5m, 1h30m" />
+                                </StackPanel>
+
+                                <StackPanel x:Name="BodyPanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="BodyLabel" Text="Body:" FontSize="12" Margin="2,0,0,3" />
+                                    <TextBox x:Name="BodyBox" Height="120" AcceptsReturn="True" TextWrapping="Wrap"
+                                             FontFamily="Consolas, Menlo, monospace" FontSize="12" />
+                                </StackPanel>
+
+                                <StackPanel x:Name="WebPanel">
+                                    <StackPanel Margin="0,0,0,8">
+                                        <TextBlock Text="Headers (one Name: value per line):" FontSize="12"
+                                                   Margin="2,0,0,3" />
+                                        <TextBox x:Name="HeadersBox" Height="70" AcceptsReturn="True"
+                                                 TextWrapping="Wrap" FontFamily="Consolas, Menlo, monospace"
+                                                 FontSize="12" PlaceholderText="X-Api-Key: %secret.my_key%" />
+                                    </StackPanel>
+
+                                    <StackPanel Margin="0,0,0,8">
+                                        <TextBlock Text="Auth:" FontSize="12" Margin="2,0,0,3" />
+                                        <ComboBox x:Name="AuthBox" Height="34" HorizontalAlignment="Stretch"
+                                                  SelectionChanged="StepField_Changed" />
+                                    </StackPanel>
+
+                                    <StackPanel x:Name="AuthUserPanel" Margin="0,0,0,8">
+                                        <TextBlock Text="Username:" FontSize="12" Margin="2,0,0,3" />
+                                        <TextBox x:Name="AuthUserBox" Height="34" />
+                                    </StackPanel>
 
-                <GridSplitter Grid.Row="1" Background="Transparent" ResizeDirection="Rows"
-                              ToolTip.Tip="Drag to resize" />
+                                    <StackPanel x:Name="AuthTokenPanel" Margin="0,0,0,8">
+                                        <TextBlock x:Name="AuthTokenLabel" Text="Token:" FontSize="12" Margin="2,0,0,3" />
+                                        <TextBox x:Name="AuthTokenBox" Height="34" PlaceholderText="%secret.my_token%" />
+                                        <TextBlock x:Name="AuthTokenWarning" FontSize="11" Foreground="Orange"
+                                                   TextWrapping="Wrap" Margin="2,3,0,0"
+                                                   Text="Saved raw into the actions file. Recommend using a %secret.name% for secrets" />
+                                    </StackPanel>
 
-                <Grid Grid.Row="2" RowDefinitions="Auto,Auto,*">
-                    <TextBlock Text="Variables" FontSize="13" FontWeight="SemiBold" Margin="0,0,0,4" />
-                    <TextBox Grid.Row="1" x:Name="VariableSearchBox" Height="30" FontSize="12" Margin="0,0,0,6"
-                             PlaceholderText="Search variables" />
-                    <ScrollViewer Grid.Row="2">
-                        <StackPanel x:Name="VariablesPanel" Spacing="2" />
+                                    <StackPanel Margin="0,0,0,8">
+                                        <TextBlock Text="Save response as (optional):" FontSize="12" Margin="2,0,0,3" />
+                                        <TextBox x:Name="OutputBox" Height="34" PlaceholderText="e.g. resp" />
+                                        <TextBlock x:Name="OutputHint" FontSize="11" Foreground="Gray"
+                                                   TextWrapping="Wrap"
+                                                   Margin="2,3,0,0" />
+                                    </StackPanel>
+                                </StackPanel>
+
+                                <TextBlock x:Name="VariablesHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap"
+                                           Margin="2,0,0,8"
+                                           Text="Variables such as %points% are filled in when this step runs. Click any to copy it" />
+
+                                <CheckBox x:Name="IgnoreErrorsCheck" Content="Ignore errors" Margin="0,0,0,4"
+                                          IsCheckedChanged="IgnoreErrors_Changed"
+                                          ToolTip.Tip="If this step fails, log it and move on" />
+
+                                <TextBlock x:Name="StepError" FontSize="11" Foreground="OrangeRed" TextWrapping="Wrap"
+                                           Margin="2,2,0,0" />
+                                <TextBlock x:Name="StepWarning" FontSize="11" Foreground="Orange" TextWrapping="Wrap"
+                                           Margin="2,2,0,0" />
+                            </StackPanel>
+                        </StackPanel>
                     </ScrollViewer>
-                </Grid>
+
+                    <GridSplitter Grid.Row="1" Background="Transparent" ResizeDirection="Rows"
+                                  ToolTip.Tip="Drag to resize" />
+
+                    <Grid Grid.Row="2" RowDefinitions="Auto,Auto,*">
+                        <TextBlock Text="Variables" FontSize="13" FontWeight="SemiBold" Margin="0,0,0,4" />
+                        <TextBox Grid.Row="1" x:Name="VariableSearchBox" Height="30" FontSize="12" Margin="0,0,0,6"
+                                 PlaceholderText="Search variables" />
+                        <ScrollViewer Grid.Row="2">
+                            <StackPanel x:Name="VariablesPanel" Spacing="2" />
+                        </ScrollViewer>
+                    </Grid>
                 </Grid>
             </Border>
         </Grid>
@@ -315,4 +391,4 @@
         <TextBlock Grid.Row="2" x:Name="StatusText" Margin="14,6,14,10" FontSize="11" Foreground="Gray"
                    TextWrapping="Wrap" />
     </Grid>
-</Window>
+</Window>
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
index bb5f1d5..ee0b8a4 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
@@ -20,43 +20,27 @@ public partial class ActionEditorWindow : Window {
     private const double StepSpacingX = 260;
     private const double StepSpacingY = 90;
 
+    private static readonly Dictionary<Guid, ActionEditorWindow> OpenEditors = [];
+
     private readonly CustomAction _action;
+    private readonly HashSet<string> _collapsedGroups = new(StringComparer.Ordinal);
+    private readonly ObservableCollection<ActionConnectionVm> _connections = [];
     private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<ActionEditorWindow>>();
     private readonly ObservableCollection<ActionNodeVm> _nodes = [];
-    private readonly ObservableCollection<ActionConnectionVm> _connections = [];
+    private readonly List<(string Group, Expander Section, StackPanel Buttons)> _paletteSections = [];
 
     private readonly Dictionary<string, string> _targetIds = new(StringComparer.OrdinalIgnoreCase);
-    private IReadOnlyList<MixItUpCommandInfo>? _mixItUpCommands;
-    private IReadOnlyList<StreamerBotActionInfo>? _streamerBotActions;
+    private bool _closeConfirmed;
 
     private bool _dirty;
+    private IReadOnlyList<MixItUpCommandInfo>? _mixItUpCommands;
     private string _savedState = "";
-    private readonly List<(string Group, Expander Section, StackPanel Buttons)> _paletteSections = [];
-    private readonly HashSet<string> _collapsedGroups = new(StringComparer.Ordinal);
-    private bool _closeConfirmed;
+    private IReadOnlyList<StreamerBotActionInfo>? _streamerBotActions;
     private int _suppress;
 
-    private static readonly Dictionary<Guid, ActionEditorWindow> OpenEditors = [];
-
     public ActionEditorWindow() : this(new CustomAction()) {
     }
 
-    public event Action<Guid>? Saved;
-
-    public static ActionEditorWindow Open(CustomAction action) {
-        if (OpenEditors.TryGetValue(action.Id, out ActionEditorWindow? existing)) {
-            if (existing.WindowState == WindowState.Minimized) existing.WindowState = WindowState.Normal;
-            existing.Activate();
-            return existing;
-        }
-
-        var editor = new ActionEditorWindow(action);
-        OpenEditors[action.Id] = editor;
-        editor.Closed += (_, _) => OpenEditors.Remove(action.Id);
-        editor.Show();
-        return editor;
-    }
-
     public ActionEditorWindow(CustomAction action) {
         InitializeComponent();
         WindowIcons.Apply(this);
@@ -93,10 +77,13 @@ public ActionEditorWindow(CustomAction action) {
                 MarkDirty();
                 if (box == NameBox) Title = $"Custom Action - {NameBox.Text}";
             };
-        foreach (TextBox box in new[] { ValueBox, DurationBox, BodyBox })
+        foreach (TextBox box in new[]
+                     { ValueBox, DurationBox, BodyBox, HeadersBox, AuthUserBox, AuthTokenBox, OutputBox })
             box.TextChanged += (_, _) => ApplyStepFields();
+
         foreach (AutoCompleteBox box in new[] { ScopeBox, TargetBox })
             box.TextChanged += (_, _) => ApplyStepFields();
+
         ScopeBox.LostFocus += (_, _) => _ = LoadTargetSuggestionsAsync();
         ScopeBox.SelectionChanged += (_, _) => _ = LoadTargetSuggestionsAsync();
 
@@ -110,10 +97,28 @@ public ActionEditorWindow(CustomAction action) {
     }
 
     private ActionGraph Graph => _action.Graph;
+
     private ActionNodeVm? SelectedVm =>
         Editor.SelectedItems is { Count: 1 } ? Editor.SelectedItems[0] as ActionNodeVm : null;
+
     private ActionNode? SelectedNode => SelectedVm?.Node;
 
+    public event Action<Guid>? Saved;
+
+    public static ActionEditorWindow Open(CustomAction action) {
+        if (OpenEditors.TryGetValue(action.Id, out ActionEditorWindow? existing)) {
+            if (existing.WindowState == WindowState.Minimized) existing.WindowState = WindowState.Normal;
+            existing.Activate();
+            return existing;
+        }
+
+        var editor = new ActionEditorWindow(action);
+        OpenEditors[action.Id] = editor;
+        editor.Closed += (_, _) => OpenEditors.Remove(action.Id);
+        editor.Show();
+        return editor;
+    }
+
     private void LoadHeader() {
         _suppress++;
         try {
@@ -204,7 +209,9 @@ private async Task<bool> SaveAsync() {
 
         ResetDirty();
         Validate();
-        StatusText.Text = Graph.IsValid(out string error) ? "Saved" : $"Save - Will not run until errors are fixed: {error}";
+        StatusText.Text = Graph.IsValid(out string error)
+            ? "Saved"
+            : $"Save - Will not run until errors are fixed: {error}";
         Saved?.Invoke(_action.Id);
 
         return true;
@@ -221,7 +228,7 @@ private async void TestRun_Click(object? sender, RoutedEventArgs e) {
         StatusText.Foreground = Brushes.Gray;
         StatusText.Text = "Test run started...";
         CustomAction snapshot = _action.Clone();
-        ActionRunResult result = await ServiceManager.Actions.RunManuallyAsync(snapshot, unsavedCopy: true);
+        ActionRunResult result = await ServiceManager.Actions.RunManuallyAsync(snapshot, true);
         StatusText.Text = result switch {
             ActionRunResult.Done => "Test run finished",
             ActionRunResult.Skipped => "Test run skipped: one is already running and this action ignores repeats",
@@ -263,4 +270,4 @@ private async void Window_Closing(object? sender, WindowClosingEventArgs e) {
         _closeConfirmed = true;
         Close();
     }
-}
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.Globals.cs b/SubathonManager.UI/Views/Actions/ActionsView.Globals.cs
new file mode 100644
index 0000000..1e8933f
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionsView.Globals.cs
@@ -0,0 +1,400 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using FluentAvalonia.UI.Controls;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
+using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionsView {
+    private static readonly FontFamily Mono = new("Consolas, Menlo, monospace");
+
+    private readonly List<StoreRow> _globalRows = [];
+    private readonly List<StoreRow> _secretRows = [];
+    private int _storeSuppress;
+
+    private void InitStore() {
+        EnterKeyCommit.Attach(GlobalsPanel, source => _ = CommitFromAsync(source, _globalRows));
+        EnterKeyCommit.Attach(SecretsPanel, source => _ = CommitFromAsync(source, _secretRows));
+    }
+
+    private void OnGlobalsChanged() {
+        Dispatcher.UIThread.Post(() => _ = RefreshStoreAsync());
+    }
+
+    private List<StoreRow> RowsOf(ActionStoreKind kind) {
+        return kind == ActionStoreKind.Global ? _globalRows : _secretRows;
+    }
+
+    private StackPanel PanelOf(ActionStoreKind kind) {
+        return kind == ActionStoreKind.Global ? GlobalsPanel : SecretsPanel;
+    }
+
+    private async Task RefreshStoreAsync() {
+        List<ActionGlobal> all;
+        try {
+            all = await ServiceManager.Actions.GetGlobalsAsync();
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "[Actions] Could not load globals and secrets");
+            StoreStatusText.Text = "Could not load globals and secrets - check the logs";
+            return;
+        }
+
+        foreach (ActionStoreKind kind in Enum.GetValues<ActionStoreKind>())
+            Reconcile(kind, all.Where(g => g.Kind == kind).ToList());
+        RefreshSavePending();
+    }
+
+    private void Reconcile(ActionStoreKind kind, List<ActionGlobal> entries) {
+        List<StoreRow> rows = RowsOf(kind);
+
+        foreach (StoreRow gone in rows.Where(r => !r.IsNew && !entries.Any(e => SameName(e.Name, r.Name))).ToList())
+            RemoveRow(gone);
+
+        foreach (ActionGlobal entry in entries) {
+            StoreRow? row = rows.FirstOrDefault(r => !r.IsNew && SameName(r.Name, entry.Name));
+            if (row == null) {
+                row = BuildRow(kind);
+                row.Name = entry.Name;
+                row.NameBox.Text = entry.Name;
+                row.NameBox.IsReadOnly = true;
+                rows.Add(row);
+                PanelOf(kind).Children.Add(row.Root);
+            }
+
+            UpdateRow(row, entry);
+        }
+
+        if (rows.Count == 0) AddRow(kind, false, false);
+    }
+
+    private static bool SameName(string? a, string? b) {
+        return string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private void UpdateRow(StoreRow row, ActionGlobal entry) {
+        string value = row.Kind == ActionStoreKind.Secret
+            ? ServiceManager.Actions.GetSecretValue(entry.Name) ?? ""
+            : entry.Value ?? "";
+
+        _storeSuppress++;
+        try {
+            bool valueEdited = (row.ValueBox.Text ?? "") != row.Saved;
+            bool typeEdited = row.TypeBox != null && SelectedType(row) != row.SavedType;
+            if (!valueEdited) row.ValueBox.Text = value;
+            if (row.TypeBox != null && !typeEdited) SelectType(row, entry.ValueType);
+            row.Saved = value;
+            row.SavedType = entry.ValueType;
+        }
+        finally {
+            _storeSuppress--;
+        }
+
+        RefreshRowState(row);
+    }
+
+    private void RefreshRowState(StoreRow row) {
+        string name = row.IsNew ? (row.NameBox.Text ?? "").Trim() : row.Name!;
+        row.CopyButton.IsEnabled = ActionStepTypeHelper.IsValidName(name);
+        if (row.IsNew) {
+            row.Detail.IsVisible = false;
+            return;
+        }
+
+        List<string> usedBy = ServiceManager.Actions.ActionsUsing(row.Kind, row.Name!).Select(a => a.Name).ToList();
+        string uses = usedBy.Count == 0 ? "Not used by any action" : $"Used by {string.Join(", ", usedBy)}";
+        bool empty = row.Saved.Length == 0;
+        row.Detail.IsVisible = true;
+        row.Detail.Foreground = empty ? Brushes.Orange : Brushes.Gray;
+        row.Detail.Text = empty ? $"No value - steps using it get it empty.  {uses}" : uses;
+    }
+
+    private void RefreshSavePending() {
+        UiHelpers.UpdateButtonPendingBorder(StoreSaveBorder, _globalRows.Concat(_secretRows).Any(r => r.Dirty));
+    }
+
+    private StoreRow BuildRow(ActionStoreKind kind) {
+        var nameBox = new TextBox {
+            Height = 34, FontFamily = Mono,
+            PlaceholderText = kind == ActionStoreKind.Global ? "name, e.g. deaths" : "name, e.g. my_token"
+        };
+        var valueBox = new TextBox { Height = 34, PlaceholderText = "value" };
+        if (kind == ActionStoreKind.Secret) {
+            valueBox.PasswordChar = '*';
+            TextBoxAssist.SetReveal(valueBox, true);
+        }
+
+        var copy = new Button {
+            Classes = { "opaquesecondary", "iconbtn" }, Width = 34, Height = 34, Padding = new Thickness(2),
+            Content = new SymIcon { Glyph = "Clipboard20" }
+        };
+        var delete = new Button {
+            Classes = { "danger", "iconbtn" }, Width = 34, Height = 34, Padding = new Thickness(2),
+            Content = new SymIcon { Glyph = "Delete20" }
+        };
+        ToolTip.SetTip(delete, "Delete");
+        var detail = new TextBlock {
+            FontSize = 11, Foreground = Brushes.Gray, TextWrapping = TextWrapping.Wrap,
+            Margin = new Thickness(4, 4, 0, 0),
+            IsVisible = false
+        };
+
+        ComboBox? typeBox = null;
+        if (kind == ActionStoreKind.Global) {
+            typeBox = new ComboBox { Height = 34, HorizontalAlignment = HorizontalAlignment.Stretch };
+            foreach (ActionValueType type in Enum.GetValues<ActionValueType>())
+                typeBox.Items.Add(new ComboBoxItem { Content = type.GetLabel(), Tag = type });
+            typeBox.SelectedIndex = 0;
+            ToolTip.SetTip(typeBox, "What the global holds. Set Global steps must give a value of this type");
+        }
+
+        var grid = new Grid {
+            ColumnDefinitions =
+                new ColumnDefinitions(kind == ActionStoreKind.Global ? "Auto,2*,110,3*,Auto" : "Auto,2*,0,3*,Auto"),
+            ColumnSpacing = 6
+        };
+
+        grid.Children.Add(copy);
+        Grid.SetColumn(nameBox, 1);
+        grid.Children.Add(nameBox);
+        if (typeBox != null) {
+            Grid.SetColumn(typeBox, 2);
+            grid.Children.Add(typeBox);
+        }
+
+        Grid.SetColumn(valueBox, 3);
+        grid.Children.Add(valueBox);
+        Grid.SetColumn(delete, 4);
+        grid.Children.Add(delete);
+
+        var card = new Border {
+            Padding = new Thickness(10, 8), CornerRadius = new CornerRadius(6), BorderThickness = new Thickness(1),
+            Child = new StackPanel { Children = { grid, detail } }
+        };
+        card.SetDynamicResource(Border.BorderBrushProperty, "UiBrushBorder");
+        card.SetDynamicResource(Border.BackgroundProperty, "UiBrushControlBackground");
+
+        var row = new StoreRow {
+            Kind = kind, Root = card, NameBox = nameBox, ValueBox = valueBox, TypeBox = typeBox, CopyButton = copy,
+            Detail = detail
+        };
+
+        nameBox.TextChanged += (_, _) => Edited(row);
+        valueBox.TextChanged += (_, _) => Edited(row);
+        if (typeBox != null)
+            typeBox.SelectionChanged += (_, _) => {
+                UpdateValueHint(row);
+                Edited(row);
+            };
+        copy.Click += async (_, _) => {
+            string name = row.IsNew ? (row.NameBox.Text ?? "").Trim() : row.Name!;
+            string placeholder = ActionStepTypeHelper.StorePlaceholder(kind, name);
+            await UiHelpers.TrySetClipboardTextAsync(placeholder);
+            StoreStatusText.Text = $"Copied {placeholder}";
+        };
+        delete.Click += async (_, _) => await DeleteRowAsync(row);
+
+        UpdateValueHint(row);
+        RefreshCopyTip(row);
+        return row;
+    }
+
+    private void Edited(StoreRow row) {
+        if (_storeSuppress > 0) return;
+        RefreshRowState(row);
+        RefreshCopyTip(row);
+        RefreshSavePending();
+    }
+
+    private static void RefreshCopyTip(StoreRow row) {
+        string name = row.IsNew ? (row.NameBox.Text ?? "").Trim() : row.Name!;
+        ToolTip.SetTip(row.CopyButton, ActionStepTypeHelper.IsValidName(name)
+            ? $"Copy {ActionStepTypeHelper.StorePlaceholder(row.Kind, name)}"
+            : "Names are letters, numbers and _ only (max length: 64)");
+    }
+
+    private static ActionValueType SelectedType(StoreRow row) {
+        return (row.TypeBox?.SelectedItem as ComboBoxItem)?.Tag is ActionValueType type ? type : ActionValueType.Text;
+    }
+
+    private static void SelectType(StoreRow row, ActionValueType type) {
+        row.TypeBox!.SelectedItem = row.TypeBox.Items.OfType<ComboBoxItem>()
+            .FirstOrDefault(i => (ActionValueType?)i.Tag == type);
+        UpdateValueHint(row);
+    }
+
+    private static void UpdateValueHint(StoreRow row) {
+        if (row.Kind == ActionStoreKind.Secret) return;
+        row.ValueBox.PlaceholderText = SelectedType(row) switch {
+            ActionValueType.Number => "a number",
+            ActionValueType.Boolean => "true or false",
+            _ => "text"
+        };
+    }
+
+    private StoreRow AddRow(ActionStoreKind kind, bool focus, bool atTop) {
+        StoreRow row = BuildRow(kind);
+        List<StoreRow> rows = RowsOf(kind);
+        int at = atTop ? 0 : rows.Count;
+        rows.Insert(at, row);
+        PanelOf(kind).Children.Insert(at, row.Root);
+        RefreshRowState(row);
+        if (focus)
+            Dispatcher.UIThread.Post(() => {
+                row.Root.BringIntoView();
+                row.NameBox.Focus();
+            }, DispatcherPriority.Background);
+        return row;
+    }
+
+    private void RemoveRow(StoreRow row) {
+        RowsOf(row.Kind).Remove(row);
+        PanelOf(row.Kind).Children.Remove(row.Root);
+    }
+
+    private void AddGlobalRow_Click(object? sender, RoutedEventArgs e) {
+        AddRow(ActionStoreKind.Global, true, true);
+    }
+
+    private void AddSecretRow_Click(object? sender, RoutedEventArgs e) {
+        AddRow(ActionStoreKind.Secret, true, true);
+    }
+
+    private async Task CommitFromAsync(object? source, List<StoreRow> rows) {
+        StoreRow? row = rows.FirstOrDefault(r => source is Visual v && (v == r.Root || r.Root.IsVisualAncestorOf(v)));
+        if (row == null) return;
+        if (row.IsNew && string.IsNullOrWhiteSpace(row.NameBox.Text)) return;
+        if (row.Dirty && await SaveRowAsync(row) is { } error) {
+            StoreStatusText.Text = error;
+            return;
+        }
+
+        if (rows.LastOrDefault() == row) AddRow(row.Kind, true, false);
+    }
+
+    private async void SaveStore_Click(object? sender, RoutedEventArgs e) {
+        List<StoreRow> changed = _globalRows.Concat(_secretRows)
+            .Where(r => r.Dirty && !(r.IsNew && string.IsNullOrWhiteSpace(r.NameBox.Text))).ToList();
+        if (changed.Count == 0) {
+            StoreStatusText.Text = "Nothing to save";
+            return;
+        }
+
+        var errors = new List<string>();
+        foreach (StoreRow row in changed)
+            if (await SaveRowAsync(row) is { } error)
+                errors.Add(error);
+
+        int saved = changed.Count - errors.Count;
+        StoreStatusText.Text = errors.Count == 0
+            ? $"Saved {saved} change(s)"
+            : $"Saved {saved}, {errors.Count} not saved: {string.Join("; ", errors)}";
+        RefreshSavePending();
+    }
+
+    private async Task<string?> SaveRowAsync(StoreRow row) {
+        string name = row.IsNew ? (row.NameBox.Text ?? "").Trim() : row.Name!;
+        string value = row.ValueBox.Text ?? "";
+        string placeholder = ActionStepTypeHelper.StorePlaceholder(row.Kind, name);
+
+        if (!ActionStepTypeHelper.IsValidName(name))
+            return $"\"{name}\": names are letters, numbers, and _ only (max length: 64)";
+
+        if (row.IsNew && RowsOf(row.Kind).Any(r => r != row && !r.IsNew && SameName(r.Name, name)))
+            return $"{placeholder} already exists";
+
+        string? note = null;
+        if (row.Kind == ActionStoreKind.Secret) {
+            if (!await ServiceManager.Actions.SetSecretAsync(name, value))
+                return $"could not save {placeholder} - check the logs";
+        }
+        else {
+            ActionValueType type = SelectedType(row);
+            if (!row.IsNew && value == row.Saved && type != row.SavedType) {
+                if (!await ServiceManager.Actions.SetGlobalTypeAsync(name, type))
+                    note = $"{placeholder}'s value couldn't convert to {type.GetLabel()} so it was cleared";
+                value = (await ServiceManager.Actions.GetGlobalsAsync(ActionStoreKind.Global))
+                    .FirstOrDefault(g => SameName(g.Name, name))?.Value ?? "";
+            }
+            else {
+                if (await ServiceManager.Actions.SetGlobalAsync(name, type, value) is { } error)
+                    return $"{placeholder}: {error}";
+                value = value.Length == 0 ? type.DefaultValue() : type.NormalizeValue(value) ?? "";
+            }
+
+            row.SavedType = type;
+        }
+
+        _storeSuppress++;
+        try {
+            row.Name = name;
+            row.NameBox.IsReadOnly = true;
+            row.ValueBox.Text = value;
+            row.Saved = value;
+        }
+        finally {
+            _storeSuppress--;
+        }
+
+        RefreshRowState(row);
+        RefreshSavePending();
+        StoreStatusText.Text = note ?? $"Saved {placeholder}";
+        return null;
+    }
+
+    private async Task DeleteRowAsync(StoreRow row) {
+        if (row.IsNew) {
+            RemoveRow(row);
+            if (RowsOf(row.Kind).Count == 0) AddRow(row.Kind, false, false);
+            RefreshSavePending();
+            return;
+        }
+
+        string placeholder = ActionStepTypeHelper.StorePlaceholder(row.Kind, row.Name!);
+        List<string> usedBy = ServiceManager.Actions.ActionsUsing(row.Kind, row.Name!).Select(a => a.Name).ToList();
+        var dialog = new FAContentDialog {
+            Title = $"Delete {row.Kind.TokenPrefix()}",
+            Content = usedBy.Count == 0
+                ? $"Delete {placeholder}?"
+                : $"Delete {placeholder}? {usedBy.Count} action(s) use it: {string.Join(", ", usedBy)}. " +
+                  "They'll be replaced with an empty value",
+            PrimaryButtonText = "Delete",
+            CloseButtonText = "Cancel"
+        };
+        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
+
+        await ServiceManager.Actions.DeleteGlobalAsync(row.Kind, row.Name!);
+        StoreStatusText.Text = $"Deleted {placeholder}";
+    }
+
+    private sealed class StoreRow {
+        public required ActionStoreKind Kind { get; init; }
+        public required Control Root { get; init; }
+        public required TextBox NameBox { get; init; }
+        public required TextBox ValueBox { get; init; }
+        public required ComboBox? TypeBox { get; init; }
+        public required Button CopyButton { get; init; }
+        public required TextBlock Detail { get; init; }
+
+        // null until the row is saved
+        public string? Name { get; set; }
+        public string Saved { get; set; } = "";
+        public ActionValueType SavedType { get; set; }
+
+        public bool IsNew => Name == null;
+
+        public bool Dirty => IsNew
+            ? !string.IsNullOrWhiteSpace(NameBox.Text)
+            : (ValueBox.Text ?? "") != Saved || (TypeBox != null && SelectedType(this) != SavedType);
+    }
+}
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml b/SubathonManager.UI/Views/Actions/ActionsView.axaml
index 43bdb11..18fe6d4 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml
@@ -147,10 +147,10 @@
                         <TextBlock x:Name="StatusText" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
                                    Margin="2,8,2,0" />
                     </StackPanel>
-    
+
                     <TextBlock Grid.Row="1" x:Name="NoSelectionText" Margin="2,24,2,0" FontSize="12"
                                Foreground="Gray" Text="Select an action to see its details here." />
-    
+
                     <Border Grid.Row="1" x:Name="DetailsPanel" IsVisible="False" Margin="0,20,0,0" Padding="16"
                             VerticalAlignment="Top" CornerRadius="6" BorderThickness="1"
                             BorderBrush="{DynamicResource UiBrushBorder}"
@@ -177,7 +177,7 @@
                             </Grid>
                             <TextBlock x:Name="DetailMeta" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
                                        Margin="0,4,0,0" />
-    
+
                             <StackPanel Orientation="Horizontal" Spacing="28" Margin="0,14,0,10">
                                 <StackPanel>
                                     <TextBlock x:Name="DetailSteps" FontSize="24" FontWeight="SemiBold" />
@@ -188,7 +188,7 @@
                                     <TextBlock Text="Branches" FontSize="11" Foreground="Gray" />
                                 </StackPanel>
                             </StackPanel>
-    
+
                             <TextBlock x:Name="DetailError" FontSize="12" Foreground="OrangeRed" TextWrapping="Wrap"
                                        Margin="0,0,0,8" />
                             <TextBlock x:Name="DetailDescription" FontSize="13" TextWrapping="Wrap" />
@@ -198,8 +198,68 @@
             </Grid>
         </TabItem>
 
+        <TabItem Header="Globals &amp; Secrets">
+            <Grid Margin="10" RowDefinitions="*,Auto" ColumnDefinitions="*,16,*">
+                <Grid Grid.Row="0" Grid.Column="0" RowDefinitions="Auto,Auto,*">
+                    <Grid ColumnDefinitions="*,Auto" Margin="6,0,2,0">
+                        <TextBlock Text="Globals" FontWeight="Bold" FontSize="18" VerticalAlignment="Center" />
+                        <Button Grid.Column="1" Classes="opaquesecondary" Padding="10,4" Click="AddGlobalRow_Click"
+                                ToolTip.Tip="Add a global">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <ctl:SymIcon Glyph="Add16" VerticalAlignment="Center" />
+                                <TextBlock Text="Add Global" VerticalAlignment="Center" />
+                            </StackPanel>
+                        </Button>
+                    </Grid>
+                    <StackPanel Grid.Row="1" Margin="6,4,2,10">
+                        <TextBlock TextWrapping="Wrap" FontSize="13"
+                                   Text="Values every action can access and modify" />
+                        <TextBlock TextWrapping="Wrap" FontSize="12" Foreground="Gray" Margin="0,4,0,0"
+                                   Text="Use as a variable in any action step as %global.name%" />
+                    </StackPanel>
+                    <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto">
+                        <StackPanel x:Name="GlobalsPanel" Spacing="6" Margin="0,0,10,0" />
+                    </ScrollViewer>
+                </Grid>
+
+                <Rectangle Grid.Row="0" Grid.Column="1" Width="2" Fill="#30808080" Margin="7,4"
+                           VerticalAlignment="Stretch" />
+
+                <Grid Grid.Row="0" Grid.Column="2" RowDefinitions="Auto,Auto,*">
+                    <Grid ColumnDefinitions="*,Auto" Margin="6,0,2,0">
+                        <TextBlock Text="Secrets" FontWeight="Bold" FontSize="18" VerticalAlignment="Center" />
+                        <Button Grid.Column="1" Classes="opaquesecondary" Padding="10,4" Click="AddSecretRow_Click"
+                                ToolTip.Tip="Add a secret">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <ctl:SymIcon Glyph="Add16" VerticalAlignment="Center" />
+                                <TextBlock Text="Add Secret" VerticalAlignment="Center" />
+                            </StackPanel>
+                        </Button>
+                    </Grid>
+                    <StackPanel Grid.Row="1" Margin="6,4,2,10">
+                        <TextBlock TextWrapping="Wrap" FontSize="13"
+                                   Text="Secrets to use as variables. Values are kept encrypted locally, and are not exported" />
+                        <TextBlock TextWrapping="Wrap" FontSize="12" Foreground="Gray" Margin="0,4,0,0"
+                                   Text="Use as a variable in any action step as %secret.name%" />
+                    </StackPanel>
+                    <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto">
+                        <StackPanel x:Name="SecretsPanel" Spacing="6" Margin="0,0,10,0" />
+                    </ScrollViewer>
+                </Grid>
+
+                <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" ColumnDefinitions="*,Auto" Margin="6,10,2,0">
+                    <TextBlock x:Name="StoreStatusText" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
+                               VerticalAlignment="Center" />
+                    <Border Grid.Column="1" x:Name="StoreSaveBorder" CornerRadius="4" BorderThickness="2"
+                            BorderBrush="Transparent">
+                        <Button Height="32" Width="90" Classes="accent" Content="Save" Click="SaveStore_Click" />
+                    </Border>
+                </Grid>
+            </Grid>
+        </TabItem>
+
         <TabItem Header="Triggers">
             <Grid />
         </TabItem>
     </TabControl>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
index 5426d45..fc3d9aa 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -29,16 +29,28 @@ public partial class ActionsView : UserControl {
     public ActionsView() {
         InitializeComponent();
         SearchBox.TextChanged += (_, _) => Refresh();
+        InitStore();
+
         Loaded += (_, _) => {
             ServiceManager.Actions.CustomActionsChanged -= OnLibraryChanged;
             ServiceManager.Actions.CustomActionsChanged += OnLibraryChanged;
+
+            ServiceManager.Actions.GlobalsChanged -= OnGlobalsChanged;
+            ServiceManager.Actions.GlobalsChanged += OnGlobalsChanged;
             Refresh();
+            _ = RefreshStoreAsync();
+        };
+        Unloaded += (_, _) => {
+            ServiceManager.Actions.CustomActionsChanged -= OnLibraryChanged;
+            ServiceManager.Actions.GlobalsChanged -= OnGlobalsChanged;
         };
-        Unloaded += (_, _) => ServiceManager.Actions.CustomActionsChanged -= OnLibraryChanged;
     }
 
     private void OnLibraryChanged() {
-        Dispatcher.UIThread.Post(Refresh);
+        Dispatcher.UIThread.Post(() => {
+            Refresh();
+            _ = RefreshStoreAsync();
+        });
     }
 
     private void Refresh() {
@@ -201,9 +213,9 @@ private async void Export_Click(object? sender, RoutedEventArgs e) {
     private async void Delete_Click(object? sender, RoutedEventArgs e) {
         if (CardOf(sender) is not { } action) return;
 
-        string id = action.Id.ToString();
+        var id = action.Id.ToString();
         await using AppDbContext db = await _factory.CreateDbContextAsync();
-        
+
         // TODO when more than just wheel spins, check
         int uses = await db.WheelSpinActions
             .CountAsync(a => a.ActionType == WheelSpinActionType.CustomAction && a.Parameter == id);
@@ -283,8 +295,6 @@ public bool IsSelected {
         }
     }
 
-    public event PropertyChangedEventHandler? PropertyChanged;
-
     public string Name => Action.Name;
     public string? Description => Action.Description;
     public bool HasDescription => !string.IsNullOrWhiteSpace(Action.Description);
@@ -293,4 +303,6 @@ public bool IsSelected {
         $"{Action.Graph.Nodes.Count} step(s) - v{Action.Version}"
         + (string.IsNullOrWhiteSpace(Action.Author) ? "" : $" - by {Action.Author}")
         + (Action.Graph.IsValid(out _) ? "" : " - needs fixing");
-}
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+}
\ No newline at end of file

From 4a2830b359f6876b761d1bd8217743149c040eb4 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Tue, 6 Oct 2026 11:01:47 -0300
Subject: [PATCH 06/23] add trigger nodes and events #338

---
 SubathonManager.Core/Enums/ActionEnums.cs     |  33 ++-
 SubathonManager.Core/Enums/EnumExtensions.cs  |   3 +
 .../{MixItUpTrigger.cs => SubathonTrigger.cs} |  28 +-
 SubathonManager.Core/Objects/ActionGraph.cs   | 110 ++++++-
 .../Objects/SubathonTriggerWatcher.cs         | 280 ++++++++++++++++++
 SubathonManager.Integration/MixItUpService.cs | 257 ++--------------
 SubathonManager.Integration/OBSService.cs     |  50 +++-
 SubathonManager.Services/ActionService.cs     | 215 +++++++++++++-
 .../MixItUpServiceTests.cs                    |  30 +-
 .../ServicesUnitTests/ActionServiceTests.cs   | 179 ++++++++++-
 .../Views/Actions/ActionEditorViewModels.cs   |  13 +-
 .../Views/Actions/ActionEditorWindow.Graph.cs |  77 +++--
 .../Actions/ActionEditorWindow.Properties.cs  |  95 +++++-
 .../Views/Actions/ActionEditorWindow.axaml    |  43 ++-
 .../Views/Actions/ActionEditorWindow.axaml.cs |  76 ++++-
 .../Views/Actions/ActionsView.Triggers.cs     | 152 ++++++++++
 .../Views/Actions/ActionsView.axaml           |  55 +++-
 .../Views/Actions/ActionsView.axaml.cs        |  73 ++++-
 .../ExternalSoftware/MixItUpSettings.axaml.cs |  16 +-
 19 files changed, 1424 insertions(+), 361 deletions(-)
 rename SubathonManager.Core/Enums/{MixItUpTrigger.cs => SubathonTrigger.cs} (54%)
 create mode 100644 SubathonManager.Core/Objects/SubathonTriggerWatcher.cs
 create mode 100644 SubathonManager.UI/Views/Actions/ActionsView.Triggers.cs

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index 0424e21..c0bd227 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -26,6 +26,18 @@ public enum ActionStepType {
         AllowsVariables = true)]
     SetGlobal = 2,
 
+    [ActionStepMeta(Label = "Trigger", Group = "Triggers")]
+    Trigger = 3,
+
+    [ActionStepMeta(Label = "Enable / Disable Action", Group = "Custom Actions",
+        Operations = [ActionOperation.Enable, ActionOperation.Disable, ActionOperation.Toggle],
+        TargetLabel = "Action:")]
+    SetActionEnabled = 4,
+
+    [ActionStepMeta(Label = "Run Action", Group = "Custom Actions",
+        Operations = [ActionOperation.Run, ActionOperation.Start], TargetLabel = "Action:")]
+    RunAction = 5,
+
     [ActionStepMeta(Label = "Add Time", Group = "Subathon", DurationLabel = "Time to add:")]
     AddTime = 100,
 
@@ -82,6 +94,13 @@ public enum ActionStepType {
         TargetLabel = "Input:")]
     ObsMedia = 403,
 
+    [ActionStepMeta(Label = "Refresh Browser", Group = "OBS", TargetLabel = "Browser source:")]
+    ObsBrowserRefresh = 404,
+
+    [ActionStepMeta(Label = "Raw Request", Group = "OBS", TargetLabel = "Request type:",
+        BodyLabel = "Request data (JSON object, optional):", AllowsVariables = true, SavesOutput = true)]
+    ObsRaw = 405,
+
     // "name=value" per line, sent as the action's arguments, found as %name%
     [ActionStepMeta(Label = "Run Action", Group = "Streamer.bot", Operations = [ActionOperation.Run],
         TargetLabel = "Action:", BodyLabel = "Arguments (one name=value per line):", AllowsVariables = true)]
@@ -136,7 +155,10 @@ public enum ActionOperation {
     NotEmpty,
 
     // Set/Adjust Global on a number
-    Adjust
+    Adjust,
+    
+    // Start another action, do not wait for result
+    Start
 }
 
 public enum ActionStoreKind {
@@ -166,7 +188,8 @@ public enum ActionRunResult {
 public enum ActionRepeatMode {
     Restart,
     Parallel,
-    Skip
+    Skip,
+    Queue
 }
 
 public enum ActionVariable {
@@ -351,6 +374,10 @@ public static bool IsWebRequest(this ActionStepType type) {
         return Meta(type)?.IsWebRequest ?? false;
     }
 
+    public static bool SavesOutput(this ActionStepType type) {
+        return type.IsWebRequest() || (Meta(type)?.SavesOutput ?? false);
+    }
+
     public static bool HasScope(this ActionStepType type) {
         return type.GetScopeLabel() != null;
     }
@@ -394,6 +421,8 @@ public static string GetOpLabel(this ActionOperation operation) {
             ActionOperation.NotEmpty => "Is Not Empty",
             ActionOperation.Set => "Set To",
             ActionOperation.Adjust => "Add/Subtract (numbers)",
+            ActionOperation.Run => "Run",
+            ActionOperation.Start => "Start - Do not wait",
             _ => $"{operation}"
         };
     }
diff --git a/SubathonManager.Core/Enums/EnumExtensions.cs b/SubathonManager.Core/Enums/EnumExtensions.cs
index 58ad7ef..d0f6428 100644
--- a/SubathonManager.Core/Enums/EnumExtensions.cs
+++ b/SubathonManager.Core/Enums/EnumExtensions.cs
@@ -147,6 +147,9 @@ public class ActionStepMetaAttribute : EnumMetaAttribute {
     // headers, auth, timeout and an output variable for the response, precanned
     public bool IsWebRequest { get; init; }
 
+    // has output variable but not rest of web stuff
+    public bool SavesOutput { get; init; }
+
     // %variables% in config will be accepted
     public bool AllowsVariables { get; init; }
 }
diff --git a/SubathonManager.Core/Enums/MixItUpTrigger.cs b/SubathonManager.Core/Enums/SubathonTrigger.cs
similarity index 54%
rename from SubathonManager.Core/Enums/MixItUpTrigger.cs
rename to SubathonManager.Core/Enums/SubathonTrigger.cs
index 6396bfc..5307d11 100644
--- a/SubathonManager.Core/Enums/MixItUpTrigger.cs
+++ b/SubathonManager.Core/Enums/SubathonTrigger.cs
@@ -1,14 +1,14 @@
 namespace SubathonManager.Core.Enums;
 
-public enum MixItUpTrigger {
+public enum SubathonTrigger {
     [EnumMeta(Label = "Subathon Event", Order = 0,
-        Description = "Any subathon event (subs, donations, orders, etc.), and commands if enabled")]
+        Description = "Any subathon event (subs, donations, orders, commands, etc.)")]
     SubathonEvent,
 
-    [EnumMeta(Label = "Timer Paused", Order = 1, Description = "The subathon timer was paused")]
+    [EnumMeta(Label = "Timer Paused", Order = 1, Description = "The timer was paused")]
     TimerPaused,
 
-    [EnumMeta(Label = "Timer Resumed", Order = 2, Description = "The subathon timer was resumed")]
+    [EnumMeta(Label = "Timer Resumed", Order = 2, Description = "The timer was resumed")]
     TimerResumed,
 
     [EnumMeta(Label = "Timer Locked", Order = 3, Description = "The subathon was locked")]
@@ -17,24 +17,28 @@ public enum MixItUpTrigger {
     [EnumMeta(Label = "Timer Unlocked", Order = 4, Description = "The subathon was unlocked")]
     TimerUnlocked,
 
-    [EnumMeta(Label = "Multiplier Started", Order = 5, Description = "A multiplier started")]
+    [EnumMeta(Label = "Multiplier Started", Order = 6, Description = "A multiplier started")]
     MultiplierStarted,
 
-    [EnumMeta(Label = "Multiplier Ended", Order = 6, Description = "A multiplier ended or was stopped")]
+    [EnumMeta(Label = "Multiplier Ended", Order = 7, Description = "A multiplier ended or was stopped")]
     MultiplierEnded,
 
-    [EnumMeta(Label = "Goal Completed", Order = 7, Description = "A goal was reached")]
+    [EnumMeta(Label = "Goal Completed", Order = 8, Description = "A goal was completed")]
     GoalCompleted,
 
-    [EnumMeta(Label = "Wheel Spin Start", Order = 8, Description = "A wheel spin started")]
+    [EnumMeta(Label = "Wheel Spin Start", Order = 9, Description = "A wheel spin started")]
     WheelSpinStart,
 
-    [EnumMeta(Label = "Wheel Spin End", Order = 9, Description = "A wheel spin landed on a result")]
+    [EnumMeta(Label = "Wheel Spin End", Order = 10, Description = "A wheel spin result came in")]
     WheelSpinEnd,
 
-    [EnumMeta(Label = "Prompt Started", Order = 10, Description = "A prompt run started")]
+    [EnumMeta(Label = "Prompt Started", Order = 11, Description = "A prompt run started")]
     PromptStarted,
 
-    [EnumMeta(Label = "Prompt Ended", Order = 11, Description = "A prompt run completed, expired or was cancelled")]
-    PromptEnded
+    [EnumMeta(Label = "Prompt Ended", Order = 12, Description = "A prompt run completed, expired or was cancelled")]
+    PromptEnded,
+
+    [EnumMeta(Label = "Timer Ended", Order = 5,
+        Description = "The timer reached 0")]
+    TimerEnded
 }
diff --git a/SubathonManager.Core/Objects/ActionGraph.cs b/SubathonManager.Core/Objects/ActionGraph.cs
index 7667853..e60fa97 100644
--- a/SubathonManager.Core/Objects/ActionGraph.cs
+++ b/SubathonManager.Core/Objects/ActionGraph.cs
@@ -1,8 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
 
 namespace SubathonManager.Core.Objects;
 
@@ -23,6 +25,12 @@ public sealed class ActionStep {
     public string? AuthToken { get; set; }
     public string? OutputVariable { get; set; }
 
+    public SubathonTrigger? Trigger { get; set; }
+    public List<string>? EventTypes { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    public bool IgnoreSimulated { get; set; }
+
     [JsonIgnore] public TimeSpan Duration => Seconds is > 0.0 ? TimeSpan.FromSeconds(Seconds.Value) : TimeSpan.Zero;
 
     [JsonIgnore] public string AllText => string.Join('\n', Target, Scope, Body, Headers, AuthUser, AuthToken);
@@ -43,7 +51,10 @@ public ActionStep Fill(Func<string, string> fill) {
             Auth = Auth,
             AuthUser = AuthUser == null ? null : fill(AuthUser),
             AuthToken = AuthToken == null ? null : fill(AuthToken),
-            OutputVariable = OutputVariable
+            OutputVariable = OutputVariable,
+            Trigger = Trigger,
+            EventTypes = EventTypes == null ? null : [..EventTypes],
+            IgnoreSimulated = IgnoreSimulated
         };
     }
 
@@ -76,6 +87,12 @@ public bool IsValid(out string error) {
             case ActionStepType.HttpGet or ActionStepType.HttpPost when !LooksLikeUrl(Target):
                 error = "The URL needs to start with http:// or https://";
                 return false;
+            case ActionStepType.Trigger when Trigger == null:
+                error = "Pick a trigger for this";
+                return false;
+            case ActionStepType.Trigger when Trigger == SubathonTrigger.SubathonEvent && (EventTypes?.Count ?? 0) == 0:
+                error = "Pick at least one event type";
+                return false;
             case ActionStepType.SetGlobal when !ActionStepTypeHelper.IsValidName(Target.Trim()):
                 error = "Pick a global by name";
                 return false;
@@ -84,13 +101,19 @@ public bool IsValid(out string error) {
                 return false;
         }
 
-        if (Type.IsWebRequest()) {
-            if (!string.IsNullOrEmpty(OutputVariable) && !IsValidOutputName(OutputVariable)) {
-                error =
-                    $"\"{OutputVariable}\" can't be an output name: use letters, numbers, _, and not a built-in variable's name";
-                return false;
-            }
+        if (Type.SavesOutput() && !string.IsNullOrEmpty(OutputVariable) && !IsValidOutputName(OutputVariable)) {
+            error =
+                $"\"{OutputVariable}\" can't be an output name: use letters, numbers, _, and not a built-in variable's name";
+            return false;
+        }
 
+        if (Type == ActionStepType.ObsRaw && !string.IsNullOrWhiteSpace(Body) && !Body.Contains('%')
+            && !IsJsonObject(Body)) {
+            error = "Request data needs to be a valid JSON object, e.g. {\"sceneName\": \"Main\"}";
+            return false;
+        }
+
+        if (Type.IsWebRequest()) {
             if (Auth == ActionHttpAuth.Bearer && string.IsNullOrWhiteSpace(AuthToken)) {
                 error = "Bearer auth needs a token, e.g. %secret.my_token%";
                 return false;
@@ -119,10 +142,35 @@ public bool IsValid(out string error) {
     public static bool IsValidOutputName(string name) {
         return ActionStepTypeHelper.IsValidName(name)
                && !ActionStepTypeHelper.TryParseToken(name, out _)
+               && !name.Equals(ActionRunProgress.TriggerVariable, StringComparison.OrdinalIgnoreCase)
                && !Enum.GetValues<ActionStoreKind>()
                    .Any(k => name.Equals(k.TokenPrefix(), StringComparison.OrdinalIgnoreCase));
     }
 
+    public bool MatchesTrigger(SubathonTrigger trigger, SubathonEvent? subathonEvent) {
+        if (Type != ActionStepType.Trigger || Trigger != trigger) return false;
+        if (trigger != SubathonTrigger.SubathonEvent) return true;
+        if (subathonEvent == null) return false;
+        if (IgnoreSimulated && subathonEvent.Source == SubathonEventSource.Simulated) return false;
+
+        string eventType = $"{subathonEvent.EventType}";
+        return EventTypes?.Contains(eventType, StringComparer.OrdinalIgnoreCase) ?? false;
+    }
+
+    private static string EventTypeLabel(string eventType) {
+        return Enum.TryParse(eventType, out SubathonEventType type)
+            ? $"{((SubathonEventType?)type).GetSource()} {((SubathonEventType?)type).GetLabel()}" : eventType;
+    }
+
+    private static bool IsJsonObject(string text) {
+        try {
+            return JsonNode.Parse(text) is JsonObject;
+        }
+        catch (JsonException) {
+            return false;
+        }
+    }
+
     private static bool LooksLikeUrl(string url) {
         url = url.Trim();
         return url.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
@@ -160,10 +208,25 @@ public string Describe() {
             ActionStepType.ObsSourceVisibility => $"{Operation} \"{target}\" in \"{Scope}\"",
             ActionStepType.ObsFilter => $"{Operation} filter \"{target}\" on \"{Scope}\"",
             ActionStepType.ObsAudio or ActionStepType.ObsMedia => $"{Operation} \"{target}\"",
+            ActionStepType.SetActionEnabled => $"{Operation} action \"{target}\"",
+            ActionStepType.RunAction => Operation == ActionOperation.Start
+                ? $"Start action \"{target}\""
+                : $"Run action \"{target}\"",
+            ActionStepType.ObsBrowserRefresh => $"Refresh \"{target}\"",
+            ActionStepType.ObsRaw => $"OBS {target}{OutputSuffix}",
             ActionStepType.StreamerBotAction => $"Streamer.bot \"{target}\"",
             ActionStepType.Condition => Type.NeedsTarget(Operation)
                 ? $"If {Scope} is {Operation.GetOpLabel().ToLowerInvariant()} {Target}"
                 : $"If {Scope} is {Operation.GetOpLabel().ToLowerInvariant()}",
+            ActionStepType.Trigger => Trigger switch {
+                null => "When ...",
+                SubathonTrigger.SubathonEvent => (EventTypes?.Count ?? 0) switch {
+                    0 => "When a subathon event (none picked)",
+                    1 => $"When {EventTypeLabel(EventTypes![0])}",
+                    _ => $"When {EventTypeLabel(EventTypes![0])} +{EventTypes!.Count - 1} more"
+                } + (IgnoreSimulated ? ", not simulated" : ""),
+                _ => $"When {Trigger.Value.GetLabel().ToLowerInvariant()}"
+            },
             ActionStepType.SetGlobal => Operation switch {
                 ActionOperation.Toggle => $"Toggle %global.{Target}%",
                 ActionOperation.Adjust => $"%global.{Target}% += {Body?.Trim()}",
@@ -231,6 +294,17 @@ public sealed class ActionGraph {
     };
 
     public ActionRepeatMode OnRepeat { get; set; } = ActionRepeatMode.Restart;
+
+    [JsonIgnore]
+    public bool HasTriggers => Nodes.Any(n => n.Step.Type == ActionStepType.Trigger);
+
+    public static bool AllowedWithTriggers(ActionRepeatMode mode) {
+        return mode is ActionRepeatMode.Parallel or ActionRepeatMode.Queue;
+    }
+
+    [JsonIgnore]
+    public ActionRepeatMode EffectiveRepeat =>
+        HasTriggers && !AllowedWithTriggers(OnRepeat) ? ActionRepeatMode.Parallel : OnRepeat;
     public List<ActionNode> Nodes { get; set; } = [];
     public List<ActionEdge> Edges { get; set; } = [];
 
@@ -313,6 +387,11 @@ public bool IsValid(out string error) {
                 return false;
             }
 
+            if (Nodes.First(n => n.Id == edge.To).Step.Type == ActionStepType.Trigger) {
+                error = "Triggers start an action, you cannot lead into them";
+                return false;
+            }
+
             if (edge.Port == null) continue;
             if (edge.Port == ActionEdge.ElsePort
                 && Nodes.First(n => n.Id == edge.From).Step.Type == ActionStepType.Condition) continue;
@@ -389,6 +468,9 @@ public sealed class CustomAction {
     public string? Author { get; set; }
     public string? Description { get; set; }
     public string Version { get; set; } = "1.0.0";
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    public bool Disabled { get; set; }
     public ActionGraph Graph { get; set; } = new();
 
     public string ToJson() {
@@ -412,10 +494,22 @@ public static bool TryParse(string? json, [NotNullWhen(true)] out CustomAction?
     }
 }
 
-public sealed record ActionContext(SubathonEventSource Source, string User, string RepeatKey, string? Label = null);
+public sealed record ActionContext(SubathonEventSource Source, string User, string RepeatKey, string? Label = null,
+    SubathonTrigger? Trigger = null, IReadOnlySet<string>? TriggerNodes = null,
+    IReadOnlyDictionary<string, string>? TriggerValues = null, int Depth = 0);
 
 public sealed class ActionRunProgress {
     public const int MaxVariableLength = 64 * 1024 * 2;
+
+    public const string TriggerVariable = "trigger";
+
+    // a step saving to %resp% also sets %resp_status%
+    public const string StatusSuffix = "_status";
+
+    public void SetOutput(string name, string value, string status) {
+        SetVariable(name, value);
+        SetVariable($"{name}{StatusSuffix}", status);
+    }
     private readonly Lock _lock = new();
 
     public HashSet<string> Done { get; set; } = [];
diff --git a/SubathonManager.Core/Objects/SubathonTriggerWatcher.cs b/SubathonManager.Core/Objects/SubathonTriggerWatcher.cs
new file mode 100644
index 0000000..c9e0a2f
--- /dev/null
+++ b/SubathonManager.Core/Objects/SubathonTriggerWatcher.cs
@@ -0,0 +1,280 @@
+using System.Globalization;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Models;
+
+namespace SubathonManager.Core.Objects;
+
+public sealed class SubathonTriggerWatcher(Action<SubathonTrigger, Dictionary<string, string>, SubathonEvent?> fire) {
+    private readonly Lock _lock = new();
+    private bool _lastLocked;
+    private MultiplierSnapshot? _lastMultiplier;
+    private bool _lastPaused;
+    private bool _lastEnded;
+    private Guid? _trackedSubathonId;
+    private bool _started;
+
+    public void Start() {
+        Stop();
+        SubathonEvents.SubathonEventProcessed += OnSubathonEventProcessed;
+        SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
+        SubathonEvents.SubathonGoalCompleted += OnGoalCompleted;
+        SubathonEvents.PromptRunStarted += OnPromptRunStarted;
+        SubathonEvents.PromptRunUpdate += OnPromptRunUpdate;
+        WheelEvents.WheelSpinStarted += OnWheelSpinStarted;
+        WheelEvents.WheelSpinResult += OnWheelSpinResult;
+        _started = true;
+    }
+
+    public void Stop() {
+        SubathonEvents.SubathonEventProcessed -= OnSubathonEventProcessed;
+        SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
+        SubathonEvents.SubathonGoalCompleted -= OnGoalCompleted;
+        SubathonEvents.PromptRunStarted -= OnPromptRunStarted;
+        SubathonEvents.PromptRunUpdate -= OnPromptRunUpdate;
+        WheelEvents.WheelSpinStarted -= OnWheelSpinStarted;
+        WheelEvents.WheelSpinResult -= OnWheelSpinResult;
+        if (!_started) return;
+        _started = false;
+        lock (_lock) {
+            _trackedSubathonId = null;
+            _lastMultiplier = null;
+        }
+    }
+
+    private void OnSubathonEventProcessed(SubathonEvent subathonEvent, bool effective) {
+        fire(SubathonTrigger.SubathonEvent, EventValues(subathonEvent), subathonEvent);
+    }
+
+    private void OnSubathonDataUpdate(SubathonData subathon, DateTime timestamp) {
+        var fired = new List<(SubathonTrigger, Dictionary<string, string>)>(3);
+        MultiplierSnapshot? multiplier = subathon.Multiplier?.SubathonId == subathon.Id
+            ? MultiplierSnapshot.From(subathon.Multiplier) : null;
+
+        lock (_lock) {
+            if (_trackedSubathonId != subathon.Id) {
+                _trackedSubathonId = subathon.Id;
+                _lastPaused = subathon.IsPaused;
+                _lastLocked = subathon.IsLocked;
+                _lastEnded = HasEnded(subathon);
+                _lastMultiplier = multiplier;
+                return;
+            }
+
+            if (subathon.IsPaused != _lastPaused) {
+                _lastPaused = subathon.IsPaused;
+                fired.Add((subathon.IsPaused ? SubathonTrigger.TimerPaused : SubathonTrigger.TimerResumed,
+                    TimerValues(subathon)));
+            }
+
+            if (subathon.IsLocked != _lastLocked) {
+                _lastLocked = subathon.IsLocked;
+                fired.Add((subathon.IsLocked ? SubathonTrigger.TimerLocked : SubathonTrigger.TimerUnlocked,
+                    TimerValues(subathon)));
+            }
+
+            bool ended = HasEnded(subathon);
+            if (ended != _lastEnded) {
+                _lastEnded = ended;
+                if (ended) fired.Add((SubathonTrigger.TimerEnded, TimerValues(subathon)));
+            }
+
+            if (multiplier != null) {
+                MultiplierSnapshot? previous = _lastMultiplier;
+                _lastMultiplier = multiplier;
+                if (previous != null) {
+                    if (multiplier.Running && multiplier != previous)
+                        fired.Add((SubathonTrigger.MultiplierStarted, MultiplierValues(multiplier)));
+                    else if (!multiplier.Running && previous.Running)
+                        fired.Add((SubathonTrigger.MultiplierEnded, MultiplierValues(previous)));
+                }
+            }
+        }
+
+        foreach ((SubathonTrigger trigger, Dictionary<string, string> values) in fired)
+            fire(trigger, values, null);
+    }
+
+    private void OnGoalCompleted(SubathonGoal goal, long currentValue) {
+        fire(SubathonTrigger.GoalCompleted, new Dictionary<string, string> {
+            ["goaltext"] = goal.Text,
+            ["goaltarget"] = Number(goal.Points),
+            ["goalcurrent"] = Number(currentValue)
+        }, null);
+    }
+
+    private void OnWheelSpinStarted(WheelSet wheel, int delaySeconds) {
+        fire(SubathonTrigger.WheelSpinStart, new Dictionary<string, string> {
+            ["wheelname"] = wheel.Name,
+            ["wheelid"] = wheel.Id.ToString(),
+            ["spindelay"] = Number(delaySeconds)
+        }, null);
+    }
+
+    private void OnWheelSpinResult(WheelSet wheel, WheelItem? item, WheelSpinHistory history, int spinsOwed) {
+        fire(SubathonTrigger.WheelSpinEnd, new Dictionary<string, string> {
+            ["wheelname"] = wheel.Name,
+            ["wheelid"] = wheel.Id.ToString(),
+            ["wheelitem"] = item?.Text ?? "",
+            ["spinstatus"] = history.Status.ToString(),
+            ["spinsowed"] = Number(spinsOwed)
+        }, null);
+    }
+
+    private void OnPromptRunStarted(SubathonPromptRun run, SubathonPrompt? prompt) {
+        fire(SubathonTrigger.PromptStarted, PromptValues(run, prompt), null);
+    }
+
+    private void OnPromptRunUpdate(SubathonPromptRun run, SubathonPrompt? prompt) {
+        if (run.IsActive) return;
+        fire(SubathonTrigger.PromptEnded, PromptValues(run, prompt), null);
+    }
+
+    private static bool HasEnded(SubathonData subathon) {
+        return !subathon.IsSubathonReversed() && subathon.MillisecondsRemaining() <= 0;
+    }
+
+    private static string Number(IFormattable value) {
+        return value.ToString(null, CultureInfo.InvariantCulture);
+    }
+
+    public static Dictionary<string, string> EventValues(SubathonEvent subathonEvent) {
+        var eventType = $"{subathonEvent.EventType}";
+        string? trueSource = subathonEvent.EventType.GetTypeTrueSource(subathonEvent.EventTypeMeta);
+        if (subathonEvent.EventType == SubathonEventType.GoAffProOrder
+            && GoAffProOrderHelper.TryGetStore(subathonEvent.EventTypeMeta, out GoAffProStore? store)) {
+            trueSource = store.InternalName;
+            eventType = store.InternalEventName;
+        }
+
+        double seconds = subathonEvent.GetFinalSecondsValueRaw() < 0.5 ? 0 : subathonEvent.GetFinalSecondsValue();
+        return new Dictionary<string, string> {
+            ["eventtype"] = eventType,
+            ["source"] = $"{subathonEvent.Source}",
+            ["truesource"] = trueSource ?? "",
+            ["subtype"] = $"{subathonEvent.EventType.GetSubType()}",
+            ["user"] = subathonEvent.User ?? "",
+            ["value"] = subathonEvent.Value,
+            ["amount"] = Number(subathonEvent.Amount),
+            ["currency"] = subathonEvent.Currency ?? "",
+            ["command"] = $"{subathonEvent.Command}",
+            ["secondsadded"] = Number(seconds),
+            ["pointsadded"] = Number(subathonEvent.GetFinalPointsValue()),
+            ["secondaryvalue"] = subathonEvent.SecondaryValue,
+            ["tertiaryvalue"] = subathonEvent.TertiaryValue,
+            ["reversed"] = $"{subathonEvent.WasReversed}"
+        };
+    }
+
+    public static Dictionary<string, string> TimerValues(SubathonData subathon) {
+        TimeSpan remaining = subathon.TimeRemainingRounded();
+        return new Dictionary<string, string> {
+            ["timeremaining"] = $"{(int)remaining.TotalHours:00}:{remaining.Minutes:00}:{remaining.Seconds:00}",
+            ["secondsremaining"] = Number((long)remaining.TotalSeconds),
+            ["points"] = Number(subathon.Points),
+            ["paused"] = $"{subathon.IsPaused}",
+            ["locked"] = $"{subathon.IsLocked}"
+        };
+    }
+
+    public static Dictionary<string, string> MultiplierValues(MultiplierSnapshot multiplier) {
+        return new Dictionary<string, string> {
+            ["multiplier"] = Number(multiplier.Multiplier),
+            ["multipliertime"] = $"{multiplier.Time}",
+            ["multiplierpoints"] = $"{multiplier.Points}",
+            ["multiplierduration"] = Number((long)(multiplier.Duration?.TotalSeconds ?? 0)),
+            ["multiplierhypetrain"] = $"{multiplier.FromHypeTrain}"
+        };
+    }
+
+    public static Dictionary<string, string> PromptValues(SubathonPromptRun run, SubathonPrompt? prompt) {
+        prompt ??= run.LinkedPrompt;
+        return new Dictionary<string, string> {
+            ["prompttext"] = prompt?.Text ?? "",
+            ["prompttype"] = $"{prompt?.Type}",
+            ["prompttarget"] = Number(prompt?.Value ?? run.SnapshotTargetValue),
+            ["promptduration"] =
+                Number((long)(prompt?.CompletionDuration.TotalSeconds ?? (run.ExpiresAt - run.StartedAt).TotalSeconds)),
+            ["promptstatus"] = $"{run.Status}"
+        };
+    }
+
+    public static Dictionary<string, string> SampleValues(SubathonTrigger trigger) {
+        switch (trigger) {
+            case SubathonTrigger.SubathonEvent:
+                return EventValues(new SubathonEvent {
+                    Source = SubathonEventSource.Simulated,
+                    EventType = SubathonEventType.ExternalDonation,
+                    User = "TestUser",
+                    Value = "5",
+                    Currency = "USD",
+                    SecondsValue = 600,
+                    PointsValue = 5,
+                    ProcessedToSubathon = true
+                });
+            case SubathonTrigger.MultiplierStarted:
+            case SubathonTrigger.MultiplierEnded:
+                return MultiplierValues(new MultiplierSnapshot(trigger == SubathonTrigger.MultiplierStarted,
+                    2, true, true, TimeSpan.FromMinutes(10), DateTime.Now, false));
+            case SubathonTrigger.TimerPaused:
+            case SubathonTrigger.TimerResumed:
+            case SubathonTrigger.TimerLocked:
+            case SubathonTrigger.TimerUnlocked:
+            case SubathonTrigger.TimerEnded:
+                return new Dictionary<string, string> {
+                    ["timeremaining"] = "12:34:56",
+                    ["secondsremaining"] = "45296",
+                    ["points"] = "250",
+                    ["paused"] = (trigger == SubathonTrigger.TimerPaused).ToString(),
+                    ["locked"] = (trigger == SubathonTrigger.TimerLocked).ToString()
+                };
+            case SubathonTrigger.GoalCompleted:
+                return new Dictionary<string, string> {
+                    ["goaltext"] = "Test Goal",
+                    ["goaltarget"] = "100",
+                    ["goalcurrent"] = "100"
+                };
+            case SubathonTrigger.WheelSpinStart:
+                return new Dictionary<string, string> {
+                    ["wheelname"] = "Test Wheel",
+                    ["wheelid"] = Guid.Empty.ToString(),
+                    ["spindelay"] = "0"
+                };
+            case SubathonTrigger.WheelSpinEnd:
+                return new Dictionary<string, string> {
+                    ["wheelname"] = "Test Wheel",
+                    ["wheelid"] = Guid.Empty.ToString(),
+                    ["wheelitem"] = "Test Item",
+                    ["spinstatus"] = "Pending",
+                    ["spinsowed"] = "0"
+                };
+            case SubathonTrigger.PromptStarted:
+            case SubathonTrigger.PromptEnded:
+                return new Dictionary<string, string> {
+                    ["prompttext"] = "Test Prompt",
+                    ["prompttype"] = $"{SubathonPromptType.Points}",
+                    ["prompttarget"] = "10",
+                    ["promptduration"] = "300",
+                    ["promptstatus"] = trigger == SubathonTrigger.PromptStarted
+                        ? $"{SubathonPromptRunStatus.Active}"
+                        : $"{SubathonPromptRunStatus.Completed}"
+                };
+            default:
+                return new Dictionary<string, string>();
+        }
+    }
+}
+
+public sealed record MultiplierSnapshot(
+    bool Running,
+    double Multiplier,
+    bool Time,
+    bool Points,
+    TimeSpan? Duration,
+    DateTime? Started,
+    bool FromHypeTrain) {
+    public static MultiplierSnapshot From(MultiplierData data) {
+        return new MultiplierSnapshot(data.IsRunning(), data.Multiplier, data.ApplyToSeconds,
+            data.ApplyToPoints, data.Duration, data.Started, data.FromHypeTrain);
+    }
+}
diff --git a/SubathonManager.Integration/MixItUpService.cs b/SubathonManager.Integration/MixItUpService.cs
index 72d1761..8c6da15 100644
--- a/SubathonManager.Integration/MixItUpService.cs
+++ b/SubathonManager.Integration/MixItUpService.cs
@@ -1,10 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Microsoft.Extensions.Logging;
-using SubathonManager.Core;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Events;
 using SubathonManager.Core.Interfaces;
@@ -42,10 +40,8 @@ public class MixItUpService(
 
     private readonly Lock _lock = new();
 
-    private bool _lastLocked;
-    private MultiplierSnapshot? _lastMultiplier;
-    private bool _lastPaused;
-    private Guid? _trackedSubathonId;
+    private SubathonTriggerWatcher? _watcher;
+    private SubathonTriggerWatcher Watcher => _watcher ??= new SubathonTriggerWatcher(OnTrigger);
 
     public static string CommandsFolder => Path.GetFullPath(Path.Combine("external", "mixitup"));
 
@@ -63,11 +59,11 @@ public string ApiUrl {
         }
     }
 
-    public static string CommandConfigKey(MixItUpTrigger trigger) {
+    public static string CommandConfigKey(SubathonTrigger trigger) {
         return $"Command.{trigger}";
     }
 
-    public string GetCommandId(MixItUpTrigger trigger) {
+    public string GetCommandId(SubathonTrigger trigger) {
         return (config.Get(ConfigSection, CommandConfigKey(trigger), "") ?? "").Trim();
     }
 
@@ -86,8 +82,6 @@ public Task StopAsync(CancellationToken ct = default) {
         timerService.Unregister(SeenTimerKey);
         lock (_lock) {
             LastSeen = null;
-            _trackedSubathonId = null;
-            _lastMultiplier = null;
         }
 
         BroadcastStatus();
@@ -103,24 +97,12 @@ public void Dispose() {
 
     private void Subscribe() {
         IntegrationEvents.ExternalSourceSeen += OnExternalSourceSeen;
-        SubathonEvents.SubathonEventProcessed += OnSubathonEventProcessed;
-        SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
-        SubathonEvents.SubathonGoalCompleted += OnGoalCompleted;
-        SubathonEvents.PromptRunStarted += OnPromptRunStarted;
-        SubathonEvents.PromptRunUpdate += OnPromptRunUpdate;
-        WheelEvents.WheelSpinStarted += OnWheelSpinStarted;
-        WheelEvents.WheelSpinResult += OnWheelSpinResult;
+        Watcher.Start();
     }
 
     private void Unsubscribe() {
         IntegrationEvents.ExternalSourceSeen -= OnExternalSourceSeen;
-        SubathonEvents.SubathonEventProcessed -= OnSubathonEventProcessed;
-        SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
-        SubathonEvents.SubathonGoalCompleted -= OnGoalCompleted;
-        SubathonEvents.PromptRunStarted -= OnPromptRunStarted;
-        SubathonEvents.PromptRunUpdate -= OnPromptRunUpdate;
-        WheelEvents.WheelSpinStarted -= OnWheelSpinStarted;
-        WheelEvents.WheelSpinResult -= OnWheelSpinResult;
+        _watcher?.Stop();
     }
     
     public async Task<bool> ProbeAsync(CancellationToken ct = default) {
@@ -312,7 +294,7 @@ private sealed class CommandEntry {
         public bool IsEnabled { get; set; }
     }
 
-    internal bool Fire(MixItUpTrigger trigger, Dictionary<string, string> identifiers) {
+    internal bool Fire(SubathonTrigger trigger, Dictionary<string, string> identifiers) {
         if (!Enabled) return false;
         if (!Guid.TryParse(GetCommandId(trigger), out Guid commandId)) return false;
 
@@ -321,243 +303,48 @@ internal bool Fire(MixItUpTrigger trigger, Dictionary<string, string> identifier
         return true;
     }
 
-    public Task<bool> TestTriggerAsync(MixItUpTrigger trigger, string commandIdText, CancellationToken ct = default) {
+    public Task<bool> TestTriggerAsync(SubathonTrigger trigger, string commandIdText, CancellationToken ct = default) {
         if (!Guid.TryParse(commandIdText.Trim(), out Guid commandId)) return Task.FromResult(false);
         Dictionary<string, string> identifiers = SampleIdentifiers(trigger);
         identifiers[$"{IdentifierPrefix}trigger"] = trigger.ToString();
         return RunCommandAsync(commandId, identifiers, ct);
     }
 
-    private void OnSubathonEventProcessed(SubathonEvent subathonEvent, bool effective) {
-        if (!config.GetBool("App", "ShowLockedEvents", false) && !subathonEvent.ProcessedToSubathon) return;
-        if (subathonEvent.EventType == SubathonEventType.Command && !IncludeCommands) return;
-        Fire(MixItUpTrigger.SubathonEvent, EventIdentifiers(subathonEvent));
-    }
-
-    private void OnSubathonDataUpdate(SubathonData subathon, DateTime timestamp) {
-        // check for multiplier and pause/lock info
-        var fired = new List<(MixItUpTrigger, Dictionary<string, string>)>(3);
-        MultiplierSnapshot? multiplier = subathon.Multiplier?.SubathonId == subathon.Id
-            ? MultiplierSnapshot.From(subathon.Multiplier)
-            : null;
-        lock (_lock) {
-            if (_trackedSubathonId != subathon.Id) {
-                _trackedSubathonId = subathon.Id;
-                _lastPaused = subathon.IsPaused;
-                _lastLocked = subathon.IsLocked;
-                _lastMultiplier = multiplier;
-                return;
-            }
-
-            if (subathon.IsPaused != _lastPaused) {
-                _lastPaused = subathon.IsPaused;
-                fired.Add((subathon.IsPaused ? MixItUpTrigger.TimerPaused : MixItUpTrigger.TimerResumed,
-                    TimerIdentifiers(subathon)));
-            }
-
-            if (subathon.IsLocked != _lastLocked) {
-                _lastLocked = subathon.IsLocked;
-                fired.Add((subathon.IsLocked ? MixItUpTrigger.TimerLocked : MixItUpTrigger.TimerUnlocked,
-                    TimerIdentifiers(subathon)));
-            }
-
-            if (multiplier != null) {
-                MultiplierSnapshot? previous = _lastMultiplier;
-                _lastMultiplier = multiplier;
-                if (previous != null) {
-                    if (multiplier.Running && multiplier != previous)
-                        fired.Add((MixItUpTrigger.MultiplierStarted, MultiplierIdentifiers(multiplier)));
-                    else if (!multiplier.Running && previous.Running)
-                        fired.Add((MixItUpTrigger.MultiplierEnded, MultiplierIdentifiers(previous)));
-                }
-            }
+    private void OnTrigger(SubathonTrigger trigger, Dictionary<string, string> values, SubathonEvent? subathonEvent) {
+        if (subathonEvent != null) {
+            if (!config.GetBool("App", "ShowLockedEvents", false) && !subathonEvent.ProcessedToSubathon) return;
+            if (subathonEvent.EventType == SubathonEventType.Command && !IncludeCommands) return;
         }
 
-        foreach ((MixItUpTrigger trigger, Dictionary<string, string> identifiers) in fired)
-            Fire(trigger, identifiers);
-    }
-
-    private void OnGoalCompleted(SubathonGoal goal, long currentValue) {
-        Fire(MixItUpTrigger.GoalCompleted, new Dictionary<string, string> {
-            [$"{IdentifierPrefix}goaltext"] = goal.Text,
-            [$"{IdentifierPrefix}goaltarget"] = ToValueStr(goal.Points),
-            [$"{IdentifierPrefix}goalcurrent"] = ToValueStr(currentValue)
-        });
-    }
-
-    private void OnWheelSpinStarted(WheelSet wheel, int delaySeconds) {
-        Fire(MixItUpTrigger.WheelSpinStart, new Dictionary<string, string> {
-            [$"{IdentifierPrefix}wheelname"] = wheel.Name,
-            [$"{IdentifierPrefix}wheelid"] = wheel.Id.ToString(),
-            [$"{IdentifierPrefix}spindelay"] = ToValueStr(delaySeconds)
-        });
+        Fire(trigger, Prefixed(values));
     }
 
-    private void OnWheelSpinResult(WheelSet wheel, WheelItem? item, WheelSpinHistory history, int spinsOwed) {
-        Fire(MixItUpTrigger.WheelSpinEnd, new Dictionary<string, string> {
-            [$"{IdentifierPrefix}wheelname"] = wheel.Name,
-            [$"{IdentifierPrefix}wheelid"] = wheel.Id.ToString(),
-            [$"{IdentifierPrefix}wheelitem"] = item?.Text ?? "",
-            [$"{IdentifierPrefix}spinstatus"] = history.Status.ToString(),
-            [$"{IdentifierPrefix}spinsowed"] = ToValueStr(spinsOwed)
-        });
-    }
-
-    private void OnPromptRunStarted(SubathonPromptRun run, SubathonPrompt? prompt) {
-        Fire(MixItUpTrigger.PromptStarted, PromptIdentifiers(run, prompt));
-    }
-
-    private void OnPromptRunUpdate(SubathonPromptRun run, SubathonPrompt? prompt) {
-        if (run.IsActive) return;
-        Fire(MixItUpTrigger.PromptEnded, PromptIdentifiers(run, prompt));
-    }
-
-    private static string ToValueStr(IFormattable value) {
-        return value.ToString(null, CultureInfo.InvariantCulture);
+    private static Dictionary<string, string> Prefixed(Dictionary<string, string> values) {
+        return values.ToDictionary(kv => $"{IdentifierPrefix}{kv.Key}", kv => kv.Value);
     }
 
     internal static Dictionary<string, string> EventIdentifiers(SubathonEvent subathonEvent) {
-        var eventType = $"{subathonEvent.EventType}";
-        string? trueSource = subathonEvent.EventType.GetTypeTrueSource(subathonEvent.EventTypeMeta);
-        if (subathonEvent.EventType == SubathonEventType.GoAffProOrder
-            && GoAffProOrderHelper.TryGetStore(subathonEvent.EventTypeMeta, out GoAffProStore? store)) {
-            trueSource = store.InternalName;
-            eventType = store.InternalEventName;
-        }
-
-        double seconds = subathonEvent.GetFinalSecondsValueRaw() < 0.5 ? 0 : subathonEvent.GetFinalSecondsValue();
-        return new Dictionary<string, string> {
-            [$"{IdentifierPrefix}eventtype"] = eventType,
-            [$"{IdentifierPrefix}source"] = $"{subathonEvent.Source}",
-            [$"{IdentifierPrefix}truesource"] = trueSource ?? "",
-            [$"{IdentifierPrefix}subtype"] = $"{subathonEvent.EventType.GetSubType()}",
-            [$"{IdentifierPrefix}user"] = subathonEvent.User ?? "",
-            [$"{IdentifierPrefix}value"] = subathonEvent.Value,
-            [$"{IdentifierPrefix}amount"] = ToValueStr(subathonEvent.Amount),
-            [$"{IdentifierPrefix}currency"] = subathonEvent.Currency ?? "",
-            [$"{IdentifierPrefix}command"] = $"{subathonEvent.Command}",
-            [$"{IdentifierPrefix}secondsadded"] = ToValueStr(seconds),
-            [$"{IdentifierPrefix}pointsadded"] = ToValueStr(subathonEvent.GetFinalPointsValue()),
-            [$"{IdentifierPrefix}secondaryvalue"] = subathonEvent.SecondaryValue,
-            [$"{IdentifierPrefix}tertiaryvalue"] = subathonEvent.TertiaryValue,
-            [$"{IdentifierPrefix}reversed"] = $"{subathonEvent.WasReversed}"
-        };
+        return Prefixed(SubathonTriggerWatcher.EventValues(subathonEvent));
     }
 
     internal static Dictionary<string, string> TimerIdentifiers(SubathonData subathon) {
-        TimeSpan remaining = subathon.TimeRemainingRounded();
-        return new Dictionary<string, string> {
-            [$"{IdentifierPrefix}timeremaining"] =
-                $"{(int)remaining.TotalHours:00}:{remaining.Minutes:00}:{remaining.Seconds:00}",
-            [$"{IdentifierPrefix}secondsremaining"] = ToValueStr((long)remaining.TotalSeconds),
-            [$"{IdentifierPrefix}points"] = ToValueStr(subathon.Points),
-            [$"{IdentifierPrefix}paused"] = $"{subathon.IsPaused}",
-            [$"{IdentifierPrefix}locked"] = $"{subathon.IsLocked}"
-        };
-    }
-
-    internal sealed record MultiplierSnapshot(
-        bool Running,
-        double Multiplier,
-        bool Time,
-        bool Points,
-        TimeSpan? Duration,
-        DateTime? Started,
-        bool FromHypeTrain) {
-        public static MultiplierSnapshot From(MultiplierData data) {
-            return new MultiplierSnapshot(data.IsRunning(), data.Multiplier, data.ApplyToSeconds,
-                data.ApplyToPoints, data.Duration, data.Started, data.FromHypeTrain);
-        }
+        return Prefixed(SubathonTriggerWatcher.TimerValues(subathon));
     }
 
     internal static Dictionary<string, string> MultiplierIdentifiers(MultiplierSnapshot multiplier) {
-        return new Dictionary<string, string> {
-            [$"{IdentifierPrefix}multiplier"] = ToValueStr(multiplier.Multiplier),
-            [$"{IdentifierPrefix}multipliertime"] = $"{multiplier.Time}",
-            [$"{IdentifierPrefix}multiplierpoints"] = $"{multiplier.Points}",
-            [$"{IdentifierPrefix}multiplierduration"] = ToValueStr((long)(multiplier.Duration?.TotalSeconds ?? 0)),
-            [$"{IdentifierPrefix}multiplierhypetrain"] = $"{multiplier.FromHypeTrain}"
-        };
+        return Prefixed(SubathonTriggerWatcher.MultiplierValues(multiplier));
     }
 
     internal static Dictionary<string, string> PromptIdentifiers(SubathonPromptRun run, SubathonPrompt? prompt) {
-        prompt ??= run.LinkedPrompt;
-        return new Dictionary<string, string> {
-            [$"{IdentifierPrefix}prompttext"] = prompt?.Text ?? "",
-            [$"{IdentifierPrefix}prompttype"] = $"{prompt?.Type}",
-            [$"{IdentifierPrefix}prompttarget"] = ToValueStr(prompt?.Value ?? run.SnapshotTargetValue),
-            [$"{IdentifierPrefix}promptduration"] =
-                ToValueStr((long)(prompt?.CompletionDuration.TotalSeconds ?? (run.ExpiresAt - run.StartedAt).TotalSeconds)),
-            [$"{IdentifierPrefix}promptstatus"] = $"{run.Status}"
-        };
+        return Prefixed(SubathonTriggerWatcher.PromptValues(run, prompt));
     }
 
-    public static IReadOnlyList<string> IdentifierNames(MixItUpTrigger trigger) {
+    public static IReadOnlyList<string> IdentifierNames(SubathonTrigger trigger) {
         return SampleIdentifiers(trigger).Keys.Prepend($"{IdentifierPrefix}trigger").Select(k => $"${k}").ToList();
     }
 
-    internal static Dictionary<string, string> SampleIdentifiers(MixItUpTrigger trigger) {
-        switch (trigger) {
-            case MixItUpTrigger.SubathonEvent:
-                return EventIdentifiers(new SubathonEvent {
-                    Source = SubathonEventSource.Simulated,
-                    EventType = SubathonEventType.ExternalDonation,
-                    User = "TestUser",
-                    Value = "5",
-                    Currency = "USD",
-                    SecondsValue = 600,
-                    PointsValue = 5,
-                    ProcessedToSubathon = true
-                });
-            case MixItUpTrigger.MultiplierStarted:
-            case MixItUpTrigger.MultiplierEnded:
-                return MultiplierIdentifiers(new MultiplierSnapshot(trigger == MixItUpTrigger.MultiplierStarted,
-                    2, true, true, TimeSpan.FromMinutes(10), DateTime.Now, false));
-            case MixItUpTrigger.TimerPaused:
-            case MixItUpTrigger.TimerResumed:
-            case MixItUpTrigger.TimerLocked:
-            case MixItUpTrigger.TimerUnlocked:
-                return new Dictionary<string, string> {
-                    [$"{IdentifierPrefix}timeremaining"] = "12:34:56",
-                    [$"{IdentifierPrefix}secondsremaining"] = "45296",
-                    [$"{IdentifierPrefix}points"] = "250",
-                    [$"{IdentifierPrefix}paused"] = (trigger == MixItUpTrigger.TimerPaused).ToString(),
-                    [$"{IdentifierPrefix}locked"] = (trigger == MixItUpTrigger.TimerLocked).ToString()
-                };
-            case MixItUpTrigger.GoalCompleted:
-                return new Dictionary<string, string> {
-                    [$"{IdentifierPrefix}goaltext"] = "Test Goal",
-                    [$"{IdentifierPrefix}goaltarget"] = "100",
-                    [$"{IdentifierPrefix}goalcurrent"] = "100"
-                };
-            case MixItUpTrigger.WheelSpinStart:
-                return new Dictionary<string, string> {
-                    [$"{IdentifierPrefix}wheelname"] = "Test Wheel",
-                    [$"{IdentifierPrefix}wheelid"] = Guid.Empty.ToString(),
-                    [$"{IdentifierPrefix}spindelay"] = "0"
-                };
-            case MixItUpTrigger.WheelSpinEnd:
-                return new Dictionary<string, string> {
-                    [$"{IdentifierPrefix}wheelname"] = "Test Wheel",
-                    [$"{IdentifierPrefix}wheelid"] = Guid.Empty.ToString(),
-                    [$"{IdentifierPrefix}wheelitem"] = "Test Item",
-                    [$"{IdentifierPrefix}spinstatus"] = "Pending",
-                    [$"{IdentifierPrefix}spinsowed"] = "0"
-                };
-            case MixItUpTrigger.PromptStarted:
-            case MixItUpTrigger.PromptEnded:
-                return new Dictionary<string, string> {
-                    [$"{IdentifierPrefix}prompttext"] = "Test Prompt",
-                    [$"{IdentifierPrefix}prompttype"] = $"{SubathonPromptType.Points}",
-                    [$"{IdentifierPrefix}prompttarget"] = "10",
-                    [$"{IdentifierPrefix}promptduration"] = "300",
-                    [$"{IdentifierPrefix}promptstatus"] = trigger == MixItUpTrigger.PromptStarted
-                        ? $"{SubathonPromptRunStatus.Active}"
-                        : $"{SubathonPromptRunStatus.Completed}"
-                };
-            default:
-                return new Dictionary<string, string>();
-        }
+    internal static Dictionary<string, string> SampleIdentifiers(SubathonTrigger trigger) {
+        return Prefixed(SubathonTriggerWatcher.SampleValues(trigger));
     }
 }
 
diff --git a/SubathonManager.Integration/OBSService.cs b/SubathonManager.Integration/OBSService.cs
index 80e6b08..1cca12f 100644
--- a/SubathonManager.Integration/OBSService.cs
+++ b/SubathonManager.Integration/OBSService.cs
@@ -731,7 +731,9 @@ public async Task AddBrowserSource(
         ActionStepType.ObsSourceVisibility, 
         ActionStepType.ObsFilter,
         ActionStepType.ObsAudio,
-        ActionStepType.ObsMedia
+        ActionStepType.ObsMedia,
+        ActionStepType.ObsBrowserRefresh,
+        ActionStepType.ObsRaw
     ];
 
     public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
@@ -739,7 +741,7 @@ public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProg
         if (!_obs.IsConnected) return Task.FromResult(false);
         return Task.Run(() => {
             try {
-                return RunStep(step);
+                return RunStep(step, progress);
             }
             catch (Exception ex) {
                 _logger?.LogWarning(ex, "[OBSService] Action \"{Step}\" failed", step.Describe());
@@ -748,7 +750,7 @@ public Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProg
         }, ct);
     }
 
-    private bool RunStep(ActionStep step) {
+    private bool RunStep(ActionStep step, ActionRunProgress progress) {
         switch (step.Type) {
             case ActionStepType.ObsSourceVisibility: {
                 (string scene, int id)? item = FindSceneItem(step.Scope ?? "", step.Target, []);
@@ -804,11 +806,48 @@ private bool RunStep(ActionStep step) {
                 });
                 return true;
 
+            case ActionStepType.ObsBrowserRefresh:
+                _obs.SendRequest("PressInputPropertiesButton", new JObject {
+                    ["inputName"] = step.Target, ["propertyName"] = "refreshnocache"
+                });
+                return true;
+
+            case ActionStepType.ObsRaw:
+                return RunRawRequest(step, progress);
+
             default:
                 return false;
         }
     }
 
+    private bool RunRawRequest(ActionStep step, ActionRunProgress progress) {
+        string? output = string.IsNullOrEmpty(step.OutputVariable) ? null : step.OutputVariable;
+        try {
+            JObject? data = string.IsNullOrWhiteSpace(step.Body) ? null : JObject.Parse(step.Body);
+            JObject? response = _obs.SendRequest(step.Target.Trim(), data);
+            if (output != null)
+                progress.SetOutput(output, response?.ToString(Newtonsoft.Json.Formatting.None) ?? "{}", "200");
+            return true;
+        }
+        catch (Exception ex) when (ex is ErrorResponseException or Newtonsoft.Json.JsonException) {
+            if (output != null) progress.SetOutput(output, "", "0");
+            _logger?.LogWarning("[OBSService] Raw request {Request} failed: {Message}", step.Target, ex.Message);
+            return false;
+        }
+    }
+
+    private List<string> AvailableRequests() {
+        try {
+            return (_obs.SendRequest("GetVersion")?["availableRequests"] as JArray)?
+                .Select(r => r.ToString()).Order(StringComparer.OrdinalIgnoreCase).ToList() ?? [];
+        }
+        catch (Exception ex) {
+            if (_logger?.IsEnabled(LogLevel.Debug) ?? false)
+                _logger?.LogDebug(ex, "[OBSService] Listing request types failed");
+            return [];
+        }
+    }
+
     private (string scene, int id)? FindSceneItem(string sceneName, string sourceName, HashSet<string> visited) {
         if (string.IsNullOrWhiteSpace(sceneName) || !visited.Add(sceneName)) return null;
         JArray? items = ListSceneItems(sceneName, visited.Count > 1);
@@ -865,6 +904,11 @@ private bool RunStep(ActionStep step) {
                 case ActionStepType.ObsMedia:
                     return ([], inputs.Where(i => i.kind.Contains("ffmpeg") || i.kind.Contains("vlc"))
                         .Select(i => i.name).ToList());
+                case ActionStepType.ObsBrowserRefresh:
+                    return ([], inputs.Where(i => i.kind.StartsWith("browser_source", StringComparison.Ordinal))
+                        .Select(i => i.name).ToList());
+                case ActionStepType.ObsRaw:
+                    return ([], AvailableRequests());
                 default:
                     return ([], inputs.Select(i => i.name).ToList());
             }
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
index 30e8add..e897039 100644
--- a/SubathonManager.Services/ActionService.cs
+++ b/SubathonManager.Services/ActionService.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -27,8 +28,10 @@ public partial class ActionService(
     ISecureStorage? secureStorage = null) : IAppService, IDisposable {
     public const string LoggedRunMeta = "logged-run";
 
+    public const string FromActionMeta = "from-action";
+
     // web step saving to %resp% also sets %resp_status%
-    public const string StatusSuffix = "_status";
+    public const string StatusSuffix = ActionRunProgress.StatusSuffix;
 
     private static readonly HttpClient Http = new() { Timeout = Timeout.InfiniteTimeSpan };
     private static readonly TimeSpan DefaultRequestTimeout = TimeSpan.FromSeconds(15);
@@ -57,6 +60,7 @@ public async Task StartAsync(CancellationToken ct = default) {
         SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
         WheelEvents.WheelSpinStatusChanged += OnWheelSpinStatusChanged;
         ActionEvents.CustomActionRunRequested += OnCustomActionRunRequested;
+        TriggerWatcher.Start();
         await LoadLibraryAsync();
 
         await using AppDbContext db = await factory.CreateDbContextAsync(ct);
@@ -74,6 +78,7 @@ public void Dispose() {
         SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
         WheelEvents.WheelSpinStatusChanged -= OnWheelSpinStatusChanged;
         ActionEvents.CustomActionRunRequested -= OnCustomActionRunRequested;
+        _triggerWatcher?.Stop();
         foreach (LiveRun run in _runs.Values) run.Cancel();
         GC.SuppressFinalize(this);
     }
@@ -136,10 +141,147 @@ private void OnCustomActionRunRequested(SubathonEvent ev) {
             return;
         }
 
+        if (action.Disabled) {
+            logger?.LogInformation("[Actions] RunAction asked for disabled action: \"{Name}\"", action.Name);
+            return;
+        }
+
         string user = string.IsNullOrWhiteSpace(ev.User) ? "SYSTEM" : ev.User;
         _ = RunCustomActionAsync(action, user, ev.Source);
     }
 
+    ////////////////// triggers
+
+    private SubathonTriggerWatcher? _triggerWatcher;
+    private SubathonTriggerWatcher TriggerWatcher => _triggerWatcher ??= new SubathonTriggerWatcher(OnTrigger);
+
+    public IEnumerable<(CustomAction Action, ActionNode Node)> TriggerSteps() {
+        return CustomActions.SelectMany(a => a.Graph.Nodes
+            .Where(n => n.Step.Type == ActionStepType.Trigger)
+            .Select(n => (a, n)));
+    }
+
+    private void OnTrigger(SubathonTrigger trigger, Dictionary<string, string> values, SubathonEvent? subathonEvent) {
+        if (subathonEvent != null) {
+            if (subathonEvent.EventTypeMeta is LoggedRunMeta or FromActionMeta) return;
+            if (!subathonEvent.ProcessedToSubathon && !(config?.GetBool("App", "ShowLockedEvents", false) ?? false))
+                return;
+        }
+
+        foreach (IGrouping<CustomAction, (CustomAction Action, ActionNode Node)> matched in TriggerSteps()
+                     .Where(t => !t.Action.Disabled && !t.Node.Disabled
+                                 && t.Node.Step.MatchesTrigger(trigger, subathonEvent))
+                     .GroupBy(t => t.Action)) {
+            HashSet<string> nodes = matched.Select(t => t.Node.Id).ToHashSet(StringComparer.Ordinal);
+            _ = RunTriggeredAsync(matched.Key, trigger, nodes, values, subathonEvent);
+        }
+    }
+
+    private async Task<ActionRunResult> RunTriggeredAsync(CustomAction action, SubathonTrigger trigger,
+        IReadOnlySet<string> nodes, IReadOnlyDictionary<string, string> values, SubathonEvent? subathonEvent,
+        string? repeatKey = null) {
+        string user = subathonEvent?.User is { } named && !string.IsNullOrWhiteSpace(named) ? named : "SYSTEM";
+        var ctx = new ActionContext(subathonEvent?.Source ?? SubathonEventSource.Unknown, user,
+            repeatKey ?? $"custom-action-{action.Id}", action.Name, trigger, nodes, values);
+        try {
+            LogRun(action.Name, ctx);
+            return await RunAsync(Guid.NewGuid(), action.Graph, ctx);
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] Running {Name} from {Trigger} failed", action.Name, trigger);
+            return ActionRunResult.Paused;
+        }
+    }
+
+    ////////////////// actions switching and running other actions
+    public const int MaxActionDepth = 8;
+
+    public CustomAction? ResolveActionTarget(ActionStep step) {
+        if (Guid.TryParse(step.Target.Trim(), out Guid id) && GetCustomAction(id) is { } byId) return byId;
+        string name = string.IsNullOrWhiteSpace(step.TargetName) ? step.Target : step.TargetName;
+        return string.IsNullOrWhiteSpace(name) ? null : FindCustomAction(name);
+    }
+
+    public async Task<bool> SetCustomActionEnabledAsync(Guid id, bool enabled) {
+        if (GetCustomAction(id) is not { } action) return false;
+        if (action.Disabled != enabled) return true;
+        CustomAction copy = action.Clone();
+        copy.Disabled = !enabled;
+        await SaveCustomActionAsync(copy);
+        logger?.LogInformation("[Actions] \"{Name}\" turned {State}", action.Name, enabled ? "on" : "off");
+        return true;
+    }
+
+    private async Task<bool> RunSetActionEnabledAsync(ActionStep step) {
+        if (ResolveActionTarget(step) is not { } target) {
+            logger?.LogWarning("[Actions] There is no action \"{Name}\" to turn on/off", step.TargetName ?? step.Target);
+            return false;
+        }
+
+        bool enable = step.Operation switch {
+            ActionOperation.Enable => true,
+            ActionOperation.Disable => false,
+            _ => target.Disabled
+        };
+        return await SetCustomActionEnabledAsync(target.Id, enable);
+    }
+
+    private async Task<bool> RunOtherActionAsync(ActionStep step, ActionContext ctx, CancellationToken ct) {
+        if (ResolveActionTarget(step) is not { } target) {
+            logger?.LogWarning("[Actions] There is no action \"{Name}\" to run", step.TargetName ?? step.Target);
+            return false;
+        }
+
+        if (target.Disabled) {
+            logger?.LogInformation("[Actions] Not running disabled action \"{Name}\"", target.Name);
+            return true;
+        }
+
+        if (ctx.Depth >= MaxActionDepth) {
+            logger?.LogWarning("[Actions] Not running \"{Name}\": action(s) are running each other more than {Max} levels deep",
+                target.Name, MaxActionDepth);
+            return false;
+        }
+
+        var child = new ActionContext(ctx.Source, ctx.User, $"custom-action-{target.Id}", target.Name,
+            Depth: ctx.Depth + 1);
+        LogRun(target.Name, child);
+        Task<ActionRunResult> run = RunChildAsync(target, child);
+        if (step.Operation == ActionOperation.Start) return true;
+
+        ActionRunResult result = await run.WaitAsync(ct);
+        return result is ActionRunResult.Done or ActionRunResult.Skipped;
+    }
+
+    private async Task<ActionRunResult> RunChildAsync(CustomAction action, ActionContext ctx) {
+        try {
+            return await RunAsync(Guid.NewGuid(), action.Graph, ctx);
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] Running {Name} from another action failed", action.Name);
+            return ActionRunResult.Paused;
+        }
+    }
+
+    public Task<ActionRunResult> TestTriggerAsync(CustomAction action, string nodeId, bool unsavedCopy = false) {
+        ActionNode? node = action.Graph.Nodes.FirstOrDefault(n => n.Id == nodeId);
+        if (node?.Step is not { Type: ActionStepType.Trigger, Trigger: { } trigger })
+            return Task.FromResult(ActionRunResult.Skipped);
+
+        Dictionary<string, string> values = SubathonTriggerWatcher.SampleValues(trigger);
+        if (trigger == SubathonTrigger.SubathonEvent
+            && node.Step.EventTypes?.FirstOrDefault() is { } picked
+            && Enum.TryParse(picked, out SubathonEventType eventType)) {
+            values["eventtype"] = $"{eventType}";
+            values["source"] = $"{SubathonEventSource.Simulated}";
+        }
+
+        values["user"] = values.GetValueOrDefault("user") is { Length: > 0 } user ? user : "CustomAction";
+        return RunTriggeredAsync(action, trigger, new HashSet<string>([nodeId]), values,
+            new SubathonEvent { Source = SubathonEventSource.Simulated, User = values["user"] },
+            unsavedCopy ? $"custom-action-test-{action.Id}" : null);
+    }
+
     private async Task<ActionStep> FillVariablesAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
         IReadOnlySet<string> outputs) {
         List<string> tokens = ActionStepTypeHelper.FindTokens(step.AllText)
@@ -515,7 +657,8 @@ private static string NewActionPath(string folder, string name) {
     public ActionGraph? ResolveGraph(WheelSpinActionType type, string? parameter) {
         if (!type.IsAvailable()) return null;
         if (type != WheelSpinActionType.CustomAction) return type.BuildActionGraph(parameter);
-        return Guid.TryParse(parameter, out Guid id) ? GetCustomAction(id)?.Graph : null;
+        return Guid.TryParse(parameter, out Guid id) && GetCustomAction(id) is { Disabled: false } action
+            ? action.Graph : null;
     }
 
     public async Task<ActionRunResult> RunAsync(Guid runId, ActionGraph graph, ActionContext ctx,
@@ -527,18 +670,36 @@ public async Task<ActionRunResult> RunAsync(Guid runId, ActionGraph graph, Actio
             return ActionRunResult.Paused;
         }
 
+        ActionRepeatMode mode = graph.EffectiveRepeat;
         List<LiveRun> overlapping = _runs.Values.Where(r => r.RepeatKey == ctx.RepeatKey && r.Id != runId).ToList();
-        if (overlapping.Count > 0 && graph.OnRepeat == ActionRepeatMode.Skip) return ActionRunResult.Skipped;
-        if (graph.OnRepeat == ActionRepeatMode.Restart)
+        if (overlapping.Count > 0 && mode == ActionRepeatMode.Skip) return ActionRunResult.Skipped;
+        if (mode == ActionRepeatMode.Restart)
             foreach (LiveRun previous in overlapping) {
                 previous.Superseded = true;
                 previous.Cancel();
             }
 
-        var live = new LiveRun(runId, ctx.RepeatKey);
-        if (!_runs.TryAdd(runId, live)) return ActionRunResult.Skipped;
+        // queue logic
+        Task ahead = Task.CompletedTask;
+        TaskCompletionSource? turn = null;
+        if (mode == ActionRepeatMode.Queue) {
+            turn = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+            lock (_queueTails) {
+                ahead = _queueTails.GetValueOrDefault(ctx.RepeatKey) ?? Task.CompletedTask;
+                _queueTails[ctx.RepeatKey] = turn.Task;
+            }
+        }
 
+        var live = new LiveRun(runId, ctx.RepeatKey);
         try {
+            if (!_runs.TryAdd(runId, live)) return ActionRunResult.Skipped;
+            try {
+                await ahead.WaitAsync(live.Token);
+            }
+            catch (OperationCanceledException) {
+                return ActionRunResult.Cancelled;
+            }
+
             bool finished = await RunGraphAsync(graph, ctx, progress, onProgress, live.Token);
             if (live.Superseded || finished) return ActionRunResult.Done;
             return live.Cancelled ? ActionRunResult.Cancelled : ActionRunResult.Paused;
@@ -546,9 +707,23 @@ public async Task<ActionRunResult> RunAsync(Guid runId, ActionGraph graph, Actio
         finally {
             _runs.TryRemove(runId, out _);
             live.Dispose();
+            if (turn != null) {
+                void Release() {
+                    turn.TrySetResult();
+                    lock (_queueTails) {
+                        if (_queueTails.GetValueOrDefault(ctx.RepeatKey) == turn.Task)
+                            _queueTails.Remove(ctx.RepeatKey);
+                    }
+                }
+
+                if (ahead.IsCompleted) Release();
+                else _ = ahead.ContinueWith(_ => Release(), TaskScheduler.Default);
+            }
         }
     }
 
+    private readonly Dictionary<string, Task> _queueTails = new(StringComparer.Ordinal);
+
     private async Task<bool> RunGraphAsync(ActionGraph graph, ActionContext ctx, ActionRunProgress progress,
         Func<ActionRunProgress, Task>? onProgress, CancellationToken outerCt) {
         using var failCts = CancellationTokenSource.CreateLinkedTokenSource(outerCt);
@@ -560,6 +735,15 @@ private async Task<bool> RunGraphAsync(ActionGraph graph, ActionContext ctx, Act
         var running = new Dictionary<Task<bool>, ActionNode>();
         HashSet<string> outputs = graph.OutputVariables();
 
+        if (graph.Nodes.Any(n => n.Step.Type == ActionStepType.Trigger)) outputs.Add(ActionRunProgress.TriggerVariable);
+        if (ctx.TriggerValues != null && !progress.TryReadVariable(ActionRunProgress.TriggerVariable, out _))
+            progress.SetVariable(ActionRunProgress.TriggerVariable, JsonSerializer.Serialize(ctx.TriggerValues));
+
+        bool StartsRun(ActionNode node) {
+            return node.Step.Type == ActionStepType.Trigger
+                ? ctx.TriggerNodes?.Contains(node.Id) ?? false : ctx.Trigger == null;
+        }
+
         void StartReady() {
             bool changed;
             do {
@@ -569,7 +753,7 @@ void StartReady() {
                     if (!incoming.All(e => progress.IsResolved(e.From))) continue;
                     pending.Remove(node.Id);
 
-                    if (incoming.Count > 0 && !incoming.Any(progress.IsLive)) {
+                    if (incoming.Count > 0 ? !incoming.Any(progress.IsLive) : !StartsRun(node)) {
                         progress.MarkSkipped(node.Id);
                         changed = true;
                         continue;
@@ -581,7 +765,7 @@ void StartReady() {
         }
 
         Task<bool> StartStep(ActionNode node) {
-            if (node.Disabled) return Task.Run(() => true, ct);
+            if (node.Disabled || node.Step.Type == ActionStepType.Trigger) return Task.Run(() => true, ct);
             return node.Step.Type == ActionStepType.Condition
                 ? RunConditionAsync(node, ctx, progress, outputs, ct)
                 : RunStepAsync(node.Step, ctx, progress, outputs, ct);
@@ -659,6 +843,12 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
             case ActionStepType.SetGlobal:
                 return await RunSetGlobalAsync(step, ct);
 
+            case ActionStepType.SetActionEnabled:
+                return await RunSetActionEnabledAsync(step);
+
+            case ActionStepType.RunAction:
+                return await RunOtherActionAsync(step, ctx, ct);
+
             case ActionStepType.Wait:
                 await Task.Delay(step.Duration, ct); // when here, easier to do a delay vs the timerservice callback
                 return true;
@@ -666,8 +856,7 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
             case ActionStepType.AddTime:
             case ActionStepType.SubtractTime: {
                 SubathonCommandType cmd = step.Type == ActionStepType.AddTime
-                    ? SubathonCommandType.AddTime
-                    : SubathonCommandType.SubtractTime;
+                    ? SubathonCommandType.AddTime : SubathonCommandType.SubtractTime;
                 SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
                     Source = ctx.Source,
                     EventTimestamp = DateTime.Now,
@@ -676,7 +865,8 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
                     User = ctx.User,
                     Value = $"{cmd} {Utils.FormatShortDuration(step.Duration)}",
                     SecondsValue = step.Duration.TotalSeconds,
-                    PointsValue = 0
+                    PointsValue = 0,
+                    EventTypeMeta = FromActionMeta
                 });
                 return true;
             }
@@ -698,7 +888,8 @@ private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, Action
                     Command = SubathonCommandType.SetMultiplier,
                     EventType = SubathonEventType.Command,
                     User = ctx.User,
-                    Value = $"{amount}|{duration}|{points}|{time}"
+                    Value = $"{amount}|{duration}|{points}|{time}",
+                    EventTypeMeta = FromActionMeta
                 });
                 _multiplierActive = true;
                 return true;
diff --git a/SubathonManager.Tests/IntegrationUnitTests/MixItUpServiceTests.cs b/SubathonManager.Tests/IntegrationUnitTests/MixItUpServiceTests.cs
index 7232233..8309e82 100644
--- a/SubathonManager.Tests/IntegrationUnitTests/MixItUpServiceTests.cs
+++ b/SubathonManager.Tests/IntegrationUnitTests/MixItUpServiceTests.cs
@@ -44,7 +44,7 @@ private static MixItUpService MakeService(RecordingHandler? handler = null,
             MockConfig.MakeMockConfig(config), factory.Object, timerService ?? new Mock<ITimerService>().Object);
     }
 
-    private static Dictionary<(string, string), string> EnabledConfig(MixItUpTrigger trigger) {
+    private static Dictionary<(string, string), string> EnabledConfig(SubathonTrigger trigger) {
         return new Dictionary<(string, string), string> {
             [(MixItUpService.ConfigSection, "Enabled")] = "True",
             [(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(trigger))] = CommandId.ToString()
@@ -240,29 +240,29 @@ public void ParseVersion_HandlesJsonAndRaw(string body, string? expected) {
 
     [Fact]
     public void Fire_Disabled_DoesNothing() {
-        Dictionary<(string, string), string> config = EnabledConfig(MixItUpTrigger.GoalCompleted);
+        Dictionary<(string, string), string> config = EnabledConfig(SubathonTrigger.GoalCompleted);
         config[(MixItUpService.ConfigSection, "Enabled")] = "False";
         MixItUpService service = MakeService(config: config);
 
-        Assert.False(service.Fire(MixItUpTrigger.GoalCompleted, new Dictionary<string, string>()));
+        Assert.False(service.Fire(SubathonTrigger.GoalCompleted, new Dictionary<string, string>()));
     }
 
     [Fact]
     public void Fire_InvalidCommandId_DoesNothing() {
-        Dictionary<(string, string), string> config = EnabledConfig(MixItUpTrigger.GoalCompleted);
-        config[(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(MixItUpTrigger.GoalCompleted))] =
+        Dictionary<(string, string), string> config = EnabledConfig(SubathonTrigger.GoalCompleted);
+        config[(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(SubathonTrigger.GoalCompleted))] =
             "not-a-guid";
         MixItUpService service = MakeService(config: config);
 
-        Assert.False(service.Fire(MixItUpTrigger.GoalCompleted, new Dictionary<string, string>()));
+        Assert.False(service.Fire(SubathonTrigger.GoalCompleted, new Dictionary<string, string>()));
     }
 
     [Fact]
     public async Task Fire_PostsCommandWithSpecialIdentifiers() {
         var handler = new RecordingHandler(HttpStatusCode.Accepted);
-        MixItUpService service = MakeService(handler, EnabledConfig(MixItUpTrigger.GoalCompleted));
+        MixItUpService service = MakeService(handler, EnabledConfig(SubathonTrigger.GoalCompleted));
 
-        bool fired = service.Fire(MixItUpTrigger.GoalCompleted,
+        bool fired = service.Fire(SubathonTrigger.GoalCompleted,
             new Dictionary<string, string> { [Id("goaltext")] = "Hat on" });
         RecordedRequest request = await handler.WaitForRequestAsync(TestContext.Current.CancellationToken);
 
@@ -280,7 +280,7 @@ public async Task Fire_PostsCommandWithSpecialIdentifiers() {
     [Fact]
     public async Task DataUpdate_FiresOnPauseChangeOnly() {
         var handler = new RecordingHandler(HttpStatusCode.Accepted);
-        Dictionary<(string, string), string> config = EnabledConfig(MixItUpTrigger.TimerPaused);
+        Dictionary<(string, string), string> config = EnabledConfig(SubathonTrigger.TimerPaused);
         MixItUpService service = MakeService(handler, config);
         await service.StartAsync(TestContext.Current.CancellationToken);
         try {
@@ -306,7 +306,7 @@ public async Task DataUpdate_FiresOnPauseChangeOnly() {
     [Fact]
     public async Task PromptEnded_FiresOnlyForEndedRuns() {
         var handler = new RecordingHandler(HttpStatusCode.Accepted);
-        MixItUpService service = MakeService(handler, EnabledConfig(MixItUpTrigger.PromptEnded));
+        MixItUpService service = MakeService(handler, EnabledConfig(SubathonTrigger.PromptEnded));
         await service.StartAsync(TestContext.Current.CancellationToken);
         try {
             var run = new SubathonPromptRun { Status = SubathonPromptRunStatus.Active };
@@ -334,7 +334,7 @@ public async Task PromptEnded_FiresOnlyForEndedRuns() {
     public async Task EventProcessed_CommandsOnlyWhenIncluded(SubathonEventType type, bool includeCommands,
         bool expectSent) {
         var handler = new RecordingHandler(HttpStatusCode.Accepted);
-        Dictionary<(string, string), string> config = EnabledConfig(MixItUpTrigger.SubathonEvent);
+        Dictionary<(string, string), string> config = EnabledConfig(SubathonTrigger.SubathonEvent);
         config[(MixItUpService.ConfigSection, MixItUpService.IncludeCommandsKey)] = includeCommands.ToString();
         MixItUpService service = MakeService(handler, config);
         await service.StartAsync(TestContext.Current.CancellationToken);
@@ -376,8 +376,8 @@ private static SubathonData WithMultiplier(Guid id, double multiplier, bool time
     [Fact]
     public async Task DataUpdate_FiresMultiplierStartAndEnd() {
         var handler = new RecordingHandler(HttpStatusCode.Accepted);
-        Dictionary<(string, string), string> config = EnabledConfig(MixItUpTrigger.MultiplierStarted);
-        config[(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(MixItUpTrigger.MultiplierEnded))] =
+        Dictionary<(string, string), string> config = EnabledConfig(SubathonTrigger.MultiplierStarted);
+        config[(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(SubathonTrigger.MultiplierEnded))] =
             CommandId.ToString();
         MixItUpService service = MakeService(handler, config);
         await service.StartAsync(TestContext.Current.CancellationToken);
@@ -417,7 +417,7 @@ await handler.WaitForRequestAsync(TestContext.Current.CancellationToken,
     [InlineData(false, true)]
     public void MultiplierIdentifiers_SendTimeAndPointsFlags(bool time, bool points) {
         Dictionary<string, string> ids = MixItUpService.MultiplierIdentifiers(
-            new MixItUpService.MultiplierSnapshot(true, 1.5, time, points, null, null, false));
+            new MultiplierSnapshot(true, 1.5, time, points, null, null, false));
 
         Assert.Equal(time.ToString(), ids[Id("multipliertime")]);
         Assert.Equal(points.ToString(), ids[Id("multiplierpoints")]);
@@ -427,7 +427,7 @@ public void MultiplierIdentifiers_SendTimeAndPointsFlags(bool time, bool points)
 
     [Fact]
     public void SampleIdentifiers_CoverEveryTrigger() {
-        foreach (MixItUpTrigger trigger in Enum.GetValues<MixItUpTrigger>()) {
+        foreach (SubathonTrigger trigger in Enum.GetValues<SubathonTrigger>()) {
             IReadOnlyList<string> names = MixItUpService.IdentifierNames(trigger);
             Assert.Contains($"${Id("trigger")}", names);
             Assert.True(names.Count > 1, $"{trigger} has no identifiers");
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
index 898db49..2ea71a1 100644
--- a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -37,7 +37,7 @@ public class ActionServiceTests {
             .Setup(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()))
             .ReturnsAsync(() => new AppDbContext(options));
 
-        foreach (string name in new[] { "SubathonEventCreated", "SubathonDataUpdate" })
+        foreach (string name in new[] { "SubathonEventCreated", "SubathonDataUpdate", "SubathonEventProcessed" })
             typeof(SubathonEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
         foreach (string name in new[] { "WheelSpinStatusChanged", "OnSpinsOwedUpdateFromEvent" })
             typeof(WheelEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
@@ -670,6 +670,183 @@ await service.SaveCustomActionAsync(new CustomAction {
         Assert.Single(service.ActionsUsing(ActionStoreKind.Global, "WINS"));
     }
 
+    [Fact]
+    public async Task TriggerSteps_StartOnlyForTheirTrigger_PassItsValues_AndManualRunsSkipThem() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        var graph = new ActionGraph {
+            Nodes = [
+                new ActionNode {
+                    Id = "1", Step = new ActionStep {
+                        Type = ActionStepType.Trigger, Trigger = SubathonTrigger.SubathonEvent,
+                        EventTypes = [$"{SubathonEventType.TwitchSub}"], IgnoreSimulated = true
+                    }
+                },
+                new ActionNode {
+                    Id = "2", Step = new ActionStep {
+                        Type = ActionStepType.MixItUpCommand, Operation = ActionOperation.Run, Target = "thanks",
+                        Body = "who=%trigger.user%\ntype=%trigger.eventtype%"
+                    }
+                },
+                new ActionNode { Id = "3", Step = Hotkey("manual") }
+            ],
+            Edges = [new ActionEdge { From = "1", To = "2" }]
+        };
+
+        Assert.True(ActionGraph.TryParse(graph.ToJson(), out ActionGraph? reloaded));
+        Assert.Equal(SubathonTrigger.SubathonEvent, reloaded.Nodes[0].Step.Trigger);
+        Assert.False(ActionStep.IsValidOutputName("trigger"));
+        await service.SaveCustomActionAsync(new CustomAction { Name = "Sub thanks", Graph = reloaded });
+
+        async Task FireAsync(SubathonEvent ev, int expectRuns) {
+            SubathonEvents.RaiseSubathonEventProcessed(ev, true);
+            for (var i = 0; i < 100 && runner.Ran.Count < expectRuns; i++)
+                await Task.Delay(10, TestContext.Current.CancellationToken);
+            await Task.Delay(100, TestContext.Current.CancellationToken);
+        }
+
+        await FireAsync(new SubathonEvent {
+            EventType = SubathonEventType.TwitchSub, Source = SubathonEventSource.Twitch, User = "Bob",
+            ProcessedToSubathon = true
+        }, 1);
+        Assert.Equal(["thanks"], runner.Ran.ToArray());
+        Assert.Equal("who=Bob\ntype=TwitchSub", runner.LastBody);
+
+        await FireAsync(new SubathonEvent {
+            EventType = SubathonEventType.TwitchFollow, Source = SubathonEventSource.Twitch, ProcessedToSubathon = true
+        }, 0);
+        await FireAsync(new SubathonEvent {
+            EventType = SubathonEventType.TwitchSub, Source = SubathonEventSource.Simulated, ProcessedToSubathon = true
+        }, 0);
+        await FireAsync(new SubathonEvent {
+            EventType = SubathonEventType.TwitchSub, Source = SubathonEventSource.Twitch, ProcessedToSubathon = false
+        }, 0);
+        await FireAsync(new SubathonEvent {
+            EventType = SubathonEventType.TwitchSub, Source = SubathonEventSource.Twitch, ProcessedToSubathon = true,
+            EventTypeMeta = ActionService.FromActionMeta
+        }, 0);
+
+        Assert.Single(runner.Ran);
+
+        CustomAction saved = service.FindCustomAction("Sub thanks")!;
+        Assert.Equal(ActionRunResult.Done, await service.RunManuallyAsync(saved));
+        Assert.Equal(["thanks", "manual"], runner.Ran.ToArray());
+
+        Assert.Equal(ActionRunResult.Done, await service.TestTriggerAsync(saved, "1"));
+        Assert.Equal(["thanks", "manual", "thanks"], runner.Ran.ToArray());
+        Assert.Equal("who=TestUser\ntype=TwitchSub", runner.LastBody);
+
+        reloaded.Edges.Add(new ActionEdge { From = "3", To = "1" });
+        Assert.False(reloaded.IsValid(out _));
+    }
+
+    [Fact]
+    public async Task QueuedRepeats_WaitTheirTurn_AndTriggerActionsNeverRestartOrIgnore() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        async Task<string[]> RunTwiceAsync(ActionRepeatMode mode) {
+            runner.Ran.Clear();
+            ActionGraph graph = ActionGraph.Sequence(Hotkey("start"), Wait(0.3), Hotkey("end"));
+            graph.OnRepeat = mode;
+            var ctx = new ActionContext(SubathonEventSource.WheelSpin, "test", $"queue-{mode}");
+            Task<ActionRunResult> first = service.RunAsync(Guid.NewGuid(), graph, ctx);
+            await Task.Delay(50, TestContext.Current.CancellationToken);
+            Task<ActionRunResult> second = service.RunAsync(Guid.NewGuid(), graph, ctx);
+            Assert.Equal([ActionRunResult.Done, ActionRunResult.Done], await Task.WhenAll(first, second));
+            return runner.Ran.ToArray();
+        }
+
+        Assert.Equal(["start", "end", "start", "end"], await RunTwiceAsync(ActionRepeatMode.Queue));
+        Assert.Equal(["start", "start", "end", "end"], await RunTwiceAsync(ActionRepeatMode.Parallel));
+
+        var withTrigger = new ActionGraph {
+            OnRepeat = ActionRepeatMode.Restart,
+            Nodes = [
+                new ActionNode {
+                    Id = "1", Step = new ActionStep { Type = ActionStepType.Trigger, Trigger = SubathonTrigger.TimerPaused }
+                }
+            ]
+        };
+
+        Assert.Equal(ActionRepeatMode.Parallel, withTrigger.EffectiveRepeat);
+        withTrigger.OnRepeat = ActionRepeatMode.Queue;
+        Assert.Equal(ActionRepeatMode.Queue, withTrigger.EffectiveRepeat);
+    }
+
+    [Fact]
+    public void TimerEnded_FiresOnceAtZero_AndAgainOnlyAfterTimeWasAddedBack() {
+        typeof(SubathonEvents).GetField("SubathonDataUpdate", BindingFlags.Static | BindingFlags.NonPublic)
+            ?.SetValue(null, null);
+        var fired = new List<SubathonTrigger>();
+        var watcher = new SubathonTriggerWatcher((t, _, _) => fired.Add(t));
+        watcher.Start();
+        try {
+            var id = Guid.NewGuid();
+            void Update(long cumulative, long elapsed) {
+                SubathonEvents.RaiseSubathonDataUpdate(new SubathonData {
+                    Id = id, MillisecondsCumulative = cumulative, MillisecondsElapsed = elapsed
+                }, DateTime.Now);
+            }
+
+            Update(10_000, 0);
+            Update(10_000, 10_000);
+            Update(10_000, 12_000);
+            Assert.Equal([SubathonTrigger.TimerEnded], fired.Where(t => t == SubathonTrigger.TimerEnded).ToArray());
+
+            Update(70_000, 12_000);
+            Update(70_000, 70_000);
+            Assert.Equal(2, fired.Count(t => t == SubathonTrigger.TimerEnded));
+        }
+        finally {
+            watcher.Stop();
+        }
+    }
+
+    [Fact]
+    public async Task RunActionSteps_RunOthers_SkipTurnedOffOnes_AndStopRunningInCircles() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        var child = new CustomAction { Name = "Child", Graph = ActionGraph.Sequence(Hotkey("child")) };
+        await service.SaveCustomActionAsync(child);
+
+        ActionStep Step(ActionStepType type, ActionOperation op, CustomAction target) {
+            return new ActionStep { Type = type, Operation = op, Target = target.Id.ToString(), TargetName = target.Name };
+        }
+
+        var parent = new CustomAction {
+            Name = "Parent",
+            Graph = ActionGraph.Sequence(Step(ActionStepType.RunAction, ActionOperation.Run, child), Hotkey("after"))
+        };
+        Assert.Equal(ActionRunResult.Done, await service.RunManuallyAsync(parent));
+        Assert.Equal(["child", "after"], runner.Ran.ToArray());
+
+        runner.Ran.Clear();
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(),
+            ActionGraph.Sequence(Step(ActionStepType.SetActionEnabled, ActionOperation.Toggle, child)),
+            new ActionContext(SubathonEventSource.WheelSpin, "test", "toggle")));
+        Assert.True(service.GetCustomAction(child.Id)!.Disabled);
+        
+        Assert.Equal(ActionRunResult.Done, await service.RunManuallyAsync(parent));
+        Assert.Equal(["after"], runner.Ran.ToArray());
+        Assert.Null(service.ResolveGraph(WheelSpinActionType.CustomAction, child.Id.ToString()));
+
+        Assert.True(await service.SetCustomActionEnabledAsync(child.Id, true));
+        Assert.Equal(child.Id, service.ResolveActionTarget(new ActionStep {
+            Type = ActionStepType.RunAction, Target = Guid.NewGuid().ToString(), TargetName = "child"
+        })?.Id);
+
+        var loop = new CustomAction { Name = "Loop" };
+        loop.Graph = ActionGraph.Sequence(Hotkey("loop"), Step(ActionStepType.RunAction, ActionOperation.Run, loop));
+        loop.Graph.OnRepeat = ActionRepeatMode.Parallel;
+        await service.SaveCustomActionAsync(loop);
+        runner.Ran.Clear();
+        Assert.Equal(ActionRunResult.Paused, await service.RunManuallyAsync(service.GetCustomAction(loop.Id)!));
+        Assert.Equal(ActionService.MaxActionDepth + 1, runner.Ran.Count);
+    }
+
     [Fact]
     public void JsonPaths_ReadTextNumbersAndNesting_AndAnythingMissingIsEmpty() {
         const string json = """{"name":"Bob","n":2.5,"ok":true,"list":[{"a":"x"},{"a":"y"}],"obj":{"k":[1,2]}}""";
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
index 75b8d25..6063fdc 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
@@ -2,6 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 using Avalonia;
+using Avalonia.Media;
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Objects;
 
@@ -30,6 +31,13 @@ public ActionNodeVm(ActionNode node) {
     public ActionConnectorVm ElseOutput { get; }
 
     public bool IsCondition => Node.Step.Type == ActionStepType.Condition;
+    public bool IsTrigger => Node.Step.Type == ActionStepType.Trigger;
+    public bool HasInput => !IsTrigger;
+
+    private static readonly IBrush TriggerTint = new SolidColorBrush(Color.FromArgb(0x33, 0x1C, 0xB8, 0x96));
+    private static readonly IBrush TriggerBorder = new SolidColorBrush(Color.FromRgb(0x1C, 0xB8, 0x96));
+    public IBrush CardTint => IsTrigger ? TriggerTint : Brushes.Transparent;
+    public IBrush CardBorder => IsTrigger ? TriggerBorder : Brushes.Transparent;
     public bool IgnoresErrors => Node.IgnoreErrors;
 
     public Point Location {
@@ -42,7 +50,8 @@ public Point Location {
         }
     }
 
-    public string Title => $"{Node.Step.Type.GetGroup()} - {Node.Step.Type.GetLabel()}";
+    public string Title => IsTrigger
+        ? $"Trigger - {Node.Step.Trigger?.GetLabel() ?? "?"}" : $"{Node.Step.Type.GetGroup()} - {Node.Step.Type.GetLabel()}";
     public string Summary => Node.Step.Describe();
     public bool IsStart { get; private set; }
     public bool IsEnd { get; private set; }
@@ -61,7 +70,7 @@ public void Refresh(ActionGraph graph) {
         Raise(nameof(IsDisabled));
         Raise(nameof(CardOpacity));
         Raise(nameof(IgnoresErrors));
-        IsStart = !graph.Incoming(Node.Id).Any();
+        IsStart = !IsTrigger && !graph.Incoming(Node.Id).Any();
 
         List<ActionEdge> outgoing = graph.Edges.Where(e => e.From == Node.Id).ToList();
         Branches = outgoing.GroupBy(e => e.Port).Select(g => g.Count()).DefaultIfEmpty(0).Max();
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
index c9242e9..24ef278 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
@@ -19,9 +19,18 @@ public partial class ActionEditorWindow {
 
     private string PaletteQuery => (PaletteSearchBox.Text ?? "").Trim();
 
+    private sealed record PaletteItem(ActionStepType Type, SubathonTrigger? Trigger, string Label);
+
+    private static IEnumerable<PaletteItem> PaletteItems(ActionStepType type) {
+        if (type != ActionStepType.Trigger) return [new PaletteItem(type, null, type.GetLabel())];
+        return Enum.GetValues<SubathonTrigger>().OrderBy(t => t.GetOrderNumber())
+            .Select(t => new PaletteItem(type, t, t.GetLabel()));
+    }
+
     private void BuildPalette() {
         foreach (IGrouping<string, ActionStepType> group in Enum.GetValues<ActionStepType>()
-                     .Where(t => t.IsAvailable()).GroupBy(t => t.GetGroup())) {
+                     .Where(t => t.IsAvailable()).GroupBy(t => t.GetGroup())
+                     .OrderBy(g => g.Contains(ActionStepType.Trigger) ? 0 : 1)) {
             var buttons = new StackPanel { Spacing = 4 };
             var section = new Expander {
                 Header = group.Key, IsExpanded = true, HorizontalAlignment = HorizontalAlignment.Stretch,
@@ -35,16 +44,16 @@ private void BuildPalette() {
                 if (PaletteQuery.Length == 0) _collapsedGroups.Add(group.Key);
             };
 
-            foreach (ActionStepType type in group) {
+            foreach (PaletteItem item in group.SelectMany(PaletteItems)) {
                 var button = new Button {
-                    Content = $"+ {type.GetLabel()}",
+                    Content = $"+ {item.Label}",
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     HorizontalContentAlignment = HorizontalAlignment.Left,
                     FontSize = 12,
-                    Tag = type
+                    Tag = item
                 };
-                ToolTip.SetTip(button, "Adds an action; with an action selected it is chained after");
-                button.Click += (_, _) => AddStep(type);
+
+                button.Click += (_, _) => AddStep(item);
                 buttons.Children.Add(button);
             }
 
@@ -54,15 +63,15 @@ private void BuildPalette() {
 
         PaletteSearchBox.TextChanged += (_, _) => FilterPalette();
         PaletteSearchBox.KeyDown += (_, e) => {
-            if (e.Key != Key.Enter || FirstPaletteMatch() is not { } type) return;
-            AddStep(type);
+            if (e.Key != Key.Enter || FirstPaletteMatch() is not { } item) return;
+            AddStep(item);
             e.Handled = true;
         };
     }
 
-    private static bool PaletteMatches(string group, ActionStepType type, string query) {
+    private static bool PaletteMatches(string group, PaletteItem item, string query) {
         return group.Contains(query, StringComparison.OrdinalIgnoreCase)
-               || type.GetLabel().Contains(query, StringComparison.OrdinalIgnoreCase);
+               || item.Label.Contains(query, StringComparison.OrdinalIgnoreCase);
     }
 
     private void FilterPalette() {
@@ -70,7 +79,7 @@ private void FilterPalette() {
         foreach ((string group, Expander section, StackPanel buttons) in _paletteSections) {
             var any = false;
             foreach (Button button in buttons.Children.OfType<Button>()) {
-                bool show = query.Length == 0 || PaletteMatches(group, (ActionStepType)button.Tag!, query);
+                bool show = query.Length == 0 || PaletteMatches(group, (PaletteItem)button.Tag!, query);
                 button.IsVisible = show;
                 any |= show;
             }
@@ -80,18 +89,19 @@ private void FilterPalette() {
         }
     }
 
-    private ActionStepType? FirstPaletteMatch() {
+    private PaletteItem? FirstPaletteMatch() {
         string query = PaletteQuery;
         if (query.Length == 0) return null;
         foreach ((string group, Expander _, StackPanel buttons) in _paletteSections)
         foreach (Button button in buttons.Children.OfType<Button>())
-            if (PaletteMatches(group, (ActionStepType)button.Tag!, query))
-                return (ActionStepType)button.Tag!;
+            if (PaletteMatches(group, (PaletteItem)button.Tag!, query))
+                return (PaletteItem)button.Tag!;
         return null;
     }
 
-    private void AddStep(ActionStepType type) {
-        var step = new ActionStep { Type = type, Operation = type.DefaultOp() };
+    private void AddStep(PaletteItem item) {
+        ActionStepType type = item.Type;
+        var step = new ActionStep { Type = type, Operation = type.DefaultOp(), Trigger = item.Trigger };
         // set defaults
         switch (type) {
             case ActionStepType.Wait:
@@ -114,7 +124,20 @@ private void AddStep(ActionStepType type) {
         var node = new ActionNode { Id = $"{next}", Step = step };
 
         ActionNode? after = SelectedNode;
-        if (after != null) {
+        ActionNode? before = null;
+        if (type == ActionStepType.Trigger) {
+            before = after is { Step.Type: not ActionStepType.Trigger } && !Graph.Incoming(after.Id).Any() ? after : null;
+            after = null;
+        }
+
+        if (before != null) {
+            node.X = before.X - StepSpacingX;
+            node.Y = before.Y;
+            while (Graph.Nodes.Any(n => Math.Abs(n.X - node.X) < StepSpacingX - 20
+                                        && Math.Abs(n.Y - node.Y) < StepSpacingY - 10))
+                node.Y += StepSpacingY;
+        }
+        else if (after != null) {
             node.X = after.X + StepSpacingX;
             node.Y = after.Y;
             while (Graph.Nodes.Any(n => Math.Abs(n.X - node.X) < StepSpacingX - 20
@@ -131,8 +154,8 @@ private void AddStep(ActionStepType type) {
         Graph.Nodes.Add(node);
         var view = new ActionNodeVm(node);
         _nodes.Add(view);
-        if (after != null) {
-            var edge = new ActionEdge { From = after.Id, To = node.Id };
+        if (after != null || before != null) {
+            var edge = new ActionEdge { From = after?.Id ?? node.Id, To = before?.Id ?? node.Id };
             Graph.Edges.Add(edge);
             AddConnectionView(edge);
         }
@@ -154,6 +177,7 @@ private void AddConnectionView(ActionEdge edge) {
     private void RefreshNodes() {
         foreach (ActionNodeVm node in _nodes) node.Refresh(Graph);
         RefreshRunVariables();
+        RefreshRepeatOptions();
     }
 
     private void OnConnectionCompleted(object? parameter) {
@@ -161,8 +185,8 @@ private void OnConnectionCompleted(object? parameter) {
                 Item1: ActionConnectorVm a, Item2: ActionConnectorVm b
             }) return;
         (ActionConnectorVm from, ActionConnectorVm to) = a.IsInput ? (b, a) : (a, b);
-        if (from.IsInput || !to.IsInput || from.Owner == to.Owner) return;
-        if (from.Port != null && !from.Owner.IsCondition) return;
+        if (from.IsInput || !to.IsInput || from.Owner == to.Owner || to.Owner.IsTrigger) return;
+        if (from is { Port: not null, Owner.IsCondition: false }) return;
 
         string fromId = from.Owner.Node.Id, toId = to.Owner.Node.Id;
         if (Graph.Edges.Any(e => e.From == fromId && e.To == toId)) {
@@ -288,7 +312,16 @@ private MenuFlyout BuildNodeMenu(ActionNodeVm clicked) {
         var delete = new MenuItem { Header = $"Delete{suffix}" };
         delete.Click += (_, _) => DeleteItems(targets, []);
 
-        return new MenuFlyout { Items = { duplicate, toggle, ignore, new Separator(), delete } };
+        var menu = new MenuFlyout { Items = { duplicate, toggle, ignore, new Separator(), delete } };
+        if (clicked.IsTrigger && targets.Count == 1) {
+            var test = new MenuItem { Header = "Test Trigger" };
+            ToolTip.SetTip(test, "Run the action with sample trigger values");
+            test.Click += async (_, _) => await TestTriggerAsync(clicked.Node.Id);
+            menu.Items.Insert(0, test);
+            menu.Items.Insert(1, new Separator());
+        }
+
+        return menu;
     }
 
     private List<ActionNodeVm> MenuTargets(ActionNodeVm clicked) {
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
index 28babb3..e1e2150 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -12,6 +12,7 @@
 using SubathonManager.Core.Objects;
 using SubathonManager.Integration;
 using SubathonManager.Services;
+using SubathonManager.UI.Controls;
 using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
 
@@ -23,6 +24,7 @@ public partial class ActionEditorWindow {
     private readonly List<(Expander Section, List<(Control Row, string Search)> Rows)> _variableSections = [];
     private Expander? _globalSection;
     private Expander? _runSection;
+    private Expander? _triggerSection;
     private Expander? _secretSection;
     private List<ActionGlobal> _stored = [];
 
@@ -46,7 +48,18 @@ private void ShowSelection() {
         ActionStepType type = step.Type;
         _suppress++;
         try {
-            StepHeader.Text = $"{type.GetGroup()} - {type.GetLabel()}";
+            StepHeader.Text = type == ActionStepType.Trigger
+                ? $"Trigger - {step.Trigger?.GetLabel()}" : $"{type.GetGroup()} - {type.GetLabel()}";
+
+            TriggerPanel.IsVisible = type == ActionStepType.Trigger;
+            TriggerDescription.Text = step.Trigger is { } trigger ? $"Runs the steps after this when: {trigger.GetDescription()}" : "";
+            TriggerEventPanel.IsVisible = step.Trigger == SubathonTrigger.SubathonEvent;
+            if (TriggerEventPanel.IsVisible) {
+                TriggerEventTypes.SetOptions(FilterOption.EventTypes(true));
+                TriggerEventTypes.SetSelected(step.EventTypes ?? []);
+            }
+
+            IgnoreSimulatedCheck.IsChecked = step.IgnoreSimulated;
 
             OpLabel.Text = type.GetOperationLabel();
             OpBox.Items.Clear();
@@ -75,6 +88,7 @@ private void ShowSelection() {
             VariablesHint.IsVisible = type.AllowsVariables();
 
             WebPanel.IsVisible = type.IsWebRequest();
+            OutputPanel.IsVisible = type.SavesOutput();
             HeadersBox.Text = step.Headers ?? "";
 
             AuthBox.Items.Clear();
@@ -90,7 +104,7 @@ private void ShowSelection() {
             AuthTokenBox.Text = step.AuthToken ?? "";
             OutputBox.Text = step.OutputVariable ?? "";
 
-            IgnoreErrorsCheck.IsVisible = type != ActionStepType.Condition;
+            IgnoreErrorsCheck.IsVisible = type is not (ActionStepType.Condition or ActionStepType.Trigger);
             IgnoreErrorsCheck.IsChecked = node.IgnoreErrors;
             RefreshFieldVisibility(step);
         }
@@ -131,6 +145,17 @@ private void RefreshFieldVisibility(ActionStep step) {
     }
 
     private IEnumerable<string> StepWarnings(ActionNode node) {
+        if (node.Step.Type is ActionStepType.RunAction or ActionStepType.SetActionEnabled) {
+            CustomAction? target = ServiceManager.Actions.ResolveActionTarget(node.Step);
+
+            if (target == null && !string.IsNullOrWhiteSpace(node.Step.Target))
+                yield return "Action not found in actions library";
+            else if (target?.Id == _action.Id && node.Step.Type == ActionStepType.RunAction)
+                yield return $"Self-Run detected - Will run at most {ActionService.MaxActionDepth}x deep";
+            else if (target is { Disabled: true } && node.Step.Type == ActionStepType.RunAction)
+                yield return "Action is currently disabled - it will not run unless enabled";
+        }
+
         if (!node.Step.Type.AllowsVariables()) yield break;
 
         HashSet<string> declared = Graph.OutputVariables();
@@ -150,7 +175,7 @@ private IEnumerable<string> StepWarnings(ActionNode node) {
             else if ((node.Step.Operation == ActionOperation.Adjust && global.ValueType != ActionValueType.Number)
                      || (node.Step.Operation == ActionOperation.Toggle && global.ValueType != ActionValueType.Boolean))
                 yield return
-                    $"%global.{global.Name}% is {global.ValueType.GetLabel()} - this step will fail when it runs";
+                    $"%global.{global.Name}% is {global.ValueType.GetLabel()} - this step will fail";
         }
 
         foreach (string token in ActionStepTypeHelper.FindTokens(node.Step.AllText)
@@ -168,6 +193,13 @@ private IEnumerable<string> StepWarnings(ActionNode node) {
                 continue;
             }
 
+            if (ActionStepTypeHelper.TokenRoot(token).Equals(ActionRunProgress.TriggerVariable,
+                    StringComparison.OrdinalIgnoreCase)) {
+                if (!Graph.Nodes.Any(n => before.Contains(n.Id) && n.Step.Type == ActionStepType.Trigger))
+                    yield return $"%{token}% only has a value when a trigger leads to this step";
+                continue;
+            }
+
             string root = OutputRoot(ActionStepTypeHelper.TokenRoot(token));
             if (declared.Contains(root) && !available.Contains(root))
                 yield return $"%{token}% is saved by a step that doesn't run before this one - it will be empty";
@@ -185,6 +217,20 @@ private void StepField_Changed(object? sender, SelectionChangedEventArgs e) {
         ApplyStepFields();
     }
 
+    private void TriggerField_Changed(object? sender, RoutedEventArgs e) {
+        if (_suppress > 0 || SelectedNode is not { Step.Type: ActionStepType.Trigger } node) return;
+        if (node.Step.Trigger == SubathonTrigger.SubathonEvent) {
+            List<string> picked = TriggerEventTypes.SelectedOptions.Select(o => o.Value).ToList();
+            node.Step.EventTypes = picked.Count == 0 ? null : picked;
+            node.Step.IgnoreSimulated = IgnoreSimulatedCheck.IsChecked == true;
+        }
+
+        RefreshFieldVisibility(node.Step);
+        RefreshNodes();
+        Validate();
+        MarkDirty();
+    }
+
     private void IgnoreErrors_Changed(object? sender, RoutedEventArgs e) {
         if (_suppress > 0 || SelectedNode is not { } node) return;
         node.IgnoreErrors = IgnoreErrorsCheck.IsChecked == true;
@@ -229,9 +275,10 @@ private void ApplyStepFields() {
             step.Auth = auth == ActionHttpAuth.None ? null : auth;
             step.AuthUser = auth == ActionHttpAuth.Basic ? NullIfBlank(AuthUserBox.Text) : null;
             step.AuthToken = auth != ActionHttpAuth.None ? NullIfBlank(AuthTokenBox.Text) : null;
-            step.OutputVariable = NullIfBlank(OutputBox.Text);
         }
 
+        step.OutputVariable = step.Type.SavesOutput() ? NullIfBlank(OutputBox.Text) : null;
+
         RefreshFieldVisibility(step);
         RefreshNodes();
         Validate();
@@ -251,7 +298,8 @@ private async Task LoadTargetSuggestionsAsync() {
         ActionStepType type = node.Step.Type;
 
         _targetIds.Clear();
-        ScopeBox.ItemsSource = null;
+        if (_suggestionsFor != node.Id) ScopeBox.ItemsSource = null;
+        _suggestionsFor = node.Id;
         TargetBox.ItemsSource = null;
         TargetHint.Text = "loading...";
 
@@ -331,12 +379,20 @@ private async Task LoadTargetSuggestionsAsync() {
                     if (SelectedNode?.Id == node.Id)
                         TargetHint.Text = "variables also work in the URL";
                     return;
+                case ActionStepType.SetActionEnabled:
+                case ActionStepType.RunAction:
+                    foreach (CustomAction other in ServiceManager.Actions.CustomActions) {
+                        ids[other.Name] = other.Id.ToString();
+                        targets.Add(other.Name);
+                    }
+
+                    break;
                 case ActionStepType.SetGlobal:
                     targets.AddRange(_stored.Where(g => g.Kind == ActionStoreKind.Global).Select(g => g.Name));
                     break;
                 case ActionStepType.Condition:
                     if (SelectedNode?.Id != node.Id) return;
-                    ScopeBox.ItemsSource = ConditionSuggestions(node);
+                    SetScopeSuggestions(ConditionSuggestions(node));
                     TargetHint.Text = "value or %variable%";
                     return;
                 default: {
@@ -361,11 +417,18 @@ private async Task LoadTargetSuggestionsAsync() {
         if (SelectedNode?.Id != node.Id) return;
         _targetIds.Clear();
         foreach (KeyValuePair<string, string> pair in ids) _targetIds[pair.Key] = pair.Value;
-        ScopeBox.ItemsSource = scopes;
+        SetScopeSuggestions(scopes);
         TargetBox.ItemsSource = targets;
         TargetHint.Text = offline != null ? $"{offline} - type it by hand" : $"{targets.Count} found";
     }
 
+    private string? _suggestionsFor;
+
+    private void SetScopeSuggestions(List<string> scopes) {
+        if (ScopeBox.ItemsSource is IEnumerable<string> current && current.SequenceEqual(scopes)) return;
+        ScopeBox.ItemsSource = scopes;
+    }
+
     private static string? NullIfBlank(string? text) {
         return string.IsNullOrWhiteSpace(text) ? null : text.Trim();
     }
@@ -380,6 +443,12 @@ private List<string> ConditionSuggestions(ActionNode node) {
             suggestions.Add($"%{previous.Step.OutputVariable}{ActionService.StatusSuffix}%");
         }
 
+        foreach (SubathonTrigger trigger in Graph.Nodes
+                     .Where(n => before.Contains(n.Id) && n.Step is { Type: ActionStepType.Trigger, Trigger: not null })
+                     .Select(n => n.Step.Trigger!.Value).Distinct())
+            suggestions.AddRange(SubathonTriggerWatcher.SampleValues(trigger).Keys
+                .Select(k => $"%{ActionRunProgress.TriggerVariable}.{k}%"));
+
         suggestions.AddRange(_stored.Where(g => g.Kind == ActionStoreKind.Global)
             .Select(g => ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name)));
         suggestions.AddRange(Enum.GetValues<ActionVariable>().Select(v => v.GetPlaceholder()));
@@ -387,6 +456,7 @@ private List<string> ConditionSuggestions(ActionNode node) {
     }
 
     private void BuildVariablesPanel() {
+        _triggerSection = AddVariableSection("Trigger", []);
         _runSection = AddVariableSection("This Run", []);
         _globalSection = AddVariableSection("Globals", []);
         _secretSection = AddVariableSection("Secrets", []);
@@ -442,6 +512,17 @@ private void RefreshRunVariables() {
         }
 
         SetVariableRows(_runSection, rows);
+
+        var triggerRows = new List<(string, string, string, string)>();
+        foreach (SubathonTrigger trigger in Graph.Nodes.Select(n => n.Step)
+                     .Where(s => s is { Type: ActionStepType.Trigger, Trigger: not null })
+                     .Select(s => s.Trigger!.Value).Distinct())
+
+        foreach ((string key, string sample) in SubathonTriggerWatcher.SampleValues(trigger))
+            triggerRows.Add(($"%{ActionRunProgress.TriggerVariable}.{key}%", "text",
+                $"{trigger.GetLabel()}, e.g. {Shorten(sample)}", "trigger"));
+
+        if (_triggerSection != null) SetVariableRows(_triggerSection, triggerRows);
     }
 
     private void OnGlobalsChanged() {
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
index bd8d674..16a5d28 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
@@ -89,8 +89,12 @@
         </DataTemplate>
 
         <DataTemplate x:Key="StepTemplate" x:DataType="local:ActionNodeVm">
+            <Border Background="{Binding CardTint}" BorderBrush="{Binding CardBorder}" BorderThickness="1"
+                    CornerRadius="3">
             <StackPanel Orientation="Horizontal" Opacity="{Binding CardOpacity}">
-                <ContentControl Content="{Binding Input}" ContentTemplate="{StaticResource InputConnectorTemplate}" />
+                <ContentControl Content="{Binding Input}" ContentTemplate="{StaticResource InputConnectorTemplate}"
+                                IsVisible="{Binding HasInput}" />
+                <Border Width="14" IsVisible="{Binding IsTrigger}" />
                 <Grid Width="200" Margin="6,6" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,Auto">
                     <TextBlock Text="{Binding Title}" FontSize="10" Foreground="Gray"
                                TextTrimming="CharacterEllipsis" />
@@ -104,6 +108,10 @@
                         <Border IsVisible="{Binding IsStart}" Background="#2E7D32" CornerRadius="3" Padding="4,0">
                             <TextBlock Text="START" FontSize="9" Foreground="White" />
                         </Border>
+                        <Border IsVisible="{Binding IsTrigger}" Background="#1CB896" CornerRadius="3" Padding="4,0"
+                                ToolTip.Tip="Starts the action when this happens">
+                            <TextBlock Text="TRIGGER" FontSize="9" Foreground="White" />
+                        </Border>
                         <Border IsVisible="{Binding IsDisabled}" Background="#555555" CornerRadius="3" Padding="4,0"
                                 ToolTip.Tip="Skipped when the action runs; right click to enable">
                             <TextBlock Text="OFF" FontSize="9" Foreground="White" />
@@ -140,6 +148,7 @@
                     </StackPanel>
                 </StackPanel>
             </StackPanel>
+            </Border>
         </DataTemplate>
 
         <DataTemplate x:Key="ConnectionTemplate" x:DataType="local:ActionConnectionVm">
@@ -169,8 +178,8 @@
                          PlaceholderText="Action name" />
                 <TextBox x:Name="AuthorBox" Width="140" Height="34" PlaceholderText="Author" />
                 <TextBox x:Name="VersionBox" Width="80" Height="34" PlaceholderText="1.0.0" />
-                <TextBlock Text="If already running:" FontSize="12" VerticalAlignment="Center" Margin="8,0,0,0" />
-                <ComboBox x:Name="RepeatBox" Width="170" Height="34" SelectionChanged="Repeat_SelectionChanged" />
+                <TextBlock Text="Concurrency Mode:" FontSize="12" VerticalAlignment="Center" Margin="8,0,0,0" />
+                <ComboBox x:Name="RepeatBox" Width="150" Height="34" SelectionChanged="Repeat_SelectionChanged" />
             </StackPanel>
             <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="6">
                 <Button Height="34" Click="TestRun_Click"
@@ -273,6 +282,20 @@
                                     </Button>
                                 </Grid>
 
+                                <StackPanel x:Name="TriggerPanel" Margin="0,0,0,8">
+                                    <TextBlock x:Name="TriggerDescription" FontSize="12" TextWrapping="Wrap"
+                                               Margin="2,0,0,6" />
+                                    <StackPanel x:Name="TriggerEventPanel" Margin="0,0,0,8">
+                                        <TextBlock Text="Event types:" FontSize="12" Margin="2,0,0,3" />
+                                        <ctl:FilterPopout x:Name="TriggerEventTypes" EmptyText="None picked yet" />
+                                        <CheckBox x:Name="IgnoreSimulatedCheck" Content="Ignore simulated events"
+                                                  Margin="0,6,0,0" IsCheckedChanged="TriggerField_Changed"
+                                                  ToolTip.Tip="Don't run for events made with the simulate/test buttons" />
+                                    </StackPanel>
+                                    <TextBlock FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,0,0,0"
+                                               Text="Steps after this can read data as %trigger.name%" />
+                                </StackPanel>
+
                                 <StackPanel x:Name="ScopePanel" Margin="0,0,0,8">
                                     <TextBlock x:Name="ScopeLabel" Text="Scene:" FontSize="12" Margin="2,0,0,3" />
                                     <AutoCompleteBox x:Name="ScopeBox" Height="34" FilterMode="ContainsOrdinal"
@@ -348,13 +371,13 @@
                                                    Text="Saved raw into the actions file. Recommend using a %secret.name% for secrets" />
                                     </StackPanel>
 
-                                    <StackPanel Margin="0,0,0,8">
-                                        <TextBlock Text="Save response as (optional):" FontSize="12" Margin="2,0,0,3" />
-                                        <TextBox x:Name="OutputBox" Height="34" PlaceholderText="e.g. resp" />
-                                        <TextBlock x:Name="OutputHint" FontSize="11" Foreground="Gray"
-                                                   TextWrapping="Wrap"
-                                                   Margin="2,3,0,0" />
-                                    </StackPanel>
+                                </StackPanel>
+
+                                <StackPanel x:Name="OutputPanel" Margin="0,0,0,8">
+                                    <TextBlock Text="Save response as (optional):" FontSize="12" Margin="2,0,0,3" />
+                                    <TextBox x:Name="OutputBox" Height="34" PlaceholderText="e.g. resp" />
+                                    <TextBlock x:Name="OutputHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap"
+                                               Margin="2,3,0,0" />
                                 </StackPanel>
 
                                 <TextBlock x:Name="VariablesHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap"
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
index ee0b8a4..1d85080 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml.cs
@@ -66,6 +66,7 @@ public ActionEditorWindow(CustomAction action) {
 
         BuildPalette();
         BuildVariablesPanel();
+        TriggerEventTypes.SelectionChanged += (_, _) => TriggerField_Changed(null, new RoutedEventArgs());
         AttachNodeMenus();
         LoadHeader();
         ShowSelection();
@@ -85,7 +86,7 @@ public ActionEditorWindow(CustomAction action) {
             box.TextChanged += (_, _) => ApplyStepFields();
 
         ScopeBox.LostFocus += (_, _) => _ = LoadTargetSuggestionsAsync();
-        ScopeBox.SelectionChanged += (_, _) => _ = LoadTargetSuggestionsAsync();
+        ScopeBox.SelectionChanged += (_, _) => Dispatcher.UIThread.Post(() => _ = LoadTargetSuggestionsAsync());
 
         AddHandler(KeyDownEvent, Window_KeyDown, RoutingStrategies.Tunnel);
         ResetDirty();
@@ -128,15 +129,7 @@ private void LoadHeader() {
             VersionBox.Text = _action.Version;
             DescriptionBox.Text = _action.Description ?? "";
 
-            RepeatBox.Items.Clear();
-            foreach ((ActionRepeatMode mode, string label) in new[] {
-                         (ActionRepeatMode.Restart, "Restart it"),
-                         (ActionRepeatMode.Parallel, "Run another in parallel"),
-                         (ActionRepeatMode.Skip, "Ignore the new one")
-                     })
-                RepeatBox.Items.Add(new ComboBoxItem { Content = label, Tag = mode });
-            RepeatBox.SelectedItem = RepeatBox.Items.OfType<ComboBoxItem>()
-                .FirstOrDefault(i => (ActionRepeatMode?)i.Tag == Graph.OnRepeat);
+            RefreshRepeatOptions();
         }
         finally {
             _suppress--;
@@ -150,6 +143,43 @@ private void ApplyHeader() {
         _action.Description = string.IsNullOrWhiteSpace(DescriptionBox.Text) ? null : DescriptionBox.Text.Trim();
     }
 
+    private void RefreshRepeatOptions() {
+        bool triggers = Graph.HasTriggers;
+        List<(ActionRepeatMode Mode, string Label)> options = new[] {
+            (ActionRepeatMode.Restart, "Restart Existing"),
+            (ActionRepeatMode.Parallel, "Run Parallel"),
+            (ActionRepeatMode.Queue, "Queue New"),
+            (ActionRepeatMode.Skip, "Skip New")
+        }.Where(o => !triggers || ActionGraph.AllowedWithTriggers(o.Item1)).ToList();
+
+        bool loaded = RepeatBox.Items.Count > 0;
+        if (triggers && !ActionGraph.AllowedWithTriggers(Graph.OnRepeat)) {
+            Graph.OnRepeat = ActionRepeatMode.Parallel;
+            StatusText.Foreground = Brushes.Gray;
+            StatusText.Text = "Actions with triggers can only run in parallel or queued - this action now runs in parallel";
+            if (loaded && _suppress == 0) MarkDirty();
+        }
+
+        _suppress++;
+        try {
+            if (!RepeatBox.Items.OfType<ComboBoxItem>().Select(i => (ActionRepeatMode)i.Tag!)
+                    .SequenceEqual(options.Select(o => o.Mode))) {
+                RepeatBox.Items.Clear();
+                foreach ((ActionRepeatMode mode, string label) in options)
+                    RepeatBox.Items.Add(new ComboBoxItem { Content = label, Tag = mode });
+            }
+
+            RepeatBox.SelectedItem = RepeatBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => (ActionRepeatMode?)i.Tag == Graph.OnRepeat);
+            ToolTip.SetTip(RepeatBox, triggers
+                ? "Triggers can fire many times in a row, so they run either in parallel or in a queue"
+                : null);
+        }
+        finally {
+            _suppress--;
+        }
+    }
+
     private void Repeat_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
         if (_suppress > 0 || (RepeatBox.SelectedItem as ComboBoxItem)?.Tag is not ActionRepeatMode mode) return;
         Graph.OnRepeat = mode;
@@ -198,6 +228,7 @@ private async Task<bool> SaveAsync() {
         }
 
         try {
+            if (ServiceManager.Actions.GetCustomAction(_action.Id) is { } current) _action.Disabled = current.Disabled;
             await ServiceManager.Actions.SaveCustomActionAsync(_action.Clone());
         }
         catch (Exception ex) {
@@ -225,10 +256,31 @@ private async void TestRun_Click(object? sender, RoutedEventArgs e) {
             return;
         }
 
+        if (Graph.Nodes.All(n => n.Step.Type == ActionStepType.Trigger || Graph.Incoming(n.Id).Any())) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = "Every branch starts with a trigger - right click a trigger to run a Test";
+            return;
+        }
+
         StatusText.Foreground = Brushes.Gray;
         StatusText.Text = "Test run started...";
-        CustomAction snapshot = _action.Clone();
-        ActionRunResult result = await ServiceManager.Actions.RunManuallyAsync(snapshot, true);
+        ShowTestResult(await ServiceManager.Actions.RunManuallyAsync(_action.Clone(), true));
+    }
+
+    private async Task TestTriggerAsync(string nodeId) {
+        ApplyHeader();
+        if (!Graph.IsValid(out string error)) {
+            StatusText.Foreground = Brushes.OrangeRed;
+            StatusText.Text = error;
+            return;
+        }
+
+        StatusText.Foreground = Brushes.Gray;
+        StatusText.Text = "Trigger test started...";
+        ShowTestResult(await ServiceManager.Actions.TestTriggerAsync(_action.Clone(), nodeId, true));
+    }
+
+    private void ShowTestResult(ActionRunResult result) {
         StatusText.Text = result switch {
             ActionRunResult.Done => "Test run finished",
             ActionRunResult.Skipped => "Test run skipped: one is already running and this action ignores repeats",
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.Triggers.cs b/SubathonManager.UI/Views/Actions/ActionsView.Triggers.cs
new file mode 100644
index 0000000..7abe8bc
--- /dev/null
+++ b/SubathonManager.UI/Views/Actions/ActionsView.Triggers.cs
@@ -0,0 +1,152 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Objects;
+using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+
+namespace SubathonManager.UI.Views.Actions;
+
+public partial class ActionsView {
+    private static readonly IBrush TriggerAccent = new SolidColorBrush(Color.FromRgb(0x1C, 0xB8, 0x96));
+
+    private void RefreshTriggers() {
+        List<(CustomAction Action, ActionNode Node)> steps = ServiceManager.Actions.TriggerSteps().ToList();
+        TriggersPanel.Children.Clear();
+        TriggersStatusText.Text = steps.Count == 0 ? "No actions have triggers yet" : "";
+
+        foreach (SubathonTrigger trigger in Enum.GetValues<SubathonTrigger>().OrderBy(t => t.GetOrderNumber())) {
+            List<(CustomAction Action, ActionNode Node)> matching =
+                steps.Where(s => s.Node.Step.Trigger == trigger).ToList();
+
+            var section = new StackPanel { Spacing = 6 };
+            var header = new StackPanel {
+                Orientation = Orientation.Horizontal, Spacing = 8,
+                Children = {
+
+                    new Border {
+                        MinWidth = 22, CornerRadius = new CornerRadius(3), Padding = new Thickness(5, 1),
+                        Background = matching.Count > 0 ? TriggerAccent : Brushes.Gray,
+                        VerticalAlignment = VerticalAlignment.Center,
+                        Child = new TextBlock {
+                            Text = $"{matching.Count}", FontSize = 11, FontWeight = FontWeight.Bold,
+                            Foreground = Brushes.White, HorizontalAlignment = HorizontalAlignment.Center
+                        }
+                    },
+
+                    new TextBlock {
+                        Text = trigger.GetLabel(), FontSize = 15, FontWeight = FontWeight.SemiBold,
+                        VerticalAlignment = VerticalAlignment.Center
+                    },
+
+                    new TextBlock {
+                        Text = trigger.GetDescription(), FontSize = 12, Foreground = Brushes.Gray,
+                        VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis
+                    }
+                }
+            };
+
+            SubathonTrigger captured = trigger;
+            var expander = new Expander {
+                Header = header, Content = section, IsExpanded = _openTriggers.Contains(trigger),
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                HorizontalContentAlignment = HorizontalAlignment.Stretch
+            };
+
+            expander.Expanded += (_, _) => _openTriggers.Add(captured);
+            expander.Collapsed += (_, _) => _openTriggers.Remove(captured);
+
+            if (matching.Count == 0)
+                section.Children.Add(new TextBlock {
+                    Text = "No actions", FontSize = 12, Foreground = Brushes.Gray
+                });
+
+            foreach ((CustomAction action, ActionNode node) in matching.OrderBy(m => m.Action.Name,
+                         StringComparer.OrdinalIgnoreCase))
+                section.Children.Add(BuildTriggerRow(action, node));
+
+            TriggersPanel.Children.Add(expander);
+        }
+    }
+
+    private readonly HashSet<SubathonTrigger> _openTriggers = [];
+
+    private Control BuildTriggerRow(CustomAction action, ActionNode node) {
+        bool valid = node.Step.IsValid(out string error) && action.Graph.IsValid(out error);
+        var name = new TextBlock { Text = action.Name, FontWeight = FontWeight.SemiBold, FontSize = 14 };
+        var summary = new TextBlock {
+            Text = node.Step.Describe(), FontSize = 12, Foreground = Brushes.Gray, TextWrapping = TextWrapping.Wrap
+        };
+        var problem = new TextBlock {
+            Text = valid ? "" : $"Won't run: {error}", FontSize = 12, Foreground = Brushes.OrangeRed,
+            TextWrapping = TextWrapping.Wrap, IsVisible = !valid
+        };
+        if (valid && action.Disabled) {
+            problem.Text = "Action is disabled";
+            problem.Foreground = Brushes.Gray;
+            problem.IsVisible = true;
+        }
+
+        var enabled = new ToggleSwitch {
+            IsChecked = !node.Disabled, OnContent = "On", OffContent = "Off", VerticalAlignment = VerticalAlignment.Center
+        };
+
+        enabled.IsCheckedChanged += async (_, _) => {
+            CustomAction copy = action.Clone();
+            if (copy.Graph.Nodes.FirstOrDefault(n => n.Id == node.Id) is not { } target) return;
+            target.Disabled = enabled.IsChecked != true;
+            try {
+                await ServiceManager.Actions.SaveCustomActionAsync(copy);
+                TriggersStatusText.Text = $"{(target.Disabled ? "Turned off" : "Turned on")} a trigger in \"{action.Name}\"";
+            }
+            catch (Exception ex) {
+                _logger?.LogError(ex, "[Actions] Saving {Name} failed", action.Name);
+                TriggersStatusText.Text = $"Could not save \"{action.Name}\": {ex.Message}";
+            }
+        };
+
+        var test = new Button {
+            Classes = { "opaquesecondary", "iconbtn" }, Width = 32, Height = 32, Padding = new Thickness(2),
+            Content = new SymIcon { Glyph = "Play20" }, IsEnabled = valid
+        };
+
+        test.Click += async (_, _) => {
+            TriggersStatusText.Text = $"Testing \"{action.Name}\"...";
+            ActionRunResult result = await ServiceManager.Actions.TestTriggerAsync(action, node.Id);
+            TriggersStatusText.Text = result switch {
+                ActionRunResult.Done => $"\"{action.Name}\" finished",
+                ActionRunResult.Skipped => $"\"{action.Name}\" is already running - skipped",
+                ActionRunResult.Cancelled => $"\"{action.Name}\" was cancelled",
+                _ => $"\"{action.Name}\" stopped at a step that could not be run - check the logs"
+            };
+        };
+
+        var open = new Button {
+            Classes = { "opaquesecondary", "iconbtn" }, Width = 32, Height = 32, Padding = new Thickness(2),
+            Content = new SymIcon { Glyph = "Edit20" }
+        };
+        ToolTip.SetTip(open, "Open in the editor");
+        open.Click += (_, _) => OpenEditor(action);
+
+        var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto,Auto"), ColumnSpacing = 8 };
+        grid.Children.Add(new StackPanel { Children = { name, summary, problem } });
+        Grid.SetColumn(enabled, 1);
+        grid.Children.Add(enabled);
+        Grid.SetColumn(test, 2);
+        grid.Children.Add(test);
+        Grid.SetColumn(open, 3);
+        grid.Children.Add(open);
+
+        var card = new Border {
+            Padding = new Thickness(12, 8), CornerRadius = new CornerRadius(6), BorderThickness = new Thickness(1),
+            Child = grid, Opacity = node.Disabled || action.Disabled ? 0.6 : 1
+        };
+        card.SetDynamicResource(Border.BorderBrushProperty, "UiBrushBorder");
+        card.SetDynamicResource(Border.BackgroundProperty, "UiBrushControlBackground");
+        return card;
+    }
+}
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml b/SubathonManager.UI/Views/Actions/ActionsView.axaml
index 18fe6d4..d3acd0b 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml
@@ -62,6 +62,7 @@
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate x:DataType="local:ActionCard">
                                     <Border Classes="actioncard" Classes.selected="{Binding IsSelected}"
+                                            Opacity="{Binding CardOpacity}"
                                             Margin="0,0,0,8" Padding="12"
                                             BorderThickness="1" CornerRadius="6"
                                             BorderBrush="{DynamicResource UiBrushBorder}"
@@ -70,8 +71,33 @@
                                             Tapped="Card_Tapped" DoubleTapped="Card_DoubleTapped">
                                         <Grid ColumnDefinitions="*,Auto">
                                             <StackPanel VerticalAlignment="Center">
-                                                <TextBlock Text="{Binding Name}" TextWrapping="Wrap"
-                                                           FontWeight="SemiBold" FontSize="16" />
+                                                <WrapPanel Orientation="Horizontal">
+                                                    <TextBlock Text="{Binding Name}" TextWrapping="Wrap"
+                                                               FontWeight="SemiBold" FontSize="16" Margin="0,0,8,0" />
+                                                    <Border Background="#555555" CornerRadius="3" Padding="5,0"
+                                                            Margin="0,0,4,0" VerticalAlignment="Center"
+                                                            IsVisible="{Binding Action.Disabled}"
+                                                            ToolTip.Tip="Turned off">
+                                                        <TextBlock Text="OFF" FontSize="10" FontWeight="Bold"
+                                                                   Foreground="White" />
+                                                    </Border>
+                                                    <Border Background="#555555" CornerRadius="3" Padding="5,0"
+                                                            Margin="0,0,4,0" VerticalAlignment="Center"
+                                                            ToolTip.Tip="{Binding ModeTip}">
+                                                        <TextBlock Text="{Binding ModeLetter}" FontSize="10"
+                                                                   FontWeight="Bold" Foreground="White" />
+                                                    </Border>
+                                                    <Border Background="#1CB896" CornerRadius="3" Padding="4,0"
+                                                            VerticalAlignment="Center" IsVisible="{Binding HasTriggers}"
+                                                            ToolTip.Tip="{Binding TriggerTip}">
+                                                        <StackPanel Orientation="Horizontal" Spacing="2">
+                                                            <ctl:SymIcon Glyph="Flash12" Foreground="White"
+                                                                         VerticalAlignment="Center" />
+                                                            <TextBlock Text="{Binding TriggerCount}" FontSize="10"
+                                                                       FontWeight="Bold" Foreground="White" />
+                                                        </StackPanel>
+                                                    </Border>
+                                                </WrapPanel>
                                                 <TextBlock Text="{Binding Detail}" FontSize="11" Foreground="Gray"
                                                            Margin="0,2,0,0" />
                                                 <TextBlock Text="{Binding Description}" FontSize="12"
@@ -123,14 +149,14 @@
                                    Text="Custom actions can chain from multiple integrations.&#x0a;Double click or press edit to open in the editor. Each action is saved as a .sma file" />
                         <WrapPanel Orientation="Horizontal" Margin="0,16,0,0">
                             <Button Classes="tile" Click="OpenActionsFolder_Click"
-                                    ToolTip.Tip="Open the folder your actions are saved in">
+                                    ToolTip.Tip="Open actions library folder">
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <ctl:SymIcon Glyph="FolderOpen20" VerticalAlignment="Center" />
                                     <TextBlock Text="Open Actions" VerticalAlignment="Center" />
                                 </StackPanel>
                             </Button>
                             <Button Classes="tile" Click="OpenExportsFolder_Click"
-                                    ToolTip.Tip="Open the folder exported .sma files are written to">
+                                    ToolTip.Tip="Open actions export folder">
                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                     <ctl:SymIcon Glyph="FolderOpen20" VerticalAlignment="Center" />
                                     <TextBlock Text="Open Exports" VerticalAlignment="Center" />
@@ -156,9 +182,13 @@
                             BorderBrush="{DynamicResource UiBrushBorder}"
                             Background="{DynamicResource UiBrushControlBackground}">
                         <StackPanel>
-                            <Grid ColumnDefinitions="*,Auto,Auto">
+                            <Grid ColumnDefinitions="*,Auto,Auto,Auto">
                                 <TextBlock x:Name="DetailTitle" FontSize="20" FontWeight="Bold" TextWrapping="Wrap"
                                            VerticalAlignment="Center" />
+                                <ToggleSwitch Grid.Column="3" x:Name="EnabledSwitch" OnContent="On" OffContent="Off"
+                                              Margin="10,0,0,0" VerticalAlignment="Center"
+                                              IsCheckedChanged="EnabledSwitch_Changed"
+                                              ToolTip.Tip="Off - nothing can run this action except the test button" />
                                 <Button Grid.Column="1" Classes="opaquesecondary" Padding="10,4" Margin="8,0,0,0"
                                         Click="RunSelected_Click"
                                         ToolTip.Tip="Run the saved action now. It runs for real: time, multiplier and reroll steps do change the subathon">
@@ -183,7 +213,7 @@
                                     <TextBlock x:Name="DetailSteps" FontSize="24" FontWeight="SemiBold" />
                                     <TextBlock Text="Steps" FontSize="11" Foreground="Gray" />
                                 </StackPanel>
-                                <StackPanel ToolTip.Tip="Separate paths from a start to an end; a straight chain is 1">
+                                <StackPanel>
                                     <TextBlock x:Name="DetailBranches" FontSize="24" FontWeight="SemiBold" />
                                     <TextBlock Text="Branches" FontSize="11" Foreground="Gray" />
                                 </StackPanel>
@@ -259,7 +289,18 @@
         </TabItem>
 
         <TabItem Header="Triggers">
-            <Grid />
+            <Grid Margin="10" RowDefinitions="Auto,*">
+                <StackPanel Margin="6,0,2,10">
+                    <TextBlock Text="Triggers" FontWeight="Bold" FontSize="18" />
+                    <TextBlock TextWrapping="Wrap" FontSize="13" Margin="0,4,0,0"
+                               Text="Triggers can run your actions automatically if their associated node exists. They also provide their own variables." />
+                    <TextBlock x:Name="TriggersStatusText" FontSize="12" Foreground="Gray" TextWrapping="Wrap"
+                               Margin="0,6,0,0" />
+                </StackPanel>
+                <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+                    <StackPanel x:Name="TriggersPanel" Spacing="6" Margin="0,0,10,0" />
+                </ScrollViewer>
+            </Grid>
         </TabItem>
     </TabControl>
 </UserControl>
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
index fc3d9aa..dabee04 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -38,6 +38,7 @@ public ActionsView() {
             ServiceManager.Actions.GlobalsChanged -= OnGlobalsChanged;
             ServiceManager.Actions.GlobalsChanged += OnGlobalsChanged;
             Refresh();
+            RefreshTriggers();
             _ = RefreshStoreAsync();
         };
         Unloaded += (_, _) => {
@@ -49,30 +50,49 @@ public ActionsView() {
     private void OnLibraryChanged() {
         Dispatcher.UIThread.Post(() => {
             Refresh();
+            RefreshTriggers();
             _ = RefreshStoreAsync();
         });
     }
 
     private void Refresh() {
         IReadOnlyList<CustomAction> all = ServiceManager.Actions.CustomActions;
+        Dictionary<string, int> wheelUses = WheelUses();
         string query = (SearchBox.Text ?? "").Trim();
         List<ActionCard> cards = all
             .Where(a => query.Length == 0
                         || a.Name.Contains(query, StringComparison.OrdinalIgnoreCase)
                         || (a.Author?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false)
                         || (a.Description?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false))
-            .Select(a => new ActionCard(a) { IsSelected = a.Id == _selectedId })
+            .Select(a => new ActionCard(a) {
+                IsSelected = a.Id == _selectedId, WheelUses = wheelUses.GetValueOrDefault(a.Id.ToString())
+            })
             .ToList();
 
         _cards = cards;
         ActionsList.ItemsSource = cards;
         EmptyText.IsVisible = cards.Count == 0;
         EmptyText.Text = all.Count == 0
-            ? "No actions yet. Create one, import a .sma file, or convert a VTube Studio / OBS wheel item"
+            ? "No actions yet. Create one, import a .sma file, or convert a compatible wheel action"
             : $"Nothing matches \"{query}\"";
         ShowDetails();
     }
 
+    private Dictionary<string, int> WheelUses() {
+        try {
+            using AppDbContext db = _factory.CreateDbContext();
+            return db.WheelSpinActions
+                .Where(a => a.ActionType == WheelSpinActionType.CustomAction && !string.IsNullOrWhiteSpace(a.Parameter))
+                .GroupBy(a => a.Parameter!)
+                .Select(g => new { g.Key, Count = g.Count() })
+                .ToDictionary(g => g.Key, g => g.Count, StringComparer.OrdinalIgnoreCase);
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "[Actions] Could not count wheel items using actions");
+            return [];
+        }
+    }
+
     public void ShowAdded(CustomAction? action, string source) {
         if (action == null) {
             StatusText.Text = $"{Path.GetFileName(source)} is not a valid custom action";
@@ -106,6 +126,9 @@ private void ShowDetails() {
         }
 
         DetailTitle.Text = action.Name;
+        _detailSuppress = true;
+        EnabledSwitch.IsChecked = !action.Disabled;
+        _detailSuppress = false;
 
         var meta = new List<string> { $"v{action.Version}" };
         if (!string.IsNullOrWhiteSpace(action.Author)) meta.Add($"by {action.Author}");
@@ -139,6 +162,15 @@ private async void Run_Click(object? sender, RoutedEventArgs e) {
         if (CardOf(sender) is { } action) await RunAsync(action);
     }
 
+    private bool _detailSuppress;
+
+    private async void EnabledSwitch_Changed(object? sender, RoutedEventArgs e) {
+        if (_detailSuppress || _selectedId is not { } id) return;
+        bool enabled = EnabledSwitch.IsChecked == true;
+        if (!await ServiceManager.Actions.SetCustomActionEnabledAsync(id, enabled)) return;
+        StatusText.Text = enabled ? "Turned on" : "Turned off";
+    }
+
     private async void RunSelected_Click(object? sender, RoutedEventArgs e) {
         if (_selectedId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action) await RunAsync(action);
     }
@@ -216,14 +248,18 @@ private async void Delete_Click(object? sender, RoutedEventArgs e) {
         var id = action.Id.ToString();
         await using AppDbContext db = await _factory.CreateDbContextAsync();
 
-        // TODO when more than just wheel spins, check
+        // what stops when it's gone: wheel items pointing at it, and its own trigger steps
         int uses = await db.WheelSpinActions
             .CountAsync(a => a.ActionType == WheelSpinActionType.CustomAction && a.Parameter == id);
+        int triggers = action.Graph.Nodes.Count(n => n.Step.Type == ActionStepType.Trigger && !n.Disabled);
+        var effects = new List<string>();
+        if (uses > 0) effects.Add($"{uses} wheel item(s) use it and will stop running until you pick another action");
+        if (triggers > 0) effects.Add($"its {triggers} trigger(s) will stop firing");
 
         var dialog = new FAContentDialog {
             Title = "Delete action",
-            Content = uses > 0
-                ? $"Delete \"{action.Name}\"? {uses} wheel item(s) use it and will stop running anything until you pick another action."
+            Content = effects.Count > 0
+                ? $"Delete \"{action.Name}\"? {string.Join(", and ", effects)}."
                 : $"Delete \"{action.Name}\"? Its .sma file is removed from the actions folder.",
             PrimaryButtonText = "Delete",
             CloseButtonText = "Cancel"
@@ -296,6 +332,33 @@ public bool IsSelected {
     }
 
     public string Name => Action.Name;
+    public double CardOpacity => Action.Disabled ? 0.55 : 1;
+    public int WheelUses { get; init; }
+
+    //
+    public string ModeLetter => Action.Graph.EffectiveRepeat switch {
+        ActionRepeatMode.Restart => "R",
+        ActionRepeatMode.Parallel => "P",
+        ActionRepeatMode.Queue => "Q",
+        _ => "S"
+    };
+
+    //
+    public string ModeTip => "Concurrency Mode: " + Action.Graph.EffectiveRepeat switch {
+        ActionRepeatMode.Restart => "Restart",
+        ActionRepeatMode.Parallel => "Parallel",
+        ActionRepeatMode.Queue => "Queued",
+        _ => "Skips New"
+    };
+
+    private int TriggerSteps => Action.Graph.Nodes.Count(n => n.Step.Type == ActionStepType.Trigger && !n.Disabled);
+    public int TriggerCount => TriggerSteps + WheelUses;
+    public bool HasTriggers => TriggerCount > 0;
+
+    public string TriggerTip => string.Join(", ", new[] {
+        TriggerSteps > 0 ? $"{TriggerSteps} trigger step(s)" : null,
+        WheelUses > 0 ? $"{WheelUses} wheel item(s)" : null
+    }.Where(s => s != null)) + " start this action";
     public string? Description => Action.Description;
     public bool HasDescription => !string.IsNullOrWhiteSpace(Action.Description);
 
diff --git a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/MixItUpSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/MixItUpSettings.axaml.cs
index 5623f34..a01c171 100644
--- a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/MixItUpSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/MixItUpSettings.axaml.cs
@@ -19,7 +19,7 @@
 namespace SubathonManager.UI.Views.SettingsViews.ExternalSoftware;
 
 public partial class MixItUpSettings : SettingsControl {
-    private readonly Dictionary<MixItUpTrigger, TriggerRow> _rows = new();
+    private readonly Dictionary<SubathonTrigger, TriggerRow> _rows = new();
     private readonly CheckBox _includeCommandsCheck = new() {
         Content = "Send Command events?", Margin = new Thickness(12, 0, 0, 0),
         VerticalAlignment = VerticalAlignment.Center
@@ -45,7 +45,7 @@ public override void Init(SettingsView host) {
             _includeCommandsCheck.IsChecked =
                 config.GetBool(MixItUpService.ConfigSection, MixItUpService.IncludeCommandsKey);
             ApiUrlBox.Text = config.Get(MixItUpService.ConfigSection, "ApiUrl", MixItUpService.DefaultApiUrl);
-            foreach ((MixItUpTrigger trigger, TriggerRow row) in _rows)
+            foreach ((SubathonTrigger trigger, TriggerRow row) in _rows)
                 row.IdBox.Text = config.Get(MixItUpService.ConfigSection,
                     MixItUpService.CommandConfigKey(trigger), "");
         });
@@ -53,9 +53,9 @@ public override void Init(SettingsView host) {
     }
 
     private void BuildTriggerRows() {
-        IEnumerable<MixItUpTrigger> triggers =
-            Enum.GetValues<MixItUpTrigger>().OrderBy(t => t.GetOrderNumber());
-        foreach (MixItUpTrigger trigger in triggers) {
+        IEnumerable<SubathonTrigger> triggers =
+            Enum.GetValues<SubathonTrigger>().OrderBy(t => t.GetOrderNumber());
+        foreach (SubathonTrigger trigger in triggers) {
             
             var panel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 2, 0, 2) };
             var label = new TextBlock {
@@ -98,7 +98,7 @@ private void BuildTriggerRows() {
             panel.Children.Add(idBox);
             panel.Children.Add(picker);
             panel.Children.Add(testBtn);
-            if (trigger == MixItUpTrigger.SubathonEvent) {
+            if (trigger == SubathonTrigger.SubathonEvent) {
                 ToolTip.SetTip(_includeCommandsCheck,
                     "Commands (add time, pause, etc.) also fire this. Don't enable it if this Mix It Up command calls Subathon Manager back, or it may loop");
                 panel.Children.Add(_includeCommandsCheck);
@@ -134,7 +134,7 @@ private static void ValidateIdBox(TriggerRow row) {
         }
     }
 
-    private static async Task TestTrigger(MixItUpTrigger trigger, TriggerRow row) {
+    private static async Task TestTrigger(SubathonTrigger trigger, TriggerRow row) {
         row.TestBtn.IsEnabled = false;
         bool ok = await ServiceManager.MixItUp.TestTriggerAsync(trigger, row.IdBox.Text ?? "");
         await Dispatcher.UIThread.InvokeAsync(() => row.TestBtn.Content = ok ? "Sent" : "Failed");
@@ -216,7 +216,7 @@ protected internal override bool UpdateConfigValueSettings() {
         hasUpdated |= config.SetBool(MixItUpService.ConfigSection, MixItUpService.IncludeCommandsKey,
             _includeCommandsCheck.IsChecked);
         hasUpdated |= config.Set(MixItUpService.ConfigSection, "ApiUrl", (ApiUrlBox.Text ?? "").Trim());
-        foreach ((MixItUpTrigger trigger, TriggerRow row) in _rows)
+        foreach ((SubathonTrigger trigger, TriggerRow row) in _rows)
             hasUpdated |= config.Set(MixItUpService.ConfigSection, MixItUpService.CommandConfigKey(trigger),
                 (row.IdBox.Text ?? "").Trim());
         return hasUpdated;

From 9797efb99a5b0fd3c008ab9cf0656b9645658ce7 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Wed, 7 Oct 2026 00:04:56 -0300
Subject: [PATCH 07/23] access globals from widgets #340 and impl POST and GET
 for them

---
 .gitignore                                    |    2 +
 SubathonManager.Core/Enums/ActionEnums.cs     |   18 +
 SubathonManager.Core/Events/ActionEvents.cs   |    6 +
 SubathonManager.Core/Models/ActionGlobal.cs   |    3 +-
 SubathonManager.Core/Models/Widget.cs         |   23 +
 SubathonManager.Core/Objects/WidgetMeta.cs    |   30 +
 ...1006182631_addGlobalsToWidgets.Designer.cs | 1179 +++++++++++++++++
 .../20261006182631_addGlobalsToWidgets.cs     |   30 +
 .../Migrations/AppDbContextModelSnapshot.cs   |    5 +
 SubathonManager.Data/OverlayPorter.cs         |   35 +-
 SubathonManager.Data/WidgetPorter.cs          |    4 +
 SubathonManager.Server/WebServer.Api.cs       |  138 ++
 SubathonManager.Server/WebServer.WebSocket.cs |  125 +-
 SubathonManager.Services/ActionService.cs     |  170 ++-
 .../ServerUnitTests/WebServerTests.cs         |  100 ++
 .../ServicesUnitTests/ActionServiceTests.cs   |   57 +
 .../EditRouteWindow.Handlers.cs               |   52 +
 SubathonManager.UI/EditRouteWindow.axaml      |   13 +-
 SubathonManager.UI/EditRouteWindow.axaml.cs   |    6 +
 SubathonManager.UI/MainWindow.Routes.cs       |    5 +
 SubathonManager.UI/MainWindow.axaml.cs        |   40 +
 .../Views/ExportOverlayDialog.axaml.cs        |   11 +-
 .../Views/ExportWidgetDialog.axaml.cs         |    4 +
 23 files changed, 1999 insertions(+), 57 deletions(-)
 create mode 100644 SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.Designer.cs
 create mode 100644 SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.cs

diff --git a/.gitignore b/.gitignore
index 516b767..f9ed950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -239,3 +239,5 @@ external/streamdeck/**/images/
 # Windows installer build output
 installer/windows/LICENSE.txt
 installer-out/
+
+presets/test/
diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index c0bd227..a283b04 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -460,6 +460,24 @@ public static string DefaultValue(this ActionValueType type) {
         };
     }
 
+    public static object ToTypedValue(this ActionValueType type, string? value) {
+        return type switch {
+            ActionValueType.Number => double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture,
+                out double number)
+                ? number : 0d,
+            ActionValueType.Boolean => string.Equals(value, "true", StringComparison.OrdinalIgnoreCase),
+            _ => value ?? ""
+        };
+    }
+
+    public static string GetJsonType(this ActionValueType type) {
+        return type switch {
+            ActionValueType.Number => "number",
+            ActionValueType.Boolean => "boolean",
+            _ => "text"
+        };
+    }
+
     public static string? ConvertValue(string? value, ActionValueType from, ActionValueType to) {
         if (value == null) return null;
         if (from == ActionValueType.Boolean && to == ActionValueType.Number) return value == "true" ? "1" : "0";
diff --git a/SubathonManager.Core/Events/ActionEvents.cs b/SubathonManager.Core/Events/ActionEvents.cs
index 6755ad1..5044b69 100644
--- a/SubathonManager.Core/Events/ActionEvents.cs
+++ b/SubathonManager.Core/Events/ActionEvents.cs
@@ -10,4 +10,10 @@ public static class ActionEvents {
     public static void RaiseCustomActionRunRequested(SubathonEvent ev) {
         CustomActionRunRequested?.Invoke(ev);
     }
+
+    public static event Action<IReadOnlyCollection<string>>? GlobalsUpdated;
+
+    public static void RaiseGlobalsUpdated(IReadOnlyCollection<string> names) {
+        if (names.Count > 0) GlobalsUpdated?.Invoke(names);
+    }
 }
diff --git a/SubathonManager.Core/Models/ActionGlobal.cs b/SubathonManager.Core/Models/ActionGlobal.cs
index ed6b7b4..4efec1a 100644
--- a/SubathonManager.Core/Models/ActionGlobal.cs
+++ b/SubathonManager.Core/Models/ActionGlobal.cs
@@ -18,4 +18,5 @@ public class ActionGlobal {
 
     public DateTime CreatedAt { get; set; } = DateTime.Now;
     public DateTime UpdatedAt { get; set; } = DateTime.Now;
-}
\ No newline at end of file
+}
+public record GlobalTypeConflict(string Name, ActionValueType Existing, ActionValueType Wanted);
diff --git a/SubathonManager.Core/Models/Widget.cs b/SubathonManager.Core/Models/Widget.cs
index 441eb34..b6957e0 100644
--- a/SubathonManager.Core/Models/Widget.cs
+++ b/SubathonManager.Core/Models/Widget.cs
@@ -235,6 +235,27 @@ public partial class Widget {
 
     public WidgetType Type { get; set; } = WidgetType.Html;
 
+    [MaxLength(4096)] public string GlobalVars { get; set; } = string.Empty;
+
+    public const string AllGlobals = "*";
+
+    [NotMapped] public bool ListensToAllGlobals => GlobalVars.Trim() == AllGlobals;
+
+    [NotMapped]
+    public IReadOnlyList<string> GlobalVarNames => ListensToAllGlobals
+        ? []
+        : GlobalVars.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
+            .Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+
+    public bool ListensToGlobal(string name) {
+        return ListensToAllGlobals || GlobalVarNames.Contains(name, StringComparer.OrdinalIgnoreCase);
+    }
+
+    public static string JoinGlobalVars(bool all, IEnumerable<string> names) {
+        return all ? AllGlobals : string.Join(",", names.Select(n => n.Trim()).Where(n => n.Length > 0)
+            .Distinct(StringComparer.OrdinalIgnoreCase));
+    }
+
     public Widget(string name, string htmlPath) {
         Name = name;
         HtmlPath = htmlPath;
@@ -253,6 +274,7 @@ public Widget Clone(Guid? routeId, string? newName, int? newZ) {
         widget.ScaleX = ScaleX;
         widget.ScaleY = ScaleY;
         widget.Type = Type;
+        widget.GlobalVars = GlobalVars;
 
         foreach (JsVariable jsVariable in JsVariables)
             widget.JsVariables.Add(jsVariable.Clone(widget.Id));
@@ -380,6 +402,7 @@ public JsonElement ToJson(string htmlRelPath) {
 
             visibility = Visibility,
             docsUrl = DocsUrl,
+            globalVars = GlobalVars,
 
             cssVariables = CssVariables.Select(v => v.ToJson()).ToArray(),
             jsVariables = JsVariables.Select(v => v.ToJson()).ToArray()
diff --git a/SubathonManager.Core/Objects/WidgetMeta.cs b/SubathonManager.Core/Objects/WidgetMeta.cs
index b0f6e00..435a634 100644
--- a/SubathonManager.Core/Objects/WidgetMeta.cs
+++ b/SubathonManager.Core/Objects/WidgetMeta.cs
@@ -11,6 +11,36 @@ public class WidgetMeta {
     public int Width { get; set; } = 300;
     public int Height { get; set; } = 300;
     public Dictionary<string, WidgetMetaVar> Vars { get; set; } = new();
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public WidgetMetaGlobals? Globals { get; set; }
+}
+
+[ExcludeFromCodeCoverage]
+public class WidgetMetaGlobals {
+    public bool All { get; set; }
+
+    public Dictionary<string, ActionValueType> Vars { get; set; } = new(StringComparer.OrdinalIgnoreCase);
+
+    public string ToWidgetValue() {
+        return Models.Widget.JoinGlobalVars(All, Vars.Keys);
+    }
+
+    public static WidgetMetaGlobals? From(Models.Widget widget, IReadOnlyDictionary<string, ActionValueType>? types,
+        WidgetMetaGlobals? previous = null) {
+        if (string.IsNullOrWhiteSpace(widget.GlobalVars)) return null;
+
+        var result = new WidgetMetaGlobals { All = widget.ListensToAllGlobals };
+        foreach (string name in widget.GlobalVarNames) {
+            ActionValueType? old = previous?.Vars.FirstOrDefault(v =>
+                string.Equals(v.Key, name, StringComparison.OrdinalIgnoreCase)).Value;
+
+            result.Vars[name] = types != null && types.TryGetValue(name, out ActionValueType type)
+                ? type : old ?? ActionValueType.Text;
+        }
+
+        return result;
+    }
 }
 
 [ExcludeFromCodeCoverage]
diff --git a/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.Designer.cs b/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.Designer.cs
new file mode 100644
index 0000000..45b7aa0
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.Designer.cs
@@ -0,0 +1,1179 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SubathonManager.Data;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261006182631_addGlobalsToWidgets")]
+    partial class addGlobalsToWidgets
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ActionGlobal", b =>
+                {
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Kind", "Name");
+
+                    b.ToTable("ActionGlobals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("CssVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.GoAffProStore", b =>
+                {
+                    b.Property<int>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SiteId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.HasIndex("SiteId")
+                        .IsUnique();
+
+                    b.ToTable("GoAffProStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("JsVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.Property<string>("ProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Valid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("JuniperProducts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Property<Guid>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.ToTable("JuniperStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MakeShipTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Orders")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ProductType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Sales")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShopifyProductId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MakeShipTrackings");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("ApplyToPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplyToSeconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<TimeSpan?>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FromHypeTrain")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("Multiplier")
+                        .HasColumnType("REAL");
+
+                    b.Property<DateTime?>("Started")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubathonId")
+                        .IsUnique();
+
+                    b.ToTable("MultiplierDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Routes");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ScheduleItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EndMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StartMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Date");
+
+                    b.ToTable("ScheduleItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.StateValue", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("StateValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<DateTime?>("CapDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPaused")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsCumulative")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsElapsed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneySum")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ReversedTime")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Amount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Command")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CurrentPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CurrentTime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EventTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventTypeMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("MultiplierPoints")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("MultiplierSeconds")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("PointsValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ProcessedToSubathon")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecondaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("SecondsValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TertiaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WasReversed")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id", "Source");
+
+                    b.HasIndex("SubathonId");
+
+                    b.ToTable("SubathonEvents");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<Guid?>("GoalSetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GoalSetId");
+
+                    b.ToTable("SubathonGoals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonGoalSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("CompletionDuration")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("FilterEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FilterMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FilterSubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPrompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("BaselineCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("SnapshotTargetValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPromptRuns");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("Cooldown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("RandomOffset")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonPromptSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonValue", b =>
+                {
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Meta")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(1);
+
+                    b.Property<double>("Points")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("Seconds")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("EventType", "Meta");
+
+                    b.ToTable("SubathonValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Weight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.ToTable("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("ActionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Parameter")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelItemId")
+                        .IsUnique();
+
+                    b.ToTable("WheelSpinActions");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.HasIndex("WheelItemId");
+
+                    b.ToTable("WheelSpinHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CountThreshold")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneyThreshold")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("SpinsToAdd")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TierValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSpinTriggers");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinsAdded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SubathonEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SubathonEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TriggerSource")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TriggerUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("TriggeredAt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("WheelSpinTriggerHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GlobalVars")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HtmlPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RouteId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("X")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("Y")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Z")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RouteId");
+
+                    b.ToTable("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WidgetCatalogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Entry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileModifiedTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Group")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastSeenUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewCachePath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewImage")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackPath")
+                        .IsUnique();
+
+                    b.ToTable("WidgetCatalogEntries");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("CssVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("JsVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.JuniperStore", "Store")
+                        .WithMany("Products")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithOne("Multiplier")
+                        .HasForeignKey("SubathonManager.Core.Models.MultiplierData", "SubathonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithMany()
+                        .HasForeignKey("SubathonId");
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonGoalSet", "LinkedGoalSet")
+                        .WithMany("Goals")
+                        .HasForeignKey("GoalSetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedGoalSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany("Prompts")
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPrompt", "LinkedPrompt")
+                        .WithMany()
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany()
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("LinkedPrompt");
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany("WheelItems")
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithOne("Action")
+                        .HasForeignKey("SubathonManager.Core.Models.WheelSpinAction", "WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany()
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithMany()
+                        .HasForeignKey("WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSpinTrigger", "Trigger")
+                        .WithMany("History")
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Route", "Route")
+                        .WithMany("Widgets")
+                        .HasForeignKey("RouteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Route");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Navigation("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Navigation("Multiplier")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Navigation("Goals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Navigation("Prompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Navigation("Action");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Navigation("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Navigation("History");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Navigation("CssVariables");
+
+                    b.Navigation("JsVariables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.cs b/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.cs
new file mode 100644
index 0000000..3485dda
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261006182631_addGlobalsToWidgets.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class addGlobalsToWidgets : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "GlobalVars",
+                table: "Widgets",
+                type: "TEXT",
+                maxLength: 4096,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GlobalVars",
+                table: "Widgets");
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
index 30d2e2f..7b17649 100644
--- a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -844,6 +844,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("DocsUrl")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("GlobalVars")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT");
+
                     b.Property<int>("Height")
                         .HasColumnType("INTEGER");
 
diff --git a/SubathonManager.Data/OverlayPorter.cs b/SubathonManager.Data/OverlayPorter.cs
index 7ceb669..1a6c769 100644
--- a/SubathonManager.Data/OverlayPorter.cs
+++ b/SubathonManager.Data/OverlayPorter.cs
@@ -10,6 +10,7 @@
 using SubathonManager.Core.Enums;
 using SubathonManager.Core.Interfaces;
 using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
 using SubathonManager.Data.Overlays;
 using SubathonManager.Data.Widgets;
 
@@ -29,13 +30,20 @@ public static class OverlayPorter {
         Converters = { new JsonStringEnumConverter() }
     };
 
+    private static readonly JsonSerializerOptions ReadOptions = new() {
+        PropertyNameCaseInsensitive = true,
+        Converters = { new JsonStringEnumConverter() }
+    };
+
     #region EXPORT
 
     public static async Task ExportRouteAsync(Route route, string outputPath, string exportName,
         HashSet<string>? excludedZipEntries = null, string version = "1", string appVersion = "",
-        string author = "", List<string>? tags = null) {
+        string author = "", List<string>? tags = null,
+        IReadOnlyDictionary<string, ActionValueType>? globalTypes = null) {
         List<Widget> widgets = route.Widgets.ToList();
         ExportPlan plan = BuildExportPlan(widgets, excludedZipEntries);
+        plan.GlobalTypes = globalTypes;
 
         await using var fileStream = new FileStream(outputPath, FileMode.Create, FileAccess.Write);
         using var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, false);
@@ -202,6 +210,7 @@ private static JsonElement BuildManifest(Route route, List<Widget> widgets, Expo
                 scale = new { x = w.ScaleX, y = w.ScaleY },
                 visibility = w.Visibility,
                 docsUrl = w.DocsUrl,
+                globals = WidgetMetaGlobals.From(w, plan.GlobalTypes),
                 cssVariables = w.CssVariables.Select(v => new { name = v.Name, value = v.Value }),
                 jsVariables = jsVars
             };
@@ -329,10 +338,17 @@ public static async Task<ImportResult> ImportExtractedRouteAsync(
         var newCssVariables = new List<CssVariable>();
         var newJsVariables = new List<JsVariable>();
         var repointedWidgets = new List<Widget>();
+        var requiredGlobals = new Dictionary<string, ActionValueType>(StringComparer.OrdinalIgnoreCase);
 
         foreach (ManifestWidget mw in manifestWidgets) {
             JsonElement wEl = mw.Element;
             string htmlAbsPath = mw.HtmlAbsPath;
+            WidgetMetaGlobals? widgetGlobals = ReadGlobals(wEl);
+            if (widgetGlobals != null) {
+                foreach ((string name, ActionValueType type) in widgetGlobals.Vars) {
+                    requiredGlobals.TryAdd(name, type);
+                }
+            }
 
             string widgetExtractFolder = mw.PackFolder != null
                 ? mw.OverlayFolder
@@ -359,7 +375,8 @@ public static async Task<ImportResult> ImportExtractedRouteAsync(
                     Id = Guid.NewGuid(), RouteId = route.Id,
                     Type = widgetType,
                     Visibility = wEl.GetProperty("visibility").GetBoolean(),
-                    DocsUrl = wEl.TryGetProperty("docsUrl", out JsonElement du) ? du.GetString() : null
+                    DocsUrl = wEl.TryGetProperty("docsUrl", out JsonElement du) ? du.GetString() : null,
+                    GlobalVars = widgetGlobals?.ToWidgetValue() ?? string.Empty
                 };
 
                 JsonElement pos = wEl.GetProperty("position");
@@ -430,6 +447,7 @@ public static async Task<ImportResult> ImportExtractedRouteAsync(
             NewCssVariables = newCssVariables,
             NewJsVariables = newJsVariables,
             RepointedWidgets = repointedWidgets,
+            RequiredGlobals = requiredGlobals,
             RouteIsNew = routeIsNew,
             MergedRouteId = routeIsNew ? null : route!.Id,
             MergedRouteName = renameMerged ? routeName : null
@@ -438,6 +456,16 @@ public static async Task<ImportResult> ImportExtractedRouteAsync(
 
     private record ManifestWidget(JsonElement Element, string HtmlAbsPath, string OverlayFolder, string? PackFolder);
 
+    private static WidgetMetaGlobals? ReadGlobals(JsonElement widgetElem) {
+        if (!widgetElem.TryGetProperty("globals", out JsonElement el) || el.ValueKind != JsonValueKind.Object) return null;
+        try {
+            return el.Deserialize<WidgetMetaGlobals>(ReadOptions);
+        }
+        catch (JsonException) {
+            return null;
+        }
+    }
+
     private static ManifestWidget ResolveManifestWidget(JsonElement wEl, string extractDir) {
         string htmlZipRelPath = wEl.TryGetProperty("htmlPath", out JsonElement hp) ? hp.GetString() ?? "" : "";
 
@@ -624,6 +652,8 @@ public class ImportResult {
         public string? FailReason { get; init; }
 
         public List<Widget> RepointedWidgets { get; init; } = [];
+
+        public Dictionary<string, ActionValueType> RequiredGlobals { get; init; } = new(StringComparer.OrdinalIgnoreCase);
         public Guid? MergedRouteId { get; init; }
         public string? MergedRouteName { get; init; }
 
@@ -645,6 +675,7 @@ private class ExportPlan {
         public Dictionary<Guid, PackReference> WidgetPacks { get; } = new();
         public List<(string Src, string ZipEntry)> FileCopies { get; } = [];
         public Dictionary<Guid, Dictionary<string, string>> VariableRewrites { get; } = new();
+        public IReadOnlyDictionary<string, ActionValueType>? GlobalTypes { get; set; }
     }
 
     #endregion
diff --git a/SubathonManager.Data/WidgetPorter.cs b/SubathonManager.Data/WidgetPorter.cs
index 35313a0..af8e296 100644
--- a/SubathonManager.Data/WidgetPorter.cs
+++ b/SubathonManager.Data/WidgetPorter.cs
@@ -118,6 +118,8 @@ public class ExportPlan {
         public Dictionary<string, (string ZipEntry, string Value)> OptionalRewrites { get; }
             = new(StringComparer.OrdinalIgnoreCase);
 
+        public Dictionary<string, ActionValueType> GlobalTypes { get; } = new(StringComparer.OrdinalIgnoreCase);
+
         public bool IsSelected(string zipEntry) {
             return Entries.Any(e => e.ZipEntry.Equals(zipEntry, StringComparison.OrdinalIgnoreCase)
                                     && (e.Locked || e.DefaultSelected));
@@ -542,6 +544,8 @@ private static string BuildWidgetMetaJson(Widget widget, ExportPlan plan, SmwExp
             metaVar.Value = ToMetaValue(jsVar.Type, plan.ResolveVarValue(jsVar), metaVar);
         }
 
+        meta.Globals = WidgetMetaGlobals.From(widget, plan.GlobalTypes, meta.Globals);
+
         return JsonSerializer.Serialize(meta, MetaOptions);
     }
 
diff --git a/SubathonManager.Server/WebServer.Api.cs b/SubathonManager.Server/WebServer.Api.cs
index 233a107..4f638ac 100644
--- a/SubathonManager.Server/WebServer.Api.cs
+++ b/SubathonManager.Server/WebServer.Api.cs
@@ -1,7 +1,9 @@
 using System.Collections.Specialized;
+using System.Globalization;
 using System.Text.Json;
 using System.Web;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SubathonManager.Core;
 using SubathonManager.Core.Enums;
@@ -10,6 +12,7 @@
 using SubathonManager.Data;
 using SubathonManager.Integration;
 using SubathonManager.Server.Interfaces;
+using SubathonManager.Services;
 
 // ReSharper disable NullableWarningSuppressionIsUsed
 
@@ -28,6 +31,11 @@ private void SetupApiRoutes() {
 
         _routes.Add((new RouteKey("GET", "/api/data/commands"), HandleCommandsRequestAsync));
 
+        _routes.Add((new RouteKey("GET", "/api/data/globals"), HandleGlobalsRequestAsync));
+        _routes.Add((new RouteKey("POST", "/api/data/globals"), HandleGlobalsSetRequestAsync));
+        _routes.Add((new RouteKey("PUT", "/api/data/globals"), HandleGlobalsSetRequestAsync));
+        _routes.Add((new RouteKey("PATCH", "/api/data/globals"), HandleGlobalsSetRequestAsync));
+
         _routes.Add((new RouteKey("GET", "/api/data/leaderboard"), HandleLeaderboardRequestAsync));
 
         _routes.Add((new RouteKey("PUT", "/api/data/values"), HandleValuesPatchRequestAsync));
@@ -280,6 +288,136 @@ internal async Task HandleCommandsRequestAsync(IHttpContext ctx) {
         await ctx.WriteResponse(200, json, true, "application/json");
     }
 
+    internal async Task HandleGlobalsRequestAsync(IHttpContext ctx) {
+        NameValueCollection query = HttpUtility.ParseQueryString(ctx.QueryString ?? string.Empty);
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        List<ActionGlobal> globals = await LoadGlobalsAsync(db);
+
+        if (query["widget"] is { } widgetParam) {
+            Widget? widget = Guid.TryParse(widgetParam, out Guid widgetId)
+                ? await db.Widgets.AsNoTracking().FirstOrDefaultAsync(w => w.Id == widgetId)
+                : null;
+            if (widget == null) {
+                await ctx.WriteResponse(404, "Widget not found");
+                return;
+            }
+
+            globals = globals.Where(g => widget.ListensToGlobal(g.Name)).ToList();
+        }
+
+        if (query["name"] is { } nameParam) {
+            var names = new HashSet<string>(nameParam.Split(',',
+                StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries), StringComparer.OrdinalIgnoreCase);
+            globals = globals.Where(g => names.Contains(g.Name)).ToList();
+        }
+
+        string json = JsonSerializer.Serialize(new { globals = globals.Select(GlobalToObject) });
+        await ctx.WriteResponse(200, json, true, "application/json");
+    }
+
+    internal async Task HandleGlobalsSetRequestAsync(IHttpContext ctx) {
+        async Task Fail(int code, string error2) {
+            await ctx.WriteResponse(code, JsonSerializer.Serialize(new { error2 }), true, "application/json");
+        }
+
+        var actions = AppServices.Provider?.GetService<ActionService>();
+        if (actions == null) {
+            await Fail(503, "Actions aren't available");
+            return;
+        }
+
+        NameValueCollection query = HttpUtility.ParseQueryString(ctx.QueryString ?? string.Empty);
+        var fields = new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase) {
+            ["name"] = query["name"], ["type"] = query["type"], ["op"] = query["op"], ["value"] = query["value"]
+        };
+        ActionValueType? sentType = null;
+
+        string body;
+        using (var reader = new StreamReader(ctx.Body, ctx.Encoding)) {
+            body = await reader.ReadToEndAsync();
+        }
+
+        if (!string.IsNullOrWhiteSpace(body))
+            try {
+                using JsonDocument doc = JsonDocument.Parse(body);
+                if (doc.RootElement.ValueKind != JsonValueKind.Object) throw new JsonException();
+
+                foreach (JsonProperty prop in doc.RootElement.EnumerateObject()) {
+                    fields[prop.Name] = prop.Value.ValueKind switch {
+                        JsonValueKind.String => prop.Value.GetString(),
+                        JsonValueKind.Null or JsonValueKind.Undefined => null,
+                        _ => prop.Value.GetRawText()
+                    };
+
+                    if (!prop.Name.Equals("value", StringComparison.OrdinalIgnoreCase)) continue;
+                    sentType = prop.Value.ValueKind switch {
+                        JsonValueKind.Number => ActionValueType.Number,
+                        JsonValueKind.True or JsonValueKind.False => ActionValueType.Boolean,
+                        _ => null
+                    };
+                }
+            }
+            catch (JsonException) {
+                await Fail(400, "Body must be a JSON object");
+                return;
+            }
+
+        string name = fields.GetValueOrDefault("name")?.Trim() ?? string.Empty;
+        if (name.Length == 0) {
+            await Fail(400, "name is required");
+            return;
+        }
+
+        if (fields.GetValueOrDefault("type") is { } typeText && !string.IsNullOrWhiteSpace(typeText)) {
+            ActionValueType? named = typeText.Trim().ToLowerInvariant() switch {
+                "text" or "string" => ActionValueType.Text,
+                "number" => ActionValueType.Number,
+                "boolean" or "bool" => ActionValueType.Boolean,
+                _ => null
+            };
+            if (named == null || (sentType != null && sentType != named)) {
+                await Fail(400, named == null
+                    ? $"Unknown type \"{typeText}\" (text, number or boolean)"
+                    : $"value is a {sentType!.Value.GetLabel()} but type says {named.Value.GetLabel()}");
+                return;
+            }
+
+            sentType = named;
+        }
+
+        string? value = fields.GetValueOrDefault("value");
+        string op = (fields.GetValueOrDefault("op") ?? "set").Trim().ToLowerInvariant();
+        ActionOperation? operation = op switch {
+            "set" => ActionOperation.Set,
+            "add" or "subtract" => ActionOperation.Adjust,
+            "toggle" => ActionOperation.Toggle,
+            _ => null
+        };
+        if (operation == null) {
+            await Fail(400, $"Unknown operation \"{op}\" (set, add, subtract or toggle)");
+            return;
+        }
+
+        if (op == "subtract" && value != null) {
+            if (ActionValueType.Number.NormalizeValue(value) is not { } amount) {
+                await Fail(400, $"Can't subtract \"{value}\", it isn't a number");
+                return;
+            }
+
+            value = (-double.Parse(amount, CultureInfo.InvariantCulture)).ToString(CultureInfo.InvariantCulture);
+        }
+
+        (ActionGlobal? global, bool created, string? error) =
+            await actions.ChangeGlobalAsync(name, sentType, operation.Value, value, true);
+        if (global == null) {
+            await Fail(400, error ?? "Could not set global");
+            return;
+        }
+
+        await ctx.WriteResponse(200, JsonSerializer.Serialize(new { created, global = GlobalToObject(global) }), true,
+            "application/json");
+    }
+
     private async Task HandleValuesRequestAsync(IHttpContext ctx) {
         string json = await _valueHelper.GetAllAsJsonAsync();
         await ctx.WriteResponse(200, json);
diff --git a/SubathonManager.Server/WebServer.WebSocket.cs b/SubathonManager.Server/WebServer.WebSocket.cs
index f54893f..393ae01 100644
--- a/SubathonManager.Server/WebServer.WebSocket.cs
+++ b/SubathonManager.Server/WebServer.WebSocket.cs
@@ -43,6 +43,8 @@ private void SetupWebsocketListeners() {
         WheelEvents.WheelSpinResult += SendWheelSpinResult;
         WheelEvents.WheelSpinStatusChanged += SendWheelSpinStatusChanged;
         WheelEvents.WheelDataChanged += SendWheelDataChanged;
+
+        ActionEvents.GlobalsUpdated += SendGlobalsUpdate;
     }
 
     private void StopWebsocketServer() {
@@ -67,6 +69,8 @@ private void StopWebsocketServer() {
         WheelEvents.WheelSpinStatusChanged -= SendWheelSpinStatusChanged;
         WheelEvents.WheelDataChanged -= SendWheelDataChanged;
 
+        ActionEvents.GlobalsUpdated -= SendGlobalsUpdate;
+
         List<IWebSocketClient> clientsCopy;
         lock (_lock) {
             clientsCopy = _clients.ToList();
@@ -101,6 +105,93 @@ internal void SendWidgetReload(Guid widgetId, float x, float y, int width, int h
             x, y, width, height, scaleX, scaleY
         };
         BroadcastObject(data, WebsocketClientMessageType.Overlay);
+        _ = SendGlobalsSnapshotAsync(null, widgetId);
+    }
+
+    ////////////////// globals for widgets
+    private readonly SemaphoreSlim _globalsSendLock = new(1, 1);
+
+    internal static object GlobalToObject(ActionGlobal global) {
+        return new {
+            name = global.Name,
+            type = global.ValueType.GetJsonType(),
+            value = global.ValueType.ToTypedValue(global.Value)
+        };
+    }
+
+    internal static async Task<List<ActionGlobal>> LoadGlobalsAsync(AppDbContext db) {
+        return (await db.ActionGlobals.AsNoTracking().Where(g => g.Kind == ActionStoreKind.Global).ToListAsync())
+            .OrderBy(g => g.Name, StringComparer.OrdinalIgnoreCase).ToList();
+    }
+
+    private static object GlobalsMessage(Guid widgetId, bool full, IEnumerable<ActionGlobal> globals,
+        IEnumerable<string> removed) {
+        return new {
+            type = "globals_update",
+            widgetId = widgetId.ToString(),
+            full,
+            globals = globals.Select(GlobalToObject).ToArray(),
+            removed = removed.ToArray()
+        };
+    }
+
+    internal async Task SendGlobalsSnapshotAsync(IWebSocketClient? socket, Guid widgetId) {
+        try {
+            await _globalsSendLock.WaitAsync();
+            try {
+                await using AppDbContext db = await _factory.CreateDbContextAsync();
+                Widget? widget = await db.Widgets.AsNoTracking().FirstOrDefaultAsync(w => w.Id == widgetId);
+                if (widget == null || string.IsNullOrWhiteSpace(widget.GlobalVars)) return;
+
+                object data = GlobalsMessage(widgetId, true,
+                    (await LoadGlobalsAsync(db)).Where(g => widget.ListensToGlobal(g.Name)), []);
+                if (socket != null) await SelectSendAsync(socket, data);
+                else BroadcastObject(data, WebsocketClientTypeHelper.ConsumersList);
+            }
+            finally {
+                _globalsSendLock.Release();
+            }
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "Failed to send globals to widget {WidgetId}", widgetId);
+        }
+    }
+
+    internal void SendGlobalsUpdate(IReadOnlyCollection<string> names) {
+        Task.Run(() => SendGlobalsUpdateAsync(names));
+    }
+
+    internal async Task SendGlobalsUpdateAsync(IReadOnlyCollection<string> names) {
+        try {
+            await _globalsSendLock.WaitAsync();
+            try {
+                await using AppDbContext db = await _factory.CreateDbContextAsync();
+                List<Widget> widgets = await db.Widgets.AsNoTracking().Where(w => w.GlobalVars != "").ToListAsync();
+                if (widgets.Count == 0) return;
+
+                var changed = new HashSet<string>(names, StringComparer.OrdinalIgnoreCase);
+                Dictionary<string, ActionGlobal> current = (await LoadGlobalsAsync(db))
+                    .Where(g => changed.Contains(g.Name))
+                    .ToDictionary(g => g.Name, StringComparer.OrdinalIgnoreCase);
+
+                foreach (Widget widget in widgets) {
+                    List<string> wanted = changed.Where(widget.ListensToGlobal).ToList();
+
+                    if (wanted.Count == 0) continue;
+
+                    BroadcastObject(GlobalsMessage(widget.Id, false,
+                            wanted.Where(current.ContainsKey).Select(n => current[n]),
+                            wanted.Where(n => !current.ContainsKey(n))),
+                        WebsocketClientTypeHelper.ConsumersList);
+                }
+            }
+            finally {
+                _globalsSendLock.Release();
+            }
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "Failed to send globals update");
+        }
     }
 
     internal void SendPromptData(SubathonPromptRun? run, long progress = 0) {
@@ -456,6 +547,11 @@ private async Task Listen(IWebSocketClient socket) {
                             _logger?.LogDebug(
                                 $"[WebSocket] [{socket.ClientId}] Hello from {json.RootElement.GetProperty("origin").GetString()}");
                             break;
+                        case "globals":
+                            if (json.RootElement.TryGetProperty("widgetId", out JsonElement widgetEl)
+                                && Guid.TryParse(widgetEl.GetString(), out Guid widgetGuid))
+                                await SendGlobalsSnapshotAsync(socket, widgetGuid);
+                            break;
                     }
 
                     if (Enum.TryParse(type.GetString(), out clientMessageType))
@@ -750,11 +846,13 @@ public string GetWebsocketInjectionScript(string? routeId = "") {
                 wheel_spin_result:   'handleWheelSpinResult',
                 wheel_data:          'handleWheelData',
                 wheel_spin_start:    'handleWheelSpinStart',
-                wheel_spin_status:   'handleWheelSpinStatus'
+                wheel_spin_status:   'handleWheelSpinStatus',
+                globals_update:      'handleGlobalVars'
             };
 
             var listeners = {};
             var state = {};
+            var globals = {};
 
             var socket = null, reconnectTimer = null, pingTimer = null, connected = false;
             var relayParent = null, relayTimer = null, relayTries = 0, gaveUpOnRelay = false;
@@ -785,6 +883,7 @@ function callLegacy(data) {
 
             function dispatch(data) {
                 if (!data || typeof data.type !== 'string') return;
+                if (data.type === 'globals_update' && !takeGlobals(data)) return;
                 if (STATE_TYPES[data.type]) state[data.type] = data;
 
                 builtin(data);
@@ -794,6 +893,26 @@ function dispatch(data) {
                 emit('*', data);
             }
 
+            function takeGlobals(data) {
+                if (IS_OVERLAY || !api.widgetId || data.widgetId !== api.widgetId) return false;
+                if (data.full) globals = {};
+                var list = data.globals || [], removed = data.removed || [], i;
+                for (i = 0; i < removed.length; i++) delete globals[removed[i]];
+                for (i = 0; i < list.length; i++) globals[list[i].name] = list[i];
+                data.all = Object.assign({}, globals);
+                state.globals_update = {
+                    type: 'globals_update', widgetId: data.widgetId, full: true,
+                    globals: Object.keys(globals).map(function (k) { return globals[k]; }),
+                    removed: [], all: data.all
+                };
+                return true;
+            }
+
+            function requestGlobals() {
+                if (IS_OVERLAY || !api.widgetId) return;
+                api.send({ ws_type: 'globals', widgetId: api.widgetId });
+            }
+
             function replayStateToLegacy() {
                 for (var type in state)
                     if (!legacyServed[type]) callLegacy(state[type]);
@@ -837,6 +956,7 @@ function setConnected(isUp) {
                 connected = isUp;
                 if (IS_OVERLAY) relayPostAll({ kind: 'status', connected: isUp });
                 if (isUp) {
+                    requestGlobals();
                     if (typeof window.handleSubathonConnect === 'function') safe(window.handleSubathonConnect);
                     emit('connect', { type: 'connect' });
                 } else {
@@ -996,6 +1116,9 @@ function openSocket() {
                 get state() { return state; },
                 get: function (type) { return state[type] || null; },
 
+                get globals() { return Object.assign({}, globals); },
+                global: function (name) { return globals[name] ? globals[name].value : undefined; },
+
                 on: function (type, fn, opts) {
                     if (typeof fn !== 'function') return api;
                     (listeners[type] || (listeners[type] = [])).push(fn);
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
index e897039..c46a433 100644
--- a/SubathonManager.Services/ActionService.cs
+++ b/SubathonManager.Services/ActionService.cs
@@ -316,6 +316,11 @@ private async Task<ActionStep> FillVariablesAsync(ActionStep step, ActionContext
     ////////////////// globals & secrets
     public event Action? GlobalsChanged;
 
+    private void NotifyGlobals(params string[] globalNames) {
+        GlobalsChanged?.Invoke();
+        ActionEvents.RaiseGlobalsUpdated(globalNames);
+    }
+
     private static string SecretKey(string name) {
         return $"{StorageKeys.ActionSecretPrefix}{name.ToLowerInvariant()}";
     }
@@ -328,6 +333,11 @@ public async Task<List<ActionGlobal>> GetGlobalsAsync(ActionStoreKind? kind = nu
             .ToListAsync();
     }
 
+    public async Task<Dictionary<string, ActionValueType>> GetGlobalTypesAsync() {
+        return (await GetGlobalsAsync(ActionStoreKind.Global))
+            .ToDictionary(g => g.Name, g => g.ValueType, StringComparer.OrdinalIgnoreCase);
+    }
+
     private async Task<Dictionary<string, string?>> GetGlobalValuesAsync(List<string> names) {
         var wanted = new HashSet<string>(names, StringComparer.OrdinalIgnoreCase);
         await using AppDbContext db = await factory.CreateDbContextAsync();
@@ -361,7 +371,7 @@ public async Task<bool> SetSecretAsync(string name, string value) {
             _globalsLock.Release();
         }
 
-        GlobalsChanged?.Invoke();
+        NotifyGlobals();
         return true;
     }
 
@@ -391,7 +401,7 @@ public async Task<bool> SetSecretAsync(string name, string value) {
             _globalsLock.Release();
         }
 
-        GlobalsChanged?.Invoke();
+        NotifyGlobals(name);
         return null;
     }
 
@@ -416,7 +426,7 @@ public async Task<bool> SetGlobalTypeAsync(string name, ActionValueType type) {
             _globalsLock.Release();
         }
 
-        GlobalsChanged?.Invoke();
+        NotifyGlobals(name);
         return kept;
     }
 
@@ -424,38 +434,68 @@ public async Task DeleteGlobalAsync(ActionStoreKind kind, string name) {
         await using AppDbContext db = await factory.CreateDbContextAsync();
         await db.ActionGlobals.Where(g => g.Kind == kind && g.Name == name).ExecuteDeleteAsync();
         if (kind == ActionStoreKind.Secret) secureStorage?.Delete(SecretKey(name));
-        GlobalsChanged?.Invoke();
+        if (kind == ActionStoreKind.Global) NotifyGlobals(name);
+        else NotifyGlobals();
     }
 
     private async Task<bool> RunSetGlobalAsync(ActionStep step, CancellationToken ct) {
-        string name = step.Target.Trim();
+        (_, _, string? error) = await ChangeGlobalAsync(step.Target, null, step.Operation, step.Body ?? "", false, ct);
+        if (error == null) return true;
+        logger?.LogWarning("[Actions] {Error}", error);
+        return false;
+    }
+
+    public async Task<(ActionGlobal? Global, bool Created, string? Error)> ChangeGlobalAsync(string name,
+        ActionValueType? type, ActionOperation operation, string? value, bool create, CancellationToken ct = default) {
+        name = name.Trim();
+        if (!ActionStepTypeHelper.IsValidName(name))
+            return (null, false, $"\"{name}\" isn't a valid global name (letters, numbers, and _ only)");
+
+        ActionGlobal? row;
+        bool created;
         await _globalsLock.WaitAsync(ct);
         try {
             await using AppDbContext db = await factory.CreateDbContextAsync(ct);
-            ActionGlobal? row = await db.ActionGlobals
-                .FirstOrDefaultAsync(g => g.Kind == ActionStoreKind.Global && g.Name == name, ct);
-            if (row == null) {
-                logger?.LogWarning("[Actions] There is no global named \"{Name}\" to set", name);
-                return false;
-            }
+            row = (await db.ActionGlobals.Where(g => g.Kind == ActionStoreKind.Global).ToListAsync(ct))
+                .FirstOrDefault(g => g.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
+            created = row == null;
+
+            if (row == null && !create) return (null, false, $"There is no global named \"{name}\" to set");
+            if (row != null && type != null && type != row.ValueType)
+                return (null, false, $"%global.{row.Name}% is {row.ValueType.GetLabel()}, not {type.Value.GetLabel()}");
 
-            string input = row.ValueType == ActionValueType.Text ? step.Body ?? "" : (step.Body ?? "").Trim();
-            string? next = step.Operation switch {
-                ActionOperation.Toggle when row.ValueType == ActionValueType.Boolean =>
-                    row.Value == "true" ? "false" : "true",
-                ActionOperation.Adjust when row.ValueType == ActionValueType.Number
+            ActionValueType? implied = operation switch {
+                ActionOperation.Adjust => ActionValueType.Number,
+                ActionOperation.Toggle => ActionValueType.Boolean,
+                _ => null
+            };
+            if (row == null && (type ?? implied) == null)
+                return (null, false, $"A type is needed to make the global \"{name}\"");
+
+            ActionValueType valueType = row?.ValueType ?? type ?? implied!.Value;
+            string current = valueType.NormalizeValue(row?.Value) ?? valueType.DefaultValue();
+            string input = valueType == ActionValueType.Text ? value ?? "" : (value ?? "").Trim();
+            string? next = operation switch {
+                ActionOperation.Toggle when valueType == ActionValueType.Boolean =>
+                    current == "true" ? "false" : "true",
+                ActionOperation.Adjust when valueType == ActionValueType.Number
                                             && ActionValueType.Number.NormalizeValue(input) is { } amount =>
                     ActionValueType.Number.NormalizeValue(
-                        (double.Parse(row.Value ?? "0", CultureInfo.InvariantCulture)
+                        (double.Parse(current, CultureInfo.InvariantCulture)
                          + double.Parse(amount, CultureInfo.InvariantCulture)).ToString(CultureInfo.InvariantCulture)),
-                ActionOperation.Set => row.ValueType.NormalizeValue(input),
+                ActionOperation.Set when value != null => valueType.NormalizeValue(input),
                 _ => null
             };
 
-            if (next == null) {
-                logger?.LogWarning("[Actions] Can't {Operation} %global.{Name}% ({Type}) with \"{Value}\"",
-                    step.Operation.GetOpLabel().ToLowerInvariant(), row.Name, row.ValueType.GetLabel(), input);
-                return false;
+            if (next == null)
+                return (null, false, operation is ActionOperation.Set or ActionOperation.Adjust && value == null
+                    ? $"A value is needed to {operation.GetOpLabel().ToLowerInvariant()} %global.{row?.Name ?? name}%"
+                    : $"Can't {operation.GetOpLabel().ToLowerInvariant()} %global.{row?.Name ?? name}% " +
+                      $"({valueType.GetLabel()}) with \"{input}\"");
+
+            if (row == null) {
+                row = new ActionGlobal { Kind = ActionStoreKind.Global, Name = name, ValueType = valueType };
+                db.ActionGlobals.Add(row);
             }
 
             row.Value = next;
@@ -466,54 +506,90 @@ private async Task<bool> RunSetGlobalAsync(ActionStep step, CancellationToken ct
             _globalsLock.Release();
         }
 
-        GlobalsChanged?.Invoke();
-        return true;
+        NotifyGlobals(row.Name);
+        return (row, created, null);
     }
 
-    public async Task<int> EnsureGlobalsAsync(CustomAction action) {
-        var used = new Dictionary<(ActionStoreKind, string), ActionValueType>(new StoreKeyComparer());
+    public async Task<int> EnsureGlobalsAsync(CustomAction action, bool reportConflicts = false) {
+        var used = new Dictionary<(ActionStoreKind, string), (ActionValueType Type, bool Strict)>(
+            new StoreKeyComparer());
         foreach (ActionNode node in action.Graph.Nodes) {
             foreach ((ActionStoreKind kind, string name) in ActionStepTypeHelper.FindStoreRefs(node.Step.AllText))
-                used.TryAdd((kind, name), ActionValueType.Text);
+                used.TryAdd((kind, name), (ActionValueType.Text, false));
             if (node.Step.Type != ActionStepType.SetGlobal ||
                 !ActionStepTypeHelper.IsValidName(node.Step.Target.Trim()))
                 continue;
 
             used[(ActionStoreKind.Global, node.Step.Target.Trim())] = node.Step.Operation switch {
-                ActionOperation.Adjust => ActionValueType.Number,
-                ActionOperation.Toggle => ActionValueType.Boolean,
-                _ => ActionValueType.Text
+                ActionOperation.Adjust => (ActionValueType.Number, true),
+                ActionOperation.Toggle => (ActionValueType.Boolean, true),
+                _ => (ActionValueType.Text, false)
             };
         }
 
-        if (used.Count == 0) return 0;
+        return (await EnsureStoreAsync(used, $"Action \"{action.Name}\"", reportConflicts)).Added;
+    }
+
+    public async Task<IReadOnlyList<GlobalTypeConflict>> EnsureTypedGlobalsAsync(
+        IReadOnlyDictionary<string, ActionValueType> wanted, string source) {
+        Dictionary<(ActionStoreKind, string), (ActionValueType, bool)> used = wanted
+            .Where(w => ActionStepTypeHelper.IsValidName(w.Key.Trim()))
+            .DistinctBy(w => w.Key.Trim(), StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(w => (ActionStoreKind.Global, w.Key.Trim()), w => (w.Value, true), new StoreKeyComparer());
+        return (await EnsureStoreAsync(used, source, true)).Conflicts;
+    }
+
+    public event Action<string, IReadOnlyList<GlobalTypeConflict>>? GlobalTypeConflictsFound;
+
+    private async Task<(int Added, IReadOnlyList<GlobalTypeConflict> Conflicts)> EnsureStoreAsync(
+        Dictionary<(ActionStoreKind, string), (ActionValueType Type, bool Strict)> used, string source,
+        bool reportConflicts) {
+        if (used.Count == 0) return (0, []);
 
         List<ActionGlobal> added;
+        List<GlobalTypeConflict> conflicts;
         await _globalsLock.WaitAsync();
         try {
             await using AppDbContext db = await factory.CreateDbContextAsync();
-            HashSet<(ActionStoreKind, string)> known = (await db.ActionGlobals.Select(g => new { g.Kind, g.Name })
+            Dictionary<(ActionStoreKind, string), ActionGlobal> known = (await db.ActionGlobals.AsNoTracking()
                     .ToListAsync())
-                .Select(g => (g.Kind, g.Name)).ToHashSet(new StoreKeyComparer());
-            added = used.Where(u => !known.Contains(u.Key))
+                .ToDictionary(g => (g.Kind, g.Name), g => g, new StoreKeyComparer());
+
+            conflicts = used.Where(u => u.Value.Strict && known.TryGetValue(u.Key, out ActionGlobal? g)
+                                                       && g.Kind == ActionStoreKind.Global
+                                                       && g.ValueType != u.Value.Type)
+                .Select(u => new GlobalTypeConflict(known[u.Key].Name, known[u.Key].ValueType, u.Value.Type))
+                .ToList();
+
+            added = used.Where(u => !known.ContainsKey(u.Key))
                 .Select(u => new ActionGlobal {
-                    Kind = u.Key.Item1, Name = u.Key.Item2, ValueType = u.Value,
-                    Value = u.Key.Item1 == ActionStoreKind.Global ? u.Value.DefaultValue() : null,
+                    Kind = u.Key.Item1, Name = u.Key.Item2, ValueType = u.Value.Type,
+                    Value = u.Key.Item1 == ActionStoreKind.Global ? u.Value.Type.DefaultValue() : null,
                     StorageKey = u.Key.Item1 == ActionStoreKind.Secret ? SecretKey(u.Key.Item2) : null
                 })
                 .ToList();
-            if (added.Count == 0) return 0;
-            db.ActionGlobals.AddRange(added);
-            await db.SaveChangesAsync();
+            if (added.Count > 0) {
+                db.ActionGlobals.AddRange(added);
+                await db.SaveChangesAsync();
+            }
         }
         finally {
             _globalsLock.Release();
         }
 
-        logger?.LogInformation("[Actions] \"{Action}\" uses globals / secrets not set up yet: {Names}", action.Name,
-            string.Join(", ", added.Select(g => ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name))));
-        GlobalsChanged?.Invoke();
-        return added.Count;
+        if (added.Count > 0) {
+            logger?.LogInformation("[Actions] {Source} uses globals / secrets not set up yet: {Names}", source,
+                string.Join(", ", added.Select(g => ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name))));
+            NotifyGlobals(added.Where(g => g.Kind == ActionStoreKind.Global).Select(g => g.Name).ToArray());
+        }
+
+        if (conflicts.Count > 0 && reportConflicts) {
+            logger?.LogWarning("[Actions] {Source} expects different types for: {Names}", source,
+                string.Join(", ", conflicts.Select(c => $"{c.Name} ({c.Existing} -> {c.Wanted})")));
+            GlobalTypeConflictsFound?.Invoke(source, conflicts);
+        }
+
+        return (added.Count, conflicts);
     }
 
     public IReadOnlyList<CustomAction> ActionsUsing(ActionStoreKind kind, string name) {
@@ -551,7 +627,7 @@ public async Task LoadLibraryAsync() {
         CustomActionsChanged?.Invoke();
     }
 
-    public async Task SaveCustomActionAsync(CustomAction action) {
+    public async Task SaveCustomActionAsync(CustomAction action, bool imported = false) {
         string path = _library.TryGetValue(action.Id, out (CustomAction Action, string Path) existing)
             ? existing.Path
             : NewActionPath(_folder, action.Name);
@@ -565,7 +641,7 @@ public async Task SaveCustomActionAsync(CustomAction action) {
         CustomActionsChanged?.Invoke();
 
         try {
-            await EnsureGlobalsAsync(action);
+            await EnsureGlobalsAsync(action, imported);
         }
         catch (Exception ex) {
             logger?.LogWarning(ex, "[Actions] Could not add the globals and secrets \"{Name}\" uses", action.Name);
@@ -588,7 +664,7 @@ public void DeleteCustomAction(Guid id) {
         CustomAction? action = await ReadActionFileAsync(file);
         if (action == null) return null;
         bool replaced = _library.ContainsKey(action.Id);
-        await SaveCustomActionAsync(action);
+        await SaveCustomActionAsync(action, true);
         return (action, replaced);
     }
 
@@ -599,7 +675,7 @@ public void DeleteCustomAction(Guid id) {
 
         if (_library.ContainsKey(action.Id)) action.Id = Guid.NewGuid();
         action.Name = UniqueName(action.Name);
-        await SaveCustomActionAsync(action);
+        await SaveCustomActionAsync(action, true);
         return action;
     }
 
diff --git a/SubathonManager.Tests/ServerUnitTests/WebServerTests.cs b/SubathonManager.Tests/ServerUnitTests/WebServerTests.cs
index 15ba8f8..9776505 100644
--- a/SubathonManager.Tests/ServerUnitTests/WebServerTests.cs
+++ b/SubathonManager.Tests/ServerUnitTests/WebServerTests.cs
@@ -10,6 +10,7 @@
 using SubathonManager.Data;
 using SubathonManager.Server;
 using SubathonManager.Server.Interfaces;
+using SubathonManager.Services;
 
 // ReSharper disable NullableWarningSuppressionIsUsed
 namespace SubathonManager.Tests.ServerUnitTests;
@@ -179,6 +180,105 @@ public async Task Commands_Endpoint_Returns_Catalog() {
         AppServices.Provider = null!;
     }
 
+    [Fact]
+    public async Task Globals_Endpoint_Returns_Typed_Values_Filtered_By_Widget_Or_Name() {
+        WebServer server = CreateServer();
+        var widgetId = Guid.NewGuid();
+        await using (AppDbContext db = await server._factory.CreateDbContextAsync(TestContext.Current.CancellationToken)) {
+            db.ActionGlobals.AddRange(
+                new ActionGlobal { Kind = ActionStoreKind.Global, Name = "deaths", ValueType = ActionValueType.Number, Value = "3.5" },
+                new ActionGlobal { Kind = ActionStoreKind.Global, Name = "hat_on", ValueType = ActionValueType.Boolean, Value = "true" },
+                new ActionGlobal { Kind = ActionStoreKind.Global, Name = "greeting", ValueType = ActionValueType.Text, Value = "hi" },
+                new ActionGlobal { Kind = ActionStoreKind.Secret, Name = "api_key", StorageKey = "x" });
+            db.Widgets.Add(new Widget("counter", "counter.html") { Id = widgetId, GlobalVars = "DEATHS,hat_on,gone" });
+            await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+        }
+
+        async Task<string> Get(string query) {
+            var ctx = new MockHttpContext { Method = "GET", Path = "/api/data/globals", QueryString = query };
+            await server.InvokeHandleRequest(ctx);
+            Assert.Equal(200, ctx.StatusCode);
+            return ctx.ResponseBody;
+        }
+
+        string all = await Get("");
+        Assert.Contains("{\"name\":\"deaths\",\"type\":\"number\",\"value\":3.5}", all);
+        Assert.Contains("{\"name\":\"hat_on\",\"type\":\"boolean\",\"value\":true}", all);
+        Assert.Contains("{\"name\":\"greeting\",\"type\":\"text\",\"value\":\"hi\"}", all);
+        Assert.DoesNotContain("api_key", all);
+
+        string forWidget = await Get($"?widget={widgetId}");
+        Assert.Contains("deaths", forWidget);
+        Assert.Contains("hat_on", forWidget);
+        Assert.DoesNotContain("greeting", forWidget);
+
+        string byName = await Get("?name=GREETING");
+        Assert.Contains("greeting", byName);
+        Assert.DoesNotContain("deaths", byName);
+
+        var missing = new MockHttpContext {
+            Method = "GET", Path = "/api/data/globals", QueryString = $"?widget={Guid.NewGuid()}"
+        };
+        await server.InvokeHandleRequest(missing);
+        Assert.Equal(404, missing.StatusCode);
+        AppServices.Provider = null!;
+    }
+
+    [Fact]
+    public async Task Globals_Post_Creates_Sets_Adds_Toggles_And_Rejects_Bad_Requests() {
+        WebServer server = CreateServer();
+        var services = new ServiceCollection();
+        services.AddSingleton(new ActionService(server._factory, []));
+        AppServices.Provider = services.BuildServiceProvider();
+
+        async Task<(int Code, string Body)> Post(string query, string body = "") {
+            var ctx = new MockHttpContext {
+                Method = "POST", Path = "/api/data/globals", QueryString = query,
+                Body = new MemoryStream(Encoding.UTF8.GetBytes(body))
+            };
+            await server.InvokeHandleRequest(ctx);
+            return (ctx.StatusCode, ctx.ResponseBody);
+        }
+
+        Assert.Equal((200, "{\"created\":true,\"global\":{\"name\":\"deaths\",\"type\":\"number\",\"value\":2}}"),
+            await Post("?name=deaths&op=add&value=2"));
+        Assert.Contains("\"value\":-1.5", (await Post("?name=debt&op=subtract&value=1.5")).Body);
+        Assert.Contains("\"value\":true", (await Post("", "{\"name\":\"hat_on\",\"op\":\"toggle\"}")).Body);
+        Assert.Equal(400, (await Post("?name=greeting&value=hi")).Code);
+        Assert.Contains("\"value\":\"hi\"", (await Post("?name=greeting&type=text&value=hi")).Body);
+        Assert.Contains("\"value\":7", (await Post("", "{\"name\":\"lives\",\"value\":7}")).Body);
+
+        Assert.Equal((200, "{\"created\":false,\"global\":{\"name\":\"deaths\",\"type\":\"number\",\"value\":1}}"),
+            await Post("?name=DEATHS&op=subtract&value=1"));
+        Assert.Contains("\"value\":false", (await Post("?name=hat_on&op=toggle")).Body);
+        Assert.Contains("\"value\":true", (await Post("", "{\"name\":\"hat_on\",\"value\":true}")).Body);
+        Assert.Contains("\"value\":\"bye\"", (await Post("?name=greeting&value=bye")).Body);
+
+        foreach ((string query, string body) in new[] {
+                     ("?name=greeting&op=add&value=1", ""), // text can only be set
+                     ("?name=greeting&op=toggle", ""),
+                     ("", "{\"name\":\"greeting\",\"value\":5}"), // number sent to text
+                     ("?name=deaths&type=boolean&value=true", ""),
+                     ("?name=deaths&op=add&value=lots", ""),
+                     ("?name=deaths&op=add", ""), // value missing
+                     ("?name=deaths", ""),
+                     ("?name=hat_on&value=maybe", ""),
+                     ("?name=deaths&op=multiply&value=2", ""),
+                     ("?name=deaths&type=float&value=2", ""),
+                     ("?value=2", ""), // name missing
+                     ("?name=bad-name&type=text&value=x", ""),
+                     ("", "[1,2]")
+                 }) {
+            (int code, string error) = await Post(query, body);
+            Assert.True(code == 400, $"{query} {body} -> {code} {error}");
+            Assert.Contains("\"error\"", error);
+        }
+
+        await using AppDbContext db = await server._factory.CreateDbContextAsync(TestContext.Current.CancellationToken);
+        Assert.Equal(5, await db.ActionGlobals.CountAsync(cancellationToken: TestContext.Current.CancellationToken));
+        AppServices.Provider = null!;
+    }
+
     [Fact]
     public async Task DataControl_Invalid_Body_Returns_400() {
         var ctx = new MockHttpContext {
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
index 2ea71a1..2062585 100644
--- a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -670,6 +670,63 @@ await service.SaveCustomActionAsync(new CustomAction {
         Assert.Single(service.ActionsUsing(ActionStoreKind.Global, "WINS"));
     }
 
+    [Fact]
+    public async Task WidgetGlobals_ImportCreatesMissing_WarnsOnTypeMismatch_AndChangesAreAnnounced() {
+        (ActionService service, _, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+
+        var announced = new List<string>();
+        void OnUpdated(IReadOnlyCollection<string> names) {
+            lock (announced) announced.AddRange(names);
+        }
+
+        var warnings = new List<(string Source, IReadOnlyList<GlobalTypeConflict> Conflicts)>();
+        service.GlobalTypeConflictsFound += (source, conflicts) => warnings.Add((source, conflicts));
+        ActionEvents.GlobalsUpdated += OnUpdated;
+        try {
+            Assert.Null(await service.SetGlobalAsync("deaths", ActionValueType.Text, "lots"));
+            Assert.Contains("deaths", announced);
+
+            var widget = new Widget("counter", "counter.html") { GlobalVars = "Deaths, hat_on,deaths" };
+            Assert.Equal(new[] { "Deaths", "hat_on" }, widget.GlobalVarNames);
+            Assert.True(widget.ListensToGlobal("HAT_ON"));
+            Assert.False(widget.ListensToGlobal("other"));
+            Assert.True(new Widget("all", "all.html") { GlobalVars = " * " }.ListensToGlobal("anything"));
+
+            WidgetMetaGlobals meta = WidgetMetaGlobals.From(widget, await service.GetGlobalTypesAsync())!;
+            Assert.Equal(ActionValueType.Text, meta.Vars["Deaths"]);
+            meta.Vars["Deaths"] = ActionValueType.Number;
+            meta.Vars["hat_on"] = ActionValueType.Boolean;
+            Assert.Equal("Deaths,hat_on", meta.ToWidgetValue());
+
+            IReadOnlyList<GlobalTypeConflict> conflicts =
+                await service.EnsureTypedGlobalsAsync(meta.Vars, "Widget \"counter\"");
+            Assert.Equal(new GlobalTypeConflict("deaths", ActionValueType.Text, ActionValueType.Number),
+                Assert.Single(conflicts));
+            Assert.Equal("Widget \"counter\"", Assert.Single(warnings).Source);
+
+            ActionGlobal hat = (await service.GetGlobalsAsync(ActionStoreKind.Global)).Single(g => g.Name == "hat_on");
+            Assert.Equal(("false", ActionValueType.Boolean), (hat.Value, hat.ValueType));
+            Assert.Contains("hat_on", announced);
+            Assert.Equal(false, hat.ValueType.ToTypedValue(hat.Value));
+            Assert.Equal(2.5, ActionValueType.Number.ToTypedValue("2.5"));
+            Assert.Equal(0d, ActionValueType.Number.ToTypedValue("junk"));
+
+            await service.SaveCustomActionAsync(new CustomAction {
+                Name = "Death counter", Graph = ActionGraph.Sequence(new ActionStep {
+                    Type = ActionStepType.SetGlobal, Operation = ActionOperation.Adjust, Target = "deaths", Body = "1"
+                })
+            });
+            Assert.Single(warnings);
+
+            await service.DeleteGlobalAsync(ActionStoreKind.Global, "hat_on");
+            Assert.Equal(2, announced.Count(n => n == "hat_on"));
+        }
+        finally {
+            ActionEvents.GlobalsUpdated -= OnUpdated;
+        }
+    }
+
     [Fact]
     public async Task TriggerSteps_StartOnlyForTheirTrigger_PassItsValues_AndManualRunsSkipThem() {
         (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
diff --git a/SubathonManager.UI/EditRouteWindow.Handlers.cs b/SubathonManager.UI/EditRouteWindow.Handlers.cs
index ad05e9f..1343412 100644
--- a/SubathonManager.UI/EditRouteWindow.Handlers.cs
+++ b/SubathonManager.UI/EditRouteWindow.Handlers.cs
@@ -1098,6 +1098,58 @@ void Attach() {
         SuppressUnsavedChanges(Attach);
     }
 
+    #region GlobalVars
+
+    private int _loadingGlobalVars;
+
+    private async Task PopulateGlobalVarsAsync(Widget widget) {
+        _loadingGlobalVars++;
+        try {
+            List<ActionGlobal> globals = await ServiceManager.Actions.GetGlobalsAsync(ActionStoreKind.Global);
+            if (_selectedWidget?.Id != widget.Id) return;
+
+            IReadOnlyList<string> picked = widget.GlobalVarNames;
+            List<FilterOption> options = globals.Select(g => new FilterOption {
+                Label = g.Name, Value = g.Name, Group = $"{g.ValueType}"
+            }).ToList();
+            options.AddRange(picked
+                .Where(n => !globals.Any(g => g.Name.Equals(n, StringComparison.OrdinalIgnoreCase)))
+                .Select(n => new FilterOption { Label = $"{n} (doesn't exist)", Value = n, Group = "Missing" }));
+
+            GlobalVarsPicker.SetOptions(options, true);
+            GlobalVarsPicker.SetSelected(picked);
+            GlobalVarsModeBox.SelectedIndex = widget.ListensToAllGlobals ? 1
+                : string.IsNullOrWhiteSpace(widget.GlobalVars) ? 0 : 2;
+            GlobalVarsPicker.IsVisible = GlobalVarsModeBox.SelectedIndex == 2;
+        }
+        catch (Exception ex) {
+            _logger?.LogWarning(ex, "Could not load globals for widget editor");
+        }
+        finally {
+            _loadingGlobalVars--;
+        }
+    }
+
+    private void GlobalVarsMode_Changed(object? sender, SelectionChangedEventArgs e) {
+        ApplyGlobalVars();
+    }
+
+    private void ApplyGlobalVars() {
+        GlobalVarsPicker.IsVisible = GlobalVarsModeBox.SelectedIndex == 2;
+        if (_loadingGlobalVars > 0 || _selectedWidget == null) return;
+
+        string value = GlobalVarsModeBox.SelectedIndex switch {
+            1 => Widget.AllGlobals,
+            2 => Widget.JoinGlobalVars(false, GlobalVarsPicker.SelectedOptions.Select(o => o.Value)),
+            _ => string.Empty
+        };
+        if (value == _selectedWidget.GlobalVars) return;
+        _selectedWidget.GlobalVars = value;
+        UpdateSaveButtonBorder(SaveButtonBorder, true);
+    }
+
+    #endregion
+
     private void Value_OnChanged(object? sender, RoutedEventArgs e) {
         bool realChange = DirtySaveGuard.Consume(sender);
         if (_suppressCount > 0 || !realChange) return;
diff --git a/SubathonManager.UI/EditRouteWindow.axaml b/SubathonManager.UI/EditRouteWindow.axaml
index a725c43..dc81306 100644
--- a/SubathonManager.UI/EditRouteWindow.axaml
+++ b/SubathonManager.UI/EditRouteWindow.axaml
@@ -691,9 +691,20 @@
                                 <Expander Header="JS Variables" IsExpanded="False" Margin="0,0,4,0">
                                     <ItemsControl x:Name="JsVarsList" ItemTemplate="{StaticResource JsVarSelector}" />
                                 </Expander>
-                                <Expander Header="Custom Fonts" IsExpanded="False" Margin="0,0,4,6">
+                                <Expander Header="Custom Fonts" IsExpanded="False" Margin="0,0,4,0">
                                     <ItemsControl x:Name="JsVarFontList" ItemTemplate="{StaticResource JsVarSelector}" />
                                 </Expander>
+                                <Expander Header="Global Vars" IsExpanded="False" Margin="0,0,4,6">
+                                    <StackPanel Spacing="6">
+                                        <ComboBox x:Name="GlobalVarsModeBox" HorizontalAlignment="Stretch"
+                                                  SelectionChanged="GlobalVarsMode_Changed">
+                                            <ComboBoxItem Content="None" />
+                                            <ComboBoxItem Content="All" />
+                                            <ComboBoxItem Content="Selected" />
+                                        </ComboBox>
+                                        <ctl:FilterPopout x:Name="GlobalVarsPicker" EmptyText="None selected" IsVisible="False" />
+                                    </StackPanel>
+                                </Expander>
                             </StackPanel>
                         </ScrollViewer>
                     </DockPanel>
diff --git a/SubathonManager.UI/EditRouteWindow.axaml.cs b/SubathonManager.UI/EditRouteWindow.axaml.cs
index 566e1fb..82c902e 100644
--- a/SubathonManager.UI/EditRouteWindow.axaml.cs
+++ b/SubathonManager.UI/EditRouteWindow.axaml.cs
@@ -72,6 +72,7 @@ public EditRouteWindow(Guid routeId) {
         WindowIcons.Apply(this);
         EditorRouteId = routeId;
         WidgetsList.ItemsSource = _widgets;
+        GlobalVarsPicker.SelectionChanged += (_, _) => ApplyGlobalVars();
         BrowserEditorButton.IsVisible = OperatingSystem.IsLinux();
         WebViewWarningButton.IsVisible = OperatingSystem.IsLinux();
         UiHelpers.EnableClickAwayUnfocus(this);
@@ -364,6 +365,7 @@ private void PopulateWidgetEditor(Widget? widget) {
 
         SubscribeCssVarChanges();
         PopulateJsVars();
+        if (!isAsset) _ = PopulateGlobalVarsAsync(widget);
         bool hasStash = _unsavedCssVars.ContainsKey(widget.Id) || _unsavedJsVars.ContainsKey(widget.Id);
         _hasPendingCssChanges = _unsavedCssVars.ContainsKey(widget.Id);
         _hasPendingJsChanges = _unsavedJsVars.ContainsKey(widget.Id);
@@ -641,10 +643,14 @@ private async Task ImportSingleWidgetAsync(string path, AppDbContext db, WidgetE
             newWidget.Width = metadata.Width > 0 ? metadata.Width : 400;
             newWidget.Height = metadata.Height > 0 ? metadata.Height : 400;
             newWidget.DocsUrl = metadata.Url;
+            newWidget.GlobalVars = metadata.Globals?.ToWidgetValue() ?? string.Empty;
 
             db.Widgets.Add(newWidget);
             await db.SaveChangesAsync();
 
+            if (metadata.Globals is { Vars.Count: > 0 } wanted)
+                await ServiceManager.Actions.EnsureTypedGlobalsAsync(wanted.Vars, $"Widget \"{newWidget.Name}\"");
+
             (List<JsVariable> jsVars, _, _) = helper.LoadNewJsVariables(newWidget, metadata);
 
             List<WidgetVariableType> allVarTypes = jsVars.Select(j => j.Type).Distinct().ToList();
diff --git a/SubathonManager.UI/MainWindow.Routes.cs b/SubathonManager.UI/MainWindow.Routes.cs
index b295741..101ce48 100644
--- a/SubathonManager.UI/MainWindow.Routes.cs
+++ b/SubathonManager.UI/MainWindow.Routes.cs
@@ -14,6 +14,7 @@
 using SubathonManager.Data;
 using SubathonManager.Data.Overlays;
 using SubathonManager.Data.Widgets;
+using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
 using SubathonManager.UI.Views;
 
@@ -234,6 +235,10 @@ private async Task<bool> ImportRouteFromFile(string filePath) {
                 return false;
             }
 
+            if (result.RequiredGlobals.Count > 0)
+                await ServiceManager.Actions.EnsureTypedGlobalsAsync(result.RequiredGlobals,
+                    $"Overlay \"{manifest.Name}\"");
+
             if (!result.HasAnythingNew) {
                 _logger?.LogInformation("Import: everything already exists, nothing to add");
                 return false;
diff --git a/SubathonManager.UI/MainWindow.axaml.cs b/SubathonManager.UI/MainWindow.axaml.cs
index 4d3c647..985cbb7 100644
--- a/SubathonManager.UI/MainWindow.axaml.cs
+++ b/SubathonManager.UI/MainWindow.axaml.cs
@@ -2,8 +2,13 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
 using Microsoft.Extensions.Logging;
 using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Models;
 using SubathonManager.Core.Objects;
 using SubathonManager.Data.Widgets;
 using SubathonManager.UI.Services;
@@ -27,6 +32,7 @@ public MainWindow() {
         InitConnectionStatus();
         InitHome();
         InitOverlays();
+        ServiceManager.Actions.GlobalTypeConflictsFound += OnGlobalTypeConflicts;
 
         RecentEventsList.HiddenTypesChanged += UpdateRecentEventsFilterTip;
         UpdateRecentEventsFilterTip();
@@ -102,6 +108,40 @@ private async Task ImportPendingActionAsync() {
         }
     }
 
+    private void OnGlobalTypeConflicts(string source, IReadOnlyList<GlobalTypeConflict> conflicts) {
+        Dispatcher.UIThread.Post(async void () => {
+            try {
+                string lines = string.Join(Environment.NewLine, conflicts.Select(c =>
+                    $"- {c.Name}: is {c.Existing.GetLabel()}, expects {c.Wanted.GetLabel()}"));
+
+                var dialog = new FAContentDialog {
+                    Title = "Global type mismatch",
+                    PrimaryButtonText = "Change types",
+                    CloseButtonText = "Keep current types",
+                    DefaultButton = FAContentDialogButton.Close,
+                    Content = new TextBlock {
+                        Text = $"{source} expects these globals to be a different type:{Environment.NewLine}" +
+                               $"{Environment.NewLine}{lines}{Environment.NewLine}{Environment.NewLine}" +
+                               "Changing a type converts the value where it can, otherwise it resets it. " +
+                               "Please verify or rename globals according to your needs.",
+                        TextWrapping = TextWrapping.Wrap,
+                        Width = 380,
+                        Margin = new Thickness(4)
+                    }
+                };
+
+                Window owner = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
+                    ?.Windows.FirstOrDefault(w => w.IsActive) ?? this;
+                if (await dialog.ShowAsync(owner) != FAContentDialogResult.Primary) return;
+                foreach (GlobalTypeConflict conflict in conflicts)
+                    await ServiceManager.Actions.SetGlobalTypeAsync(conflict.Name, conflict.Wanted);
+            }
+            catch (Exception ex) {
+                _logger?.LogWarning(ex, "Could not resolve global type mismatches from {Source}", source);
+            }
+        });
+    }
+
     private async Task ImportPendingOverlayAsync() {
         string? path = Utils.PendingOverlayImportPath;
         if (string.IsNullOrWhiteSpace(path)) return;
diff --git a/SubathonManager.UI/Views/ExportOverlayDialog.axaml.cs b/SubathonManager.UI/Views/ExportOverlayDialog.axaml.cs
index ee35bb0..94d4c13 100644
--- a/SubathonManager.UI/Views/ExportOverlayDialog.axaml.cs
+++ b/SubathonManager.UI/Views/ExportOverlayDialog.axaml.cs
@@ -15,6 +15,7 @@
 using SubathonManager.Data;
 using SubathonManager.Data.Overlays;
 using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
 
 namespace SubathonManager.UI.Views;
@@ -310,9 +311,9 @@ private async void ConfirmButton_Click(object? sender, RoutedEventArgs e) {
             SuggestedFileName = safeFileName,
             DefaultExtension = "smo",
             SuggestedStartLocation = startFolder,
-            FileTypeChoices = new[] {
-                new FilePickerFileType("Subathon Manager Overlay (*.smo)") { Patterns = new[] { "*.smo" } }
-            }
+            FileTypeChoices = [
+                new FilePickerFileType("Subathon Manager Overlay (*.smo)") { Patterns = ["*.smo"] }
+            ]
         });
 
         if (picked == null) return;
@@ -334,8 +335,8 @@ private async void ConfirmButton_Click(object? sender, RoutedEventArgs e) {
                 .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
             await OverlayPorter.ExportRouteAsync(_route, outputPath, exportName, excludedZipEntries, version,
-                appVersion,
-                AuthorBox.Text?.Trim() ?? string.Empty, WidgetPorter.ParseTags(TagsBox.Text));
+                appVersion, AuthorBox.Text?.Trim() ?? string.Empty, 
+                WidgetPorter.ParseTags(TagsBox.Text), await ServiceManager.Actions.GetGlobalTypesAsync());
             Close();
         }
         catch (Exception ex) {
diff --git a/SubathonManager.UI/Views/ExportWidgetDialog.axaml.cs b/SubathonManager.UI/Views/ExportWidgetDialog.axaml.cs
index 1b6b85a..c01269d 100644
--- a/SubathonManager.UI/Views/ExportWidgetDialog.axaml.cs
+++ b/SubathonManager.UI/Views/ExportWidgetDialog.axaml.cs
@@ -11,10 +11,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SubathonManager.Core;
+using SubathonManager.Core.Enums;
 using SubathonManager.Core.Models;
 using SubathonManager.Data;
 using SubathonManager.Data.Widgets;
 using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
 using SubathonManager.UI.UiUtils;
 
 namespace SubathonManager.UI.Views;
@@ -445,6 +447,8 @@ private async void ConfirmButton_Click(object? sender, RoutedEventArgs e) {
         try {
             foreach (FileEntry entry in _allEntries)
                 entry.Entry.DefaultSelected = entry.IsIncluded;
+            foreach ((string name, ActionValueType type) in await ServiceManager.Actions.GetGlobalTypesAsync())
+                _plan.GlobalTypes[name] = type;
 
             await WidgetPorter.ExportWidgetAsync(_plan, BuildOptions(), outputPath);
 

From a59bdeadcb45659ca22353ef3ccad1dce3703ddf Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Wed, 7 Oct 2026 14:58:01 -0300
Subject: [PATCH 08/23] add optional actions to prompt completions #338

---
 .../Enums/SubathonPromptType.cs               |    7 +
 SubathonManager.Core/Events/SubathonEvents.cs |    5 +
 SubathonManager.Core/Models/SubathonPrompt.cs |    7 +
 ...7032117_addActionsToPromptRuns.Designer.cs | 1191 +++++++++++++++++
 .../20261007032117_addActionsToPromptRuns.cs  |   60 +
 .../Migrations/AppDbContextModelSnapshot.cs   |   12 +
 SubathonManager.Services/ActionService.cs     |   86 ++
 .../PromptOrchestratorService.cs              |    3 +-
 .../ServicesUnitTests/ActionServiceTests.cs   |   80 +-
 .../Views/Actions/ActionsView.axaml.cs        |   32 +-
 .../Views/Prompts/PromptsEditor.History.cs    |  412 ++++++
 .../Views/Prompts/PromptsEditor.axaml         |  106 +-
 .../Views/Prompts/PromptsEditor.axaml.cs      |    7 +-
 13 files changed, 1978 insertions(+), 30 deletions(-)
 create mode 100644 SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.Designer.cs
 create mode 100644 SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.cs
 create mode 100644 SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs

diff --git a/SubathonManager.Core/Enums/SubathonPromptType.cs b/SubathonManager.Core/Enums/SubathonPromptType.cs
index df51299..8234139 100644
--- a/SubathonManager.Core/Enums/SubathonPromptType.cs
+++ b/SubathonManager.Core/Enums/SubathonPromptType.cs
@@ -34,6 +34,13 @@ public enum SubathonPromptRunStatus {
     Cancelled
 }
 
+public enum SubathonPromptActionStatus {
+    None,
+    Running,
+    Done,
+    Failed
+}
+
 [ExcludeFromCodeCoverage]
 public static class SubathonPromptTypeExtensions {
     private static readonly ReadOnlyDictionary<SubathonPromptType, SubathonPromptSubType[]> _validSubTypes =
diff --git a/SubathonManager.Core/Events/SubathonEvents.cs b/SubathonManager.Core/Events/SubathonEvents.cs
index 0f37470..37e3101 100644
--- a/SubathonManager.Core/Events/SubathonEvents.cs
+++ b/SubathonManager.Core/Events/SubathonEvents.cs
@@ -32,6 +32,11 @@ public static event Action<SubathonEvent, bool>?
     public static event Action<SubathonPromptRun, long>? PromptRunProgressUpdated;
     public static event Action? PromptRunCancelRequested;
     public static event Action<Guid>? PromptRunNowRequested;
+    public static event Action<SubathonPromptRun>? PromptRunActionStatusChanged;
+
+    public static void RaisePromptRunActionStatusChanged(SubathonPromptRun run) {
+        PromptRunActionStatusChanged?.Invoke(run);
+    }
 
     public static void RaiseSubathonTotalsUpdated(SubathonTotals totals) {
         SubathonTotalsUpdated?.Invoke(totals);
diff --git a/SubathonManager.Core/Models/SubathonPrompt.cs b/SubathonManager.Core/Models/SubathonPrompt.cs
index 374c850..9bcc53f 100644
--- a/SubathonManager.Core/Models/SubathonPrompt.cs
+++ b/SubathonManager.Core/Models/SubathonPrompt.cs
@@ -29,6 +29,9 @@ public class SubathonPrompt {
 
     public int Index { get; set; } = 0;
 
+    // optional action
+    public Guid? CustomActionId { get; set; }
+
     public bool HasStock() {
         return IsInfinite || Quantity > 0;
     }
@@ -59,6 +62,10 @@ public class SubathonPromptRun {
     public long SnapshotTargetValue { get; set; }
     public long BaselineCount { get; set; } = 0;
 
+    public Guid? ActionId { get; set; }
+    public SubathonPromptActionStatus ActionStatus { get; set; } = SubathonPromptActionStatus.None;
+    public string? ActionProgress { get; set; }
+
     public bool IsActive => Status == SubathonPromptRunStatus.Active;
     public bool IsExpired => DateTime.Now >= ExpiresAt && Status == SubathonPromptRunStatus.Active;
 
diff --git a/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.Designer.cs b/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.Designer.cs
new file mode 100644
index 0000000..72ea57c
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.Designer.cs
@@ -0,0 +1,1191 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SubathonManager.Data;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261007032117_addActionsToPromptRuns")]
+    partial class addActionsToPromptRuns
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ActionGlobal", b =>
+                {
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Kind", "Name");
+
+                    b.ToTable("ActionGlobals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("CssVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.GoAffProStore", b =>
+                {
+                    b.Property<int>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SiteId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.HasIndex("SiteId")
+                        .IsUnique();
+
+                    b.ToTable("GoAffProStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("JsVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.Property<string>("ProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Valid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("JuniperProducts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Property<Guid>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.ToTable("JuniperStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MakeShipTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Orders")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ProductType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Sales")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShopifyProductId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MakeShipTrackings");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("ApplyToPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplyToSeconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<TimeSpan?>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FromHypeTrain")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("Multiplier")
+                        .HasColumnType("REAL");
+
+                    b.Property<DateTime?>("Started")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubathonId")
+                        .IsUnique();
+
+                    b.ToTable("MultiplierDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Routes");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ScheduleItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EndMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StartMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Date");
+
+                    b.ToTable("ScheduleItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.StateValue", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("StateValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<DateTime?>("CapDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPaused")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsCumulative")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsElapsed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneySum")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ReversedTime")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Amount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Command")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CurrentPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CurrentTime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EventTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventTypeMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("MultiplierPoints")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("MultiplierSeconds")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("PointsValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ProcessedToSubathon")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecondaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("SecondsValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TertiaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WasReversed")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id", "Source");
+
+                    b.HasIndex("SubathonId");
+
+                    b.ToTable("SubathonEvents");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<Guid?>("GoalSetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GoalSetId");
+
+                    b.ToTable("SubathonGoals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonGoalSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("CompletionDuration")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("CustomActionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("FilterEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FilterMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FilterSubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPrompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActionStatus")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("BaselineCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("SnapshotTargetValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPromptRuns");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("Cooldown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("RandomOffset")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonPromptSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonValue", b =>
+                {
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Meta")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(1);
+
+                    b.Property<double>("Points")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("Seconds")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("EventType", "Meta");
+
+                    b.ToTable("SubathonValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Weight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.ToTable("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("ActionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Parameter")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelItemId")
+                        .IsUnique();
+
+                    b.ToTable("WheelSpinActions");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.HasIndex("WheelItemId");
+
+                    b.ToTable("WheelSpinHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CountThreshold")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneyThreshold")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("SpinsToAdd")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TierValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSpinTriggers");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinsAdded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SubathonEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SubathonEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TriggerSource")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TriggerUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("TriggeredAt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("WheelSpinTriggerHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GlobalVars")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HtmlPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RouteId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("X")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("Y")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Z")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RouteId");
+
+                    b.ToTable("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WidgetCatalogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Entry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileModifiedTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Group")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastSeenUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewCachePath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewImage")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackPath")
+                        .IsUnique();
+
+                    b.ToTable("WidgetCatalogEntries");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("CssVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("JsVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.JuniperStore", "Store")
+                        .WithMany("Products")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithOne("Multiplier")
+                        .HasForeignKey("SubathonManager.Core.Models.MultiplierData", "SubathonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithMany()
+                        .HasForeignKey("SubathonId");
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonGoalSet", "LinkedGoalSet")
+                        .WithMany("Goals")
+                        .HasForeignKey("GoalSetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedGoalSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany("Prompts")
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPrompt", "LinkedPrompt")
+                        .WithMany()
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany()
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("LinkedPrompt");
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany("WheelItems")
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithOne("Action")
+                        .HasForeignKey("SubathonManager.Core.Models.WheelSpinAction", "WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany()
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithMany()
+                        .HasForeignKey("WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSpinTrigger", "Trigger")
+                        .WithMany("History")
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Route", "Route")
+                        .WithMany("Widgets")
+                        .HasForeignKey("RouteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Route");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Navigation("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Navigation("Multiplier")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Navigation("Goals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Navigation("Prompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Navigation("Action");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Navigation("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Navigation("History");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Navigation("CssVariables");
+
+                    b.Navigation("JsVariables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.cs b/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.cs
new file mode 100644
index 0000000..7c3e789
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261007032117_addActionsToPromptRuns.cs
@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class addActionsToPromptRuns : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "CustomActionId",
+                table: "SubathonPrompts",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ActionId",
+                table: "SubathonPromptRuns",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ActionProgress",
+                table: "SubathonPromptRuns",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ActionStatus",
+                table: "SubathonPromptRuns",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CustomActionId",
+                table: "SubathonPrompts");
+
+            migrationBuilder.DropColumn(
+                name: "ActionId",
+                table: "SubathonPromptRuns");
+
+            migrationBuilder.DropColumn(
+                name: "ActionProgress",
+                table: "SubathonPromptRuns");
+
+            migrationBuilder.DropColumn(
+                name: "ActionStatus",
+                table: "SubathonPromptRuns");
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
index 7b17649..ab1c526 100644
--- a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -518,6 +518,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<long>("CompletionDuration")
                         .HasColumnType("INTEGER");
 
+                    b.Property<Guid?>("CustomActionId")
+                        .HasColumnType("TEXT");
+
                     b.Property<bool>("Enabled")
                         .HasColumnType("INTEGER");
 
@@ -568,6 +571,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("TEXT");
 
+                    b.Property<Guid?>("ActionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActionStatus")
+                        .HasColumnType("INTEGER");
+
                     b.Property<long>("BaselineCount")
                         .HasColumnType("INTEGER");
 
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
index c46a433..73d4e3f 100644
--- a/SubathonManager.Services/ActionService.cs
+++ b/SubathonManager.Services/ActionService.cs
@@ -60,6 +60,7 @@ public async Task StartAsync(CancellationToken ct = default) {
         SubathonEvents.SubathonDataUpdate += OnSubathonDataUpdate;
         WheelEvents.WheelSpinStatusChanged += OnWheelSpinStatusChanged;
         ActionEvents.CustomActionRunRequested += OnCustomActionRunRequested;
+        SubathonEvents.PromptRunUpdate += OnPromptRunUpdate;
         TriggerWatcher.Start();
         await LoadLibraryAsync();
 
@@ -67,6 +68,9 @@ public async Task StartAsync(CancellationToken ct = default) {
         await db.WheelSpinHistories
             .Where(h => h.Status == WheelSpinHistoryStatus.Running)
             .ExecuteUpdateAsync(s => s.SetProperty(h => h.Status, WheelSpinHistoryStatus.Pending), ct);
+        await db.SubathonPromptRuns
+            .Where(r => r.ActionStatus == SubathonPromptActionStatus.Running)
+            .ExecuteUpdateAsync(s => s.SetProperty(r => r.ActionStatus, SubathonPromptActionStatus.Failed), ct);
     }
 
     public Task StopAsync(CancellationToken ct = default) {
@@ -78,6 +82,7 @@ public void Dispose() {
         SubathonEvents.SubathonDataUpdate -= OnSubathonDataUpdate;
         WheelEvents.WheelSpinStatusChanged -= OnWheelSpinStatusChanged;
         ActionEvents.CustomActionRunRequested -= OnCustomActionRunRequested;
+        SubathonEvents.PromptRunUpdate -= OnPromptRunUpdate;
         _triggerWatcher?.Stop();
         foreach (LiveRun run in _runs.Values) run.Cancel();
         GC.SuppressFinalize(this);
@@ -1125,6 +1130,87 @@ await db.WheelSpinHistories.Where(h => h.Id == history.Id)
             WheelEvents.RaiseWheelSpinStatusChanged(history, StateValueHelper.Get<int>(db, StateKeys.WheelSpinsOwed));
     }
 
+    ////////////////// prompts
+    private void OnPromptRunUpdate(SubathonPromptRun run, SubathonPrompt? prompt) {
+        if (run is { Status: SubathonPromptRunStatus.Completed, ActionId: not null })
+            _ = RunPromptActionAsync(run.Id);
+    }
+
+    public async Task<ActionRunResult> RunPromptActionAsync(Guid runId, bool retry = false) {
+        SubathonPromptRun? run;
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            run = await db.SubathonPromptRuns.Include(r => r.LinkedPrompt).AsNoTracking()
+                .FirstOrDefaultAsync(r => r.Id == runId);
+            if (run is not { Status: SubathonPromptRunStatus.Completed, ActionId: not null })
+                return ActionRunResult.Skipped;
+
+            SubathonPromptActionStatus from = retry ? SubathonPromptActionStatus.Failed : SubathonPromptActionStatus.None;
+            int claimed = await db.SubathonPromptRuns.Where(r => r.Id == runId && r.ActionStatus == from)
+                .ExecuteUpdateAsync(s => s.SetProperty(r => r.ActionStatus, SubathonPromptActionStatus.Running));
+            if (claimed == 0) return ActionRunResult.Skipped;
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] Could not start the action for prompt run {Id}", runId);
+            return ActionRunResult.Skipped;
+        }
+
+        run.ActionStatus = SubathonPromptActionStatus.Running;
+        SubathonEvents.RaisePromptRunActionStatusChanged(run);
+
+        CustomAction? action = GetCustomAction(run.ActionId.Value);
+        ActionGraph? graph = ResolveGraph(WheelSpinActionType.CustomAction, run.ActionId.Value.ToString());
+        if (action == null || graph == null) {
+            logger?.LogWarning("[Actions] Prompt \"{Prompt}\" completed, but action {Reason}",
+                run.LinkedPrompt?.Text, action == null ? "is missing from the actions library" : "is disabled");
+            await SavePromptActionAsync(run, SubathonPromptActionStatus.Failed, run.ActionProgress);
+            return ActionRunResult.Skipped;
+        }
+
+        var ctx = new ActionContext(SubathonEventSource.Unknown, "Prompt", $"custom-action-{action.Id}",
+            run.LinkedPrompt?.Text ?? action.Name);
+        LogRun(action.Name, ctx);
+
+        ActionRunProgress progress = ActionRunProgress.Parse(run.ActionProgress);
+        ActionRunResult result;
+        try {
+            result = await RunAsync(runId, graph, ctx, progress, async p => {
+                string json = p.ToJson();
+                await using AppDbContext db = await factory.CreateDbContextAsync();
+                await db.SubathonPromptRuns.Where(r => r.Id == runId)
+                    .ExecuteUpdateAsync(s => s.SetProperty(r => r.ActionProgress, json));
+            });
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] \"{Action}\" failed for prompt \"{Prompt}\"", action.Name,
+                run.LinkedPrompt?.Text);
+            result = ActionRunResult.Paused;
+        }
+
+        bool done = result == ActionRunResult.Done;
+        await SavePromptActionAsync(run, done ? SubathonPromptActionStatus.Done : SubathonPromptActionStatus.Failed,
+            done ? null : progress.ToJson());
+        return result;
+    }
+
+    private async Task SavePromptActionAsync(SubathonPromptRun run, SubathonPromptActionStatus status,
+        string? progress) {
+        run.ActionStatus = status;
+        run.ActionProgress = progress;
+        try {
+            await using AppDbContext db = await factory.CreateDbContextAsync();
+            await db.SubathonPromptRuns.Where(r => r.Id == run.Id)
+                .ExecuteUpdateAsync(s => s
+                    .SetProperty(r => r.ActionStatus, status)
+                    .SetProperty(r => r.ActionProgress, progress));
+        }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[Actions] Could not save action status for prompt run {Id}", run.Id);
+        }
+
+        SubathonEvents.RaisePromptRunActionStatusChanged(run);
+    }
+
     private void OnWheelSpinStatusChanged(WheelSpinHistory history, int _) {
         if (history.Status != WheelSpinHistoryStatus.Running) Cancel(history.Id);
     }
diff --git a/SubathonManager.Services/PromptOrchestratorService.cs b/SubathonManager.Services/PromptOrchestratorService.cs
index 96ca334..9bde029 100644
--- a/SubathonManager.Services/PromptOrchestratorService.cs
+++ b/SubathonManager.Services/PromptOrchestratorService.cs
@@ -180,7 +180,8 @@ private async Task StartRunAsync(AppDbContext db, SubathonPromptSet set, Subatho
             ExpiresAt = DateTime.Now + prompt.CompletionDuration,
             Status = SubathonPromptRunStatus.Active,
             SnapshotTargetValue = prompt.Value,
-            BaselineCount = baseline
+            BaselineCount = baseline,
+            ActionId = prompt.CustomActionId
         };
 
         db.SubathonPromptRuns.Add(run);
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
index 2062585..02b3e43 100644
--- a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -37,7 +37,10 @@ public class ActionServiceTests {
             .Setup(f => f.CreateDbContextAsync(It.IsAny<CancellationToken>()))
             .ReturnsAsync(() => new AppDbContext(options));
 
-        foreach (string name in new[] { "SubathonEventCreated", "SubathonDataUpdate", "SubathonEventProcessed" })
+        foreach (string name in new[] {
+                     "SubathonEventCreated", "SubathonDataUpdate", "SubathonEventProcessed", "PromptRunUpdate",
+                     "PromptRunActionStatusChanged"
+                 })
             typeof(SubathonEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
         foreach (string name in new[] { "WheelSpinStatusChanged", "OnSpinsOwedUpdateFromEvent" })
             typeof(WheelEvents).GetField(name, BindingFlags.Static | BindingFlags.NonPublic)?.SetValue(null, null);
@@ -688,7 +691,7 @@ void OnUpdated(IReadOnlyCollection<string> names) {
             Assert.Contains("deaths", announced);
 
             var widget = new Widget("counter", "counter.html") { GlobalVars = "Deaths, hat_on,deaths" };
-            Assert.Equal(new[] { "Deaths", "hat_on" }, widget.GlobalVarNames);
+            Assert.Equal(["Deaths", "hat_on"], widget.GlobalVarNames);
             Assert.True(widget.ListensToGlobal("HAT_ON"));
             Assert.False(widget.ListensToGlobal("other"));
             Assert.True(new Widget("all", "all.html") { GlobalVars = " * " }.ListensToGlobal("anything"));
@@ -861,6 +864,79 @@ void Update(long cumulative, long elapsed) {
         }
     }
 
+    [Fact]
+    public async Task PromptActions_RunOnceWhenCompleted_AndFailedOnesCanBeRetried() {
+        (ActionService service, FakeRunner runner, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
+            await SetupAsync();
+        await using SqliteConnection __ = conn;
+        CancellationToken ct = TestContext.Current.CancellationToken;
+
+        var action = new CustomAction { Name = "Prize", Graph = ActionGraph.Sequence(Hotkey("confetti"), Hotkey("bell")) };
+        await service.SaveCustomActionAsync(action);
+
+        async Task<SubathonPromptRun> AddRun(SubathonPromptRunStatus status, Guid? actionId) {
+            await using var db = new AppDbContext(options);
+            var set = new SubathonPromptSet();
+            var prompt = new SubathonPrompt { Text = "Get 5 subs", LinkedSet = set, CustomActionId = actionId };
+            var run = new SubathonPromptRun {
+                LinkedPrompt = prompt, LinkedSet = set, Status = status, ActionId = actionId,
+                ExpiresAt = DateTime.Now.AddMinutes(5)
+            };
+            db.SubathonPromptRuns.Add(run);
+            await db.SaveChangesAsync(ct);
+            return run;
+        }
+
+        async Task<SubathonPromptRun> Reload(Guid id) {
+            await using var db = new AppDbContext(options);
+            return await db.SubathonPromptRuns.AsNoTracking().FirstAsync(r => r.Id == id, ct);
+        }
+
+        var announced = new ConcurrentQueue<SubathonPromptActionStatus>();
+        SubathonEvents.PromptRunActionStatusChanged += r => announced.Enqueue(r.ActionStatus);
+
+        SubathonPromptRun expired = await AddRun(SubathonPromptRunStatus.Expired, action.Id);
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(expired.Id));
+        SubathonPromptRun plain = await AddRun(SubathonPromptRunStatus.Completed, null);
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(plain.Id));
+
+        SubathonPromptRun done = await AddRun(SubathonPromptRunStatus.Completed, action.Id);
+        Assert.Equal(ActionRunResult.Done, await service.RunPromptActionAsync(done.Id));
+        Assert.Equal(["confetti", "bell"], runner.Ran.ToArray());
+        Assert.Equal(SubathonPromptActionStatus.Done, (await Reload(done.Id)).ActionStatus);
+        Assert.Equal([SubathonPromptActionStatus.Running, SubathonPromptActionStatus.Done], announced.ToArray());
+
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(done.Id));
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(done.Id, true));
+        Assert.Equal(2, runner.Ran.Count);
+
+        runner.FailOnce.Add("bell");
+        SubathonPromptRun failed = await AddRun(SubathonPromptRunStatus.Completed, action.Id);
+        SubathonEvents.RaisePromptRunUpdate(failed, null);
+        for (var i = 0; i < 100 && (await Reload(failed.Id)).ActionStatus != SubathonPromptActionStatus.Failed; i++)
+            await Task.Delay(20, ct);
+        SubathonPromptRun afterFail = await Reload(failed.Id);
+        Assert.Equal(SubathonPromptActionStatus.Failed, afterFail.ActionStatus);
+        Assert.NotNull(afterFail.ActionProgress);
+
+        Assert.Equal(ActionRunResult.Done, await service.RunPromptActionAsync(failed.Id, true));
+        Assert.Equal(["confetti", "bell", "confetti", "bell"], runner.Ran.ToArray());
+        SubathonPromptRun retried = await Reload(failed.Id);
+        Assert.Equal((SubathonPromptActionStatus.Done, (string?)null), (retried.ActionStatus, retried.ActionProgress));
+
+        SubathonPromptRun missing = await AddRun(SubathonPromptRunStatus.Completed, Guid.NewGuid());
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(missing.Id));
+        Assert.Equal(SubathonPromptActionStatus.Failed, (await Reload(missing.Id)).ActionStatus);
+
+        Assert.True(await service.SetCustomActionEnabledAsync(action.Id, false));
+        SubathonPromptRun off = await AddRun(SubathonPromptRunStatus.Completed, action.Id);
+        Assert.Equal(ActionRunResult.Skipped, await service.RunPromptActionAsync(off.Id));
+        Assert.Equal(SubathonPromptActionStatus.Failed, (await Reload(off.Id)).ActionStatus);
+        Assert.True(await service.SetCustomActionEnabledAsync(action.Id, true));
+        Assert.Equal(ActionRunResult.Done, await service.RunPromptActionAsync(off.Id, true));
+        Assert.Equal(6, runner.Ran.Count);
+    }
+
     [Fact]
     public async Task RunActionSteps_RunOthers_SkipTurnedOffOnes_AndStopRunningInCircles() {
         (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
index dabee04..b910c94 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -57,7 +57,7 @@ private void OnLibraryChanged() {
 
     private void Refresh() {
         IReadOnlyList<CustomAction> all = ServiceManager.Actions.CustomActions;
-        Dictionary<string, int> wheelUses = WheelUses();
+        (Dictionary<string, int> wheelUses, Dictionary<Guid, int> promptUses) = Uses();
         string query = (SearchBox.Text ?? "").Trim();
         List<ActionCard> cards = all
             .Where(a => query.Length == 0
@@ -65,7 +65,8 @@ private void Refresh() {
                         || (a.Author?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false)
                         || (a.Description?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false))
             .Select(a => new ActionCard(a) {
-                IsSelected = a.Id == _selectedId, WheelUses = wheelUses.GetValueOrDefault(a.Id.ToString())
+                IsSelected = a.Id == _selectedId, WheelUses = wheelUses.GetValueOrDefault(a.Id.ToString()),
+                PromptUses = promptUses.GetValueOrDefault(a.Id)
             })
             .ToList();
 
@@ -78,18 +79,24 @@ private void Refresh() {
         ShowDetails();
     }
 
-    private Dictionary<string, int> WheelUses() {
+    private (Dictionary<string, int> Wheel, Dictionary<Guid, int> Prompts) Uses() {
         try {
             using AppDbContext db = _factory.CreateDbContext();
-            return db.WheelSpinActions
+            Dictionary<string, int> wheel = db.WheelSpinActions
                 .Where(a => a.ActionType == WheelSpinActionType.CustomAction && !string.IsNullOrWhiteSpace(a.Parameter))
                 .GroupBy(a => a.Parameter!)
                 .Select(g => new { g.Key, Count = g.Count() })
                 .ToDictionary(g => g.Key, g => g.Count, StringComparer.OrdinalIgnoreCase);
+            Dictionary<Guid, int> prompts = db.SubathonPrompts
+                .Where(p => p.CustomActionId != null)
+                .GroupBy(p => p.CustomActionId!.Value)
+                .Select(g => new { g.Key, Count = g.Count() })
+                .ToDictionary(g => g.Key, g => g.Count);
+            return (wheel, prompts);
         }
         catch (Exception ex) {
-            _logger?.LogWarning(ex, "[Actions] Could not count wheel items using actions");
-            return [];
+            _logger?.LogWarning(ex, "[Actions] Could not count wheel items and prompts using actions");
+            return ([], []);
         }
     }
 
@@ -248,13 +255,14 @@ private async void Delete_Click(object? sender, RoutedEventArgs e) {
         var id = action.Id.ToString();
         await using AppDbContext db = await _factory.CreateDbContextAsync();
 
-        // what stops when it's gone: wheel items pointing at it, and its own trigger steps
         int uses = await db.WheelSpinActions
             .CountAsync(a => a.ActionType == WheelSpinActionType.CustomAction && a.Parameter == id);
+        int promptUses = await db.SubathonPrompts.CountAsync(p => p.CustomActionId == action.Id);
         int triggers = action.Graph.Nodes.Count(n => n.Step.Type == ActionStepType.Trigger && !n.Disabled);
         var effects = new List<string>();
-        if (uses > 0) effects.Add($"{uses} wheel item(s) use it and will stop running until you pick another action");
-        if (triggers > 0) effects.Add($"its {triggers} trigger(s) will stop firing");
+        if (uses > 0) effects.Add($"{uses} wheel item(s) use it");
+        if (promptUses > 0) effects.Add($"{promptUses} prompt(s) currently use it");
+        if (triggers > 0) effects.Add($"{triggers} trigger(s) use it and will all stop");
 
         var dialog = new FAContentDialog {
             Title = "Delete action",
@@ -334,6 +342,7 @@ public bool IsSelected {
     public string Name => Action.Name;
     public double CardOpacity => Action.Disabled ? 0.55 : 1;
     public int WheelUses { get; init; }
+    public int PromptUses { get; init; }
 
     //
     public string ModeLetter => Action.Graph.EffectiveRepeat switch {
@@ -352,12 +361,13 @@ public bool IsSelected {
     };
 
     private int TriggerSteps => Action.Graph.Nodes.Count(n => n.Step.Type == ActionStepType.Trigger && !n.Disabled);
-    public int TriggerCount => TriggerSteps + WheelUses;
+    public int TriggerCount => TriggerSteps + WheelUses + PromptUses;
     public bool HasTriggers => TriggerCount > 0;
 
     public string TriggerTip => string.Join(", ", new[] {
         TriggerSteps > 0 ? $"{TriggerSteps} trigger step(s)" : null,
-        WheelUses > 0 ? $"{WheelUses} wheel item(s)" : null
+        WheelUses > 0 ? $"{WheelUses} wheel item(s)" : null,
+        PromptUses > 0 ? $"{PromptUses} prompt(s)" : null
     }.Where(s => s != null)) + " start this action";
     public string? Description => Action.Description;
     public bool HasDescription => !string.IsNullOrWhiteSpace(Action.Description);
diff --git a/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs b/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs
new file mode 100644
index 0000000..9d5d7cd
--- /dev/null
+++ b/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs
@@ -0,0 +1,412 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SubathonManager.Core;
+using SubathonManager.Core.Enums;
+using SubathonManager.Core.Events;
+using SubathonManager.Core.Models;
+using SubathonManager.Core.Objects;
+using SubathonManager.Data;
+using SubathonManager.Services;
+using SubathonManager.UI.Controls;
+using SubathonManager.UI.Services;
+using SubathonManager.UI.UiUtils;
+using SubathonManager.UI.Views.Actions;
+
+namespace SubathonManager.UI.Views.Prompts;
+
+public partial class PromptsEditor {
+    private const int HistoryPageSize = 50;
+    private readonly ILogger? _logger = AppServices.Provider.GetService<ILogger<PromptsEditor>>();
+    private readonly Dictionary<Guid, long> _historyProgress = new();
+    private SubathonPromptRunStatus? _historyFilter;
+    private bool _historyLoading;
+    private int _historyOffset;
+
+    private void InitHistory() {
+        SubathonEvents.PromptRunStarted += (_, _) => Dispatcher.UIThread.Post(() => _ = LoadHistoryAsync());
+
+        SubathonEvents.PromptRunUpdate += (run, prompt) => Dispatcher.UIThread.Post(() =>
+            UpdateHistoryRow(run.Id, r => {
+                r.Status = run.Status;
+                r.EndedAt = run.EndedAt;
+                r.LinkedPrompt ??= prompt;
+            }));
+
+        SubathonEvents.PromptRunProgressUpdated += (run, progress) => Dispatcher.UIThread.Post(() => {
+            _historyProgress[run.Id] = progress;
+            UpdateHistoryRow(run.Id, _ => { });
+        });
+
+        SubathonEvents.PromptRunActionStatusChanged += run => Dispatcher.UIThread.Post(() =>
+            UpdateHistoryRow(run.Id, r => {
+                r.ActionStatus = run.ActionStatus;
+                r.ActionProgress = run.ActionProgress;
+            }));
+
+        Loaded += (_, _) => {
+            ServiceManager.Actions.CustomActionsChanged -= OnCustomActionsChanged;
+            ServiceManager.Actions.CustomActionsChanged += OnCustomActionsChanged;
+        };
+        Unloaded += (_, _) => ServiceManager.Actions.CustomActionsChanged -= OnCustomActionsChanged;
+    }
+
+    #region History
+
+    private async Task LoadHistoryAsync(bool append = false) {
+        if (_historyLoading) return;
+        _historyLoading = true;
+        try {
+            if (!append) {
+                _historyOffset = 0;
+                await Dispatcher.UIThread.InvokeAsync(() => HistoryStack.Children.Clear());
+            }
+
+            if (_activeSet == null) return;
+            Guid setId = _activeSet.Id;
+
+            await using AppDbContext db = await _factory.CreateDbContextAsync();
+            List<SubathonPromptRun> runs = await db.SubathonPromptRuns
+                .Include(r => r.LinkedPrompt)
+                .Where(r => r.SetId == setId && (_historyFilter == null || r.Status == _historyFilter))
+                .OrderByDescending(r => r.StartedAt)
+                .Skip(_historyOffset).Take(HistoryPageSize).AsNoTracking()
+                .ToListAsync();
+
+            foreach (SubathonPromptRun run in runs.Where(r => r is { IsActive: true, LinkedPrompt: not null }))
+                _historyProgress[run.Id] = await PromptOrchestratorService.GetCurrentCountAsync(db, run.LinkedPrompt!)
+                                           - run.BaselineCount;
+
+            _historyOffset += runs.Count;
+            await Dispatcher.UIThread.InvokeAsync(() => {
+                foreach (SubathonPromptRun run in runs) HistoryStack.Children.Add(BuildHistoryRow(run));
+            });
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "[Prompts] Could not load prompt history");
+        }
+        finally {
+            _historyLoading = false;
+        }
+    }
+
+    private void UpdateHistoryRow(Guid runId, Action<SubathonPromptRun> change) {
+        for (var i = 0; i < HistoryStack.Children.Count; i++) {
+            if (HistoryStack.Children[i] is not Grid { Tag: SubathonPromptRun run } || run.Id != runId) continue;
+            change(run);
+            HistoryStack.Children[i] = BuildHistoryRow(run);
+            return;
+        }
+    }
+
+    private Grid BuildHistoryRow(SubathonPromptRun run) {
+        var row = new Grid {
+            Margin = new Thickness(2, 1, 2, 1),
+            MinHeight = 26,
+            Tag = run,
+            ColumnDefinitions = new ColumnDefinitions("78,1.7*,64,*,76")
+        };
+
+        var timeLabel = new TextBlock {
+            Text = run.StartedAt.ToString("MM/dd HH:mm"),
+            FontSize = 10,
+            Foreground = Brushes.Gray,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+        ToolTip.SetTip(timeLabel, $"Started {run.StartedAt:yyyy-MM-dd HH:mm:ss}"
+                                  + (run.EndedAt is { } ended ? $"\nEnded {ended:yyyy-MM-dd HH:mm:ss}" : ""));
+
+        SubathonPrompt? prompt = run.LinkedPrompt;
+        var promptLabel = new TextBlock {
+            Text = prompt?.Text ?? "(deleted)",
+            FontSize = 11,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis,
+            Margin = new Thickness(4, 0, 4, 0)
+        };
+
+        ToolTip.SetTip(promptLabel, prompt == null
+            ? "Prompt was deleted"
+            : $"{prompt.Text}\n{prompt.Type} - goal {run.SnapshotTargetValue} - "
+              + $"{(int)prompt.CompletionDuration.TotalMinutes} min");
+
+        string progress = run.Status switch {
+            SubathonPromptRunStatus.Completed => $"{run.SnapshotTargetValue} / {run.SnapshotTargetValue}",
+            SubathonPromptRunStatus.Active =>
+                $"{Math.Max(0, _historyProgress.GetValueOrDefault(run.Id))} / {run.SnapshotTargetValue}",
+            _ => "-"
+        };
+        var progressLabel = new TextBlock {
+            Text = progress,
+            FontSize = 10,
+            Foreground = Brushes.Gray,
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        var statusLabel = new TextBlock {
+            Text = run.Status.ToString(),
+            FontSize = 10,
+            FontWeight = FontWeight.SemiBold,
+            Foreground = RunStatusBrush(run.Status),
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        Grid.SetColumn(timeLabel, 0);
+        Grid.SetColumn(promptLabel, 1);
+        Grid.SetColumn(progressLabel, 2);
+        Grid.SetColumn(statusLabel, 4);
+        row.Children.Add(timeLabel);
+        row.Children.Add(promptLabel);
+        row.Children.Add(progressLabel);
+        row.Children.Add(BuildActionCell(run));
+        row.Children.Add(statusLabel);
+        return row;
+    }
+
+    private Grid BuildActionCell(SubathonPromptRun run) {
+        var cell = new Grid { Margin = new Thickness(4, 0, 2, 0), ColumnDefinitions = new ColumnDefinitions("*,Auto") };
+        Grid.SetColumn(cell, 3);
+
+        if (run.ActionId is not { } actionId) {
+            cell.Children.Add(new TextBlock {
+                Text = "-", FontSize = 10, Foreground = Brushes.Gray, VerticalAlignment = VerticalAlignment.Center
+            });
+            return cell;
+        }
+
+        string name = ServiceManager.Actions.GetCustomAction(actionId)?.Name ?? "(missing action)";
+        (string state, IBrush brush, string tip) = run.ActionStatus switch {
+            SubathonPromptActionStatus.Running => ("running", Brushes.Goldenrod, "Running"),
+            SubathonPromptActionStatus.Done => ("ran", Brushes.MediumSeaGreen, "Done"),
+            SubathonPromptActionStatus.Failed => ("failed", Brushes.IndianRed,
+                "Did not finish"),
+            _ when run.Status == SubathonPromptRunStatus.Active => ("waiting", Brushes.Gray,
+                "Waiting..."),
+            _ => ("not run", Brushes.Gray, "Only runs on completion")
+        };
+
+        var label = new TextBlock {
+            Text = $"{name} - {state}",
+            FontSize = 10,
+            Foreground = brush,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextTrimming = TextTrimming.CharacterEllipsis
+        };
+        ToolTip.SetTip(label, $"{name}\n{tip}");
+        cell.Children.Add(label);
+
+        if (run.ActionStatus != SubathonPromptActionStatus.Failed) return cell;
+
+        var playBtn = new Button {
+            Content = new SymIcon { Glyph = "Play16" },
+            Width = 20, Height = 20,
+            Padding = new Thickness(1),
+            Margin = new Thickness(3, 0, 0, 0)
+        };
+
+        ToolTip.SetTip(playBtn, "Run the action again, resuming where it stopped");
+        playBtn.Click += async (_, _) => {
+            playBtn.IsEnabled = false;
+            ActionRunResult result = await ServiceManager.Actions.RunPromptActionAsync(run.Id, true);
+            if (result == ActionRunResult.Skipped) playBtn.IsEnabled = true;
+        };
+
+        Grid.SetColumn(playBtn, 1);
+        cell.Children.Add(playBtn);
+        return cell;
+    }
+
+    private static IBrush RunStatusBrush(SubathonPromptRunStatus status) {
+        return status switch {
+            SubathonPromptRunStatus.Active => new SolidColorBrush(Color.FromRgb(80, 180, 255)),
+            SubathonPromptRunStatus.Completed => new SolidColorBrush(Color.FromRgb(80, 220, 120)),
+            SubathonPromptRunStatus.Expired => new SolidColorBrush(Color.FromRgb(200, 100, 60)),
+            _ => new SolidColorBrush(Color.FromRgb(140, 140, 140))
+        };
+    }
+
+    private void HistoryFilter_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        if (_activeSet == null || sender is not ComboBox box) return;
+        string? selection = (box.SelectedItem as ComboBoxItem)?.Tag?.ToString();
+        _historyFilter = Enum.TryParse(selection ?? "", out SubathonPromptRunStatus status) ? status : null;
+        _ = LoadHistoryAsync();
+    }
+
+    private void HistoryScroller_ScrollChanged(object? sender, ScrollChangedEventArgs e) {
+        if (_historyLoading) return;
+        double scrollable = HistoryScroller.Extent.Height - HistoryScroller.Viewport.Height;
+        if (scrollable > 0 && scrollable - HistoryScroller.Offset.Y < 100)
+            _ = LoadHistoryAsync(true);
+    }
+
+    private async void ExportHistory_Click(object? sender, RoutedEventArgs e) {
+        try {
+            await using AppDbContext db = await _factory.CreateDbContextAsync();
+            List<SubathonPromptRun> runs = await db.SubathonPromptRuns
+                .Include(r => r.LinkedPrompt)
+                .Include(r => r.LinkedSet)
+                .OrderByDescending(r => r.StartedAt).AsNoTracking()
+                .ToListAsync();
+
+            string path = await CsvUtils.ExportAsync("prompt-history",
+                [[
+                    "Id", "Set Id", "Set Name", "Prompt Id", "Prompt Text", "Type", "Target", "Status",
+                    "Started At", "Expires At", "Ended At", "Action Id", "Action Name", "Action Status"
+                ]], runs,
+                r => [
+                    r.Id, r.SetId, r.LinkedSet?.Name, r.PromptId, r.LinkedPrompt?.Text, r.LinkedPrompt?.Type,
+                    r.SnapshotTargetValue, r.Status, r.StartedAt, r.ExpiresAt, r.EndedAt, r.ActionId,
+                    r.ActionId is { } id ? ServiceManager.Actions.GetCustomAction(id)?.Name : null,
+                    r.ActionId == null ? null : r.ActionStatus
+                ]);
+            UiHelpers.OpenFolder(Path.GetDirectoryName(path));
+        }
+        catch (Exception ex) {
+            _logger?.LogError(ex, "[Prompts] Could not export prompt history");
+        }
+    }
+
+    private async void DeleteAllPromptHistory_Click(object? sender, RoutedEventArgs e) {
+        if (_activeSet == null) return;
+        Guid setId = _activeSet.Id;
+
+        var dialog = new FAContentDialog {
+            Title = "Delete Prompt History",
+            PrimaryButtonText = "Delete",
+            CloseButtonText = "Cancel",
+            Content = new TextBlock {
+                Text = $"Delete all finished prompt history for \"{_activeSet.Name}\"?",
+                TextWrapping = TextWrapping.Wrap,
+                Width = 320,
+                Margin = new Thickness(4)
+            }
+        };
+        if (await dialog.ShowAsync() != FAContentDialogResult.Primary) return;
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        await db.SubathonPromptRuns
+            .Where(r => r.SetId == setId && r.Status != SubathonPromptRunStatus.Active
+                                         && r.ActionStatus != SubathonPromptActionStatus.Running)
+            .ExecuteDeleteAsync();
+        await LoadHistoryAsync();
+    }
+
+    #endregion
+
+    #region Optional Action
+
+    private Guid? SelectedPromptActionId => (PromptActionBox.SelectedItem as ComboBoxItem)?.Tag as Guid?;
+
+    private void PopulatePromptActionBox(Guid? select) {
+        SuppressChanges(() => {
+            PromptActionBox.Items.Clear();
+            PromptActionBox.Items.Add(new ComboBoxItem { Content = "(none)", Tag = null });
+            foreach (CustomAction action in ServiceManager.Actions.CustomActions)
+                PromptActionBox.Items.Add(new ComboBoxItem { Content = action.Name, Tag = (Guid?)action.Id });
+
+            if (select is { } id && PromptActionBox.Items.OfType<ComboBoxItem>().All(i => i.Tag as Guid? != id))
+                PromptActionBox.Items.Add(new ComboBoxItem {
+                    Content = "(missing from actions library)", Tag = (Guid?)id
+                });
+
+            PromptActionBox.SelectedItem = PromptActionBox.Items.OfType<ComboBoxItem>()
+                .FirstOrDefault(i => i.Tag as Guid? == select);
+        });
+        UpdatePromptActionHint();
+    }
+
+    private void UpdatePromptActionHint() {
+        if (SelectedPromptActionId is not { } id) {
+            PromptActionHint.Text = "";
+            return;
+        }
+
+        if (ServiceManager.Actions.GetCustomAction(id) is not { } action) {
+            PromptActionHint.Text = "Action missing from actions library";
+            return;
+        }
+
+        string problem = action.Graph.Nodes.Count == 0 ? $"\"{action.Name}\" has no steps"
+            : !action.Graph.IsValid(out string error) ? error
+            : action.Disabled ? $"\"{action.Name}\" is disabled" : "";
+        PromptActionHint.Text = problem.Length > 0 ? problem : "";
+    }
+
+    private void OnCustomActionsChanged() {
+        Dispatcher.UIThread.Post(() => {
+            if (_selectedPrompt != null) PopulatePromptActionBox(SelectedPromptActionId);
+            foreach (Grid row in HistoryStack.Children.OfType<Grid>())
+                if (row.Tag is SubathonPromptRun { ActionId: not null } run)
+                    UpdateHistoryRow(run.Id, _ => { });
+        });
+    }
+
+    private void PromptAction_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
+        if (_suppressCount > 0) return;
+        UpdatePromptActionHint();
+        MarkPendingChanges();
+    }
+
+    private void OpenPromptActionEditor(CustomAction action) {
+        Guid? openedFor = _selectedPrompt?.Id;
+        ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        editor.Saved += id => {
+            if (openedFor == null || _selectedPrompt?.Id != openedFor) return;
+            if (SelectedPromptActionId == id) {
+                UpdatePromptActionHint();
+                return;
+            }
+
+            PopulatePromptActionBox(id);
+            MarkPendingChanges();
+        };
+    }
+
+    private void EditPromptAction_Click(object? sender, RoutedEventArgs e) {
+        if (SelectedPromptActionId is { } id && ServiceManager.Actions.GetCustomAction(id) is { } action)
+            OpenPromptActionEditor(action);
+        else
+            NewPromptAction_Click(sender, e);
+    }
+
+    private void NewPromptAction_Click(object? sender, RoutedEventArgs e) {
+        string name = (PromptTextBox.Text ?? "").Trim();
+        OpenPromptActionEditor(new CustomAction { Name = name.Length > 0 ? name : "New Action" });
+    }
+
+    private async void ImportPromptAction_Click(object? sender, RoutedEventArgs e) {
+        if (TopLevel.GetTopLevel(this) is not { } top) return;
+        IReadOnlyList<IStorageFile> picked = await top.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions {
+            Title = "Import Custom Action",
+            AllowMultiple = false,
+            FileTypeFilter = [
+                new FilePickerFileType("Subathon Manager Action") { Patterns = [$"*{CustomAction.FileExtension}"] }
+            ]
+        });
+        if (picked.Count == 0) return;
+
+        (CustomAction Action, bool Replaced)? imported =
+            await ServiceManager.Actions.ImportCustomActionAsync(picked[0].Path.LocalPath);
+        if (imported is not { } result) {
+            StatusText.Text = "That file is not a valid custom action";
+            return;
+        }
+
+        PopulatePromptActionBox(result.Action.Id);
+        StatusText.Text = result.Replaced
+            ? $"Updated \"{result.Action.Name}\" in the actions library" : $"Imported \"{result.Action.Name}\"";
+        MarkPendingChanges();
+    }
+
+    #endregion
+}
diff --git a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml
index 50abb91..b3e8b46 100644
--- a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml
+++ b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml
@@ -6,9 +6,11 @@
              xmlns:val="using:SubathonManager.UI.Validation"
              mc:Ignorable="d" d:DesignHeight="800" d:DesignWidth="1200"
              x:Class="SubathonManager.UI.Views.Prompts.PromptsEditor">
-    <Grid x:Name="RootGrid" Focusable="True" PointerPressed="Grid_PointerPressed" ColumnDefinitions="3*,2*">
+    <Grid x:Name="RootGrid" Focusable="True" PointerPressed="Grid_PointerPressed" ColumnDefinitions="3*,2*"
+          RowDefinitions="*,*">
 
-        <Border Grid.Column="0" Padding="8" Margin="16,16,8,16" BorderThickness="1" BorderBrush="#333" CornerRadius="8">
+        <Border Grid.Column="0" Grid.Row="0" Padding="8" Margin="16,16,8,-72" BorderThickness="1" BorderBrush="#333"
+                CornerRadius="8">
             <Grid RowDefinitions="Auto,Auto,*">
                 <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,Auto,Auto">
                     <TextBox x:Name="SetNameTextBox" FontWeight="Bold" FontSize="18" IsTabStop="False"
@@ -48,9 +50,53 @@
             </Grid>
         </Border>
 
-        <Grid Grid.Column="1">
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <StackPanel Margin="20,16,16,56" VerticalAlignment="Top">
+        <Border Grid.Column="0" Grid.Row="1" Padding="8" Margin="16,80,8,16"
+                BorderThickness="1" BorderBrush="#333" CornerRadius="8">
+            <Grid RowDefinitions="Auto,Auto,*">
+                <Grid Grid.Row="0" Margin="0,0,0,4" ColumnDefinitions="*,Auto,Auto,Auto">
+                    <TextBlock Text="Prompt History" FontSize="13" FontWeight="SemiBold" VerticalAlignment="Center" />
+                    <ComboBox x:Name="HistoryFilterBox" Grid.Column="1" Width="116" Height="26" Margin="0,0,4,0"
+                              FontSize="10" SelectedIndex="0" Padding="4,0" VerticalContentAlignment="Center"
+                              SelectionChanged="HistoryFilter_SelectionChanged">
+                        <ComboBoxItem Content="All" Tag="All" FontSize="10" />
+                        <ComboBoxItem Content="Active" Tag="Active" FontSize="10" />
+                        <ComboBoxItem Content="Completed" Tag="Completed" FontSize="10" />
+                        <ComboBoxItem Content="Expired" Tag="Expired" FontSize="10" />
+                        <ComboBoxItem Content="Cancelled" Tag="Cancelled" FontSize="10" />
+                    </ComboBox>
+                    <Button Grid.Column="2" Classes="iconbtn" Width="28" Height="28"
+                            ToolTip.Tip="Export all prompt history to CSV" Click="ExportHistory_Click">
+                        <ctl:SymIcon Glyph="ArrowExportUp16" />
+                    </Button>
+                    <Button Grid.Column="3" Classes="iconbtn" Width="28" Height="28" Margin="4,0,0,0"
+                            ToolTip.Tip="Delete the finished prompt history for this set"
+                            Click="DeleteAllPromptHistory_Click" Foreground="Red">
+                        <ctl:SymIcon Glyph="Delete16" />
+                    </Button>
+                </Grid>
+
+                <Border Grid.Row="1" BorderBrush="#444" BorderThickness="0,0,0,1" Margin="0,0,4,2">
+                    <Grid Margin="2,0,2,4" ColumnDefinitions="78,1.7*,64,*,76">
+                        <TextBlock Grid.Column="0" Text="Started" FontSize="10" Foreground="Gray" />
+                        <TextBlock Grid.Column="1" Text="Prompt" FontSize="10" Foreground="Gray" Margin="4,0,0,0" />
+                        <TextBlock Grid.Column="2" Text="Progress" FontSize="10" Foreground="Gray"
+                                   HorizontalAlignment="Center" />
+                        <TextBlock Grid.Column="3" Text="Action" FontSize="10" Foreground="Gray" Margin="4,0,0,0" />
+                        <TextBlock Grid.Column="4" Text="Status" FontSize="10" Foreground="Gray"
+                                   HorizontalAlignment="Center" />
+                    </Grid>
+                </Border>
+
+                <ScrollViewer Grid.Row="2" x:Name="HistoryScroller" VerticalScrollBarVisibility="Auto"
+                              ScrollChanged="HistoryScroller_ScrollChanged">
+                    <StackPanel x:Name="HistoryStack" Orientation="Vertical" Margin="0,2,0,0" />
+                </ScrollViewer>
+            </Grid>
+        </Border>
+
+        <Grid Grid.Column="1" Grid.Row="0" Grid.RowSpan="2">
+            <Grid Margin="20,16,16,56" RowDefinitions="Auto,*,Auto">
+                <StackPanel Grid.Row="0">
 
                     <TextBlock Text="Prompts Editor" FontSize="20" FontWeight="Bold" Margin="0,0,0,10" />
 
@@ -115,19 +161,23 @@
                         </StackPanel>
                     </Border>
 
-                    <Border x:Name="PromptDetailBorder" Padding="10" BorderThickness="1" BorderBrush="#333"
-                            CornerRadius="6"
+                </StackPanel>
+
+                    <Border x:Name="PromptDetailBorder" Grid.Row="1" Padding="10,10,4,10" BorderThickness="1"
+                            BorderBrush="#333" CornerRadius="6" VerticalAlignment="Top"
                             Margin="0,0,0,12" IsVisible="False">
-                        <StackPanel>
+                        <Grid RowDefinitions="Auto,Auto,*">
                             <TextBlock Text="Selected Prompt" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,8" />
 
-                            <Border x:Name="RunningLockText" IsVisible="False" Background="#22FF8800"
+                            <Border Grid.Row="1" x:Name="RunningLockText" IsVisible="False" Background="#22FF8800"
                                     BorderBrush="#66FF8800"
-                                    BorderThickness="1" CornerRadius="4" Padding="8,6" Margin="0,0,0,8">
-                                <TextBlock Text="⏵ This prompt is currently running - editing is locked."
+                                    BorderThickness="1" CornerRadius="4" Padding="8,6" Margin="0,0,6,8">
+                                <TextBlock Text="⏵ This prompt is currently running - editing is locked"
                                            FontSize="12" Foreground="Orange" />
                             </Border>
 
+                            <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto">
+                            <StackPanel x:Name="PromptDetailFields" Margin="0,0,6,0">
                             <TextBlock Text="Text:" FontSize="12" Margin="2,0,0,3" />
                             <TextBox x:Name="PromptTextBox" PlaceholderText="What should viewers do..." Height="36"
                                      Margin="0,0,0,8" />
@@ -190,12 +240,38 @@
                                               IsCheckedChanged="PromptInfinite_Changed" />
                                 </StackPanel>
                             </Grid>
-                        </StackPanel>
+
+                            <Border BorderBrush="#333" BorderThickness="0,1,0,0" Padding="0,8,0,0" Margin="0,4,0,0">
+                                <StackPanel>
+                                    <TextBlock Text="Optional Action:" FontSize="12" Margin="2,0,0,3" />
+                                    <Grid ColumnDefinitions="*,Auto,Auto,Auto">
+                                        <ComboBox x:Name="PromptActionBox" Height="36" HorizontalAlignment="Stretch"
+                                                  Margin="0,0,4,0" SelectionChanged="PromptAction_SelectionChanged" />
+                                        <Button Grid.Column="1" Height="36" Padding="8,2" Margin="0,0,4,0"
+                                                Click="EditPromptAction_Click"
+                                                ToolTip.Tip="Open selected action in the editor">
+                                            <ctl:SymIcon Glyph="Edit16" />
+                                        </Button>
+                                        <Button Grid.Column="2" Height="36" Padding="8,2" Margin="0,0,4,0"
+                                                Click="NewPromptAction_Click" ToolTip.Tip="Create a new custom action">
+                                            <ctl:SymIcon Glyph="Add16" />
+                                        </Button>
+                                        <Button Grid.Column="3" Height="36" Padding="8,2"
+                                                Click="ImportPromptAction_Click"
+                                                ToolTip.Tip="Import a .sma file into the actions library">
+                                            <ctl:SymIcon Glyph="ArrowDownload16" />
+                                        </Button>
+                                    </Grid>
+                                    <TextBlock x:Name="PromptActionHint" FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,4,0,0" />
+                                </StackPanel>
+                            </Border>
+                            </StackPanel>
+                            </ScrollViewer>
+                        </Grid>
                     </Border>
 
-                    <TextBlock x:Name="StatusText" Foreground="Gray" FontSize="12" Margin="0,0,0,6" />
-                </StackPanel>
-            </ScrollViewer>
+                    <TextBlock Grid.Row="2" x:Name="StatusText" Foreground="Gray" FontSize="12" Margin="0,0,0,6" />
+            </Grid>
 
             <Border x:Name="SaveButtonBorder" HorizontalAlignment="Right" VerticalAlignment="Bottom"
                     CornerRadius="6" BorderThickness="2" BorderBrush="Transparent" Margin="6,10,14,10">
diff --git a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
index 352ebbd..8300f7c 100644
--- a/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
+++ b/SubathonManager.UI/Views/Prompts/PromptsEditor.axaml.cs
@@ -48,6 +48,7 @@ public PromptsEditor() {
             if (run.Status == SubathonPromptRunStatus.Completed)
                 LoadPromptRows();
         });
+        InitHistory();
 
         Loaded += (_, _) => {
             if (!_initialized) {
@@ -242,6 +243,7 @@ private void LoadSetById(Guid setId) {
         DeleteSetBtn.IsEnabled = totalSets > 1;
 
         Dispatcher.UIThread.Post(LoadPromptRows);
+        _ = LoadHistoryAsync();
     }
 
     private void SetSelectorBox_SelectionChanged(object? sender, SelectionChangedEventArgs e) {
@@ -652,6 +654,7 @@ SubathonEventType.MakeShipPledge or SubathonEventType.MakeShipSale
             }
 
             UpdateValueLabel(prompt.Type, prompt.SubType);
+            PopulatePromptActionBox(prompt.CustomActionId);
         });
 
         RefreshRowHighlights(clickedRow);
@@ -820,6 +823,7 @@ private void WriteDetailToPrompt(SubathonPrompt prompt) {
 
         prompt.Type = SelectedType() ?? prompt.Type;
         prompt.SubType = SelectedSubType() ?? SubathonPromptSubType.Default;
+        prompt.CustomActionId = SelectedPromptActionId;
 
         if (prompt.Type == SubathonPromptType.Event) {
             prompt.FilterEventType = _selectedFilterEventType;
@@ -851,6 +855,7 @@ private static void CopyPromptToTracked(SubathonPrompt source, SubathonPrompt tr
         tracked.FilterEventType = source.FilterEventType;
         tracked.FilterMeta = source.FilterMeta;
         tracked.FilterSubType = source.FilterSubType;
+        tracked.CustomActionId = source.CustomActionId;
     }
 
     private void MarkPendingChanges() {
@@ -1125,7 +1130,7 @@ private void OnRunStateChanged(Guid promptId, bool isRunning) {
     }
 
     private void ApplyEditorLock(bool locked) {
-        PromptDetailBorder.IsEnabled = !locked;
+        PromptDetailFields.IsEnabled = !locked;
         RunningLockText.IsVisible = locked;
         SaveBtn.IsEnabled = !locked;
     }

From 6df280d2fcc647b6e77477ba1cdbdf965542a01b Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Wed, 7 Oct 2026 21:29:53 -0300
Subject: [PATCH 09/23] minor cleanup

---
 SubathonManager.Core/Enums/ActionEnums.cs     | 28 +++++++++----------
 .../Actions/ActionEditorWindow.Properties.cs  |  2 +-
 .../Views/Actions/ActionEditorWindow.axaml    |  2 +-
 .../Views/Actions/ActionsView.axaml           |  4 +--
 .../Views/Actions/ActionsView.axaml.cs        |  3 +-
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index a283b04..55c4256 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -194,15 +194,15 @@ public enum ActionRepeatMode {
 
 public enum ActionVariable {
     [ActionVariableMeta(Token = "seconds_remaining", Group = "Timer", ValueType = "number",
-        Description = "Whole seconds left on the timer")]
+        Description = "Seconds left on the timer")]
     SecondsRemaining,
 
     [ActionVariableMeta(Token = "time_remaining", Group = "Timer", ValueType = "text",
-        Description = "Time left as hours:minutes:seconds, e.g. 26:04:59")]
+        Description = "Time left as hh:mm:ss, e.g. 26:04:59")]
     TimeRemaining,
 
     [ActionVariableMeta(Token = "seconds_elapsed", Group = "Timer", ValueType = "number",
-        Description = "Whole seconds the timer has run")]
+        Description = "Seconds the timer has run")]
     SecondsElapsed,
 
     [ActionVariableMeta(Token = "timer_paused", Group = "Timer", ValueType = "true/false",
@@ -210,19 +210,19 @@ public enum ActionVariable {
     TimerPaused,
 
     [ActionVariableMeta(Token = "timer_locked", Group = "Timer", ValueType = "true/false",
-        Description = "Whether the subathon is locked to new events")]
+        Description = "Whether the subathon is locked")]
     TimerLocked,
 
     [ActionVariableMeta(Token = "timer_reversed", Group = "Timer", ValueType = "true/false",
-        Description = "Whether the timer counts up instead of down")]
+        Description = "Is the timer is in reverse mode?")]
     TimerReversed,
 
     [ActionVariableMeta(Token = "multiplier_active", Group = "Multiplier", ValueType = "true/false",
-        Description = "Whether a multiplier is running")]
+        Description = "Whether a multiplier is active")]
     MultiplierActive,
 
     [ActionVariableMeta(Token = "multiplier_amount", Group = "Multiplier", ValueType = "number",
-        Description = "Current multiplier, 1 when none is running")]
+        Description = "Current multiplier amount, 1 if inactive")]
     MultiplierAmount,
 
     [ActionVariableMeta(Token = "multiplier_seconds_remaining", Group = "Multiplier", ValueType = "number",
@@ -251,11 +251,11 @@ public enum ActionVariable {
 
     // should always match subathon currency, but included just in case / to open up config reading
     [ActionVariableMeta(Token = "default_currency", Group = "Points & Money", ValueType = "text",
-        Description = "The primary currency from settings")]
+        Description = "The primary currency from settings, should match subathon currency")]
     DefaultCurrency,
 
     [ActionVariableMeta(Token = "goal_text", Group = "Goals", ValueType = "text",
-        Description = "The goal currently being worked towards, empty once all are done")]
+        Description = "The current unfinished goal, empty once all are done")]
     GoalText,
 
     [ActionVariableMeta(Token = "goal_points", Group = "Goals", ValueType = "number",
@@ -263,20 +263,20 @@ public enum ActionVariable {
     GoalPoints,
 
     [ActionVariableMeta(Token = "goal_index", Group = "Goals", ValueType = "number",
-        Description = "Position of the current goal in the list, starting at 1; 0 when all are done")]
+        Description = "Position of the current goal in the list, starting at 1; 0 when all done")]
     GoalIndex,
 
     [ActionVariableMeta(Token = "goal_count", Group = "Goals", ValueType = "number",
-        Description = "How many goals the active list has")]
+        Description = "How many goals in total")]
     GoalCount,
 
     // should match points or money, but whatever is relevant for goals list
     [ActionVariableMeta(Token = "goal_progress", Group = "Goals", ValueType = "number",
-        Description = "Points (or whole money) counted towards goals")]
+        Description = "Points (or whole money) counted towards all goals")]
     GoalProgress,
 
     [ActionVariableMeta(Token = "last_goal_text", Group = "Goals", ValueType = "text",
-        Description = "The most recently completed goal, empty if none yet")]
+        Description = "Most recently completed goal, empty if none yet")]
     LastGoalText,
 
     [ActionVariableMeta(Token = "last_goal_points", Group = "Goals", ValueType = "number",
@@ -288,7 +288,7 @@ public enum ActionVariable {
     GoalListName,
 
     [ActionVariableMeta(Token = "goal_type", Group = "Goals", ValueType = "text",
-        Description = "What the active goal list counts: Points or Money")]
+        Description = "Are goals tracking `Points` or `Money`?")]
     GoalType,
 
     [ActionVariableMeta(Token = "user", Group = "Action", ValueType = "text",
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
index e1e2150..4a1254f 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -545,7 +545,7 @@ private async Task LoadStoredAsync() {
         if (_globalSection != null)
             SetVariableRows(_globalSection, _stored.Where(g => g.Kind == ActionStoreKind.Global).Select(g => (
                 ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name), g.ValueType.GetLabel(),
-                g.Value == null ? "No value yet" : $"Now: {Shorten(g.Value)}", "global")));
+                g.Value == null ? "No value yet" : $"Current: {Shorten(g.Value)}", "global")));
         if (_secretSection != null)
             SetVariableRows(_secretSection, _stored.Where(g => g.Kind == ActionStoreKind.Secret).Select(g => (
                 ActionStepTypeHelper.StorePlaceholder(g.Kind, g.Name), "secret",
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
index 16a5d28..e01f9de 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
@@ -269,7 +269,7 @@
                                          TextWrapping="Wrap" PlaceholderText="Description..." />
 
                                 <TextBlock FontSize="11" Foreground="Gray" TextWrapping="Wrap" Margin="2,10,0,0"
-                                           Text="Add new steps from the left. If you have an action selected, it will chain it, else it will start a new parallel branch.&#x0a;&#x0a;You can drag an arrow to and from steps to create new connections and branches.&#x0a;&#x0a;If an action has multiple inputs, it waits for all paths to complete before running.&#x0a;&#x0a;Select actions or a connection and press Delete to remove them." />
+                                           Text="Add new steps from the left. If you have an action selected, it will chain it, else it will start a new parallel branch.&#x0a;&#x0a;Drag an arrow to/from steps to create new connections and branches.&#x0a;&#x0a;If an action has multiple inputs, it waits for all paths to complete before running.&#x0a;&#x0a;Select actions or a connection and press Delete to remove them." />
                             </StackPanel>
 
                             <StackPanel x:Name="StepPanel" IsVisible="False">
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml b/SubathonManager.UI/Views/Actions/ActionsView.axaml
index d3acd0b..7bafe1f 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml
@@ -175,7 +175,7 @@
                     </StackPanel>
 
                     <TextBlock Grid.Row="1" x:Name="NoSelectionText" Margin="2,24,2,0" FontSize="12"
-                               Foreground="Gray" Text="Select an action to see its details here." />
+                               Foreground="Gray" Text="Select an action to see its details here" />
 
                     <Border Grid.Row="1" x:Name="DetailsPanel" IsVisible="False" Margin="0,20,0,0" Padding="16"
                             VerticalAlignment="Top" CornerRadius="6" BorderThickness="1"
@@ -191,7 +191,7 @@
                                               ToolTip.Tip="Off - nothing can run this action except the test button" />
                                 <Button Grid.Column="1" Classes="opaquesecondary" Padding="10,4" Margin="8,0,0,0"
                                         Click="RunSelected_Click"
-                                        ToolTip.Tip="Run the saved action now. It runs for real: time, multiplier and reroll steps do change the subathon">
+                                        ToolTip.Tip="Run the action now">
                                     <StackPanel Orientation="Horizontal" Spacing="6">
                                         <ctl:SymIcon Glyph="Play16" VerticalAlignment="Center" />
                                         <TextBlock Text="Run Now" VerticalAlignment="Center" />
diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
index b910c94..afaafb7 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -140,7 +140,7 @@ private void ShowDetails() {
         var meta = new List<string> { $"v{action.Version}" };
         if (!string.IsNullOrWhiteSpace(action.Author)) meta.Add($"by {action.Author}");
         string? path = ServiceManager.Actions.GetCustomActionPath(action.Id);
-        if (path != null && File.Exists(path)) meta.Add($"updated {File.GetLastWriteTime(path):yyyy-MM-dd HH:mm}");
+        if (path != null && File.Exists(path)) meta.Add($"Updated {File.GetLastWriteTime(path):yyyy-MM-dd HH:mm}");
         DetailMeta.Text = string.Join("  -  ", meta);
 
         DetailSteps.Text = $"{action.Graph.Nodes.Count}";
@@ -175,7 +175,6 @@ private async void EnabledSwitch_Changed(object? sender, RoutedEventArgs e) {
         if (_detailSuppress || _selectedId is not { } id) return;
         bool enabled = EnabledSwitch.IsChecked == true;
         if (!await ServiceManager.Actions.SetCustomActionEnabledAsync(id, enabled)) return;
-        StatusText.Text = enabled ? "Turned on" : "Turned off";
     }
 
     private async void RunSelected_Click(object? sender, RoutedEventArgs e) {

From 688fbead5a4efaaddd063214b739c1f8be96e4a2 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Wed, 7 Oct 2026 23:52:59 -0300
Subject: [PATCH 10/23] add completion mark to goals

---
 SubathonManager.Core/Models/SubathonGoal.cs   |    1 +
 ...261008003253_addDoneColToGoals.Designer.cs | 1194 +++++++++++++++++
 .../20261008003253_addDoneColToGoals.cs       |   29 +
 .../Migrations/AppDbContextModelSnapshot.cs   |    3 +
 SubathonManager.UI/Views/GoalsEditor.axaml    |    5 +-
 SubathonManager.UI/Views/GoalsEditor.axaml.cs |   34 +-
 6 files changed, 1262 insertions(+), 4 deletions(-)
 create mode 100644 SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.Designer.cs
 create mode 100644 SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.cs

diff --git a/SubathonManager.Core/Models/SubathonGoal.cs b/SubathonManager.Core/Models/SubathonGoal.cs
index e81ee84..9dcd75e 100644
--- a/SubathonManager.Core/Models/SubathonGoal.cs
+++ b/SubathonManager.Core/Models/SubathonGoal.cs
@@ -10,6 +10,7 @@ public class SubathonGoal {
 
     public string Text { get; set; } = "New Goal";
     public long Points { get; set; } = 1;
+    public bool IsCompleted { get; set; }
 
     [ForeignKey("SubathonGoalSet")] public Guid? GoalSetId { get; set; }
 
diff --git a/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.Designer.cs b/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.Designer.cs
new file mode 100644
index 0000000..6e2725f
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.Designer.cs
@@ -0,0 +1,1194 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SubathonManager.Data;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261008003253_addDoneColToGoals")]
+    partial class addDoneColToGoals
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.12");
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ActionGlobal", b =>
+                {
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StorageKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Kind", "Name");
+
+                    b.ToTable("ActionGlobals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("CssVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.GoAffProStore", b =>
+                {
+                    b.Property<int>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SiteId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.HasIndex("SiteId")
+                        .IsUnique();
+
+                    b.ToTable("GoAffProStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WidgetId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WidgetId");
+
+                    b.ToTable("JsVariables");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.Property<string>("ProductId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("StoreId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Valid")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("StoreId");
+
+                    b.ToTable("JuniperProducts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Property<Guid>("RowId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastFetched")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("RowId");
+
+                    b.ToTable("JuniperStores");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MakeShipTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Orders")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ProductType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Sales")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShopifyProductId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MakeShipTrackings");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("ApplyToPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplyToSeconds")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<TimeSpan?>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("FromHypeTrain")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("Multiplier")
+                        .HasColumnType("REAL");
+
+                    b.Property<DateTime?>("Started")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubathonId")
+                        .IsUnique();
+
+                    b.ToTable("MultiplierDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("UpdatedTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Routes");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.ScheduleItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EndMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDone")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StartMinute")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Date");
+
+                    b.ToTable("ScheduleItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.StateValue", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.ToTable("StateValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<DateTime?>("CapDateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsPaused")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsCumulative")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("MillisecondsElapsed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneySum")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("ReversedTime")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonDatas");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(1);
+
+                    b.Property<int>("Amount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Command")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("CurrentPoints")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("CurrentTime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("EventTimestamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EventTypeMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("MultiplierPoints")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("MultiplierSeconds")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("PointsValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ProcessedToSubathon")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SecondaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<double?>("SecondsValue")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid?>("SubathonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TertiaryValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WasReversed")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id", "Source");
+
+                    b.HasIndex("SubathonId");
+
+                    b.ToTable("SubathonEvents");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<Guid?>("GoalSetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsCompleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Points")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GoalSetId");
+
+                    b.ToTable("SubathonGoals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonGoalSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("CompletionDuration")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("CustomActionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("FilterEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FilterMeta")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("FilterSubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPrompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActionStatus")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("BaselineCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("SetId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("SnapshotTargetValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId");
+
+                    b.HasIndex("SetId");
+
+                    b.ToTable("SubathonPromptRuns");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<long>("Cooldown")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("RandomOffset")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubathonPromptSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonValue", b =>
+                {
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("Meta")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(1);
+
+                    b.Property<double>("Points")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("Seconds")
+                        .HasColumnType("REAL");
+
+                    b.HasKey("EventType", "Meta");
+
+                    b.ToTable("SubathonValues");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInfinite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Weight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.ToTable("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<int>("ActionType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Parameter")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelItemId")
+                        .IsUnique();
+
+                    b.ToTable("WheelSpinActions");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionProgress")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("WheelItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WheelId");
+
+                    b.HasIndex("WheelItemId");
+
+                    b.ToTable("WheelSpinHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CountThreshold")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Currency")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("MoneyThreshold")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("SpinsToAdd")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TierValue")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WheelSpinTriggers");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SpinsAdded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SubathonEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SubathonEventType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TriggerSource")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TriggerUser")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("TriggeredAt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("WheelSpinTriggerHistories");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GlobalVars")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HtmlPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RouteId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Visibility")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float>("X")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("Y")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Z")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RouteId");
+
+                    b.ToTable("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WidgetCatalogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocsUrl")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Entry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileModifiedTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Group")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("LastSeenUtc")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PackPath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewCachePath")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreviewImage")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("ScaleX")
+                        .HasColumnType("REAL");
+
+                    b.Property<float>("ScaleY")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("Source")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Tags")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PackPath")
+                        .IsUnique();
+
+                    b.ToTable("WidgetCatalogEntries");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.CssVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("CssVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JsVariable", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Widget", "Widget")
+                        .WithMany("JsVariables")
+                        .HasForeignKey("WidgetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Widget");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperProduct", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.JuniperStore", "Store")
+                        .WithMany("Products")
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.MultiplierData", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithOne("Multiplier")
+                        .HasForeignKey("SubathonManager.Core.Models.MultiplierData", "SubathonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonEvent", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonData", "LinkedSubathon")
+                        .WithMany()
+                        .HasForeignKey("SubathonId");
+
+                    b.Navigation("LinkedSubathon");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoal", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonGoalSet", "LinkedGoalSet")
+                        .WithMany("Goals")
+                        .HasForeignKey("GoalSetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedGoalSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPrompt", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany("Prompts")
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptRun", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.SubathonPrompt", "LinkedPrompt")
+                        .WithMany()
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.SubathonPromptSet", "LinkedSet")
+                        .WithMany()
+                        .HasForeignKey("SetId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("LinkedPrompt");
+
+                    b.Navigation("LinkedSet");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany("WheelItems")
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinAction", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithOne("Action")
+                        .HasForeignKey("SubathonManager.Core.Models.WheelSpinAction", "WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSet", "LinkedWheel")
+                        .WithMany()
+                        .HasForeignKey("WheelId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("SubathonManager.Core.Models.WheelItem", "LinkedItem")
+                        .WithMany()
+                        .HasForeignKey("WheelItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("LinkedItem");
+
+                    b.Navigation("LinkedWheel");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTriggerHistory", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.WheelSpinTrigger", "Trigger")
+                        .WithMany("History")
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.HasOne("SubathonManager.Core.Models.Route", "Route")
+                        .WithMany("Widgets")
+                        .HasForeignKey("RouteId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Route");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.JuniperStore", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Route", b =>
+                {
+                    b.Navigation("Widgets");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonData", b =>
+                {
+                    b.Navigation("Multiplier")
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonGoalSet", b =>
+                {
+                    b.Navigation("Goals");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.SubathonPromptSet", b =>
+                {
+                    b.Navigation("Prompts");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelItem", b =>
+                {
+                    b.Navigation("Action");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSet", b =>
+                {
+                    b.Navigation("WheelItems");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.WheelSpinTrigger", b =>
+                {
+                    b.Navigation("History");
+                });
+
+            modelBuilder.Entity("SubathonManager.Core.Models.Widget", b =>
+                {
+                    b.Navigation("CssVariables");
+
+                    b.Navigation("JsVariables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.cs b/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.cs
new file mode 100644
index 0000000..541ae9e
--- /dev/null
+++ b/SubathonManager.Data/Migrations/20261008003253_addDoneColToGoals.cs
@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SubathonManager.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class addDoneColToGoals : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsCompleted",
+                table: "SubathonGoals",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsCompleted",
+                table: "SubathonGoals");
+        }
+    }
+}
diff --git a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
index ab1c526..574d169 100644
--- a/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/SubathonManager.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -472,6 +472,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<Guid?>("GoalSetId")
                         .HasColumnType("TEXT");
 
+                    b.Property<bool>("IsCompleted")
+                        .HasColumnType("INTEGER");
+
                     b.Property<long>("Points")
                         .HasColumnType("INTEGER");
 
diff --git a/SubathonManager.UI/Views/GoalsEditor.axaml b/SubathonManager.UI/Views/GoalsEditor.axaml
index d439eae..3a6defe 100644
--- a/SubathonManager.UI/Views/GoalsEditor.axaml
+++ b/SubathonManager.UI/Views/GoalsEditor.axaml
@@ -20,11 +20,12 @@
                         <ctl:SymIcon Glyph="Add16" />
                     </Button>
                 </Grid>
-                <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto,Auto" Margin="4,12,4,2">
+                <Grid Grid.Row="1" ColumnDefinitions="Auto,*,Auto,Auto,Auto" Margin="4,12,4,2">
                     <Border Grid.Column="0" Width="22" />
                     <TextBlock Grid.Column="1" Text="Goal" Margin="0,0,8,0" />
                     <TextBlock Grid.Column="2" Text="Points" Width="80" Margin="0,0,8,0" />
-                    <Border Grid.Column="3" Width="36" />
+                    <TextBlock Grid.Column="3" Text="Done" Width="40" />
+                    <Border Grid.Column="4" Width="36" />
                 </Grid>
                 <ScrollViewer Grid.Row="2" x:Name="GoalsEditorScroller" MinHeight="200"
                               VerticalScrollBarVisibility="Visible"
diff --git a/SubathonManager.UI/Views/GoalsEditor.axaml.cs b/SubathonManager.UI/Views/GoalsEditor.axaml.cs
index d705847..8fd3af6 100644
--- a/SubathonManager.UI/Views/GoalsEditor.axaml.cs
+++ b/SubathonManager.UI/Views/GoalsEditor.axaml.cs
@@ -247,7 +247,7 @@ private async void LoadGoals() {
     private Grid AddGoalRow(SubathonGoal goal, bool isUnsaved) {
         var panel = new Grid {
             Margin = new Thickness(4, 0, 4, 8),
-            ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto,Auto")
+            ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto,Auto,Auto")
         };
 
         var textBox = new TextBox {
@@ -272,6 +272,18 @@ private Grid AddGoalRow(SubathonGoal goal, bool isUnsaved) {
         pointsBox.TextChanged += Value_OnChanged;
         DirtySaveGuard.Rebase(pointsBox);
 
+        var doneBox = new CheckBox {
+            IsChecked = goal.IsCompleted,
+            Width = 32,
+            MinWidth = 0,
+            Padding = new Thickness(0),
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = new Thickness(8, 0,0, 0)
+        };
+        ToolTip.SetTip(doneBox, "Mark Done");
+        doneBox.IsCheckedChanged += (_, _) => DoneBox_Changed(goal, doneBox.IsChecked == true);
+
         var deleteBtn = new Button {
             Content = new SymIcon { Glyph = "Delete20", HorizontalAlignment = HorizontalAlignment.Center },
             Width = 32, Height = 32,
@@ -290,13 +302,15 @@ private Grid AddGoalRow(SubathonGoal goal, bool isUnsaved) {
 
         Grid.SetColumn(textBox, 1);
         Grid.SetColumn(pointsBox, 2);
-        Grid.SetColumn(deleteBtn, 3);
+        Grid.SetColumn(doneBox, 3);
+        Grid.SetColumn(deleteBtn, 4);
         Grid.SetColumn(grip, 0);
 
         panel.Children.Add(textBox);
         panel.Children.Add(pointsBox);
         panel.Children.Add(deleteBtn);
         panel.Children.Add(grip);
+        panel.Children.Add(doneBox);
         panel.Tag = goal;
 
         if (isUnsaved) _unsavedGoals.Add(goal);
@@ -312,6 +326,21 @@ private Grid AddGoalRow(SubathonGoal goal, bool isUnsaved) {
         return row.Children[1] as TextBox;
     }
 
+    private static CheckBox? RowDoneBox(Grid row) {
+        return row.Children[4] as CheckBox;
+    }
+
+    private async void DoneBox_Changed(SubathonGoal goal, bool done) {
+        if (_suppressCount > 0 || goal.IsCompleted == done) return;
+        goal.IsCompleted = done;
+        if (_unsavedGoals.Contains(goal)) return;
+
+        await using AppDbContext db = await _factory.CreateDbContextAsync();
+        await db.SubathonGoals
+            .Where(g => g.Id == goal.Id)
+            .ExecuteUpdateAsync(s => s.SetProperty(g => g.IsCompleted, done));
+    }
+
     private List<Grid> GoalRows() {
         return GoalsStack.Children.OfType<Grid>().ToList();
     }
@@ -509,6 +538,7 @@ private async Task SaveGoalsAsync(object? sender, RoutedEventArgs? e) {
 
             goal.Text = textBox.Text ?? "";
             goal.Points = pts;
+            goal.IsCompleted = RowDoneBox(panel)?.IsChecked == true;
 
             if (_unsavedGoals.Contains(goal)) db.SubathonGoals.Add(goal);
             else db.Update(goal);

From d3fff985a4c0743e49c45efba0e7beffc0a998b3 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 8 Oct 2026 11:42:00 -0300
Subject: [PATCH 11/23] allow multi run mode for multi inputs as toggle

---
 SubathonManager.Core/Enums/ActionEnums.cs     |  5 ++
 SubathonManager.Core/Objects/ActionGraph.cs   | 34 ++++++++-
 SubathonManager.Services/ActionService.cs     | 70 ++++++++++++++-----
 .../ServicesUnitTests/ActionServiceTests.cs   | 59 ++++++++++++++++
 .../Views/Actions/ActionEditorViewModels.cs   | 14 ++++
 .../Views/Actions/ActionEditorWindow.Graph.cs | 21 +++++-
 .../Actions/ActionEditorWindow.Properties.cs  |  9 +++
 .../Views/Actions/ActionEditorWindow.axaml    | 12 +++-
 8 files changed, 203 insertions(+), 21 deletions(-)

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index 55c4256..eb1c2b0 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -172,6 +172,11 @@ public enum ActionValueType {
     Boolean
 }
 
+public enum ActionInputMode {
+    Wait,
+    Multiple
+}
+
 public enum ActionHttpAuth {
     None,
     Bearer,
diff --git a/SubathonManager.Core/Objects/ActionGraph.cs b/SubathonManager.Core/Objects/ActionGraph.cs
index e60fa97..7bfc25d 100644
--- a/SubathonManager.Core/Objects/ActionGraph.cs
+++ b/SubathonManager.Core/Objects/ActionGraph.cs
@@ -276,6 +276,9 @@ public sealed class ActionNode {
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     public bool IgnoreErrors { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    public ActionInputMode Inputs { get; set; }
 }
 
 public sealed class ActionEdge {
@@ -515,6 +518,8 @@ public void SetOutput(string name, string value, string status) {
     public HashSet<string> Done { get; set; } = [];
     public HashSet<string> Skipped { get; set; } = [];
     public Dictionary<string, string> Ports { get; set; } = [];
+
+    public Dictionary<string, int> Fired { get; set; } = [];
     public Dictionary<string, string> Variables { get; set; } = new(StringComparer.OrdinalIgnoreCase);
 
     public Dictionary<string, double> Values { get; set; } = [];
@@ -550,12 +555,37 @@ public void SetPort(string nodeId, string? port) {
         }
     }
 
-    public bool IsLive(ActionEdge edge) {
+    private static string FireKey(string nodeId, string? port) {
+        return $"{nodeId}|{port}";
+    }
+
+    public void RecordRun(string nodeId, string? port) {
         lock (_lock) {
-            return Done.Contains(edge.From) && Ports.GetValueOrDefault(edge.From) == edge.Port;
+            string key = FireKey(nodeId, port);
+            Fired[key] = Fired.GetValueOrDefault(key) + 1;
         }
     }
 
+    public int Runs(string nodeId) {
+        var prefix = $"{nodeId}|";
+        lock (_lock) {
+            return Fired.Where(f => f.Key.StartsWith(prefix, StringComparison.Ordinal)).Sum(f => f.Value);
+        }
+    }
+
+    public int Firings(ActionEdge edge) {
+        var prefix = $"{edge.From}|";
+        lock (_lock) {
+            if (Fired.TryGetValue(FireKey(edge.From, edge.Port), out int count)) return count;
+            if (Fired.Keys.Any(k => k.StartsWith(prefix, StringComparison.Ordinal))) return 0;
+            return Done.Contains(edge.From) && Ports.GetValueOrDefault(edge.From) == edge.Port ? 1 : 0;
+        }
+    }
+
+    public bool IsLive(ActionEdge edge) {
+        return Firings(edge) > 0;
+    }
+
     public void SetVariable(string name, string value) {
         if (value.Length > MaxVariableLength) value = value[..MaxVariableLength];
         lock (_lock) {
diff --git a/SubathonManager.Services/ActionService.cs b/SubathonManager.Services/ActionService.cs
index 73d4e3f..70d847d 100644
--- a/SubathonManager.Services/ActionService.cs
+++ b/SubathonManager.Services/ActionService.cs
@@ -813,7 +813,9 @@ private async Task<bool> RunGraphAsync(ActionGraph graph, ActionContext ctx, Act
         Dictionary<string, ActionNode> pending = graph.Nodes
             .Where(n => !progress.IsResolved(n.Id))
             .ToDictionary(n => n.Id);
-        var running = new Dictionary<Task<bool>, ActionNode>();
+
+        var running = new Dictionary<Task<(bool Ok, string? Port)>, ActionNode>();
+        var inFlight = new Dictionary<string, int>(StringComparer.Ordinal);
         HashSet<string> outputs = graph.OutputVariables();
 
         if (graph.Nodes.Any(n => n.Step.Type == ActionStepType.Trigger)) outputs.Add(ActionRunProgress.TriggerVariable);
@@ -831,37 +833,71 @@ void StartReady() {
                 changed = false;
                 foreach (ActionNode node in pending.Values.ToList()) {
                     List<ActionEdge> incoming = graph.IncomingEdges(node.Id).ToList();
-                    if (!incoming.All(e => progress.IsResolved(e.From))) continue;
-                    pending.Remove(node.Id);
+                    if (incoming.Count == 0) {
+                        pending.Remove(node.Id);
+                        if (StartsRun(node)) {
+                            Start(node);
+                            continue;
+                        }
 
-                    if (incoming.Count > 0 ? !incoming.Any(progress.IsLive) : !StartsRun(node)) {
                         progress.MarkSkipped(node.Id);
                         changed = true;
                         continue;
                     }
 
-                    running[StartStep(node)] = node;
+                    int have = progress.Runs(node.Id) + inFlight.GetValueOrDefault(node.Id);
+                    if (node.Inputs == ActionInputMode.Multiple) {
+                        for (int handedOver = incoming.Sum(progress.Firings); have < handedOver; have++)
+                            Start(node);
+                    }
+                    else {
+                        while (incoming.Any(e => progress.Firings(e) > have)
+                               && incoming.All(e => progress.Firings(e) > have || progress.IsResolved(e.From))) {
+                            Start(node);
+                            have++;
+                        }
+                    }
+
+                    if (inFlight.GetValueOrDefault(node.Id) > 0 || !incoming.All(e => progress.IsResolved(e.From)))
+                        continue;
+
+                    pending.Remove(node.Id);
+                    if (progress.Runs(node.Id) > 0) progress.MarkDone(node.Id);
+                    else progress.MarkSkipped(node.Id);
+                    changed = true;
                 }
             } while (changed);
         }
 
-        Task<bool> StartStep(ActionNode node) {
-            if (node.Disabled || node.Step.Type == ActionStepType.Trigger) return Task.Run(() => true, ct);
-            return node.Step.Type == ActionStepType.Condition
-                ? RunConditionAsync(node, ctx, progress, outputs, ct)
-                : RunStepAsync(node.Step, ctx, progress, outputs, ct);
+        void Start(ActionNode node) {
+            inFlight[node.Id] = inFlight.GetValueOrDefault(node.Id) + 1;
+            running[StartStep(node)] = node;
+        }
+
+        async Task<(bool Ok, string? Port)> StartStep(ActionNode node) {
+            if (node.Disabled || node.Step.Type == ActionStepType.Trigger) {
+                await Task.Yield();
+                ct.ThrowIfCancellationRequested();
+                return (true, null);
+            }
+
+            if (node.Step.Type == ActionStepType.Condition)
+                return (true, await RunConditionAsync(node, ctx, progress, outputs, ct));
+            return (await RunStepAsync(node.Step, ctx, progress, outputs, ct), null);
         }
 
         StartReady();
         var failed = false;
         while (running.Count > 0) {
-            Task<bool> next = await Task.WhenAny(running.Keys);
+            Task<(bool Ok, string? Port)> next = await Task.WhenAny(running.Keys);
             ActionNode node = running[next];
             running.Remove(next);
+            inFlight[node.Id]--;
 
             bool ok;
+            string? port = null;
             try {
-                ok = await next;
+                (ok, port) = await next;
             }
             catch (OperationCanceledException) {
                 ok = false;
@@ -878,7 +914,10 @@ Task<bool> StartStep(ActionNode node) {
             }
 
             if (ok) {
-                progress.MarkDone(node.Id);
+                progress.RecordRun(node.Id, port);
+                progress.SetPort(node.Id, port);
+                if (!graph.IncomingEdges(node.Id).Any()) progress.MarkDone(node.Id);
+
                 if (onProgress != null) await onProgress(progress);
                 if (!failed && !ct.IsCancellationRequested) StartReady();
                 continue;
@@ -894,18 +933,17 @@ Task<bool> StartStep(ActionNode node) {
         return !failed && pending.Count == 0 && !outerCt.IsCancellationRequested;
     }
 
-    private async Task<bool> RunConditionAsync(ActionNode node, ActionContext ctx, ActionRunProgress progress,
+    private async Task<string?> RunConditionAsync(ActionNode node, ActionContext ctx, ActionRunProgress progress,
         IReadOnlySet<string> outputs, CancellationToken ct) {
         ct.ThrowIfCancellationRequested();
         ActionStep step = await FillVariablesAsync(node.Step, ctx, progress, outputs);
 
         bool result = ActionStepTypeHelper.Compare(step.Scope ?? "", step.Operation, step.Target);
-        progress.SetPort(node.Id, result ? null : ActionEdge.ElsePort);
 
         if (logger?.IsEnabled(LogLevel.Debug) ?? false)
             logger.LogDebug("[Actions] {Label}: \"{Step}\" was {Result}", ctx.Label ?? ctx.RepeatKey,
                 node.Step.Describe(), result);
-        return true;
+        return result ? null : ActionEdge.ElsePort;
     }
 
     private async Task<bool> RunStepAsync(ActionStep step, ActionContext ctx, ActionRunProgress progress,
diff --git a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
index 02b3e43..552236b 100644
--- a/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/ActionServiceTests.cs
@@ -177,6 +177,65 @@ public async Task Branches_RunInParallel_AndAJoinWaitsForEveryInput() {
         Assert.Equal(["start", "fast", "slow", "join"], runner.Ran.ToArray());
     }
 
+    [Fact]
+    public async Task MultipleInputSteps_RunPerInput_StepsAfterThemRunPerRun_AndResumeRunsWhatsMissing() {
+        (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
+        await using SqliteConnection __ = conn;
+        //////////////////////////////////////////////////////////////////
+        //      +-> wait 0.3s -> slow --+
+        // start                        +-> each (Multiple) -> after (Wait)
+        //      +-> fast ---------------+
+        //      +-> no (if false) ------+   (skipped)
+        //////////////////////////////////////////////////////////////////
+        ActionGraph Build() {
+            return new ActionGraph {
+                Nodes = [
+                    new ActionNode { Id = "start", Step = Hotkey("start") },
+                    new ActionNode { Id = "wait", Step = Wait(0.3) },
+                    new ActionNode { Id = "slow", Step = Hotkey("slow") },
+                    new ActionNode { Id = "fast", Step = Hotkey("fast") },
+                    new ActionNode {
+                        Id = "if", Step = new ActionStep {
+                            Type = ActionStepType.Condition, Scope = "1", Operation = ActionOperation.IsEqual, Target = "2"
+                        }
+                    },
+                    new ActionNode { Id = "no", Step = Hotkey("no") },
+                    new ActionNode { Id = "each", Step = Hotkey("each"), Inputs = ActionInputMode.Multiple },
+                    new ActionNode { Id = "after", Step = Hotkey("after") }
+                ],
+                Edges = [
+                    new ActionEdge { From = "start", To = "wait" },
+                    new ActionEdge { From = "wait", To = "slow" },
+                    new ActionEdge { From = "start", To = "fast" },
+                    new ActionEdge { From = "start", To = "if" },
+                    new ActionEdge { From = "if", To = "no" },
+                    new ActionEdge { From = "slow", To = "each" },
+                    new ActionEdge { From = "fast", To = "each" },
+                    new ActionEdge { From = "no", To = "each" },
+                    new ActionEdge { From = "each", To = "after" }
+                ]
+            };
+        }
+
+        var ctx = new ActionContext(SubathonEventSource.WheelSpin, "test", "multiple");
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), Build(), ctx));
+        Assert.Equal(["start", "fast", "each", "after", "slow", "each", "after"], runner.Ran.ToArray());
+
+        runner.Ran.Clear();
+        runner.FailOnce.Add("each");
+        var progress = new ActionRunProgress();
+        Assert.Equal(ActionRunResult.Paused, await service.RunAsync(Guid.NewGuid(), Build(), ctx, progress));
+        Assert.Equal(["start", "fast"], runner.Ran.ToArray());
+
+        ActionRunProgress resumed = ActionRunProgress.Parse(progress.ToJson());
+        Assert.Equal(ActionRunResult.Done, await service.RunAsync(Guid.NewGuid(), Build(), ctx, resumed));
+
+        Assert.Equal(["start", "fast", "each", "after", "slow", "each", "after"], runner.Ran.ToArray());
+        Assert.Equal(2, resumed.Runs("each"));
+        Assert.Equal(2, resumed.Runs("after"));
+        Assert.Contains("no", resumed.Skipped);
+    }
+
     [Fact]
     public async Task FailedStep_PausesTheRun_AndResumeContinuesFromThatStep() {
         (ActionService service, FakeRunner runner, _, SqliteConnection conn) = await SetupAsync();
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
index 6063fdc..8394557 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorViewModels.cs
@@ -39,6 +39,7 @@ public ActionNodeVm(ActionNode node) {
     public IBrush CardTint => IsTrigger ? TriggerTint : Brushes.Transparent;
     public IBrush CardBorder => IsTrigger ? TriggerBorder : Brushes.Transparent;
     public bool IgnoresErrors => Node.IgnoreErrors;
+    public bool IsMultiInput => HasInput && Node.Inputs == ActionInputMode.Multiple;
 
     public Point Location {
         get => new(Node.X, Node.Y);
@@ -70,6 +71,8 @@ public void Refresh(ActionGraph graph) {
         Raise(nameof(IsDisabled));
         Raise(nameof(CardOpacity));
         Raise(nameof(IgnoresErrors));
+        Raise(nameof(IsMultiInput));
+        Input.RefreshMode();
         IsStart = !IsTrigger && !graph.Incoming(Node.Id).Any();
 
         List<ActionEdge> outgoing = graph.Edges.Where(e => e.From == Node.Id).ToList();
@@ -96,6 +99,17 @@ public sealed class ActionConnectorVm(ActionNodeVm owner, bool isInput, string?
     public bool IsInput { get; } = isInput;
     public string? Port { get; } = port;
 
+    public bool IsMultiInput => IsInput && Owner.IsMultiInput;
+
+    public string Tip => IsMultiInput
+        ? "Multiple: runs each time any connected step finishes"
+        : "Wait: runs when all connected steps have finished";
+
+    public void RefreshMode() {
+        Raise(nameof(IsMultiInput));
+        Raise(nameof(Tip));
+    }
+
     public Point Anchor {
         get => _anchor;
         set {
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
index 24ef278..12558ea 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Graph.cs
@@ -309,10 +309,19 @@ private MenuFlyout BuildNodeMenu(ActionNodeVm clicked) {
         toggle.Click += (_, _) => ToggleNodes(targets, !clicked.Node.Disabled);
         var ignore = new MenuItem { Header = "Ignore Errors" };
         ignore.Click += (_, _) => SetIgnoreErrors(targets, !clicked.Node.IgnoreErrors);
+        var multiple = new MenuItem {
+            Header = "Run For Each Input",
+            ToggleType = MenuItemToggleType.CheckBox,
+            IsChecked = clicked.Node.Inputs == ActionInputMode.Multiple,
+            IsVisible = targets.Any(t => t.HasInput)
+        };
+
+        multiple.Click += (_, _) => SetInputMode(targets,
+            clicked.Node.Inputs == ActionInputMode.Multiple ? ActionInputMode.Wait : ActionInputMode.Multiple);
         var delete = new MenuItem { Header = $"Delete{suffix}" };
         delete.Click += (_, _) => DeleteItems(targets, []);
 
-        var menu = new MenuFlyout { Items = { duplicate, toggle, ignore, new Separator(), delete } };
+        var menu = new MenuFlyout { Items = { duplicate, toggle, ignore, multiple, new Separator(), delete } };
         if (clicked.IsTrigger && targets.Count == 1) {
             var test = new MenuItem { Header = "Test Trigger" };
             ToolTip.SetTip(test, "Run the action with sample trigger values");
@@ -329,6 +338,13 @@ private List<ActionNodeVm> MenuTargets(ActionNodeVm clicked) {
         return selected.Count > 1 && selected.Contains(clicked) ? selected : [clicked];
     }
 
+    private void SetInputMode(List<ActionNodeVm> targets, ActionInputMode mode) {
+        foreach (ActionNodeVm node in targets.Where(t => t.HasInput)) node.Node.Inputs = mode;
+        RefreshNodes();
+        if (SelectedVm is { } selected && targets.Contains(selected)) ShowSelection();
+        MarkDirty();
+    }
+
     private void SetIgnoreErrors(List<ActionNodeVm> targets, bool ignore) {
         foreach (ActionNodeVm node in targets) node.Node.IgnoreErrors = ignore;
         RefreshNodes();
@@ -357,7 +373,8 @@ private void DuplicateNodes(List<ActionNodeVm> targets) {
                 X = original.Node.X + 30,
                 Y = original.Node.Y + StepSpacingY,
                 Disabled = original.Node.Disabled,
-                IgnoreErrors = original.Node.IgnoreErrors
+                IgnoreErrors = original.Node.IgnoreErrors,
+                Inputs = original.Node.Inputs
             };
             newIds[original.Node.Id] = copy.Id;
             Graph.Nodes.Add(copy);
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
index 4a1254f..0634ee6 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -106,6 +106,8 @@ private void ShowSelection() {
 
             IgnoreErrorsCheck.IsVisible = type is not (ActionStepType.Condition or ActionStepType.Trigger);
             IgnoreErrorsCheck.IsChecked = node.IgnoreErrors;
+            MultipleInputsCheck.IsVisible = type != ActionStepType.Trigger;
+            MultipleInputsCheck.IsChecked = node.Inputs == ActionInputMode.Multiple;
             RefreshFieldVisibility(step);
         }
         finally {
@@ -231,6 +233,13 @@ private void TriggerField_Changed(object? sender, RoutedEventArgs e) {
         MarkDirty();
     }
 
+    private void MultipleInputs_Changed(object? sender, RoutedEventArgs e) {
+        if (_suppress > 0 || SelectedNode is not { } node) return;
+        node.Inputs = MultipleInputsCheck.IsChecked == true ? ActionInputMode.Multiple : ActionInputMode.Wait;
+        RefreshNodes();
+        MarkDirty();
+    }
+
     private void IgnoreErrors_Changed(object? sender, RoutedEventArgs e) {
         if (_suppress > 0 || SelectedNode is not { } node) return;
         node.IgnoreErrors = IgnoreErrorsCheck.IsChecked == true;
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
index e01f9de..01eac08 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.axaml
@@ -45,6 +45,9 @@
                     </Border>
                 </ControlTemplate>
             </Setter>
+            <Style Selector="^.multi">
+                <Setter Property="Background" Value="#DEADFF" />
+            </Style>
         </ControlTheme>
 
         <ControlTheme x:Key="ConnectorRightTheme" TargetType="connections:Connector"
@@ -72,7 +75,7 @@
         <DataTemplate x:Key="InputConnectorTemplate" x:DataType="local:ActionConnectorVm">
             <connections:Connector Anchor="{Binding Anchor, Mode=OneWayToSource}" IsConnected="True"
                                    VerticalAlignment="Center" Theme="{StaticResource ConnectorLeftTheme}"
-                                   ToolTip.Tip="Runs after everything connected has finished" />
+                                   Classes.multi="{Binding IsMultiInput}" ToolTip.Tip="{Binding Tip}" />
         </DataTemplate>
 
         <DataTemplate x:Key="OutputConnectorTemplate" x:DataType="local:ActionConnectorVm">
@@ -155,6 +158,7 @@
             <connections:StepConnection Source="{Binding Source.Anchor}" Target="{Binding Target.Anchor}"
                                         Theme="{StaticResource StepConnectionTheme}"
                                         Classes.else="{Binding IsElse}"
+                                        Classes.multi="{Binding Target.IsMultiInput}"
                                         connections:BaseConnection.IsSelectable="True" />
         </DataTemplate>
 
@@ -169,6 +173,9 @@
             <Setter Property="Stroke" Value="#C77C2E" />
             <Setter Property="Fill" Value="#C77C2E" />
         </Style>
+        <Style Selector="connections|StepConnection.multi">
+            <Setter Property="ArrowShape" Value="Ellipse" />
+        </Style>
     </Window.Styles>
 
     <Grid RowDefinitions="Auto,*,Auto">
@@ -387,6 +394,9 @@
                                 <CheckBox x:Name="IgnoreErrorsCheck" Content="Ignore errors" Margin="0,0,0,4"
                                           IsCheckedChanged="IgnoreErrors_Changed"
                                           ToolTip.Tip="If this step fails, log it and move on" />
+                                <CheckBox x:Name="MultipleInputsCheck" Content="Run for each input"
+                                          Margin="0,0,0,4" IsCheckedChanged="MultipleInputs_Changed"
+                                          ToolTip.Tip="Off waits for all inputs to finish before running once.&#xA;&#xA;On will run for each successful input and can trigger multiple times." />
 
                                 <TextBlock x:Name="StepError" FontSize="11" Foreground="OrangeRed" TextWrapping="Wrap"
                                            Margin="2,2,0,0" />

From d2e475c9c718e863ba93b51c2c1b606fadf01991 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 8 Oct 2026 13:07:05 -0300
Subject: [PATCH 12/23] fix test

---
 SubathonManager.Server/WebServer.Api.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SubathonManager.Server/WebServer.Api.cs b/SubathonManager.Server/WebServer.Api.cs
index 4f638ac..b3cb7ce 100644
--- a/SubathonManager.Server/WebServer.Api.cs
+++ b/SubathonManager.Server/WebServer.Api.cs
@@ -316,8 +316,8 @@ internal async Task HandleGlobalsRequestAsync(IHttpContext ctx) {
     }
 
     internal async Task HandleGlobalsSetRequestAsync(IHttpContext ctx) {
-        async Task Fail(int code, string error2) {
-            await ctx.WriteResponse(code, JsonSerializer.Serialize(new { error2 }), true, "application/json");
+        async Task Fail(int code, string error) {
+            await ctx.WriteResponse(code, JsonSerializer.Serialize(new { error }), true, "application/json");
         }
 
         var actions = AppServices.Provider?.GetService<ActionService>();
@@ -407,10 +407,10 @@ await Fail(400, named == null
             value = (-double.Parse(amount, CultureInfo.InvariantCulture)).ToString(CultureInfo.InvariantCulture);
         }
 
-        (ActionGlobal? global, bool created, string? error) =
+        (ActionGlobal? global, bool created, string? errorStr) =
             await actions.ChangeGlobalAsync(name, sentType, operation.Value, value, true);
         if (global == null) {
-            await Fail(400, error ?? "Could not set global");
+            await Fail(400, errorStr ?? "Could not set global");
             return;
         }
 

From ac2123ff1d1cb8f868a77e57a9aff5ff5d2b6d5d Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Fri, 9 Oct 2026 01:26:28 -0300
Subject: [PATCH 13/23] minor cleanup

---
 SubathonManager.Core/Enums/ActionEnums.cs   |  5 ++-
 SubathonManager.Core/Objects/ActionGraph.cs | 41 +++++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index eb1c2b0..6da0c93 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -156,7 +156,7 @@ public enum ActionOperation {
 
     // Set/Adjust Global on a number
     Adjust,
-    
+
     // Start another action, do not wait for result
     Start
 }
@@ -469,7 +469,8 @@ public static object ToTypedValue(this ActionValueType type, string? value) {
         return type switch {
             ActionValueType.Number => double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture,
                 out double number)
-                ? number : 0d,
+                ? number
+                : 0d,
             ActionValueType.Boolean => string.Equals(value, "true", StringComparison.OrdinalIgnoreCase),
             _ => value ?? ""
         };
diff --git a/SubathonManager.Core/Objects/ActionGraph.cs b/SubathonManager.Core/Objects/ActionGraph.cs
index 7bfc25d..b9b2989 100644
--- a/SubathonManager.Core/Objects/ActionGraph.cs
+++ b/SubathonManager.Core/Objects/ActionGraph.cs
@@ -153,13 +153,14 @@ public bool MatchesTrigger(SubathonTrigger trigger, SubathonEvent? subathonEvent
         if (subathonEvent == null) return false;
         if (IgnoreSimulated && subathonEvent.Source == SubathonEventSource.Simulated) return false;
 
-        string eventType = $"{subathonEvent.EventType}";
+        var eventType = $"{subathonEvent.EventType}";
         return EventTypes?.Contains(eventType, StringComparer.OrdinalIgnoreCase) ?? false;
     }
 
     private static string EventTypeLabel(string eventType) {
         return Enum.TryParse(eventType, out SubathonEventType type)
-            ? $"{((SubathonEventType?)type).GetSource()} {((SubathonEventType?)type).GetLabel()}" : eventType;
+            ? $"{((SubathonEventType?)type).GetSource()} {((SubathonEventType?)type).GetLabel()}"
+            : eventType;
     }
 
     private static bool IsJsonObject(string text) {
@@ -298,19 +299,19 @@ public sealed class ActionGraph {
 
     public ActionRepeatMode OnRepeat { get; set; } = ActionRepeatMode.Restart;
 
-    [JsonIgnore]
-    public bool HasTriggers => Nodes.Any(n => n.Step.Type == ActionStepType.Trigger);
-
-    public static bool AllowedWithTriggers(ActionRepeatMode mode) {
-        return mode is ActionRepeatMode.Parallel or ActionRepeatMode.Queue;
-    }
+    [JsonIgnore] public bool HasTriggers => Nodes.Any(n => n.Step.Type == ActionStepType.Trigger);
 
     [JsonIgnore]
     public ActionRepeatMode EffectiveRepeat =>
         HasTriggers && !AllowedWithTriggers(OnRepeat) ? ActionRepeatMode.Parallel : OnRepeat;
+
     public List<ActionNode> Nodes { get; set; } = [];
     public List<ActionEdge> Edges { get; set; } = [];
 
+    public static bool AllowedWithTriggers(ActionRepeatMode mode) {
+        return mode is ActionRepeatMode.Parallel or ActionRepeatMode.Queue;
+    }
+
     public static ActionGraph Sequence(params ActionStep[] steps) {
         var graph = new ActionGraph();
         for (var i = 0; i < steps.Length; i++) {
@@ -407,6 +408,7 @@ public bool IsValid(out string error) {
                                                         !string.IsNullOrEmpty(node.Step.OutputVariable) &&
                                                         !outputs.Add(node.Step.OutputVariable))) {
             error = $"More than one step saves its response as %{node.Step.OutputVariable}%";
+            // should we let people have a toggle to allow overriding vars that are local to an action?
             return false;
         }
 
@@ -474,6 +476,7 @@ public sealed class CustomAction {
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
     public bool Disabled { get; set; }
+
     public ActionGraph Graph { get; set; } = new();
 
     public string ToJson() {
@@ -497,9 +500,15 @@ public static bool TryParse(string? json, [NotNullWhen(true)] out CustomAction?
     }
 }
 
-public sealed record ActionContext(SubathonEventSource Source, string User, string RepeatKey, string? Label = null,
-    SubathonTrigger? Trigger = null, IReadOnlySet<string>? TriggerNodes = null,
-    IReadOnlyDictionary<string, string>? TriggerValues = null, int Depth = 0);
+public sealed record ActionContext(
+    SubathonEventSource Source,
+    string User,
+    string RepeatKey,
+    string? Label = null,
+    SubathonTrigger? Trigger = null,
+    IReadOnlySet<string>? TriggerNodes = null,
+    IReadOnlyDictionary<string, string>? TriggerValues = null,
+    int Depth = 0);
 
 public sealed class ActionRunProgress {
     public const int MaxVariableLength = 64 * 1024 * 2;
@@ -508,11 +517,6 @@ public sealed class ActionRunProgress {
 
     // a step saving to %resp% also sets %resp_status%
     public const string StatusSuffix = "_status";
-
-    public void SetOutput(string name, string value, string status) {
-        SetVariable(name, value);
-        SetVariable($"{name}{StatusSuffix}", status);
-    }
     private readonly Lock _lock = new();
 
     public HashSet<string> Done { get; set; } = [];
@@ -524,6 +528,11 @@ public void SetOutput(string name, string value, string status) {
 
     public Dictionary<string, double> Values { get; set; } = [];
 
+    public void SetOutput(string name, string value, string status) {
+        SetVariable(name, value);
+        SetVariable($"{name}{StatusSuffix}", status);
+    }
+
     public bool IsDone(string nodeId) {
         lock (_lock) {
             return Done.Contains(nodeId);

From ca7bddc5752c28ecb6ffbbf3eb3b419df468e784 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Fri, 9 Oct 2026 21:04:02 -0300
Subject: [PATCH 14/23] fix labels on http action step enums

---
 SubathonManager.Core/Enums/ActionEnums.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SubathonManager.Core/Enums/ActionEnums.cs b/SubathonManager.Core/Enums/ActionEnums.cs
index 6da0c93..f637003 100644
--- a/SubathonManager.Core/Enums/ActionEnums.cs
+++ b/SubathonManager.Core/Enums/ActionEnums.cs
@@ -107,13 +107,13 @@ public enum ActionStepType {
     StreamerBotAction = 500,
 
     [ActionStepMeta(Label = "GET Request", Group = "Web", TargetLabel = "URL:",
-        DurationLabel = "Timeout (blank = 10s):",
+        DurationLabel = "Timeout (blank = 15s):",
         AllowsVariables = true, IsWebRequest = true)]
     HttpGet = 600,
 
     // body is sent as-is
     [ActionStepMeta(Label = "POST Request", Group = "Web", TargetLabel = "URL:", BodyLabel = "Body:",
-        DurationLabel = "Timeout (blank = 10s):", AllowsVariables = true, IsWebRequest = true)]
+        DurationLabel = "Timeout (blank = 15s):", AllowsVariables = true, IsWebRequest = true)]
     HttpPost = 601
 }
 

From 68a9863db0b1dc6157ba85329784e73c97f7bf12 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sat, 24 Oct 2026 22:41:43 -0300
Subject: [PATCH 15/23] add new known goaffpro store

---
 SubathonManager.Data/DbContext.cs | 41 +++----------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/SubathonManager.Data/DbContext.cs b/SubathonManager.Data/DbContext.cs
index f4b100d..6580e16 100644
--- a/SubathonManager.Data/DbContext.cs
+++ b/SubathonManager.Data/DbContext.cs
@@ -513,7 +513,8 @@ private static void SeedKnownGoAffProStores(AppDbContext db) {
             new() { SiteId = 7111695, StoreName = "V1 Tech", EventName = "V1 Tech Order" },
             new() { SiteId = 7120088, StoreName = "Plush Foundry", EventName = "PlushFoundry Order" },
             new() { SiteId = 7112002, StoreName = "Horizons Merch", EventName = "Horizons Merch Order" },
-            new() { SiteId = 7181690, StoreName = "Redtail Retail", EventName = "Redtail Order" }
+            new() { SiteId = 7181690, StoreName = "Redtail Retail", EventName = "Redtail Order" },
+            new() { SiteId = 7158345, StoreName = "Xepher Arcade",  EventName = "Xepher Arcade Order" },
         };
 
         foreach (GoAffProStore def in defaults) {
@@ -541,8 +542,8 @@ private static void SeedKnownGoAffProStores(AppDbContext db) {
     }
 
     private static void MigrateLegacyGoAffProData(AppDbContext db) {
-        // Convert rows stored under retired per-store GoAffPro enum values to the single
-        // GoAffProOrder type, SiteId in the meta column
+        // Convert rows stored under legacy per-store GoAffPro enum values to the single
+        // GoAffProOrder type, SiteId in the meta column - only relevant if updating from very old
         var newGoAffProOrderInt = (int)SubathonEventType.GoAffProOrder;
 
         foreach (SubathonEventType legacyType in Enum.GetValues<SubathonEventType>()
@@ -586,39 +587,5 @@ private static void MigrateLegacyData(AppDbContext db) {
                     s.SetProperty(x => x.ReversedTime, false));
 
         MigrateLegacyGoAffProData(db);
-
-        // var fontTypes = WidgetVariableTypeHelper.FontVariables.ToList();
-        // var widgetsMissingFontTypes = db.Widgets
-        //     .Where(w => !fontTypes.All(ft => w.JsVariables.Any(v => v.Type == ft)))
-        //     .Include(w => w.JsVariables)
-        //     .ToList();
-        // if (widgetsMissingFontTypes.Count > 0)
-        // {
-        //     var newVars = new List<JsVariable>();
-        //     foreach (var widget in widgetsMissingFontTypes)
-        //     {
-        //         var existingTypes = widget.JsVariables
-        //             .Select(v => v.Type)
-        //             .ToHashSet();
-        //
-        //         foreach (var fontVar in fontTypes.Where(ft => !existingTypes.Contains(ft)))
-        //         {
-        //             newVars.Add(new JsVariable
-        //             {
-        //                 WidgetId = widget.Id,
-        //                 Widget = widget,
-        //                 Type = fontVar,
-        //                 Name = $"{fontVar}s",
-        //                 Description = $"Custom font names to include from {fontVar}s, comma separated",
-        //                 Value = string.Empty
-        //             });
-        //         }
-        //     }
-        //     if (newVars.Count > 0)
-        //     {
-        //         db.JsVariables.AddRange(newVars);
-        //         db.SaveChanges();
-        //     }
-        // }
     }
 }
\ No newline at end of file

From 5cf860fb18e8ade173a02a60c7545653dabd5852 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sun, 25 Oct 2026 16:37:03 -0300
Subject: [PATCH 16/23] add warnings for blocked makeship issues

---
 .../Models/MakeShipTracking.cs                |  1 +
 .../MakeShipService.cs                        | 40 ++++++++++++++++---
 .../MakeShipServiceTests.cs                   | 39 ++++++++++++++++++
 .../External/MakeShipSettings.axaml.cs        |  9 +++++
 4 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/SubathonManager.Core/Models/MakeShipTracking.cs b/SubathonManager.Core/Models/MakeShipTracking.cs
index 583264b..3cd6d70 100644
--- a/SubathonManager.Core/Models/MakeShipTracking.cs
+++ b/SubathonManager.Core/Models/MakeShipTracking.cs
@@ -16,4 +16,5 @@ public class MakeShipTracking {
     public int Orders { get; set; }
 
     [NotMapped] public bool PollFailing { get; set; }
+    [NotMapped] public bool Blocked { get; set; }
 }
\ No newline at end of file
diff --git a/SubathonManager.Integration/MakeShipService.cs b/SubathonManager.Integration/MakeShipService.cs
index 4c76b53..d551dfd 100644
--- a/SubathonManager.Integration/MakeShipService.cs
+++ b/SubathonManager.Integration/MakeShipService.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Net;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
@@ -24,13 +25,15 @@ public partial class MakeShipService(
     private const string TimerKey = "makeship-poll";
     private const int InvalidAfterConsecutiveFailures = 3;
 
-    private static readonly TimeSpan PollInterval = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan PollInterval = TimeSpan.FromSeconds(60);
+    private static readonly TimeSpan BlockedPollInterval = TimeSpan.FromMinutes(10);
     private static readonly TimeSpan HttpTimeout = TimeSpan.FromSeconds(20);
     private static readonly TimeSpan StaggerDelay = TimeSpan.FromSeconds(2);
     private readonly Dictionary<Guid, int> _contentFailures = new();
     private readonly HashSet<Guid> _syncedSinceStart = new();
     private readonly Lock _syncLock = new();
     private bool _lastBroadcastStatus;
+    private bool _backedOff;
     private int _pollSweepRunning;
     private bool _running;
 
@@ -61,6 +64,7 @@ public Task StartAsync(CancellationToken ct = default) {
         }
 
         _running = true;
+        _backedOff = false;
 
         timerService?.Register(TimerKey, PollInterval, PollTimerTick);
         logger?.LogInformation("[MakeShip] Tracking started ({Count} urls)", trackings.Count);
@@ -138,9 +142,22 @@ private async Task PollAllAsync(CancellationToken ct) {
 
         List<MakeShipTracking> trackings = MakeShipTrackingRegistry.All();
         Connected = trackings.Count > 0 && trackings.Any(IsTracked);
+        UpdatePollInterval(trackings.Any(t => t.Blocked));
         BroadcastStatus();
     }
 
+    private void UpdatePollInterval(bool blocked) {
+        if (!_running || blocked == _backedOff) return;
+        _backedOff = blocked;
+        TimeSpan interval = blocked ? BlockedPollInterval : PollInterval;
+        timerService?.Register(TimerKey, interval, PollTimerTick);
+        if (blocked)
+            logger?.LogWarning("[MakeShip] Requests are being blocked (403). Polling every {Interval} until it clears",
+                interval);
+        else
+            logger?.LogInformation("[MakeShip] No longer blocked. Polling every {Interval}", interval);
+    }
+
     private static bool IsTracked(MakeShipTracking t) {
         return t.ProductType is MakeShipProductType.Petition or MakeShipProductType.Campaign
                && !string.IsNullOrEmpty(t.ShopifyProductId);
@@ -148,6 +165,7 @@ private static bool IsTracked(MakeShipTracking t) {
 
     internal async Task PollTrackingAsync(MakeShipTracking tracking, CancellationToken ct) {
         if (tracking.ProductType == MakeShipProductType.Invalid) return;
+        tracking.Blocked = false;
         if (string.IsNullOrEmpty(tracking.ShopifyProductId) && !await ResolveTrackingAsync(tracking, ct)) {
             MakeShipTrackingRegistry.RaiseTrackingUpdated(tracking);
             return;
@@ -216,7 +234,7 @@ private async Task<bool> ResolveTrackingAsync(MakeShipTracking tracking, Cancell
             return false;
         }
 
-        string? html = await GetStringAsync(tracking.Url, ct);
+        string? html = await GetStringAsync(tracking, tracking.Url, ct);
         if (html == null) return false;
 
         string? productId = type == MakeShipProductType.Petition
@@ -241,7 +259,7 @@ private async Task<bool> ResolveTrackingAsync(MakeShipTracking tracking, Cancell
     }
 
     private async Task<bool> RefreshPetitionAsync(MakeShipTracking tracking, CancellationToken ct) {
-        string? json = await GetStringAsync(
+        string? json = await GetStringAsync(tracking,
             $"{PreProductApiBase}{tracking.ShopifyProductId}.json{PreProductShopQuery}", ct);
         if (json == null) return false;
 
@@ -265,7 +283,7 @@ private async Task<bool> RefreshPetitionAsync(MakeShipTracking tracking, Cancell
     }
 
     private async Task<bool> RefreshCampaignAsync(MakeShipTracking tracking, CancellationToken ct) {
-        string? json = await GetStringAsync(
+        string? json = await GetStringAsync(tracking,
             $"{StorefrontBase}/products/{tracking.ShopifyProductId}/sales-quantity", ct);
         if (json == null) {
             logger?.LogWarning("[MakeShip] No sales-quantity for product {Id} ({Url})",
@@ -288,7 +306,7 @@ private async Task<bool> RefreshCampaignAsync(MakeShipTracking tracking, Cancell
     }
 
     private async Task<bool> RefreshPledgeCountAsync(MakeShipTracking tracking, string url, CancellationToken ct) {
-        string? body = await GetStringAsync(url, ct);
+        string? body = await GetStringAsync(tracking, url, ct);
         if (body == null) {
             logger?.LogWarning("[MakeShip] Pledge count request failed for '{Name}' ({Url})", tracking.Name, url);
             return false;
@@ -380,7 +398,7 @@ private void BroadcastStatus(bool force = false) {
         });
     }
 
-    private async Task<string?> GetStringAsync(string url, CancellationToken ct) {
+    private async Task<string?> GetStringAsync(MakeShipTracking tracking, string url, CancellationToken ct) {
         using HttpClient client = httpClientFactory.CreateClient(nameof(MakeShipService));
         client.Timeout = HttpTimeout;
         if (!client.DefaultRequestHeaders.UserAgent.Any())
@@ -388,6 +406,16 @@ private void BroadcastStatus(bool force = false) {
                 "Mozilla/5.0 (Windows NT 10.0; Win64; x64) SubathonManager");
         try {
             HttpResponseMessage response = await client.GetAsync(url, ct);
+            if (response.StatusCode == HttpStatusCode.Forbidden) {
+                tracking.Blocked = true;
+                string headers = string.Join("; ", response.Headers.Concat(response.Content.Headers)
+                    .Select(h => $"{h.Key}: {string.Join(",", h.Value)}"));
+                string body = await response.Content.ReadAsStringAsync(ct);
+                logger?.LogWarning("[MakeShip] Forbidden (403) from {Url}. Headers: {Headers}. Body: {Body}",
+                    url, headers, Truncate(body, 500));
+                return null;
+            }
+
             if (!response.IsSuccessStatusCode) {
                 logger?.LogDebug("[MakeShip] {Status} from {Url}", response.StatusCode, url);
                 return null;
diff --git a/SubathonManager.Tests/IntegrationUnitTests/MakeShipServiceTests.cs b/SubathonManager.Tests/IntegrationUnitTests/MakeShipServiceTests.cs
index 3a7bb87..6d11711 100644
--- a/SubathonManager.Tests/IntegrationUnitTests/MakeShipServiceTests.cs
+++ b/SubathonManager.Tests/IntegrationUnitTests/MakeShipServiceTests.cs
@@ -250,6 +250,45 @@ public async Task Campaign_NoSalesQuantity_StaysResolvedButPollFailing() {
         Assert.Equal(MakeShipProductType.Campaign, tracking.ProductType);
         Assert.Equal(CampaignProductId, tracking.ShopifyProductId);
         Assert.True(tracking.PollFailing);
+        Assert.False(tracking.Blocked);
+    }
+
+    [Fact]
+    public async Task Campaign_Forbidden_MarksBlockedAndClearsOnRecovery() {
+        var tracking = new MakeShipTracking { Url = CampaignUrl };
+        MakeShipTrackingRegistry.Upsert(tracking);
+        var handler = new RoutedHttpHandler {
+            [CampaignUrl] = (HttpStatusCode.OK, CampaignHtml),
+            [$"https://storefront.makeship.com/products/{CampaignProductId}/sales-quantity"] =
+                (HttpStatusCode.Forbidden, null)
+        };
+        MakeShipService service = MakeService(handler);
+
+        await service.PollTrackingAsync(tracking, CancellationToken.None);
+
+        Assert.True(tracking.Blocked);
+        Assert.True(tracking.PollFailing);
+
+        await MakeServiceReusingSync(service, CampaignHandler(800, 42))
+            .PollTrackingAsync(tracking, CancellationToken.None);
+
+        Assert.False(tracking.Blocked);
+        Assert.False(tracking.PollFailing);
+        Assert.Equal(800, tracking.Sales);
+    }
+
+    [Fact]
+    public async Task Petition_ForbiddenOnPageResolve_MarksBlocked() {
+        var tracking = new MakeShipTracking { Url = PetitionUrl };
+        MakeShipTrackingRegistry.Upsert(tracking);
+        MakeShipService service = MakeService(new RoutedHttpHandler {
+            [PetitionUrl] = (HttpStatusCode.Forbidden, null)
+        });
+
+        await service.PollTrackingAsync(tracking, CancellationToken.None);
+
+        Assert.True(tracking.Blocked);
+        Assert.True(string.IsNullOrEmpty(tracking.ShopifyProductId));
     }
 
     [Fact]
diff --git a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
index 7d08761..6e79bf7 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
@@ -199,6 +199,15 @@ private static void RefreshRowStatus(TrackedValueRow row) {
             return;
         }
 
+        if (tracking.Blocked) {
+            info.StatusText.Text = "Blocked by MakeShip (403)";
+            info.StatusText.Foreground = Brushes.IndianRed;
+            ToolTip.SetTip(info.StatusText,
+                "MakeShip is refusing requests from the app (403 Forbidden). Retrying in 10 minutes");
+            return;
+        }
+
+        ToolTip.SetTip(info.StatusText, null);
         switch (tracking.ProductType) {
             case MakeShipProductType.Petition:
             case MakeShipProductType.Campaign:

From dc91eb861642aaab954d2aa16ac15889af9ee6ec Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sun, 25 Oct 2026 16:50:50 -0300
Subject: [PATCH 17/23] add makeship feature flag for warning

---
 SubathonManager.Core/FeatureFlags.cs                         | 1 +
 .../Views/SettingsViews/External/MakeShipSettings.axaml      | 4 ++++
 .../Views/SettingsViews/External/MakeShipSettings.axaml.cs   | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/SubathonManager.Core/FeatureFlags.cs b/SubathonManager.Core/FeatureFlags.cs
index 6cd2427..55d191f 100644
--- a/SubathonManager.Core/FeatureFlags.cs
+++ b/SubathonManager.Core/FeatureFlags.cs
@@ -8,4 +8,5 @@ public static class FeatureFlags {
     public static readonly bool VTubeStudioEnabled = true;
     public static readonly bool VTubeStudioMarkAsExperimental = true;
     public static readonly bool GoAffProBackfillPollingEnabled = true;
+    public static readonly bool MakeShipMarkAsExperimental = true;
 }
\ No newline at end of file
diff --git a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml
index 0c22507..2f68d07 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml
+++ b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml
@@ -11,6 +11,10 @@
         <StackPanel Orientation="Horizontal" Margin="0,2,0,8">
             <TextBlock Text="Status:" Width="80" VerticalAlignment="Center" FontSize="12" />
             <TextBlock x:Name="MakeShipStatusText" Text="Disconnected" VerticalAlignment="Center" FontSize="12" />
+            <TextBlock x:Name="ExperimentalFlag" FontSize="12" Text="Experimental" IsVisible="False"
+                       Margin="34 0 8 0"
+                       ToolTip.Tip="MakeShip may block requests to get pledges/sales and may not work. Use at your own risk"
+                       HorizontalAlignment="Right" VerticalAlignment="Center"/>
         </StackPanel>
 
         <Grid Margin="10,5,0,5" ColumnDefinitions="*,Auto">
diff --git a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
index 6e79bf7..494ac38 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
@@ -44,6 +44,11 @@ public MakeShipSettings() {
             UpdateStatus(Utils.GetConnection(SubathonEventSource.MakeShip, nameof(SubathonEventSource.MakeShip)));
         };
         Unloaded += (_, _) => { IntegrationEvents.ConnectionUpdated -= UpdateStatus; };
+
+        if (FeatureFlags.MakeShipMarkAsExperimental) {
+            ExperimentalFlag.IsVisible = true;
+            ExperimentalFlag.Foreground = Brushes.Orange;
+        }
     }
 
     public override void Init(SettingsView host) {

From 1b1080d14669c92fcabc01cbd26fade6be1e491f Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Sun, 25 Oct 2026 17:16:21 -0300
Subject: [PATCH 18/23] send multi events for each goal completed

---
 .../MakeShipService.cs                        | 15 ++++++---
 SubathonManager.Services/EventService.cs      | 11 +++++--
 .../ServicesUnitTests/EventServiceTests.cs    | 31 +++++++++++++++++++
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/SubathonManager.Integration/MakeShipService.cs b/SubathonManager.Integration/MakeShipService.cs
index d551dfd..7b4cbcb 100644
--- a/SubathonManager.Integration/MakeShipService.cs
+++ b/SubathonManager.Integration/MakeShipService.cs
@@ -408,11 +408,16 @@ private void BroadcastStatus(bool force = false) {
             HttpResponseMessage response = await client.GetAsync(url, ct);
             if (response.StatusCode == HttpStatusCode.Forbidden) {
                 tracking.Blocked = true;
-                string headers = string.Join("; ", response.Headers.Concat(response.Content.Headers)
-                    .Select(h => $"{h.Key}: {string.Join(",", h.Value)}"));
-                string body = await response.Content.ReadAsStringAsync(ct);
-                logger?.LogWarning("[MakeShip] Forbidden (403) from {Url}. Headers: {Headers}. Body: {Body}",
-                    url, headers, Truncate(body, 500));
+                if ((bool)logger?.IsEnabled(LogLevel.Debug)) {
+                    string headers = string.Join("; ", response.Headers.Concat(response.Content.Headers)
+                        .Select(h => $"{h.Key}: {string.Join(",", h.Value)}"));
+                    string body = await response.Content.ReadAsStringAsync(ct);
+                    logger?.LogDebug("[MakeShip] Forbidden (403) from {Url}. Headers: {Headers}. Body: {Body}",
+                        url, headers, Truncate(body, 500));
+                }
+                else {
+                    logger?.LogWarning("[MakeShip] Forbidden (403) from {Url}", url);
+                }
                 return null;
             }
 
diff --git a/SubathonManager.Services/EventService.cs b/SubathonManager.Services/EventService.cs
index 472c39a..0824776 100644
--- a/SubathonManager.Services/EventService.cs
+++ b/SubathonManager.Services/EventService.cs
@@ -582,7 +582,7 @@ private static async Task CheckForGoalChange(AppDbContext db, long newPoints, lo
                 if (prevCompletedGoal2 != null &&
                     prevCompletedGoal1?.Id != prevCompletedGoal2.Id) {
                     if (prevCompletedGoal1 == null || prevCompletedGoal1.Points <= prevCompletedGoal2.Points)
-                        SubathonEvents.RaiseSubathonGoalCompleted(prevCompletedGoal2, newPoints);
+                        RaiseGoalsCompletedBetween(goalSet, initialPoints, newPoints);
                     else
                         SubathonEvents.RaiseSubathonGoalListUpdated(goalSet.Goals, newPoints, (GoalsType)goalSet.Type!);
                 }
@@ -595,6 +595,13 @@ private static async Task CheckForGoalChange(AppDbContext db, long newPoints, lo
         await Task.CompletedTask;
     }
 
+    private static void RaiseGoalsCompletedBetween(SubathonGoalSet goalSet, long fromPoints, long toPoints) {
+        foreach (SubathonGoal goal in goalSet.Goals
+                     .Where(g => g.Points > fromPoints && g.Points <= toPoints)
+                     .OrderBy(g => g.Points))
+            SubathonEvents.RaiseSubathonGoalCompleted(goal, toPoints);
+    }
+
     private void OnSubathonEventCancelled(Guid id, SubathonEventType type, string reference) {
         Task.Run(async () => {
             try {
@@ -843,7 +850,7 @@ private async Task DetectGoalStateChange(AppDbContext db, SubathonData subathon,
                     prevCompletedGoal1.Id != prevCompletedGoal2.Id) {
                     // the else is for if we undid stuff
                     if (prevCompletedGoal1.Points <= prevCompletedGoal2.Points)
-                        SubathonEvents.RaiseSubathonGoalCompleted(prevCompletedGoal2, pts);
+                        RaiseGoalsCompletedBetween(goalSet, initialPoints, pts);
                     else
                         SubathonEvents.RaiseSubathonGoalListUpdated(goalSet.Goals, pts, (GoalsType)goalSet.Type!);
                 }
diff --git a/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
index 4106ca1..32173ba 100644
--- a/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
@@ -1317,6 +1317,37 @@ public async Task DonationCrossingGoal_RaisesGoalCompletedOnce() {
         await conn.CloseAsync();
     }
 
+    [Fact]
+    public async Task PointsJumpPastMultipleGoals_RaisesEachCompletedGoalInOrder() {
+        (EventService service, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
+            await SetupServiceWithDb(100, false);
+        await using (var db = new AppDbContext(options)) {
+            SubathonGoalSet set = await db.SubathonGoalSets.Include(s => s.Goals)
+                .FirstAsync(TestContext.Current.CancellationToken);
+            set.Goals.Add(new SubathonGoal { Text = "C", Points = 150 });
+            set.Goals.Add(new SubathonGoal { Text = "A", Points = 110 });
+            set.Goals.Add(new SubathonGoal { Text = "B", Points = 120 });
+            set.Goals.Add(new SubathonGoal { Text = "D", Points = 200 });
+            await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+        }
+
+        var completed = new List<string>();
+        SubathonEvents.SubathonGoalCompleted += (goal, _) => {
+            lock (completed) completed.Add(goal.Text);
+        };
+
+        (bool processed, _) = await service.ProcessSubathonEvent(new SubathonEvent {
+            Id = Guid.NewGuid(), EventType = SubathonEventType.Command,
+            Command = SubathonCommandType.AddPoints, PointsValue = 50
+        });
+
+        Assert.True(processed);
+        Assert.Equal(["A", "B", "C"], completed);
+
+        await service.StopAsync(TestContext.Current.CancellationToken);
+        await conn.CloseAsync();
+    }
+
     [Fact]
     public async Task CancelledOrder_RemovesTrackedEventAndWarns() {
         (EventService service, DbContextOptions<AppDbContext> options, SqliteConnection conn) =

From 5f2907572f9bed7cb434d15cb78493ea36eccda0 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Mon, 26 Oct 2026 14:53:22 -0300
Subject: [PATCH 19/23] Fix fourthwall devtunnel startup again

---
 SubathonManager.Integration/DevTunnelsService.cs | 5 +++--
 SubathonManager.Integration/FourthWallService.cs | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SubathonManager.Integration/DevTunnelsService.cs b/SubathonManager.Integration/DevTunnelsService.cs
index 617dae3..9f34d79 100644
--- a/SubathonManager.Integration/DevTunnelsService.cs
+++ b/SubathonManager.Integration/DevTunnelsService.cs
@@ -155,8 +155,9 @@ public async Task<DevTunnelLoginStatus> LogoutAsync(CancellationToken ct = defau
     }
 
     public async Task StartTunnelAsync(CancellationToken ct = default) {
-        // Fast path: no lock needed if a session is already running.
-        if (_session != null) return;
+        // Fast path: no lock needed if the tunnel is already up. A session that is still
+        // starting must fall through to the lock so callers wait for it to be ready.
+        if (_session != null && IsTunnelRunning) return;
 
         await _startLock.WaitAsync(ct);
         try {
diff --git a/SubathonManager.Integration/FourthWallService.cs b/SubathonManager.Integration/FourthWallService.cs
index 1000269..323c6f6 100644
--- a/SubathonManager.Integration/FourthWallService.cs
+++ b/SubathonManager.Integration/FourthWallService.cs
@@ -60,7 +60,7 @@ public async Task StartAsync(CancellationToken ct = default) {
 
         if (enabled) {
             logger?.LogInformation("[FourthWall] Webhook listener ready at {Path}", WebhookPath);
-            _ = devTunnels.StartTunnelAsync(ct);
+            _ = Task.Run(() => Initialize(ct), ct);
         }
         else {
             logger?.LogInformation("[FourthWall] Has not been setup before. Integration is disabled");
@@ -153,6 +153,13 @@ public async Task Initialize(CancellationToken ct = default) {
         try {
             await InitializeCoreAsync(ct);
         }
+        catch (Exception ex) {
+            logger?.LogError(ex, "[FourthWall] Failed to initialize");
+            ErrorMessageEvents.RaiseErrorEvent("WARN", nameof(SubathonEventSource.FourthWall),
+                "FourthWall failed to connect. Check the logs or try reconnecting in the FourthWall settings.",
+                DateTime.Now);
+            BroadcastStatus(HasTokenFile(), null);
+        }
         finally {
             _initLock.Release();
         }

From ad9d63b880d30f89e09f49b6be1e39c6b366c268 Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Tue, 27 Oct 2026 14:41:35 -0300
Subject: [PATCH 20/23] use utils parser for cultured decimal numbers #345

---
 SubathonManager.Core/Models/Widget.cs         |  5 +-
 .../Objects/VTSWheelAction.cs                 |  2 +-
 SubathonManager.Core/Utils.cs                 | 53 ++++++++-------
 SubathonManager.Data/WidgetEntityHelper.cs    |  2 +-
 SubathonManager.Data/WidgetPorter.cs          |  2 +-
 .../FourthWallService.cs                      |  2 +-
 .../MakeShipService.cs                        | 14 +++-
 SubathonManager.Integration/PallyService.cs   |  2 +-
 .../StreamElementsService.cs                  |  2 +-
 .../StreamLabsService.cs                      |  2 +-
 SubathonManager.Integration/ThroneService.cs  |  6 +-
 SubathonManager.Integration/TiltifyService.cs |  2 +-
 .../TipeeeStreamService.cs                    |  3 +-
 SubathonManager.Integration/YouTubeService.cs |  2 +-
 .../CoreUnitTests/UtilsTests.cs               | 66 ++++++++++++++++++-
 .../ServicesUnitTests/EventServiceTests.cs    | 14 ++--
 SubathonManager.UI/Controls/SymIcon.cs        |  3 +-
 .../EditRouteWindow.Handlers.cs               | 13 ++--
 SubathonManager.UI/MainWindow.Multiplier.cs   |  2 +-
 .../MainWindow.SubathonTimer.cs               |  2 +-
 .../Validation/NumericInputBehaviour.cs       |  2 +
 .../Actions/ActionEditorWindow.Properties.cs  |  3 +-
 SubathonManager.UI/Views/SettingsControl.cs   |  8 +--
 .../Views/SettingsView.Settings.cs            |  2 +-
 .../Extensions/ChatExtensionSettings.axaml.cs | 16 ++---
 .../StreamElementsSettings.axaml.cs           |  4 +-
 .../Extensions/StreamLabsSettings.axaml.cs    |  4 +-
 .../Extensions/TangiaSettings.axaml.cs        |  4 +-
 .../Extensions/TipeeeStreamSettings.axaml.cs  |  4 +-
 .../Extensions/TreatStreamSettings.axaml.cs   |  4 +-
 .../External/ExternalServiceSettings.axaml.cs | 12 ++--
 .../External/FourthWallSettings.axaml.cs      | 18 ++---
 .../GoAffPro/GoAffProSourceControl.axaml.cs   |  8 +--
 .../External/JuniperSettings.axaml.cs         |  8 +--
 .../External/KoFiCombinedSettings.axaml.cs    | 20 +++---
 .../External/MakeShipSettings.axaml.cs        |  8 +--
 .../External/PallySettings.axaml.cs           |  4 +-
 .../External/PatreonSettings.axaml.cs         |  4 +-
 .../External/ThroneSettings.axaml.cs          | 14 ++--
 .../External/TiltifySettings.axaml.cs         |  4 +-
 .../VTubeStudioSettings.axaml.cs              |  2 +-
 .../Streaming/PicartoSettings.axaml.cs        | 12 ++--
 .../Streaming/TwitchSettings.axaml.cs         | 18 ++---
 .../Streaming/YouTubeSettings.axaml.cs        | 12 ++--
 .../Views/WheelSpin/WheelEditor.Actions.cs    |  9 +--
 .../WheelSpin/WheelTriggerEditor.axaml.cs     |  4 +-
 46 files changed, 243 insertions(+), 164 deletions(-)

diff --git a/SubathonManager.Core/Models/Widget.cs b/SubathonManager.Core/Models/Widget.cs
index b6957e0..aa91c0a 100644
--- a/SubathonManager.Core/Models/Widget.cs
+++ b/SubathonManager.Core/Models/Widget.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
@@ -117,8 +118,8 @@ public string GetInjectLine() {
         else if (Type == WidgetVariableType.Boolean && bool.TryParse(Value, out bool b)) {
             sb.Append($"{b.ToString().ToLower()}");
         }
-        else if (Type == WidgetVariableType.Float && float.TryParse(Value, out float f)) {
-            sb.Append($"{f}");
+        else if (Type == WidgetVariableType.Float && Utils.TryParseAmount(Value, out double f)) {
+            sb.Append(((float)f).ToString(CultureInfo.InvariantCulture));
         }
         else if (Type == WidgetVariableType.Int && int.TryParse(Value, out int intValue)) {
             sb.Append($"{intValue}");
diff --git a/SubathonManager.Core/Objects/VTSWheelAction.cs b/SubathonManager.Core/Objects/VTSWheelAction.cs
index a9c6aa0..81978cc 100644
--- a/SubathonManager.Core/Objects/VTSWheelAction.cs
+++ b/SubathonManager.Core/Objects/VTSWheelAction.cs
@@ -219,6 +219,6 @@ static ActionOperation ToToggleOp(VtsToggleAction action) {
     }
 
     private static bool TryParseNumber(string text, out double value) {
-        return double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out value);
+        return Utils.TryParseAmount(text, out value);
     }
 }
\ No newline at end of file
diff --git a/SubathonManager.Core/Utils.cs b/SubathonManager.Core/Utils.cs
index fb04e08..51f347c 100644
--- a/SubathonManager.Core/Utils.cs
+++ b/SubathonManager.Core/Utils.cs
@@ -13,7 +13,7 @@
 
 namespace SubathonManager.Core;
 
-public static class Utils {
+public static partial class Utils {
     public static readonly Dictionary<string, bool> DonationSettings = new();
 
     private static readonly ConcurrentDictionary<(SubathonEventSource Source, string Service), IntegrationConnection>
@@ -146,14 +146,16 @@ public static Guid CreateGuidFromUniqueString(string? key) {
         return new Guid(guidBytes);
     }
 
-    // handles locals where it may be "12,50" instead of "12.50"
     public static bool TryParseAmount(string? text, out double value) {
         value = 0;
         if (string.IsNullOrWhiteSpace(text)) return false;
         text = text.Trim();
-        return double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out value) ||
-               double.TryParse(text, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.CurrentCulture,
-                   out value);
+        if (double.TryParse(text, NumberStyles.Float, CultureInfo.InvariantCulture, out value)) return true;
+        if (DecimalValueCultureCommaRegex().IsMatch(text))
+            return double.TryParse(text.Replace(',', '.'), NumberStyles.Float, CultureInfo.InvariantCulture,
+                out value);
+        return double.TryParse(text, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.CurrentCulture,
+            out value);
     }
 
     public static double ParseAmount(string? text) {
@@ -162,7 +164,7 @@ public static double ParseAmount(string? text) {
 
     public static string TryParseCurrency(string amountString) {
         var currency = "";
-        Match match = Regex.Match(amountString, @"^(?<code>[A-Z]{3})(?![A-Z])");
+        Match match = CurrencyCodeCheckRegex().Match(amountString);
         if (match.Success) {
             currency = match.Groups["code"].Value;
         }
@@ -176,28 +178,28 @@ public static string TryParseCurrency(string amountString) {
                 else if (amountString.StartsWith("NT$")) currency = "TWD";
                 else if (amountString.StartsWith("NZ$")) currency = "NZD";
             }
-            else if (amountString.Contains("₨")) {
+            else if (amountString.Contains('₨')) {
                 if (amountString.StartsWith("PK₨")) currency = "PKR";
                 else if (amountString.StartsWith("LK₨")) currency = "LKR";
                 else if (amountString.StartsWith("MU₨")) currency = "MUR";
                 else if (amountString.StartsWith("NP₨")) currency = "NPR";
             }
             else {
-                if (amountString.StartsWith("₩")) currency = "KRW";
-                else if (amountString.StartsWith("₱")) currency = "PHP";
-                else if (amountString.StartsWith("₫")) currency = "VND";
-                else if (amountString.StartsWith("₦")) currency = "NGN";
-                else if (amountString.StartsWith("₴")) currency = "UAH";
-                else if (amountString.StartsWith("₲")) currency = "PYG"; // 
-                else if (amountString.StartsWith("₡")) currency = "CRC";
-                else if (amountString.StartsWith("₺")) currency = "TRY";
-                else if (amountString.StartsWith("₼")) currency = "AZN";
-                else if (amountString.StartsWith("₸")) currency = "KZT";
-                else if (amountString.StartsWith("₭")) currency = "LAK";
-                else if (amountString.StartsWith("₾")) currency = "GEL";
-                else if (amountString.StartsWith("₮")) currency = "MNT";
-                else if (amountString.StartsWith("₹")) currency = "INR";
-                else if (amountString.StartsWith("₣")) currency = "CHF";
+                if (amountString.StartsWith('₩')) currency = "KRW";
+                else if (amountString.StartsWith('₱')) currency = "PHP";
+                else if (amountString.StartsWith('₫')) currency = "VND";
+                else if (amountString.StartsWith('₦')) currency = "NGN";
+                else if (amountString.StartsWith('₴')) currency = "UAH";
+                else if (amountString.StartsWith('₲')) currency = "PYG"; // 
+                else if (amountString.StartsWith('₡')) currency = "CRC";
+                else if (amountString.StartsWith('₺')) currency = "TRY";
+                else if (amountString.StartsWith('₼')) currency = "AZN";
+                else if (amountString.StartsWith('₸')) currency = "KZT";
+                else if (amountString.StartsWith('₭')) currency = "LAK";
+                else if (amountString.StartsWith('₾')) currency = "GEL";
+                else if (amountString.StartsWith('₮')) currency = "MNT";
+                else if (amountString.StartsWith('₹')) currency = "INR";
+                else if (amountString.StartsWith('₣')) currency = "CHF";
             }
         }
 
@@ -240,7 +242,7 @@ public static (bool, double) GetAltCurrencyUseAsDonation(IConfig config, Subatho
         if (!eventType.IsToken())
             return (false, 1);
         if (eventType != SubathonEventType.TwitchCheer && eventType != SubathonEventType.PicartoTip)
-            double.TryParse(config.Get("Extensions", $"{eventType}.Modifier", "1"), out modifier);
+            TryParseAmount(config.Get("Extensions", $"{eventType}.Modifier", "1"), out modifier);
 
         bool useAsDonation = config.GetBool("Currency", "BitsLikeAsDonation");
         return (useAsDonation, modifier);
@@ -391,4 +393,9 @@ public struct COPYDATASTRUCT {
             public IntPtr lpData;
         }
     }
+
+    [GeneratedRegex(@"^[+-]?\d+,\d{1,2}$")]
+    private static partial Regex DecimalValueCultureCommaRegex();
+    [GeneratedRegex(@"^(?<code>[A-Z]{3})(?![A-Z])")]
+    private static partial Regex CurrencyCodeCheckRegex();
 }
\ No newline at end of file
diff --git a/SubathonManager.Data/WidgetEntityHelper.cs b/SubathonManager.Data/WidgetEntityHelper.cs
index d1e48bd..1144528 100644
--- a/SubathonManager.Data/WidgetEntityHelper.cs
+++ b/SubathonManager.Data/WidgetEntityHelper.cs
@@ -293,7 +293,7 @@ internal WidgetMeta ConvertHtmlMetaToJsonMeta(Dictionary<string, string> data) {
                     WidgetVariableType.Boolean => bool.TryParse(rawValue, out bool b) && b,
                     WidgetVariableType.Int => int.TryParse(rawValue, out int i) ? i : 0,
                     WidgetVariableType.Percent => int.TryParse(rawValue, out int i) ? i : 0,
-                    WidgetVariableType.Float => float.TryParse(rawValue, out float d) ? d : 0,
+                    WidgetVariableType.Float => (float)Utils.ParseAmount(rawValue),
                     _ => rawValue
                 };
             }
diff --git a/SubathonManager.Data/WidgetPorter.cs b/SubathonManager.Data/WidgetPorter.cs
index af8e296..cece3b5 100644
--- a/SubathonManager.Data/WidgetPorter.cs
+++ b/SubathonManager.Data/WidgetPorter.cs
@@ -566,7 +566,7 @@ private static object ToMetaValue(WidgetVariableType type, string value, WidgetM
                 return int.TryParse(value, out int i) ? i : 0;
 
             case WidgetVariableType.Float:
-                return float.TryParse(value, out float f) ? f : 0f;
+                return (float)Utils.ParseAmount(value);
 
             default:
                 if (type.IsListType()) return items;
diff --git a/SubathonManager.Integration/FourthWallService.cs b/SubathonManager.Integration/FourthWallService.cs
index 323c6f6..c46bc9b 100644
--- a/SubathonManager.Integration/FourthWallService.cs
+++ b/SubathonManager.Integration/FourthWallService.cs
@@ -57,6 +57,7 @@ public async Task StartAsync(CancellationToken ct = default) {
         IntegrationEvents.ConnectionUpdated += OnTunnelUpdated;
 
         bool enabled = HasTokenFile();
+        BroadcastStatus(enabled, null);
 
         if (enabled) {
             logger?.LogInformation("[FourthWall] Webhook listener ready at {Path}", WebhookPath);
@@ -64,7 +65,6 @@ public async Task StartAsync(CancellationToken ct = default) {
         }
         else {
             logger?.LogInformation("[FourthWall] Has not been setup before. Integration is disabled");
-            BroadcastStatus(false, null);
         }
 
         await Task.CompletedTask;
diff --git a/SubathonManager.Integration/MakeShipService.cs b/SubathonManager.Integration/MakeShipService.cs
index 7b4cbcb..44b2f14 100644
--- a/SubathonManager.Integration/MakeShipService.cs
+++ b/SubathonManager.Integration/MakeShipService.cs
@@ -33,6 +33,7 @@ public partial class MakeShipService(
     private readonly HashSet<Guid> _syncedSinceStart = new();
     private readonly Lock _syncLock = new();
     private bool _lastBroadcastStatus;
+    private string _lastBroadcastName = "";
     private bool _backedOff;
     private int _pollSweepRunning;
     private bool _running;
@@ -386,13 +387,20 @@ public static void Simulate(string name, bool isPetition, int count) {
     private void BroadcastStatus(bool force = false) {
         List<MakeShipTracking> trackings = MakeShipTrackingRegistry.All();
         int tracked = trackings.Count(IsTracked);
-        bool status = _running && tracked > 0;
-        if (!force && status == _lastBroadcastStatus) return;
+        int blocked = trackings.Count(t => t.Blocked);
+        bool status = _running && tracked > 0 && blocked == 0;
+        string name = trackings.Count == 0 ? ""
+            : blocked > 0 ? $"{tracked}/{trackings.Count} tracked, {blocked} errors"
+            : $"{tracked}/{trackings.Count} tracked";
+
+        if (!force && status == _lastBroadcastStatus && name == _lastBroadcastName) return;
         _lastBroadcastStatus = status;
+        _lastBroadcastName = name;
+
         IntegrationEvents.RaiseConnectionUpdate(new IntegrationConnection {
             Source = SubathonEventSource.MakeShip,
             Service = nameof(SubathonEventSource.MakeShip),
-            Name = trackings.Count == 0 ? "" : $"{tracked}/{trackings.Count} tracked",
+            Name = name,
             Status = status,
             Configured = trackings.Count > 0
         });
diff --git a/SubathonManager.Integration/PallyService.cs b/SubathonManager.Integration/PallyService.cs
index 258657a..43bbcd7 100644
--- a/SubathonManager.Integration/PallyService.cs
+++ b/SubathonManager.Integration/PallyService.cs
@@ -252,7 +252,7 @@ internal static Guid GuidFromString(string input) {
     }
 
     public static void SimulateTip(string value = "10.00") {
-        if (!double.TryParse(value, out double val) || val <= 0) return;
+        if (!Utils.TryParseAmount(value, out double val) || val <= 0) return;
         SubathonEvents.RaiseSubathonEventCreated(new SubathonEvent {
             User = "SYSTEM",
             Currency = "USD",
diff --git a/SubathonManager.Integration/StreamElementsService.cs b/SubathonManager.Integration/StreamElementsService.cs
index bdacc1d..eeb566d 100644
--- a/SubathonManager.Integration/StreamElementsService.cs
+++ b/SubathonManager.Integration/StreamElementsService.cs
@@ -232,7 +232,7 @@ public void Disconnect() {
     }
 
     public static void SimulateTip(string value = "10.00", string currency = "USD") {
-        if (!double.TryParse(value, out double val))
+        if (!Utils.TryParseAmount(value, out double val))
             return;
 
         SubathonEvent subathonEvent = new() {
diff --git a/SubathonManager.Integration/StreamLabsService.cs b/SubathonManager.Integration/StreamLabsService.cs
index e2da91f..ee5b5e5 100644
--- a/SubathonManager.Integration/StreamLabsService.cs
+++ b/SubathonManager.Integration/StreamLabsService.cs
@@ -109,7 +109,7 @@ private void OnDonation(object? o, DonationMessage message) {
     }
 
     public static void SimulateTip(string value = "10.00", string currency = "USD") {
-        if (!double.TryParse(value, out double val))
+        if (!Utils.TryParseAmount(value, out double val))
             return;
 
         var subathonEvent = new SubathonEvent {
diff --git a/SubathonManager.Integration/ThroneService.cs b/SubathonManager.Integration/ThroneService.cs
index 7b258be..002d122 100644
--- a/SubathonManager.Integration/ThroneService.cs
+++ b/SubathonManager.Integration/ThroneService.cs
@@ -168,7 +168,7 @@ public void ProcessData(string stringData, bool isSim = false) {
                     OrderTypeModes.Dollar);
 
                 data.TryGetValue("price", out object? price);
-                double.TryParse(price?.ToString() ?? "0.00", out double priceInt);
+                Utils.TryParseAmount(price?.ToString() ?? "0.00", out double priceInt);
                 subathonEvent.EventType = SubathonEventType.ThroneGiftPurchase;
                 subathonEvent.Currency =
                     mode == OrderTypeModes.Dollar
@@ -184,13 +184,13 @@ public void ProcessData(string stringData, bool isSim = false) {
                 subathonEvent.Currency = currency;
                 data.TryGetValue("amount", out object? amount);
                 subathonEvent.TertiaryValue = itemName?.ToString() ?? "New Contribution";
-                double.TryParse(amount?.ToString(), out double amountInt);
+                Utils.TryParseAmount(amount?.ToString(), out double amountInt);
                 subathonEvent.Value =
                     (amountInt / 100).ToString("F2", CultureInfo.InvariantCulture);
                 break;
             case "gift_crowdfunded":
                 data.TryGetValue("price", out object? price2);
-                double.TryParse(price2?.ToString() ?? "0.00", out double priceInt2);
+                Utils.TryParseAmount(price2?.ToString() ?? "0.00", out double priceInt2);
                 subathonEvent.EventType = SubathonEventType.ThroneCrowdGiftComplete;
                 subathonEvent.User = itemName?.ToString() ?? "Crowdfunding Complete!";
                 subathonEvent.Currency = currency;
diff --git a/SubathonManager.Integration/TiltifyService.cs b/SubathonManager.Integration/TiltifyService.cs
index 0ce118a..ad20773 100644
--- a/SubathonManager.Integration/TiltifyService.cs
+++ b/SubathonManager.Integration/TiltifyService.cs
@@ -402,7 +402,7 @@ public async Task<List<SubathonEvent>> FetchMissedEventsAsync(DateTime from, Dat
     }
 
     public static void SimulateDonation(string amount, string currency, CampaignOption? campaign = null) {
-        if (!double.TryParse(amount, NumberStyles.Any, CultureInfo.InvariantCulture, out double amt)) return;
+        if (!Utils.TryParseAmount(amount, out double amt)) return;
         var ev = new SubathonEvent {
             Source = SubathonEventSource.Simulated,
             EventType = SubathonEventType.TiltifyDonation,
diff --git a/SubathonManager.Integration/TipeeeStreamService.cs b/SubathonManager.Integration/TipeeeStreamService.cs
index 692e7bd..5883ed3 100644
--- a/SubathonManager.Integration/TipeeeStreamService.cs
+++ b/SubathonManager.Integration/TipeeeStreamService.cs
@@ -341,8 +341,7 @@ public async Task ConnectAsync(CancellationToken ct = default) {
     }
 
     public static void SimulateDonation(string amount, string currency) {
-        if (!double.TryParse(amount, NumberStyles.Any,
-                CultureInfo.InvariantCulture, out double amt)) return;
+        if (!Utils.TryParseAmount(amount, out double amt)) return;
         var ev = new SubathonEvent {
             Source = SubathonEventSource.Simulated,
             EventType = SubathonEventType.TipeeeStreamDonation,
diff --git a/SubathonManager.Integration/YouTubeService.cs b/SubathonManager.Integration/YouTubeService.cs
index c6bbcb3..14d4233 100644
--- a/SubathonManager.Integration/YouTubeService.cs
+++ b/SubathonManager.Integration/YouTubeService.cs
@@ -420,7 +420,7 @@ protected virtual void Dispose(bool disposing) {
     }
 
     public static void SimulateSuperChat(string value = "10.00", string currency = "USD") {
-        if (!double.TryParse(value, out double val))
+        if (!Utils.TryParseAmount(value, out double val))
             return;
 
         var subathonEvent = new SubathonEvent {
diff --git a/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs b/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
index 46def99..ccaf06e 100644
--- a/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
+++ b/SubathonManager.Tests/CoreUnitTests/UtilsTests.cs
@@ -123,4 +123,68 @@ public void ParseCurrency() {
         Assert.Equal("INR", Utils.TryParseCurrency("₹"));
         Assert.Equal("CHF", Utils.TryParseCurrency("₣"));
     }
-}
\ No newline at end of file
+
+    [Theory]
+    [InlineData("fr-CA")]
+    [InlineData("de-DE")]
+    [InlineData("en-US")]
+    public void TryParseAmount_AcceptsDotRegardlessOfCulture(string culture) {
+        System.Globalization.CultureInfo previous = System.Globalization.CultureInfo.CurrentCulture;
+        try {
+            System.Globalization.CultureInfo.CurrentCulture = new System.Globalization.CultureInfo(culture);
+
+            Assert.True(Utils.TryParseAmount("10.00", out double tip));
+            Assert.Equal(10, tip);
+            Assert.True(Utils.TryParseAmount(" 0.5 ", out double half));
+            Assert.Equal(0.5, half);
+            Assert.False(Utils.TryParseAmount("abc", out _));
+            Assert.False(Utils.TryParseAmount(null, out _));
+
+            // making sure js will still be fine
+            var jsVar = new Core.Models.JsVariable {
+                Name = "speed", Value = "0.5", Type = Core.Enums.WidgetVariableType.Float
+            };
+            Assert.Contains("= 0.5", jsVar.GetInjectLine());
+        }
+        finally {
+            System.Globalization.CultureInfo.CurrentCulture = previous;
+        }
+    }
+
+    [Theory]
+    [InlineData("fr-CA")]
+    [InlineData("de-DE")]
+    [InlineData("en-US")]
+    public void TryParseAmount_TreatsTrailingCommaDigitsAsDecimal(string culture) {
+        System.Globalization.CultureInfo previous = System.Globalization.CultureInfo.CurrentCulture;
+        try {
+            System.Globalization.CultureInfo.CurrentCulture = new System.Globalization.CultureInfo(culture);
+
+            Assert.True(Utils.TryParseAmount("0,5", out double half));
+            Assert.Equal(0.5, half);
+            Assert.True(Utils.TryParseAmount("12,50", out double tip));
+            Assert.Equal(12.5, tip);
+            Assert.True(Utils.TryParseAmount("-3,25", out double negative));
+            Assert.Equal(-3.25, negative);
+        }
+        finally {
+            System.Globalization.CultureInfo.CurrentCulture = previous;
+        }
+    }
+
+    [Fact]
+    public void TryParseAmount_KeepsThousandsCommaInDotCulture() {
+        System.Globalization.CultureInfo previous = System.Globalization.CultureInfo.CurrentCulture;
+        try {
+            System.Globalization.CultureInfo.CurrentCulture = new System.Globalization.CultureInfo("en-US");
+
+            Assert.True(Utils.TryParseAmount("1,250", out double thousands));
+            Assert.Equal(1250, thousands);
+            Assert.True(Utils.TryParseAmount("1,250.00", out double withCents));
+            Assert.Equal(1250, withCents);
+        }
+        finally {
+            System.Globalization.CultureInfo.CurrentCulture = previous;
+        }
+    }
+}
diff --git a/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs b/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
index 32173ba..70d19d3 100644
--- a/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
+++ b/SubathonManager.Tests/ServicesUnitTests/EventServiceTests.cs
@@ -1322,12 +1322,12 @@ public async Task PointsJumpPastMultipleGoals_RaisesEachCompletedGoalInOrder() {
         (EventService service, DbContextOptions<AppDbContext> options, SqliteConnection conn) =
             await SetupServiceWithDb(100, false);
         await using (var db = new AppDbContext(options)) {
-            SubathonGoalSet set = await db.SubathonGoalSets.Include(s => s.Goals)
-                .FirstAsync(TestContext.Current.CancellationToken);
-            set.Goals.Add(new SubathonGoal { Text = "C", Points = 150 });
-            set.Goals.Add(new SubathonGoal { Text = "A", Points = 110 });
-            set.Goals.Add(new SubathonGoal { Text = "B", Points = 120 });
-            set.Goals.Add(new SubathonGoal { Text = "D", Points = 200 });
+            SubathonGoalSet set = await db.SubathonGoalSets.FirstAsync(TestContext.Current.CancellationToken);
+            db.SubathonGoals.AddRange(
+                new SubathonGoal { Text = "C", Points = 150, GoalSetId = set.Id },
+                new SubathonGoal { Text = "A", Points = 110, GoalSetId = set.Id },
+                new SubathonGoal { Text = "B", Points = 120, GoalSetId = set.Id },
+                new SubathonGoal { Text = "D", Points = 200, GoalSetId = set.Id });
             await db.SaveChangesAsync(TestContext.Current.CancellationToken);
         }
 
@@ -1462,7 +1462,7 @@ public async Task Command_SubtractMoney_NegatesValue() {
         SubathonEvent? saved =
             await db.SubathonEvents.FirstOrDefaultAsync(e => e.Id == ev.Id, TestContext.Current.CancellationToken);
         Assert.NotNull(saved);
-        Assert.True(double.Parse(saved.Value) < 0);
+        Assert.True(Utils.ParseAmount(saved.Value) < 0);
 
         await conn.CloseAsync();
     }
diff --git a/SubathonManager.UI/Controls/SymIcon.cs b/SubathonManager.UI/Controls/SymIcon.cs
index b7ebbfa..afc3028 100644
--- a/SubathonManager.UI/Controls/SymIcon.cs
+++ b/SubathonManager.UI/Controls/SymIcon.cs
@@ -1,6 +1,7 @@
 using Avalonia;
 using FluentIcons.Avalonia;
 using FluentIcons.Common;
+using SubathonManager.Core;
 
 namespace SubathonManager.UI.Controls;
 
@@ -28,7 +29,7 @@ private void ApplyGlyph(string? glyph) {
 
         if (Enum.TryParse<Symbol>(name, out Symbol sym))
             Symbol = sym;
-        if (double.TryParse(sizeStr, out double size) && size > 0)
+        if (Utils.TryParseAmount(sizeStr, out double size) && size > 0)
             FontSize = size;
     }
 }
\ No newline at end of file
diff --git a/SubathonManager.UI/EditRouteWindow.Handlers.cs b/SubathonManager.UI/EditRouteWindow.Handlers.cs
index 1343412..e25714b 100644
--- a/SubathonManager.UI/EditRouteWindow.Handlers.cs
+++ b/SubathonManager.UI/EditRouteWindow.Handlers.cs
@@ -389,11 +389,11 @@ private async Task<bool> SaveSelectedWidgetAsync() {
             _selectedWidget.Name = WidgetNameBox.Text ?? string.Empty;
             _selectedWidget.Width = int.TryParse(WidgetWidthBox.Text, out int w) ? w : _selectedWidget.Width;
             _selectedWidget.Height = int.TryParse(WidgetHeightBox.Text, out int h) ? h : _selectedWidget.Height;
-            _selectedWidget.X = float.TryParse(WidgetXBox.Text, out float x) ? x : _selectedWidget.X;
-            _selectedWidget.Y = float.TryParse(WidgetYBox.Text, out float y) ? y : _selectedWidget.Y;
-            _selectedWidget.ScaleX = float.TryParse(WidgetScaleXBox.Text, out float sx) ? sx :
+            _selectedWidget.X = Utils.TryParseAmount(WidgetXBox.Text, out double x) ? (float)x : _selectedWidget.X;
+            _selectedWidget.Y = Utils.TryParseAmount(WidgetYBox.Text, out double y) ? (float)y : _selectedWidget.Y;
+            _selectedWidget.ScaleX = Utils.TryParseAmount(WidgetScaleXBox.Text, out double sx) ? (float)sx :
                 _selectedWidget.ScaleX == 0 ? 1 : _selectedWidget.ScaleX;
-            _selectedWidget.ScaleY = float.TryParse(WidgetScaleYBox.Text, out float sy) ? sy :
+            _selectedWidget.ScaleY = Utils.TryParseAmount(WidgetScaleYBox.Text, out double sy) ? (float)sy :
                 _selectedWidget.ScaleY == 0 ? 1 : _selectedWidget.ScaleY;
 
             foreach (CssVariable cssVar in _editingCssVars) {
@@ -1252,8 +1252,9 @@ private void OpacityBox_Loaded(object? sender, RoutedEventArgs e) {
     }
 
     private static bool TryParseSliderValue(string? text, out float value) {
-        return float.TryParse((text ?? "").Trim().TrimEnd('%'), NumberStyles.Float,
-            CultureInfo.InvariantCulture, out value);
+        bool ok = Utils.TryParseAmount((text ?? "").Trim().TrimEnd('%'), out double parsed);
+        value = (float)parsed;
+        return ok;
     }
 
     private static string FormatSliderBoxText(CssVariable cssVar, float value) {
diff --git a/SubathonManager.UI/MainWindow.Multiplier.cs b/SubathonManager.UI/MainWindow.Multiplier.cs
index 538bdf7..31d771a 100644
--- a/SubathonManager.UI/MainWindow.Multiplier.cs
+++ b/SubathonManager.UI/MainWindow.Multiplier.cs
@@ -45,7 +45,7 @@ private void TogglePowerMultiplier_Click(object? sender, RoutedEventArgs e) {
         }
 
         TimeSpan duration = Utils.ParseDurationString(MultiplierDurationInput.Text ?? "");
-        if (!double.TryParse(MultiplierAmtInput.Text, out double parsedAmt) || parsedAmt <= 0) return;
+        if (!Utils.TryParseAmount(MultiplierAmtInput.Text, out double parsedAmt) || parsedAmt <= 0) return;
 
         string durationStr = duration == TimeSpan.Zero ? "x" : ((int)duration.TotalSeconds).ToString();
         var dataStr = $"{parsedAmt}|{durationStr}s|{applyPts}|{applyTime}";
diff --git a/SubathonManager.UI/MainWindow.SubathonTimer.cs b/SubathonManager.UI/MainWindow.SubathonTimer.cs
index ce4d59c..c6ac3b2 100644
--- a/SubathonManager.UI/MainWindow.SubathonTimer.cs
+++ b/SubathonManager.UI/MainWindow.SubathonTimer.cs
@@ -281,7 +281,7 @@ private void SubtractMoney_Click(object? sender, RoutedEventArgs e) {
     }
 
     private void AdjustSubathonMoneyBy(int direction) {
-        if (!double.TryParse(AdjustSubathonMoney.Text, out double parsedVal) || parsedVal <= 0) return;
+        if (!Utils.TryParseAmount(AdjustSubathonMoney.Text, out double parsedVal) || parsedVal <= 0) return;
         SubathonCommandType cmd = direction > 0 ? SubathonCommandType.AddMoney : SubathonCommandType.SubtractMoney;
         RaiseCommand(new SubathonEvent {
             EventTimestamp = DateTime.Now - TimeSpan.FromSeconds(1),
diff --git a/SubathonManager.UI/Validation/NumericInputBehaviour.cs b/SubathonManager.UI/Validation/NumericInputBehaviour.cs
index 13233f6..e1cc919 100644
--- a/SubathonManager.UI/Validation/NumericInputBehaviour.cs
+++ b/SubathonManager.UI/Validation/NumericInputBehaviour.cs
@@ -64,6 +64,8 @@ private static bool IsAcceptable(string text, NumericMode mode) {
         bool allowSign = mode is NumericMode.SignedInteger or NumericMode.SignedDecimal;
         bool allowDecimal = mode is NumericMode.Decimal or NumericMode.SignedDecimal;
 
+        if (allowDecimal && text.Count(c => c is '.' or ',') <= 1) text = text.Replace(',', '.');
+
         if (text == "-") return allowSign;
         if (text == ".") return allowDecimal;
         if (text == "-.") return allowSign && allowDecimal;
diff --git a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
index 0634ee6..4d844e8 100644
--- a/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
+++ b/SubathonManager.UI/Views/Actions/ActionEditorWindow.Properties.cs
@@ -268,8 +268,7 @@ private void ApplyStepFields() {
         }
 
         step.Value = step.Type.HasValue(step.Operation)
-                     && double.TryParse((ValueBox.Text ?? "").Trim(), NumberStyles.Float,
-                         CultureInfo.InvariantCulture, out double value)
+                     && Utils.TryParseAmount(ValueBox.Text, out double value)
             ? value
             : null;
         TimeSpan duration = Utils.ParseDurationString((DurationBox.Text ?? "").Trim());
diff --git a/SubathonManager.UI/Views/SettingsControl.cs b/SubathonManager.UI/Views/SettingsControl.cs
index 7a061cc..c39e0b3 100644
--- a/SubathonManager.UI/Views/SettingsControl.cs
+++ b/SubathonManager.UI/Views/SettingsControl.cs
@@ -325,13 +325,13 @@ internal bool SaveMembershipValues(AppDbContext db) {
 
         SubathonValue? defaultValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == type && sv.Meta == "DEFAULT");
-        if (defaultValue != null && double.TryParse(_DefaultMembershipSecondsBox?.Text, out double defaultSeconds) &&
+        if (defaultValue != null && Utils.TryParseAmount(_DefaultMembershipSecondsBox?.Text, out double defaultSeconds) &&
             !defaultSeconds.Equals(defaultValue.Seconds)) {
             defaultValue.Seconds = defaultSeconds;
             hasUpdated = true;
         }
 
-        if (defaultValue != null && double.TryParse(_DefaultMembershipPointsBox?.Text, out double defaultPoints) &&
+        if (defaultValue != null && Utils.TryParseAmount(_DefaultMembershipPointsBox?.Text, out double defaultPoints) &&
             !defaultPoints.Equals(defaultValue.Points)) {
             defaultValue.Points = defaultPoints;
             hasUpdated = true;
@@ -348,8 +348,8 @@ internal bool SaveMembershipValues(AppDbContext db) {
         foreach (DynamicSubRow subRow in _dynamicSubRows) {
             string meta = (subRow.NameBox.Text ?? "").Trim();
             if (meta == "DEFAULT") continue;
-            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
-            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
+            if (!Utils.TryParseAmount(subRow.TimeBox.Text, out double seconds)) seconds = 0;
+            if (!Utils.TryParseAmount(subRow.PointsBox.Text, out double points)) points = 0;
 
 #pragma warning disable CA1862
             SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
diff --git a/SubathonManager.UI/Views/SettingsView.Settings.cs b/SubathonManager.UI/Views/SettingsView.Settings.cs
index 0cb4494..06d4ac5 100644
--- a/SubathonManager.UI/Views/SettingsView.Settings.cs
+++ b/SubathonManager.UI/Views/SettingsView.Settings.cs
@@ -126,7 +126,7 @@ public void UpdateConnectionStatus(bool status, TextBlock? textBlock, Button? bu
     public bool SaveSubTier(AppDbContext db, SubathonEventType type, string meta, TextBox tb, TextBox tb2) {
         var hasUpdated = false;
         SubathonValue? val = db.SubathonValues.FirstOrDefault(sv => sv.EventType == type && sv.Meta == meta);
-        if (val != null && double.TryParse(tb.Text, out double seconds) && !seconds.Equals(val.Seconds)) {
+        if (val != null && Utils.TryParseAmount(tb.Text, out double seconds) && !seconds.Equals(val.Seconds)) {
             val.Seconds = seconds;
             hasUpdated = true;
         }
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/ChatExtensionSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/ChatExtensionSettings.axaml.cs
index 6a12720..d3e0eea 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/ChatExtensionSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/ChatExtensionSettings.axaml.cs
@@ -33,13 +33,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? blerpBitsValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.BlerpBits && sv.Meta == "");
-        if (blerpBitsValue != null && double.TryParse(BitsTextBox.Text, out double bitsSeconds) &&
+        if (blerpBitsValue != null && Utils.TryParseAmount(BitsTextBox.Text, out double bitsSeconds) &&
             !bitsSeconds.Equals(blerpBitsValue.Seconds / 100.0)) {
             blerpBitsValue.Seconds = bitsSeconds / 100.0;
             hasUpdated = true;
         }
 
-        if (blerpBitsValue != null && double.TryParse(Bits2TextBox.Text, out double bitsPoints) &&
+        if (blerpBitsValue != null && Utils.TryParseAmount(Bits2TextBox.Text, out double bitsPoints) &&
             !bitsPoints.Equals(blerpBitsValue.Points)) {
             blerpBitsValue.Points = bitsPoints;
             hasUpdated = true;
@@ -47,13 +47,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? blerpBeetsValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.BlerpBits && sv.Meta == "");
-        if (blerpBeetsValue != null && double.TryParse(BeetsTextBox.Text, out double beetsSeconds) &&
+        if (blerpBeetsValue != null && Utils.TryParseAmount(BeetsTextBox.Text, out double beetsSeconds) &&
             !beetsSeconds.Equals(blerpBeetsValue.Seconds / 100.0)) {
             blerpBeetsValue.Seconds = beetsSeconds / 100.0;
             hasUpdated = true;
         }
 
-        if (blerpBeetsValue != null && double.TryParse(Beets2TextBox.Text, out double beetsPoints) &&
+        if (blerpBeetsValue != null && Utils.TryParseAmount(Beets2TextBox.Text, out double beetsPoints) &&
             !beetsPoints.Equals(blerpBeetsValue.Points)) {
             blerpBeetsValue.Points = beetsPoints;
             hasUpdated = true;
@@ -89,9 +89,9 @@ public override (string, string, TextBox?, TextBox?) GetValueBoxes(SubathonValue
     public bool SaveConfigValues() {
         var hasUpdated = false;
         var config = AppServices.Provider.GetRequiredService<IConfig>();
-        if (double.TryParse(BitsModifierTextBox.Text, out double blerpBitsMod))
+        if (Utils.TryParseAmount(BitsModifierTextBox.Text, out double blerpBitsMod))
             hasUpdated |= config.Set("Extensions", "BlerpBits.Modifier", $"{blerpBitsMod}");
-        if (double.TryParse(BeetsModifierTextBox.Text, out double blerpBeetsMod))
+        if (Utils.TryParseAmount(BeetsModifierTextBox.Text, out double blerpBeetsMod))
             hasUpdated |= config.Set("Extensions", "BlerpBeets.Modifier", $"{blerpBeetsMod}");
         hasUpdated |= config.SetBool("Extensions", "Blerp.Enabled", EnabledBox.IsChecked ?? true);
         return hasUpdated;
@@ -99,9 +99,9 @@ public bool SaveConfigValues() {
 
     public void LoadConfigValues() {
         var config = AppServices.Provider.GetRequiredService<IConfig>();
-        double.TryParse(config.Get("Extensions", "BlerpBits.Modifier", "1"), out double blerpBitsMod);
+        Utils.TryParseAmount(config.Get("Extensions", "BlerpBits.Modifier", "1"), out double blerpBitsMod);
         BitsModifierTextBox.Text = $"{blerpBitsMod}";
-        double.TryParse(config.Get("Extensions", "BlerpBeets.Modifier", "1"), out double blerpBeetsMod);
+        Utils.TryParseAmount(config.Get("Extensions", "BlerpBeets.Modifier", "1"), out double blerpBeetsMod);
         BeetsModifierTextBox.Text = $"{blerpBeetsMod}";
         EnabledBox.IsChecked = config.GetBool("Extensions", "Blerp.Enabled", true);
     }
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/StreamElementsSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/StreamElementsSettings.axaml.cs
index dc77184..1046657 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/StreamElementsSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/StreamElementsSettings.axaml.cs
@@ -42,13 +42,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? seTipValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.StreamElementsDonation && sv.Meta == "");
-        if (seTipValue != null && double.TryParse(DonoBox.Text, out double seTipSeconds) &&
+        if (seTipValue != null && Utils.TryParseAmount(DonoBox.Text, out double seTipSeconds) &&
             !seTipSeconds.Equals(seTipValue.Seconds)) {
             seTipValue.Seconds = seTipSeconds;
             hasUpdated = true;
         }
 
-        if (seTipValue != null && double.TryParse(DonoBox2.Text, out double seTipPoints) &&
+        if (seTipValue != null && Utils.TryParseAmount(DonoBox2.Text, out double seTipPoints) &&
             !seTipPoints.Equals(seTipValue.Points)) {
             seTipValue.Points = seTipPoints;
             hasUpdated = true;
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/StreamLabsSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/StreamLabsSettings.axaml.cs
index 1907ade..25f5d88 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/StreamLabsSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/StreamLabsSettings.axaml.cs
@@ -42,13 +42,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? slTipValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.StreamLabsDonation && sv.Meta == "");
-        if (slTipValue != null && double.TryParse(DonoBox.Text, out double slTipSeconds) &&
+        if (slTipValue != null && Utils.TryParseAmount(DonoBox.Text, out double slTipSeconds) &&
             !slTipSeconds.Equals(slTipValue.Seconds)) {
             slTipValue.Seconds = slTipSeconds;
             hasUpdated = true;
         }
 
-        if (slTipValue != null && double.TryParse(DonoBox2.Text, out double slTipPoints) &&
+        if (slTipValue != null && Utils.TryParseAmount(DonoBox2.Text, out double slTipPoints) &&
             !slTipPoints.Equals(slTipValue.Points)) {
             slTipValue.Points = slTipPoints;
             hasUpdated = true;
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/TangiaSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/TangiaSettings.axaml.cs
index 8d31bcb..8d5a673 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/TangiaSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/TangiaSettings.axaml.cs
@@ -69,13 +69,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? tokensValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.TangiaTokens && sv.Meta == "");
 
-        if (tokensValue != null && double.TryParse(TokensSecondsBox.Text, out double seconds) &&
+        if (tokensValue != null && Utils.TryParseAmount(TokensSecondsBox.Text, out double seconds) &&
             !seconds.Equals(Math.Round(tokensValue.Seconds * 100))) {
             tokensValue.Seconds = seconds / 100.0;
             hasUpdated = true;
         }
 
-        if (tokensValue != null && double.TryParse(TokensPointsBox.Text, out double points) &&
+        if (tokensValue != null && Utils.TryParseAmount(TokensPointsBox.Text, out double points) &&
             !points.Equals(tokensValue.Points)) {
             tokensValue.Points = points;
             hasUpdated = true;
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/TipeeeStreamSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/TipeeeStreamSettings.axaml.cs
index 125a7c6..a0053a1 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/TipeeeStreamSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/TipeeeStreamSettings.axaml.cs
@@ -58,12 +58,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? tipValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.TipeeeStreamDonation && sv.Meta == "");
         if (tipValue != null) {
-            if (double.TryParse(DonoBox.Text, out double s) && !s.Equals(tipValue.Seconds)) {
+            if (Utils.TryParseAmount(DonoBox.Text, out double s) && !s.Equals(tipValue.Seconds)) {
                 tipValue.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(DonoBox2.Text, out double p) && !p.Equals(tipValue.Points)) {
+            if (Utils.TryParseAmount(DonoBox2.Text, out double p) && !p.Equals(tipValue.Points)) {
                 tipValue.Points = p;
                 hasUpdated = true;
             }
diff --git a/SubathonManager.UI/Views/SettingsViews/Extensions/TreatStreamSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Extensions/TreatStreamSettings.axaml.cs
index 3b0c0e0..a0871b3 100644
--- a/SubathonManager.UI/Views/SettingsViews/Extensions/TreatStreamSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Extensions/TreatStreamSettings.axaml.cs
@@ -67,13 +67,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? treatValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.TreatStreamOrder && sv.Meta == "");
-        if (treatValue != null && double.TryParse(TreatBox.Text, out double seconds) &&
+        if (treatValue != null && Utils.TryParseAmount(TreatBox.Text, out double seconds) &&
             !seconds.Equals(treatValue.Seconds)) {
             treatValue.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (treatValue != null && double.TryParse(TreatBox2.Text, out double points) &&
+        if (treatValue != null && Utils.TryParseAmount(TreatBox2.Text, out double points) &&
             !points.Equals(treatValue.Points)) {
             treatValue.Points = points;
             hasUpdated = true;
diff --git a/SubathonManager.UI/Views/SettingsViews/External/ExternalServiceSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/ExternalServiceSettings.axaml.cs
index 343aa34..ae608b9 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/ExternalServiceSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/ExternalServiceSettings.axaml.cs
@@ -38,13 +38,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? externalDonoValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.ExternalDonation && sv.Meta == "");
-        if (externalDonoValue != null && double.TryParse(DonoBox.Text, out double exSeconds) &&
+        if (externalDonoValue != null && Utils.TryParseAmount(DonoBox.Text, out double exSeconds) &&
             !exSeconds.Equals(externalDonoValue.Seconds)) {
             externalDonoValue.Seconds = exSeconds;
             hasUpdated = true;
         }
 
-        if (externalDonoValue != null && double.TryParse(DonoBox2.Text, out double exPoints) &&
+        if (externalDonoValue != null && Utils.TryParseAmount(DonoBox2.Text, out double exPoints) &&
             !exPoints.Equals(externalDonoValue.Points)) {
             externalDonoValue.Points = exPoints;
             hasUpdated = true;
@@ -52,13 +52,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? defaultSubValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.ExternalSub && sv.Meta == "DEFAULT");
-        if (defaultSubValue != null && double.TryParse(SubDTextBox.Text, out double defaultSeconds) &&
+        if (defaultSubValue != null && Utils.TryParseAmount(SubDTextBox.Text, out double defaultSeconds) &&
             !defaultSeconds.Equals(defaultSubValue.Seconds)) {
             defaultSubValue.Seconds = defaultSeconds;
             hasUpdated = true;
         }
 
-        if (defaultSubValue != null && double.TryParse(SubDTextBox2.Text, out double defaultPoints) &&
+        if (defaultSubValue != null && Utils.TryParseAmount(SubDTextBox2.Text, out double defaultPoints) &&
             !defaultPoints.Equals(defaultSubValue.Points)) {
             defaultSubValue.Points = defaultPoints;
             hasUpdated = true;
@@ -82,8 +82,8 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
             if (meta == "DEFAULT") continue;
 
-            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
-            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
+            if (!Utils.TryParseAmount(subRow.TimeBox.Text, out double seconds)) seconds = 0;
+            if (!Utils.TryParseAmount(subRow.PointsBox.Text, out double points)) points = 0;
 
 #pragma warning disable CA1862
             SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
diff --git a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
index 26cd262..051e951 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/FourthWallSettings.axaml.cs
@@ -112,13 +112,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? externalDonoValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.FourthWallDonation && sv.Meta == "");
-        if (externalDonoValue != null && double.TryParse(DonoBox.Text, out double exSeconds) &&
+        if (externalDonoValue != null && Utils.TryParseAmount(DonoBox.Text, out double exSeconds) &&
             !exSeconds.Equals(externalDonoValue.Seconds)) {
             externalDonoValue.Seconds = exSeconds;
             hasUpdated = true;
         }
 
-        if (externalDonoValue != null && double.TryParse(DonoBox2.Text, out double exPoints) &&
+        if (externalDonoValue != null && Utils.TryParseAmount(DonoBox2.Text, out double exPoints) &&
             !exPoints.Equals(externalDonoValue.Points)) {
             externalDonoValue.Points = exPoints;
             hasUpdated = true;
@@ -128,24 +128,24 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? orderVal =
             db.SubathonValues.FirstOrDefault(x => x.EventType == SubathonEventType.FourthWallOrder && x.Meta == "");
-        if (orderVal != null && double.TryParse(ShopOrderBox.Text, out double osec) && !orderVal.Seconds.Equals(osec)) {
+        if (orderVal != null && Utils.TryParseAmount(ShopOrderBox.Text, out double osec) && !orderVal.Seconds.Equals(osec)) {
             orderVal.Seconds = osec;
             hasUpdated = true;
         }
 
-        if (orderVal != null && double.TryParse(ShopOrderBox2.Text, out double opts) && !orderVal.Points.Equals(opts)) {
+        if (orderVal != null && Utils.TryParseAmount(ShopOrderBox2.Text, out double opts) && !orderVal.Points.Equals(opts)) {
             orderVal.Points = opts;
             hasUpdated = true;
         }
 
         SubathonValue? value =
             db.SubathonValues.FirstOrDefault(x => x.EventType == SubathonEventType.FourthWallGiftOrder && x.Meta == "");
-        if (value != null && double.TryParse(gShopOrderBox.Text, out double gosec) && !value.Seconds.Equals(gosec)) {
+        if (value != null && Utils.TryParseAmount(gShopOrderBox.Text, out double gosec) && !value.Seconds.Equals(gosec)) {
             value.Seconds = gosec;
             hasUpdated = true;
         }
 
-        if (value != null && double.TryParse(gShopOrderBox2.Text, out double gpts) && !value.Points.Equals(gpts)) {
+        if (value != null && Utils.TryParseAmount(gShopOrderBox2.Text, out double gpts) && !value.Points.Equals(gpts)) {
             value.Points = gpts;
             hasUpdated = true;
         }
@@ -260,7 +260,7 @@ private void TestFwShopGiftOrder_Click(object? sender, RoutedEventArgs e) {
         if (quantity < 1) return;
         oEvent.Quantity = quantity;
 
-        if (!double.TryParse(gOrderTotalSimBox.Text, out double subtotal)) return;
+        if (!Utils.TryParseAmount(gOrderTotalSimBox.Text, out double subtotal)) return;
         oEvent.Amounts = new Fourthwall.Client.Generated.Models.Openapi.Model.GiftPurchaseV1.Amounts {
             Subtotal = new Money { Value = subtotal, Currency = gOrderCurrencyBox.Text },
             Profit = new Money { Value = subtotal * 0.67, Currency = gOrderCurrencyBox.Text },
@@ -293,7 +293,7 @@ private void TestFwShopOrder_Click(object? sender, RoutedEventArgs e) {
         if (!int.TryParse(OrderQuantitySimBox.Text, out int quantity)) return;
         if (quantity < 1) return;
         item.Variant.Quantity = quantity;
-        if (!double.TryParse(OrderTotalSimBox.Text, out double subtotal)) return;
+        if (!Utils.TryParseAmount(OrderTotalSimBox.Text, out double subtotal)) return;
         item.Variant.Price = new Money { Currency = OrderCurrencyBox.Text, Value = subtotal };
         item.Variant.UnitPrice = new Money { Currency = OrderCurrencyBox.Text, Value = subtotal / quantity };
         item.Variant.Cost = new Money { Currency = OrderCurrencyBox.Text, Value = subtotal * 0.67 };
@@ -334,7 +334,7 @@ private void TestFwShopOrder_Click(object? sender, RoutedEventArgs e) {
     private void TestFwTip_Click(object? sender, RoutedEventArgs e) {
         var donoEvent = new DonationV1 { Amounts = new Amounts { Total = new Money() } };
 
-        if (double.TryParse(SimulateFwTipAmountBox.Text, out double tipAmt))
+        if (Utils.TryParseAmount(SimulateFwTipAmountBox.Text, out double tipAmt))
             donoEvent.Amounts.Total.Value = tipAmt;
         else return;
         donoEvent.Amounts.Total.Currency = CurrencyBox.Text;
diff --git a/SubathonManager.UI/Views/SettingsViews/External/GoAffPro/GoAffProSourceControl.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/GoAffPro/GoAffProSourceControl.axaml.cs
index a1797d9..5c48ed8 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/GoAffPro/GoAffProSourceControl.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/GoAffPro/GoAffProSourceControl.axaml.cs
@@ -76,12 +76,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
             hasUpdated = true;
         }
 
-        if (double.TryParse(SecondsBox.Text, out double seconds) && !value.Seconds.Equals(seconds)) {
+        if (Utils.TryParseAmount(SecondsBox.Text, out double seconds) && !value.Seconds.Equals(seconds)) {
             value.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (double.TryParse(PointsBox.Text, out double points) && !value.Points.Equals(points)) {
+        if (Utils.TryParseAmount(PointsBox.Text, out double points) && !value.Points.Equals(points)) {
             value.Points = points;
             hasUpdated = true;
         }
@@ -109,8 +109,8 @@ public bool UpdateConfigSettings(IConfig config, string configSection) {
     }
 
     public void SimulateOrder() {
-        decimal total = decimal.TryParse(TotalSimBox.Text, out decimal r) ? r : 0;
-        decimal commTotal = decimal.TryParse(CommSimBox.Text, out decimal r2) ? r2 : 0;
+        decimal total = (decimal)Utils.ParseAmount(TotalSimBox.Text);
+        decimal commTotal = (decimal)Utils.ParseAmount(CommSimBox.Text);
         int itemCount = int.TryParse(QuantitySimBox.Text, out int r3) ? r3 : 0;
         string currency = (CurrencyText.Text ?? "").Replace("[", "").Replace("]", "");
         if (string.IsNullOrWhiteSpace(currency)) currency = "USD";
diff --git a/SubathonManager.UI/Views/SettingsViews/External/JuniperSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/JuniperSettings.axaml.cs
index 02ed477..9d38216 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/JuniperSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/JuniperSettings.axaml.cs
@@ -218,12 +218,12 @@ private static bool SaveValue(AppDbContext db, SubathonEventType eventType, Text
             hasUpdated = true;
         }
 
-        if (double.TryParse(secondsBox.Text, out double seconds) && !seconds.Equals(value.Seconds)) {
+        if (Utils.TryParseAmount(secondsBox.Text, out double seconds) && !seconds.Equals(value.Seconds)) {
             value.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (double.TryParse(pointsBox.Text, out double points) && !points.Equals(value.Points)) {
+        if (Utils.TryParseAmount(pointsBox.Text, out double points) && !points.Equals(value.Points)) {
             value.Points = points;
             hasUpdated = true;
         }
@@ -332,8 +332,8 @@ private static bool SaveOverride(AppDbContext db, List<SubathonValue> juniperVal
             return existing.Count > 0;
         }
 
-        double seconds = double.TryParse(secondsText, out double s) ? s : 0;
-        double points = double.TryParse(pointsText, out double p) ? p : 0;
+        double seconds = Utils.TryParseAmount(secondsText, out double s) ? s : 0;
+        double points = Utils.TryParseAmount(pointsText, out double p) ? p : 0;
 
         SubathonValue? keep = existing.FirstOrDefault();
         if (keep == null) {
diff --git a/SubathonManager.UI/Views/SettingsViews/External/KoFiCombinedSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/KoFiCombinedSettings.axaml.cs
index c9b12c5..4557072 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/KoFiCombinedSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/KoFiCombinedSettings.axaml.cs
@@ -133,12 +133,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? tipValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.KoFiDonation);
         if (tipValue != null) {
-            if (double.TryParse(DonoBox.Text, out double s) && !s.Equals(tipValue.Seconds)) {
+            if (Utils.TryParseAmount(DonoBox.Text, out double s) && !s.Equals(tipValue.Seconds)) {
                 tipValue.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(DonoBox2.Text, out double p) && !p.Equals(tipValue.Points)) {
+            if (Utils.TryParseAmount(DonoBox2.Text, out double p) && !p.Equals(tipValue.Points)) {
                 tipValue.Points = p;
                 hasUpdated = true;
             }
@@ -147,12 +147,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? shopValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.KoFiShopOrder);
         if (shopValue != null) {
-            if (double.TryParse(ShopOrderBox.Text, out double s) && !s.Equals(shopValue.Seconds)) {
+            if (Utils.TryParseAmount(ShopOrderBox.Text, out double s) && !s.Equals(shopValue.Seconds)) {
                 shopValue.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(ShopOrderBox2.Text, out double p) && !p.Equals(shopValue.Points)) {
+            if (Utils.TryParseAmount(ShopOrderBox2.Text, out double p) && !p.Equals(shopValue.Points)) {
                 shopValue.Points = p;
                 hasUpdated = true;
             }
@@ -161,12 +161,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? commValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.KoFiCommissionOrder);
         if (commValue != null) {
-            if (double.TryParse(CommissionBox.Text, out double s) && !s.Equals(commValue.Seconds)) {
+            if (Utils.TryParseAmount(CommissionBox.Text, out double s) && !s.Equals(commValue.Seconds)) {
                 commValue.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(CommissionBox2.Text, out double p) && !p.Equals(commValue.Points)) {
+            if (Utils.TryParseAmount(CommissionBox2.Text, out double p) && !p.Equals(commValue.Points)) {
                 commValue.Points = p;
                 hasUpdated = true;
             }
@@ -175,12 +175,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? defaultSub = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.KoFiSub && sv.Meta == "DEFAULT");
         if (defaultSub != null) {
-            if (double.TryParse(KFSubDTextBox.Text, out double s) && !s.Equals(defaultSub.Seconds)) {
+            if (Utils.TryParseAmount(KFSubDTextBox.Text, out double s) && !s.Equals(defaultSub.Seconds)) {
                 defaultSub.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(KFSubDTextBox2.Text, out double p) && !p.Equals(defaultSub.Points)) {
+            if (Utils.TryParseAmount(KFSubDTextBox2.Text, out double p) && !p.Equals(defaultSub.Points)) {
                 defaultSub.Points = p;
                 hasUpdated = true;
             }
@@ -203,8 +203,8 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
             if (meta == "DEFAULT") continue;
 
-            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
-            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
+            if (!Utils.TryParseAmount(subRow.TimeBox.Text, out double seconds)) seconds = 0;
+            if (!Utils.TryParseAmount(subRow.PointsBox.Text, out double points)) points = 0;
 
 #pragma warning disable CA1862
             SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
diff --git a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
index 494ac38..4bbed0f 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/MakeShipSettings.axaml.cs
@@ -251,12 +251,12 @@ private static bool SaveValue(AppDbContext db, SubathonEventType eventType, Text
             hasUpdated = true;
         }
 
-        if (double.TryParse(secondsBox.Text, out double seconds) && !seconds.Equals(value.Seconds)) {
+        if (Utils.TryParseAmount(secondsBox.Text, out double seconds) && !seconds.Equals(value.Seconds)) {
             value.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (double.TryParse(pointsBox.Text, out double points) && !points.Equals(value.Points)) {
+        if (Utils.TryParseAmount(pointsBox.Text, out double points) && !points.Equals(value.Points)) {
             value.Points = points;
             hasUpdated = true;
         }
@@ -353,8 +353,8 @@ private static bool SaveOverride(AppDbContext db, List<SubathonValue> makeShipVa
             return existing.Count > 0;
         }
 
-        double seconds = double.TryParse(secondsText, out double s) ? s : 0;
-        double points = double.TryParse(pointsText, out double p) ? p : 0;
+        double seconds = Utils.TryParseAmount(secondsText, out double s) ? s : 0;
+        double points = Utils.TryParseAmount(pointsText, out double p) ? p : 0;
 
         var updated = false;
         SubathonValue? keep = existing.FirstOrDefault(sv => sv.EventType == desiredType);
diff --git a/SubathonManager.UI/Views/SettingsViews/External/PallySettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/PallySettings.axaml.cs
index 5ab1338..dc35846 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/PallySettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/PallySettings.axaml.cs
@@ -108,12 +108,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? tipValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.PallyGGDonation && sv.Meta == "");
-        if (tipValue != null && double.TryParse(TipBox.Text, out double seconds) && !seconds.Equals(tipValue.Seconds)) {
+        if (tipValue != null && Utils.TryParseAmount(TipBox.Text, out double seconds) && !seconds.Equals(tipValue.Seconds)) {
             tipValue.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (tipValue != null && double.TryParse(TipBox2.Text, out double points) && !points.Equals(tipValue.Points)) {
+        if (tipValue != null && Utils.TryParseAmount(TipBox2.Text, out double points) && !points.Equals(tipValue.Points)) {
             tipValue.Points = points;
             hasUpdated = true;
         }
diff --git a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs
index 6314c54..024196e 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/PatreonSettings.axaml.cs
@@ -84,13 +84,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         bool hasUpdated = SaveMembershipValues(db);
         SubathonValue? perUnit = db.SubathonValues.FirstOrDefault(v =>
             v.EventType == SubathonEventType.PatreonPledge && v.Meta == Utils.PerUnitMeta);
-        if (perUnit != null && double.TryParse(PerUnitBox.Text, out double seconds) &&
+        if (perUnit != null && Utils.TryParseAmount(PerUnitBox.Text, out double seconds) &&
             !seconds.Equals(perUnit.Seconds)) {
             perUnit.Seconds = seconds;
             hasUpdated = true;
         }
 
-        if (perUnit != null && double.TryParse(PerUnitBox2.Text, out double points) &&
+        if (perUnit != null && Utils.TryParseAmount(PerUnitBox2.Text, out double points) &&
             !points.Equals(perUnit.Points)) {
             perUnit.Points = points;
             hasUpdated = true;
diff --git a/SubathonManager.UI/Views/SettingsViews/External/ThroneSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/ThroneSettings.axaml.cs
index 0103f28..88416f5 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/ThroneSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/ThroneSettings.axaml.cs
@@ -67,13 +67,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? contribVal = db.SubathonValues.FirstOrDefault(x =>
             x.EventType == SubathonEventType.ThroneGiftContribution && x.Meta == "");
-        if (contribVal != null && double.TryParse(ContribBox.Text, out double osec) &&
+        if (contribVal != null && Utils.TryParseAmount(ContribBox.Text, out double osec) &&
             !contribVal.Seconds.Equals(osec)) {
             contribVal.Seconds = osec;
             hasUpdated = true;
         }
 
-        if (contribVal != null && double.TryParse(ContribBox2.Text, out double opts) &&
+        if (contribVal != null && Utils.TryParseAmount(ContribBox2.Text, out double opts) &&
             !contribVal.Points.Equals(opts)) {
             contribVal.Points = opts;
             hasUpdated = true;
@@ -81,12 +81,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? value =
             db.SubathonValues.FirstOrDefault(x => x.EventType == SubathonEventType.ThroneGiftPurchase && x.Meta == "");
-        if (value != null && double.TryParse(GiftsBox.Text, out double gosec) && !value.Seconds.Equals(gosec)) {
+        if (value != null && Utils.TryParseAmount(GiftsBox.Text, out double gosec) && !value.Seconds.Equals(gosec)) {
             value.Seconds = gosec;
             hasUpdated = true;
         }
 
-        if (value != null && double.TryParse(GiftsBox2.Text, out double gpts) && !value.Points.Equals(gpts)) {
+        if (value != null && Utils.TryParseAmount(GiftsBox2.Text, out double gpts) && !value.Points.Equals(gpts)) {
             value.Points = gpts;
             hasUpdated = true;
         }
@@ -129,7 +129,7 @@ public override (string seconds, string points, TextBox? timeBox, TextBox? point
     }
 
     private void TestThroneGift_Click(object? sender, RoutedEventArgs e) {
-        double.TryParse(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
+        Utils.TryParseAmount(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
             ? "10.00"
             : SimulateThroneContribAmountBox.Text, out double amount);
         amount *= 100;
@@ -154,7 +154,7 @@ private void TestThroneGift_Click(object? sender, RoutedEventArgs e) {
     }
 
     private void TestThroneContrib_Click(object? sender, RoutedEventArgs e) {
-        double.TryParse(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
+        Utils.TryParseAmount(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
             ? "10.00"
             : SimulateThroneContribAmountBox.Text, out double amount);
         amount *= 100;
@@ -177,7 +177,7 @@ private void TestThroneContrib_Click(object? sender, RoutedEventArgs e) {
     }
 
     private void TestThroneCrowdfund_Click(object? sender, RoutedEventArgs e) {
-        double.TryParse(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
+        Utils.TryParseAmount(string.IsNullOrWhiteSpace(SimulateThroneContribAmountBox.Text)
             ? "10.00"
             : SimulateThroneContribAmountBox.Text, out double amount);
         amount *= 100;
diff --git a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
index 25e5062..df2f9ec 100644
--- a/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/External/TiltifySettings.axaml.cs
@@ -114,12 +114,12 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? donoValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.TiltifyDonation && sv.Meta == "");
         if (donoValue != null) {
-            if (double.TryParse(DonoBox.Text, out double s) && !s.Equals(donoValue.Seconds)) {
+            if (Utils.TryParseAmount(DonoBox.Text, out double s) && !s.Equals(donoValue.Seconds)) {
                 donoValue.Seconds = s;
                 hasUpdated = true;
             }
 
-            if (double.TryParse(DonoBox2.Text, out double p) && !p.Equals(donoValue.Points)) {
+            if (Utils.TryParseAmount(DonoBox2.Text, out double p) && !p.Equals(donoValue.Points)) {
                 donoValue.Points = p;
                 hasUpdated = true;
             }
diff --git a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/VTubeStudioSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/VTubeStudioSettings.axaml.cs
index 67c5029..52b15f3 100644
--- a/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/VTubeStudioSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/ExternalSoftware/VTubeStudioSettings.axaml.cs
@@ -243,7 +243,7 @@ private async void SetParameter_Click(object? sender, RoutedEventArgs e) {
             return;
         }
 
-        if (!double.TryParse((VtsParameterValueBox.Text ?? "").Trim(), out double value)) {
+        if (!Utils.TryParseAmount((VtsParameterValueBox.Text ?? "").Trim(), out double value)) {
             SetHint("Enter a numeric value to set");
             return;
         }
diff --git a/SubathonManager.UI/Views/SettingsViews/Streaming/PicartoSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Streaming/PicartoSettings.axaml.cs
index 87265b0..7ef0df4 100644
--- a/SubathonManager.UI/Views/SettingsViews/Streaming/PicartoSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Streaming/PicartoSettings.axaml.cs
@@ -127,13 +127,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? cheerValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.PicartoTip && sv.Meta == "");
         // divide by 100 since UI shows "per 100 kudos"
-        if (cheerValue != null && double.TryParse(KudosTextBox.Text, out double cheerSeconds) &&
+        if (cheerValue != null && Utils.TryParseAmount(KudosTextBox.Text, out double cheerSeconds) &&
             !cheerValue.Seconds.Equals(cheerSeconds / 100.0)) {
             cheerValue.Seconds = cheerSeconds / 100.0;
             hasUpdated = true;
         }
 
-        if (cheerValue != null && double.TryParse(Kudos2TextBox.Text, out double cheerPoints) &&
+        if (cheerValue != null && Utils.TryParseAmount(Kudos2TextBox.Text, out double cheerPoints) &&
             !cheerValue.Points.Equals(cheerPoints)) {
             cheerValue.Points = cheerPoints;
             hasUpdated = true;
@@ -141,13 +141,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? followValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.PicartoFollow && sv.Meta == "");
-        if (followValue != null && double.TryParse(FollowTextBox.Text, out double followSeconds) &&
+        if (followValue != null && Utils.TryParseAmount(FollowTextBox.Text, out double followSeconds) &&
             !followValue.Seconds.Equals(followSeconds)) {
             followValue.Seconds = followSeconds;
             hasUpdated = true;
         }
 
-        if (followValue != null && double.TryParse(Follow2TextBox.Text, out double followPoints) &&
+        if (followValue != null && Utils.TryParseAmount(Follow2TextBox.Text, out double followPoints) &&
             !followValue.Points.Equals(followPoints)) {
             followValue.Points = followPoints;
             hasUpdated = true;
@@ -162,11 +162,11 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
     private void TestPicartoTip_Click(object? sender, RoutedEventArgs e) {
         string? value = SimulateTipAmt.Text;
-        if (string.IsNullOrWhiteSpace(value)) return;
+        if (!Utils.TryParseAmount(value, out double amount)) return;
 
         var tip = new PicartoTip {
             Channel = string.IsNullOrWhiteSpace(PicartoUserBox.Text) ? "SYSTEM" : PicartoUserBox.Text,
-            Amount = decimal.Parse(value),
+            Amount = (decimal)amount,
             Username = "SYSTEM"
         };
         PicartoService.ProcessAlert(tip);
diff --git a/SubathonManager.UI/Views/SettingsViews/Streaming/TwitchSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Streaming/TwitchSettings.axaml.cs
index febf0a0..a4c5d78 100644
--- a/SubathonManager.UI/Views/SettingsViews/Streaming/TwitchSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Streaming/TwitchSettings.axaml.cs
@@ -73,13 +73,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         SubathonValue? cheerValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.TwitchCheer && sv.Meta == "");
         // divide by 100 since UI shows "per 100 bits"
-        if (cheerValue != null && double.TryParse(CheerTextBox.Text, out double cheerSeconds) &&
+        if (cheerValue != null && Utils.TryParseAmount(CheerTextBox.Text, out double cheerSeconds) &&
             !cheerValue.Seconds.Equals(cheerSeconds / 100.0)) {
             cheerValue.Seconds = cheerSeconds / 100.0;
             hasUpdated = true;
         }
 
-        if (cheerValue != null && double.TryParse(Cheer2TextBox.Text, out double cheerPoints) &&
+        if (cheerValue != null && Utils.TryParseAmount(Cheer2TextBox.Text, out double cheerPoints) &&
             !cheerValue.Points.Equals(cheerPoints)) {
             cheerValue.Points = cheerPoints;
             hasUpdated = true;
@@ -87,13 +87,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? raidValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.TwitchRaid && sv.Meta == "");
-        if (raidValue != null && double.TryParse(RaidTextBox.Text, out double raidSeconds) &&
+        if (raidValue != null && Utils.TryParseAmount(RaidTextBox.Text, out double raidSeconds) &&
             !raidValue.Seconds.Equals(raidSeconds)) {
             raidValue.Seconds = raidSeconds;
             hasUpdated = true;
         }
 
-        if (raidValue != null && double.TryParse(Raid2TextBox.Text, out double raidPoints) &&
+        if (raidValue != null && Utils.TryParseAmount(Raid2TextBox.Text, out double raidPoints) &&
             !raidValue.Points.Equals(raidPoints)) {
             raidValue.Points = raidPoints;
             hasUpdated = true;
@@ -101,13 +101,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? followValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.TwitchFollow && sv.Meta == "");
-        if (followValue != null && double.TryParse(FollowTextBox.Text, out double followSeconds) &&
+        if (followValue != null && Utils.TryParseAmount(FollowTextBox.Text, out double followSeconds) &&
             !followValue.Seconds.Equals(followSeconds)) {
             followValue.Seconds = followSeconds;
             hasUpdated = true;
         }
 
-        if (followValue != null && double.TryParse(Follow2TextBox.Text, out double followPoints) &&
+        if (followValue != null && Utils.TryParseAmount(Follow2TextBox.Text, out double followPoints) &&
             !followValue.Points.Equals(followPoints)) {
             followValue.Points = followPoints;
             hasUpdated = true;
@@ -115,13 +115,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? tcdTipValue = db.SubathonValues.FirstOrDefault(sv =>
             sv.EventType == SubathonEventType.TwitchCharityDonation && sv.Meta == "");
-        if (tcdTipValue != null && double.TryParse(DonoBox.Text, out double tcdTipSeconds) &&
+        if (tcdTipValue != null && Utils.TryParseAmount(DonoBox.Text, out double tcdTipSeconds) &&
             !tcdTipValue.Seconds.Equals(tcdTipSeconds)) {
             tcdTipValue.Seconds = tcdTipSeconds;
             hasUpdated = true;
         }
 
-        if (tcdTipValue != null && double.TryParse(DonoBox2.Text, out double tcdTipPoints) &&
+        if (tcdTipValue != null && Utils.TryParseAmount(DonoBox2.Text, out double tcdTipPoints) &&
             !tcdTipValue.Points.Equals(tcdTipPoints)) {
             tcdTipValue.Points = tcdTipPoints;
             hasUpdated = true;
@@ -273,7 +273,7 @@ private void LoadHypeTrainValues() {
         bool enabled = config.GetBool("Twitch", "HypeTrainMultiplier.Enabled");
         if (HypeTrainMultBox.IsChecked != enabled) HypeTrainMultBox.IsChecked = enabled;
 
-        double.TryParse(config.Get("Twitch", "HypeTrainMultiplier.Multiplier", "1"), out double parsedAmt);
+        Utils.TryParseAmount(config.Get("Twitch", "HypeTrainMultiplier.Multiplier", "1"), out double parsedAmt);
         if (HypeTrainMultAmt.Text != parsedAmt.ToString("0.00")) HypeTrainMultAmt.Text = parsedAmt.ToString("0.00");
 
         bool applyPts = config.GetBool("Twitch", "HypeTrainMultiplier.Points");
diff --git a/SubathonManager.UI/Views/SettingsViews/Streaming/YouTubeSettings.axaml.cs b/SubathonManager.UI/Views/SettingsViews/Streaming/YouTubeSettings.axaml.cs
index 1fd60c0..6a7848a 100644
--- a/SubathonManager.UI/Views/SettingsViews/Streaming/YouTubeSettings.axaml.cs
+++ b/SubathonManager.UI/Views/SettingsViews/Streaming/YouTubeSettings.axaml.cs
@@ -113,13 +113,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
         var hasUpdated = false;
         SubathonValue? superchatValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.YouTubeSuperChat && sv.Meta == "");
-        if (superchatValue != null && double.TryParse(DonoBox.Text, out double scSeconds) &&
+        if (superchatValue != null && Utils.TryParseAmount(DonoBox.Text, out double scSeconds) &&
             !scSeconds.Equals(superchatValue.Seconds)) {
             superchatValue.Seconds = scSeconds;
             hasUpdated = true;
         }
 
-        if (superchatValue != null && double.TryParse(DonoBox2.Text, out double scPoints) &&
+        if (superchatValue != null && Utils.TryParseAmount(DonoBox2.Text, out double scPoints) &&
             !scPoints.Equals(superchatValue.Points)) {
             superchatValue.Points = scPoints;
             hasUpdated = true;
@@ -127,13 +127,13 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
         SubathonValue? redirectValue =
             db.SubathonValues.FirstOrDefault(sv => sv.EventType == SubathonEventType.YouTubeRedirect && sv.Meta == "");
-        if (redirectValue != null && double.TryParse(RaidBox.Text, out double rdSeconds) &&
+        if (redirectValue != null && Utils.TryParseAmount(RaidBox.Text, out double rdSeconds) &&
             !rdSeconds.Equals(redirectValue.Seconds)) {
             redirectValue.Seconds = rdSeconds;
             hasUpdated = true;
         }
 
-        if (redirectValue != null && double.TryParse(RaidBox2.Text, out double rdPoints) &&
+        if (redirectValue != null && Utils.TryParseAmount(RaidBox2.Text, out double rdPoints) &&
             !rdPoints.Equals(redirectValue.Points)) {
             redirectValue.Points = rdPoints;
             hasUpdated = true;
@@ -162,8 +162,8 @@ public override bool UpdateValueSettings(AppDbContext db) {
 
             if (meta == "DEFAULT") continue;
 
-            if (!double.TryParse(subRow.TimeBox.Text, out double seconds)) seconds = 0;
-            if (!double.TryParse(subRow.PointsBox.Text, out double points)) points = 0;
+            if (!Utils.TryParseAmount(subRow.TimeBox.Text, out double seconds)) seconds = 0;
+            if (!Utils.TryParseAmount(subRow.PointsBox.Text, out double points)) points = 0;
 
 #pragma warning disable CA1862
             SubathonValue? existing = db.SubathonValues.FirstOrDefault(sv =>
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
index 27baeb0..08f21e6 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
@@ -62,8 +62,7 @@ private void ParseMultiplierParameter(string parameter) {
     }
 
     private string BuildMultiplierParameter() {
-        if (!double.TryParse(MultiplierAmountBox.Text, NumberStyles.Float,
-                CultureInfo.InvariantCulture, out double amount))
+        if (!Utils.TryParseAmount(MultiplierAmountBox.Text, out double amount))
             amount = 1.0;
         TimeSpan duration = Utils.ParseDurationString((MultiplierDurationBox.Text ?? "").Trim());
         string durationStr = duration == TimeSpan.Zero ? "x" : ((int)duration.TotalSeconds).ToString();
@@ -158,8 +157,7 @@ private static bool IsActionValid(WheelSpinActionType type, string param, out st
                 return false;
             }
 
-            if (!double.TryParse(parts[0], NumberStyles.Float,
-                    CultureInfo.InvariantCulture, out double amt) || amt == 0) {
+            if (!Utils.TryParseAmount(parts[0], out double amt) || amt == 0) {
                 error = "Multiplier amount must be a non-zero number";
                 return false;
             }
@@ -433,8 +431,7 @@ private VTSWheelAction ReadVtsBoxes() {
     }
 
     private static double ParseDoubleOrZero(string? text) {
-        return double.TryParse((text ?? "").Trim(), NumberStyles.Float,
-            CultureInfo.InvariantCulture, out double v) ? v : 0d;
+        return Utils.ParseAmount(text);
     }
 
     private string BuildVtsParameter() {
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs b/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
index 2cd2cbf..5d4e29d 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
+++ b/SubathonManager.UI/Views/WheelSpin/WheelTriggerEditor.axaml.cs
@@ -788,7 +788,7 @@ private async void SaveTrigger_Click(object? sender, RoutedEventArgs e) {
                 }
                 else if (OrderByMoneyRadio.IsChecked == true) {
                     if (string.IsNullOrWhiteSpace(OrderMoneyBox.Text) ||
-                        !double.TryParse(OrderMoneyBox.Text, out double om) || om <= 0) {
+                        !Utils.TryParseAmount(OrderMoneyBox.Text, out double om) || om <= 0) {
                         TriggerStatusText.Text = "Order amount must be a positive number";
                         return;
                     }
@@ -806,7 +806,7 @@ private async void SaveTrigger_Click(object? sender, RoutedEventArgs e) {
 
             case SubathonEventSubType.DonationLike:
                 if (string.IsNullOrWhiteSpace(DonationMoneyBox.Text) ||
-                    !double.TryParse(DonationMoneyBox.Text, out double dm) || dm <= 0) {
+                    !Utils.TryParseAmount(DonationMoneyBox.Text, out double dm) || dm <= 0) {
                     TriggerStatusText.Text = "Donation amount must be a positive number";
                     return;
                 }

From 86c4974c37f0652ae96c31503bac12e9bda651bb Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Tue, 27 Oct 2026 14:49:39 -0300
Subject: [PATCH 21/23] update some dependencies

---
 .github/workflows/build.yml                  | 2 +-
 SubathonManager.UI/SubathonManager.UI.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81f0a75..039acc3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -498,7 +498,7 @@ jobs:
       - name: Upload build artifact (Nextcloud)
         id: nc
         if: ${{ env.PRIMARY == 'nextcloud' || steps.gh.outcome == 'failure' }}
-        uses: trympet/nextcloud-artifacts-action@v2
+        uses: trympet/nextcloud-artifacts-action@v3
         continue-on-error: false
         with:
           name: SubathonManager_${{ matrix.runtime }}_${{ steps.avars.outputs.suffix }}
diff --git a/SubathonManager.UI/SubathonManager.UI.csproj b/SubathonManager.UI/SubathonManager.UI.csproj
index def4a58..f195021 100644
--- a/SubathonManager.UI/SubathonManager.UI.csproj
+++ b/SubathonManager.UI/SubathonManager.UI.csproj
@@ -48,7 +48,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="12.1.3"/>
-        <PackageReference Include="Avalonia.Controls.WebView" Version="12.1.0"/>
+        <PackageReference Include="Avalonia.Controls.WebView" Version="12.1.1"/>
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="12.1.2"/>
         <PackageReference Include="Avalonia.Desktop" Version="12.1.3"/>
         <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.3"/>

From 9c7d7ea36c303e2a4da95a1bc8db1ee0865cb69d Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 29 Oct 2026 00:01:22 -0300
Subject: [PATCH 22/23] fix warning

---
 SubathonManager.Integration/MakeShipService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SubathonManager.Integration/MakeShipService.cs b/SubathonManager.Integration/MakeShipService.cs
index 44b2f14..dff67dc 100644
--- a/SubathonManager.Integration/MakeShipService.cs
+++ b/SubathonManager.Integration/MakeShipService.cs
@@ -416,7 +416,7 @@ private void BroadcastStatus(bool force = false) {
             HttpResponseMessage response = await client.GetAsync(url, ct);
             if (response.StatusCode == HttpStatusCode.Forbidden) {
                 tracking.Blocked = true;
-                if ((bool)logger?.IsEnabled(LogLevel.Debug)) {
+                if (logger != null && logger.IsEnabled(LogLevel.Debug)) {
                     string headers = string.Join("; ", response.Headers.Concat(response.Content.Headers)
                         .Select(h => $"{h.Key}: {string.Join(",", h.Value)}"));
                     string body = await response.Content.ReadAsStringAsync(ct);

From a4b6b90be3075a3f714d69730a71319db2c84dcc Mon Sep 17 00:00:00 2001
From: WolfwithSword <12175651+WolfwithSword@users.noreply.github.com>
Date: Thu, 29 Oct 2026 19:41:20 -0300
Subject: [PATCH 23/23] fix actions editor open location

---
 SubathonManager.UI/Views/Actions/ActionsView.axaml.cs     | 2 ++
 SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs | 3 +++
 SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
index afaafb7..c61f907 100644
--- a/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
+++ b/SubathonManager.UI/Views/Actions/ActionsView.axaml.cs
@@ -206,6 +206,8 @@ private void EditSelected_Click(object? sender, RoutedEventArgs e) {
 
     private void OpenEditor(CustomAction action) {
         ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        Window? main = TopLevel.GetTopLevel(this) as Window;
+        UiHelpers.CenterOver(editor, main);
         editor.Saved -= OnEditorSaved;
         editor.Saved += OnEditorSaved;
     }
diff --git a/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs b/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs
index 9d5d7cd..9de3f5c 100644
--- a/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs
+++ b/SubathonManager.UI/Views/Prompts/PromptsEditor.History.cs
@@ -360,6 +360,9 @@ private void PromptAction_SelectionChanged(object? sender, SelectionChangedEvent
     private void OpenPromptActionEditor(CustomAction action) {
         Guid? openedFor = _selectedPrompt?.Id;
         ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        Window? main = TopLevel.GetTopLevel(this) as Window;
+        UiHelpers.CenterOver(editor, main);
+        
         editor.Saved += id => {
             if (openedFor == null || _selectedPrompt?.Id != openedFor) return;
             if (SelectedPromptActionId == id) {
diff --git a/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
index 08f21e6..4b21067 100644
--- a/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
+++ b/SubathonManager.UI/Views/WheelSpin/WheelEditor.Actions.cs
@@ -755,6 +755,10 @@ private void CustomAction_SelectionChanged(object? sender, SelectionChangedEvent
     private void OpenActionEditor(CustomAction action) {
         Guid? openedFor = _selectedItem?.Id;
         ActionEditorWindow editor = ActionEditorWindow.Open(action);
+        
+        Window? main = TopLevel.GetTopLevel(this) as Window;
+        UiHelpers.CenterOver(editor, main);
+
         editor.Saved += id => {
             if (openedFor == null || _selectedItem?.Id != openedFor || !CustomParamPanel.IsVisible) return;
             if (SelectedCustomActionId == id) {