From 0440bae3cb36fcf5796193220ea09fe228bcecbb Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 11:33:02 +0200
Subject: [PATCH 01/10] Share WebApplicationFactory across BackOffice tests via
 IClassFixture

---
 .../AcknowledgeBillingDriftTests.cs           |   2 +-
 .../BackOffice/BackOfficeBlobProxyTests.cs    |  15 +-
 .../BackOffice/BackOfficeEndpointBaseTest.cs  | 139 +++-----------
 .../Tests/BackOffice/BackOfficeTestContext.cs |  17 ++
 .../BackOfficeWebApplicationFactory.cs        | 176 ++++++++++++++++++
 .../GetDashboardMrrConsistencySummaryTests.cs |   2 +-
 .../GetUnsyncedSubscriptionsSummaryTests.cs   |   2 +-
 .../Dashboard/GetDashboardKpisTests.cs        |   2 +-
 .../Dashboard/GetDashboardMrrTrendTests.cs    |   2 +-
 .../GetDashboardPlanDistributionTests.cs      |   2 +-
 .../GetDashboardRecentSignupsTests.cs         |   2 +-
 .../GetDashboardRecentStripeEventsTests.cs    |   2 +-
 .../GetDashboardRevenueTrendTests.cs          |   2 +-
 .../Dashboard/GetDashboardTrendsTests.cs      |   2 +-
 .../GetBackOfficeBillingEventsTests.cs        |   2 +-
 .../BackOffice/GetBackOfficeInvoicesTests.cs  |   2 +-
 .../account/Tests/BackOffice/GetMeTests.cs    |   2 +-
 .../Tests/BackOffice/MockLoginRouteTests.cs   |   2 +-
 .../ReconcileTenantWithStripeTests.cs         |   2 +-
 .../ReplayArchivedTenantStripeEventsTests.cs  |   2 +-
 .../BackOffice/GetTenantActivityTests.cs      |   2 +-
 .../BackOffice/GetTenantDetailTests.cs        |   2 +-
 .../GetTenantPaymentHistoryTests.cs           |   2 +-
 .../BackOffice/GetTenantUserCountsTests.cs    |   2 +-
 .../Tenants/BackOffice/GetTenantUsersTests.cs |   2 +-
 .../Tenants/BackOffice/GetTenantsTests.cs     |   2 +-
 .../GetBackOfficeUserDetailTests.cs           |   2 +-
 .../GetBackOfficeUserLoginHistoryTests.cs     |   2 +-
 .../GetBackOfficeUserSessionsTests.cs         |   2 +-
 .../BackOffice/GetBackOfficeUsersTests.cs     |   2 +-
 30 files changed, 255 insertions(+), 144 deletions(-)
 create mode 100644 application/account/Tests/BackOffice/BackOfficeTestContext.cs
 create mode 100644 application/account/Tests/BackOffice/BackOfficeWebApplicationFactory.cs

diff --git a/application/account/Tests/BackOffice/AcknowledgeBillingDriftTests.cs b/application/account/Tests/BackOffice/AcknowledgeBillingDriftTests.cs
index e98078621f..eb355255fc 100644
--- a/application/account/Tests/BackOffice/AcknowledgeBillingDriftTests.cs
+++ b/application/account/Tests/BackOffice/AcknowledgeBillingDriftTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class AcknowledgeBillingDriftTests : BackOfficeEndpointBaseTest
+public sealed class AcknowledgeBillingDriftTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task AcknowledgeBillingDrift_WhenSubscriptionHasDrift_ShouldClearDrift()
diff --git a/application/account/Tests/BackOffice/BackOfficeBlobProxyTests.cs b/application/account/Tests/BackOffice/BackOfficeBlobProxyTests.cs
index b48f25cd42..fcfa891834 100644
--- a/application/account/Tests/BackOffice/BackOfficeBlobProxyTests.cs
+++ b/application/account/Tests/BackOffice/BackOfficeBlobProxyTests.cs
@@ -8,9 +8,10 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class BackOfficeBlobProxyTests : BackOfficeEndpointBaseTest
+public sealed class BackOfficeBlobProxyTests(BackOfficeBlobProxyFactory factory)
+    : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeBlobProxyFactory>
 {
-    private readonly IBlobStorageClient _blobStorageClient = Substitute.For<IBlobStorageClient>();
+    private readonly IBlobStorageClient _blobStorageClient = factory.BlobStorageClient;
 
     [Fact]
     public async Task BackOfficeBlobProxy_WhenServingBlob_ShouldSetNoSniffHeader()
@@ -30,10 +31,18 @@ public async Task BackOfficeBlobProxy_WhenServingBlob_ShouldSetNoSniffHeader()
         response.StatusCode.Should().Be(HttpStatusCode.OK);
         response.Headers.GetValues("X-Content-Type-Options").Should().Contain("nosniff");
     }
+}
+
+public sealed class BackOfficeBlobProxyFactory : BackOfficeWebApplicationFactory
+{
+    // Shared across every test in the class (IClassFixture lifetime). If more tests are added,
+    // call ClearSubstitute() / ClearReceivedCalls() at the top of each so configured behaviours
+    // and ReceivedCalls() do not leak between tests.
+    public IBlobStorageClient BlobStorageClient { get; } = Substitute.For<IBlobStorageClient>();
 
     protected override void ConfigureAdditionalTestServices(IServiceCollection services)
     {
         services.RemoveAll(typeof(IBlobStorageClient));
-        services.AddKeyedSingleton("account-storage", _blobStorageClient);
+        services.AddKeyedSingleton("account-storage", BlobStorageClient);
     }
 }
diff --git a/application/account/Tests/BackOffice/BackOfficeEndpointBaseTest.cs b/application/account/Tests/BackOffice/BackOfficeEndpointBaseTest.cs
index 4f9af40d4b..b61c5b3ac3 100644
--- a/application/account/Tests/BackOffice/BackOfficeEndpointBaseTest.cs
+++ b/application/account/Tests/BackOffice/BackOfficeEndpointBaseTest.cs
@@ -2,104 +2,51 @@
 using Account.Integrations.Stripe;
 using Bogus;
 using JetBrains.Annotations;
-using Microsoft.ApplicationInsights;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using NSubstitute;
 using SharedKernel.Authentication.BackOfficeIdentity;
 using SharedKernel.Authentication.MockEasyAuth;
-using SharedKernel.ExecutionContext;
-using SharedKernel.Integrations.Email;
-using SharedKernel.SinglePageApp;
 using SharedKernel.Telemetry;
 using SharedKernel.Tests.Telemetry;
 
 namespace Account.Tests.BackOffice;
 
-// Base class for back-office endpoint tests. Configures the BackOffice host (so RequireHost matches)
-// and provides helpers to build HTTP clients with the right Host header and X-MS-CLIENT-PRINCIPAL-* headers.
+// Base class for back-office endpoint tests. Each derived class declares
+// IClassFixture<BackOfficeWebApplicationFactory> (or a subclass) to share a single host across
+// its tests; per-test isolation is preserved by the BackOfficeTestContext routed through the
+// fixture's AsyncLocal slot.
 public abstract class BackOfficeEndpointBaseTest : IDisposable
 {
-    protected const string BackOfficeHost = "back-office.test.localhost";
+    protected const string BackOfficeHost = BackOfficeWebApplicationFactory.BackOfficeHost;
 
-    private const string TestPublicUrl = "https://localhost";
-
-    private static readonly Lock SpaShellLock = new();
     protected readonly Faker Faker = new();
-    private readonly WebApplicationFactory<Program> _webApplicationFactory;
+    private readonly BackOfficeWebApplicationFactory _factory;
+    private readonly IDisposable _testScope;
 
-    protected BackOfficeEndpointBaseTest()
+    protected BackOfficeEndpointBaseTest(BackOfficeWebApplicationFactory factory)
     {
-        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.PublicUrlKey, TestPublicUrl);
-        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.CdnUrlKey, $"{TestPublicUrl}/account");
-        Environment.SetEnvironmentVariable(
-            "APPLICATIONINSIGHTS_CONNECTION_STRING",
-            "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://localhost;LiveEndpoint=https://localhost"
-        );
-        Environment.SetEnvironmentVariable("Stripe__AllowMockProvider", "true");
-        Environment.SetEnvironmentVariable("Stripe__PublishableKey", "pk_test_mock_publishable_key");
-
-        EnsureBackOfficeSpaShell();
-
-        TelemetryEventsCollectorSpy = new TelemetryEventsCollectorSpy(new TelemetryEventsCollector());
+        _factory = factory;
 
         Connection = new SqliteConnection($"Data Source=TestDb_{Guid.NewGuid():N};Mode=Memory;Cache=Shared");
         Connection.Open();
 
-        _webApplicationFactory = new WebApplicationFactory<Program>().WithWebHostBuilder(builder =>
+        TelemetryEventsCollectorSpy = new TelemetryEventsCollectorSpy(new TelemetryEventsCollector());
+        StripeState = new MockStripeState();
+
+        // BeginTest must run before any service resolution so the host's startup hosted services
+        // (PlatformCurrencyStartupResolver) and the EnsureCreated call below see the per-test state.
+        _testScope = factory.BeginTest(new BackOfficeTestContext
             {
-                builder.ConfigureLogging(logging => logging.AddFilter(_ => false));
-
-                builder.ConfigureAppConfiguration((_, configuration) =>
-                    {
-                        var backOfficeSettings = new Dictionary<string, string?>
-                        {
-                            ["BackOffice:Host"] = BackOfficeHost,
-                            // Match the AppHost wiring: mock admin identity carries this group id, so
-                            // configuring it here lets BackOfficeAdminAuthorizationHandler and GetMe.IsAdmin
-                            // resolve admin status the same way they do in dev.
-                            ["BackOffice:AdminsGroupId"] = MockEasyAuthIdentities.MockAdminsGroupId,
-                            // The user-facing SPA shell is scoped to Hostnames:App via UseHostScopedSinglePageAppFallback.
-                            // Tests that target the user-facing host use app.test.localhost.
-                            ["Hostnames:App"] = "app.test.localhost"
-                        };
-
-                        configuration.AddInMemoryCollection(backOfficeSettings);
-                    }
-                );
-
-                builder.ConfigureTestServices(services =>
-                    {
-                        services.Remove(services.Single(d => d.ServiceType == typeof(IDbContextOptionsConfiguration<AccountDbContext>)));
-                        services.AddDbContext<AccountDbContext>(options => options.UseSqlite(Connection).UseSnakeCaseNamingConvention());
-
-                        services.AddScoped<ITelemetryEventsCollector>(_ => TelemetryEventsCollectorSpy);
-
-                        services.Remove(services.Single(d => d.ServiceType == typeof(IEmailClient)));
-                        services.AddTransient<IEmailClient>(_ => Substitute.For<IEmailClient>());
-
-                        services.AddSingleton(new TelemetryClient(new TelemetryConfiguration { TelemetryChannel = Substitute.For<ITelemetryChannel>() }));
-                        services.AddScoped<IExecutionContext, HttpExecutionContext>();
-
-                        ConfigureAdditionalTestServices(services);
-                    }
-                );
+                Connection = Connection,
+                TelemetryCollector = TelemetryEventsCollectorSpy,
+                StripeState = StripeState
             }
         );
 
-        using var scope = _webApplicationFactory.Services.CreateScope();
+        using var scope = factory.Services.CreateScope();
         scope.ServiceProvider.GetRequiredService<AccountDbContext>().Database.EnsureCreated();
         DatabaseSeeder = ActivatorUtilities.CreateInstance<DatabaseSeeder>(scope.ServiceProvider);
-
-        Environment.SetEnvironmentVariable("BypassAntiforgeryValidation", "true");
     }
 
     protected SqliteConnection Connection { get; }
@@ -108,7 +55,7 @@ protected BackOfficeEndpointBaseTest()
 
     protected TelemetryEventsCollectorSpy TelemetryEventsCollectorSpy { get; }
 
-    protected MockStripeState StripeState => _webApplicationFactory.Services.GetRequiredService<MockStripeState>();
+    protected MockStripeState StripeState { get; }
 
     public void Dispose()
     {
@@ -116,47 +63,9 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    protected virtual void ConfigureAdditionalTestServices(IServiceCollection services)
-    {
-    }
-
-    // SinglePageAppConfiguration.GetHtmlTemplate() reads BackOffice/dist/index.html on every SPA-shell
-    // request. Locally that file is generated by `rsbuild dev`; in CI the test step runs before any frontend
-    // build, so the file is missing and the fallback returns 500. The dist's index.html is just the public
-    // template plus rsbuild's bundle <script> injection — we don't need that here, so seed dist/index.html
-    // from public/index.html when it is missing or when a previous failed `rsbuild dev` left a broken
-    // artifact (no <body id="back-office">). The static Lock serializes parallel test class constructors;
-    // File.Copy opens the destination with FileShare.None and concurrent writers hit IOException.
-    private static void EnsureBackOfficeSpaShell()
-    {
-        // Walk up looking for the account folder (the parent of both Tests/BackOffice and BackOffice).
-        // Matching just on "BackOffice" would stop at Tests/BackOffice, which is this test fixture's
-        // own folder, not the SPA bundle.
-        var directory = new DirectoryInfo(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!);
-        while (directory is not null && !Directory.Exists(Path.Combine(directory.FullName, "BackOffice", "public")))
-        {
-            directory = directory.Parent;
-        }
-
-        if (directory is null) return;
-
-        var distDirectory = Path.Combine(directory.FullName, "BackOffice", "dist");
-        var distIndexPath = Path.Combine(distDirectory, "index.html");
-        var publicIndexPath = Path.Combine(directory.FullName, "BackOffice", "public", "index.html");
-
-        lock (SpaShellLock)
-        {
-            if (File.Exists(distIndexPath) && File.ReadAllText(distIndexPath).Contains("id=\"back-office\"", StringComparison.Ordinal)) return;
-            if (!File.Exists(publicIndexPath)) return;
-
-            Directory.CreateDirectory(distDirectory);
-            File.Copy(publicIndexPath, distIndexPath, true);
-        }
-    }
-
     protected HttpClient CreateBackOfficeClient(string? clientPrincipalName = null, string? clientPrincipalId = null, string? clientPrincipalPayload = null)
     {
-        var client = _webApplicationFactory.CreateClient(new WebApplicationFactoryClientOptions
+        var client = _factory.CreateClient(new WebApplicationFactoryClientOptions
             {
                 BaseAddress = new Uri($"https://{BackOfficeHost}"),
                 AllowAutoRedirect = false
@@ -171,7 +80,7 @@ protected HttpClient CreateBackOfficeClient(string? clientPrincipalName = null,
 
     protected HttpClient CreateBackOfficeClientForIdentity(MockEasyAuthIdentity identity)
     {
-        var client = _webApplicationFactory.CreateClient(new WebApplicationFactoryClientOptions
+        var client = _factory.CreateClient(new WebApplicationFactoryClientOptions
             {
                 BaseAddress = new Uri($"https://{BackOfficeHost}"),
                 AllowAutoRedirect = false
@@ -186,7 +95,7 @@ protected HttpClient CreateBackOfficeClientForIdentity(MockEasyAuthIdentity iden
 
     protected HttpClient CreateClientForHost(string host)
     {
-        var client = _webApplicationFactory.CreateClient(new WebApplicationFactoryClientOptions
+        var client = _factory.CreateClient(new WebApplicationFactoryClientOptions
             {
                 BaseAddress = new Uri($"https://{host}"),
                 AllowAutoRedirect = false
@@ -201,6 +110,6 @@ protected virtual void Dispose(bool disposing)
     {
         if (!disposing) return;
         Connection.Close();
-        _webApplicationFactory.Dispose();
+        _testScope.Dispose();
     }
 }
diff --git a/application/account/Tests/BackOffice/BackOfficeTestContext.cs b/application/account/Tests/BackOffice/BackOfficeTestContext.cs
new file mode 100644
index 0000000000..4a05d108c7
--- /dev/null
+++ b/application/account/Tests/BackOffice/BackOfficeTestContext.cs
@@ -0,0 +1,17 @@
+using Account.Integrations.Stripe;
+using Microsoft.Data.Sqlite;
+using SharedKernel.Tests.Telemetry;
+
+namespace Account.Tests.BackOffice;
+
+// Per-test state surfaced to the shared BackOfficeWebApplicationFactory via AsyncLocal so that
+// each test sees its own database, telemetry collector, and Stripe state while the host stays
+// shared across the test class.
+public sealed class BackOfficeTestContext
+{
+    public required SqliteConnection Connection { get; init; }
+
+    public required TelemetryEventsCollectorSpy TelemetryCollector { get; init; }
+
+    public required MockStripeState StripeState { get; init; }
+}
diff --git a/application/account/Tests/BackOffice/BackOfficeWebApplicationFactory.cs b/application/account/Tests/BackOffice/BackOfficeWebApplicationFactory.cs
new file mode 100644
index 0000000000..7e7c3aebf2
--- /dev/null
+++ b/application/account/Tests/BackOffice/BackOfficeWebApplicationFactory.cs
@@ -0,0 +1,176 @@
+using Account.Database;
+using Account.Integrations.Stripe;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Channel;
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
+using NSubstitute;
+using SharedKernel.Authentication.MockEasyAuth;
+using SharedKernel.ExecutionContext;
+using SharedKernel.Integrations.Email;
+using SharedKernel.SinglePageApp;
+using SharedKernel.Telemetry;
+
+namespace Account.Tests.BackOffice;
+
+// Shared host for all back-office endpoint tests in a class. Constructed once via xUnit's
+// IClassFixture, the host wires its DbContext, telemetry collector, and Stripe state to a
+// per-test BackOfficeTestContext stored in an AsyncLocal — so the same host can serve every
+// test in the class while each test still has isolated state.
+public class BackOfficeWebApplicationFactory : WebApplicationFactory<Program>
+{
+    public const string BackOfficeHost = "back-office.test.localhost";
+
+    private const string TestPublicUrl = "https://localhost";
+
+    private static readonly Lock SpaShellLock = new();
+
+    private readonly AsyncLocal<BackOfficeTestContext?> _currentContext = new();
+
+    public BackOfficeWebApplicationFactory()
+    {
+        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.PublicUrlKey, TestPublicUrl);
+        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.CdnUrlKey, $"{TestPublicUrl}/account");
+        Environment.SetEnvironmentVariable(
+            "APPLICATIONINSIGHTS_CONNECTION_STRING",
+            "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://localhost;LiveEndpoint=https://localhost"
+        );
+        Environment.SetEnvironmentVariable("Stripe__AllowMockProvider", "true");
+        Environment.SetEnvironmentVariable("Stripe__PublishableKey", "pk_test_mock_publishable_key");
+        Environment.SetEnvironmentVariable("BypassAntiforgeryValidation", "true");
+
+        EnsureBackOfficeSpaShell();
+    }
+
+    private BackOfficeTestContext CurrentContext => _currentContext.Value
+                                                    ?? throw new InvalidOperationException("BackOfficeTestContext is not set. Call BeginTest before resolving services.");
+
+    // Sets the per-test context for the calling logical-call context. The returned scope clears the
+    // context on Dispose so the AsyncLocal does not leak past the test instance lifetime.
+    public IDisposable BeginTest(BackOfficeTestContext context)
+    {
+        _currentContext.Value = context;
+        return new TestScope(this);
+    }
+
+    // TestServer.PreserveExecutionContext defaults to false, which means the calling test's
+    // ExecutionContext (and therefore the AsyncLocal-stored BackOfficeTestContext) does not flow
+    // into request handling. Enabling it preserves the flow so per-request DI resolutions see the
+    // current test's context.
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        var host = base.CreateHost(builder);
+        if (host.Services.GetRequiredService<IServer>() is TestServer testServer)
+        {
+            testServer.PreserveExecutionContext = true;
+        }
+
+        return host;
+    }
+
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
+    {
+        builder.ConfigureLogging(logging => logging.AddFilter(_ => false));
+
+        builder.ConfigureAppConfiguration((_, configuration) =>
+            {
+                var backOfficeSettings = new Dictionary<string, string?>
+                {
+                    ["BackOffice:Host"] = BackOfficeHost,
+                    // Match the AppHost wiring: mock admin identity carries this group id, so
+                    // configuring it here lets BackOfficeAdminAuthorizationHandler and GetMe.IsAdmin
+                    // resolve admin status the same way they do in dev.
+                    ["BackOffice:AdminsGroupId"] = MockEasyAuthIdentities.MockAdminsGroupId,
+                    // The user-facing SPA shell is scoped to Hostnames:App via UseHostScopedSinglePageAppFallback.
+                    // Tests that target the user-facing host use app.test.localhost.
+                    ["Hostnames:App"] = "app.test.localhost"
+                };
+
+                configuration.AddInMemoryCollection(backOfficeSettings);
+            }
+        );
+
+        builder.ConfigureTestServices(services =>
+            {
+                services.Remove(services.Single(d => d.ServiceType == typeof(IDbContextOptionsConfiguration<AccountDbContext>)));
+                services.AddDbContext<AccountDbContext>((_, options) => options.UseSqlite(CurrentContext.Connection).UseSnakeCaseNamingConvention());
+
+                services.AddScoped<ITelemetryEventsCollector>(_ => CurrentContext.TelemetryCollector);
+
+                // Replace the production singleton with a transient that resolves the per-test instance
+                // from the current BackOfficeTestContext. MockStripeClient is keyed-scoped and captures
+                // MockStripeState per scope, so this delegates state mutations to the active test.
+                services.RemoveAll(typeof(MockStripeState));
+                services.AddTransient<MockStripeState>(_ => CurrentContext.StripeState);
+
+                services.Remove(services.Single(d => d.ServiceType == typeof(IEmailClient)));
+                services.AddTransient<IEmailClient>(_ => Substitute.For<IEmailClient>());
+
+                services.AddSingleton(new TelemetryClient(new TelemetryConfiguration { TelemetryChannel = Substitute.For<ITelemetryChannel>() }));
+                services.AddScoped<IExecutionContext, HttpExecutionContext>();
+
+                ConfigureAdditionalTestServices(services);
+            }
+        );
+    }
+
+    protected virtual void ConfigureAdditionalTestServices(IServiceCollection services)
+    {
+    }
+
+    // SinglePageAppConfiguration.GetHtmlTemplate() reads BackOffice/dist/index.html on every SPA-shell
+    // request. Locally that file is generated by `rsbuild dev`; in CI the test step runs before any frontend
+    // build, so the file is missing and the fallback returns 500. The dist's index.html is just the public
+    // template plus rsbuild's bundle <script> injection — we don't need that here, so seed dist/index.html
+    // from public/index.html when it is missing or when a previous failed `rsbuild dev` left a broken
+    // artifact (no <body id="back-office">). The static Lock serializes parallel test class constructors;
+    // File.Copy opens the destination with FileShare.None and concurrent writers hit IOException.
+    private static void EnsureBackOfficeSpaShell()
+    {
+        // Walk up looking for the account folder (the parent of both Tests/BackOffice and BackOffice).
+        // Matching just on "BackOffice" would stop at Tests/BackOffice, which is this test fixture's
+        // own folder, not the SPA bundle.
+        var directory = new DirectoryInfo(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!);
+        while (directory is not null && !Directory.Exists(Path.Combine(directory.FullName, "BackOffice", "public")))
+        {
+            directory = directory.Parent;
+        }
+
+        if (directory is null) return;
+
+        var distDirectory = Path.Combine(directory.FullName, "BackOffice", "dist");
+        var distIndexPath = Path.Combine(distDirectory, "index.html");
+        var publicIndexPath = Path.Combine(directory.FullName, "BackOffice", "public", "index.html");
+
+        lock (SpaShellLock)
+        {
+            if (File.Exists(distIndexPath) && File.ReadAllText(distIndexPath).Contains("id=\"back-office\"", StringComparison.Ordinal)) return;
+            if (!File.Exists(publicIndexPath)) return;
+
+            Directory.CreateDirectory(distDirectory);
+            File.Copy(publicIndexPath, distIndexPath, true);
+        }
+    }
+
+    private void EndTest()
+    {
+        _currentContext.Value = null;
+    }
+
+    private sealed class TestScope(BackOfficeWebApplicationFactory factory) : IDisposable
+    {
+        public void Dispose()
+        {
+            factory.EndTest();
+        }
+    }
+}
diff --git a/application/account/Tests/BackOffice/BillingDrift/GetDashboardMrrConsistencySummaryTests.cs b/application/account/Tests/BackOffice/BillingDrift/GetDashboardMrrConsistencySummaryTests.cs
index ad0185819f..53de7f0afb 100644
--- a/application/account/Tests/BackOffice/BillingDrift/GetDashboardMrrConsistencySummaryTests.cs
+++ b/application/account/Tests/BackOffice/BillingDrift/GetDashboardMrrConsistencySummaryTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice.BillingDrift;
 
-public sealed class GetDashboardMrrConsistencySummaryTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardMrrConsistencySummaryTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardMrrConsistencySummary_WhenSubscriptionsAndEventsAgree_ShouldReturnEqualValues()
diff --git a/application/account/Tests/BackOffice/BillingDrift/GetUnsyncedSubscriptionsSummaryTests.cs b/application/account/Tests/BackOffice/BillingDrift/GetUnsyncedSubscriptionsSummaryTests.cs
index be667ae577..3dd169e92c 100644
--- a/application/account/Tests/BackOffice/BillingDrift/GetUnsyncedSubscriptionsSummaryTests.cs
+++ b/application/account/Tests/BackOffice/BillingDrift/GetUnsyncedSubscriptionsSummaryTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice.BillingDrift;
 
-public sealed class GetUnsyncedSubscriptionsSummaryTests : BackOfficeEndpointBaseTest
+public sealed class GetUnsyncedSubscriptionsSummaryTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetUnsyncedSubscriptionsSummary_WhenCalled_ShouldReturnPaidSubscriptionsWithoutBillingEvents()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardKpisTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardKpisTests.cs
index b7f87ed64d..9c1333e59c 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardKpisTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardKpisTests.cs
@@ -18,7 +18,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardKpisTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardKpisTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardKpis_WhenCalled_ShouldReturnTenantUserAndRevenueAggregates()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardMrrTrendTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardMrrTrendTests.cs
index 706df7c0e3..53e459bea7 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardMrrTrendTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardMrrTrendTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardMrrTrendTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardMrrTrendTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardMrrTrend_WhenCalled_ShouldReturnDailyMrrSeriesForPeriod()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardPlanDistributionTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardPlanDistributionTests.cs
index 105a125534..0034f23fbb 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardPlanDistributionTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardPlanDistributionTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardPlanDistributionTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardPlanDistributionTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardPlanDistribution_WhenCalled_ShouldReturnEntryPerPlan()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentSignupsTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentSignupsTests.cs
index 1bec665ced..06d345d2f1 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentSignupsTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentSignupsTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardRecentSignupsTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardRecentSignupsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardRecentSignups_WhenCalled_ShouldReturnMostRecentTenantsFirst()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentStripeEventsTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentStripeEventsTests.cs
index 041eb1289a..80eca55175 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentStripeEventsTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardRecentStripeEventsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardRecentStripeEventsTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardRecentStripeEventsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardRecentStripeEvents_WhenCalled_ShouldReturnEventsFromBillingEventLog()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardRevenueTrendTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardRevenueTrendTests.cs
index b48f616006..c86dbb9069 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardRevenueTrendTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardRevenueTrendTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardRevenueTrendTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardRevenueTrendTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardRevenueTrend_WhenPaymentsAcrossMultipleDays_ShouldAccumulateRevenueInPeriod()
diff --git a/application/account/Tests/BackOffice/Dashboard/GetDashboardTrendsTests.cs b/application/account/Tests/BackOffice/Dashboard/GetDashboardTrendsTests.cs
index baec52c24c..e823229491 100644
--- a/application/account/Tests/BackOffice/Dashboard/GetDashboardTrendsTests.cs
+++ b/application/account/Tests/BackOffice/Dashboard/GetDashboardTrendsTests.cs
@@ -17,7 +17,7 @@
 
 namespace Account.Tests.BackOffice.Dashboard;
 
-public sealed class GetDashboardTrendsTests : BackOfficeEndpointBaseTest
+public sealed class GetDashboardTrendsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetDashboardTrends_WhenMetricIsNewTenants_ShouldBucketTenantsByCreatedDate()
diff --git a/application/account/Tests/BackOffice/GetBackOfficeBillingEventsTests.cs b/application/account/Tests/BackOffice/GetBackOfficeBillingEventsTests.cs
index 55e4336a8b..d65c2d3efe 100644
--- a/application/account/Tests/BackOffice/GetBackOfficeBillingEventsTests.cs
+++ b/application/account/Tests/BackOffice/GetBackOfficeBillingEventsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class GetBackOfficeBillingEventsTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeBillingEventsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeBillingEvents_WhenCalled_ShouldReturnAllEventsOrderedByOccurredAtDescending()
diff --git a/application/account/Tests/BackOffice/GetBackOfficeInvoicesTests.cs b/application/account/Tests/BackOffice/GetBackOfficeInvoicesTests.cs
index 75b20c96f9..81257deef9 100644
--- a/application/account/Tests/BackOffice/GetBackOfficeInvoicesTests.cs
+++ b/application/account/Tests/BackOffice/GetBackOfficeInvoicesTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class GetBackOfficeInvoicesTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeInvoicesTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeInvoices_WithoutStatusFilter_ShouldReturnInvoiceAndCreditNoteRowsForEveryTransaction()
diff --git a/application/account/Tests/BackOffice/GetMeTests.cs b/application/account/Tests/BackOffice/GetMeTests.cs
index 1431ffafa4..16e62eab44 100644
--- a/application/account/Tests/BackOffice/GetMeTests.cs
+++ b/application/account/Tests/BackOffice/GetMeTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class GetMeTests : BackOfficeEndpointBaseTest
+public sealed class GetMeTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetMe_WithAdminIdentity_ShouldReturnIsAdminTrue()
diff --git a/application/account/Tests/BackOffice/MockLoginRouteTests.cs b/application/account/Tests/BackOffice/MockLoginRouteTests.cs
index 4e73df74cd..140c1fcf24 100644
--- a/application/account/Tests/BackOffice/MockLoginRouteTests.cs
+++ b/application/account/Tests/BackOffice/MockLoginRouteTests.cs
@@ -10,7 +10,7 @@ namespace Account.Tests.BackOffice;
 // authenticated principal — it serves the SPA shell that hosts the MockEasyAuth identity picker. The
 // Azure branch (empty unauthenticatedPaths + 401 short-circuit) is gated on the static readonly
 // SharedInfrastructureConfiguration.IsRunningInAzure and verified by inspection of Program.cs.
-public sealed class MockLoginRouteTests : BackOfficeEndpointBaseTest
+public sealed class MockLoginRouteTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetLogin_OnBackOfficeHostWithoutAuth_ShouldServeSpaShell()
diff --git a/application/account/Tests/BackOffice/ReconcileTenantWithStripeTests.cs b/application/account/Tests/BackOffice/ReconcileTenantWithStripeTests.cs
index ce6579a498..85fe55cf4f 100644
--- a/application/account/Tests/BackOffice/ReconcileTenantWithStripeTests.cs
+++ b/application/account/Tests/BackOffice/ReconcileTenantWithStripeTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class ReconcileTenantWithStripeTests : BackOfficeEndpointBaseTest
+public sealed class ReconcileTenantWithStripeTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task ReconcileTenantWithStripe_WhenSubscriptionHasStripeCustomer_ShouldReturnReconcileResponse()
diff --git a/application/account/Tests/BackOffice/ReplayArchivedTenantStripeEventsTests.cs b/application/account/Tests/BackOffice/ReplayArchivedTenantStripeEventsTests.cs
index 2b758734a3..07e9b01441 100644
--- a/application/account/Tests/BackOffice/ReplayArchivedTenantStripeEventsTests.cs
+++ b/application/account/Tests/BackOffice/ReplayArchivedTenantStripeEventsTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.BackOffice;
 
-public sealed class ReplayArchivedTenantStripeEventsTests : BackOfficeEndpointBaseTest
+public sealed class ReplayArchivedTenantStripeEventsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task ExecuteAsync_ReplaysArchivedEventsIntoBillingEvents()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantActivityTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantActivityTests.cs
index f5a3ec5612..9c7d50e4e3 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantActivityTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantActivityTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantActivityTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantActivityTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenantActivity_WhenTenantExists_ShouldReturnEmptyEventsList()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantDetailTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantDetailTests.cs
index 805903246c..7113256512 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantDetailTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantDetailTests.cs
@@ -15,7 +15,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantDetailTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantDetailTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenantDetail_WhenTenantExists_ShouldReturnFullDetail()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantPaymentHistoryTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantPaymentHistoryTests.cs
index ecb2b6845c..917e86ba17 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantPaymentHistoryTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantPaymentHistoryTests.cs
@@ -14,7 +14,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantPaymentHistoryTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantPaymentHistoryTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenantPaymentHistory_WhenSubscriptionHasTransactions_ShouldReturnPagedTransactions()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantUserCountsTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantUserCountsTests.cs
index 888f5b996e..f7131c906d 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantUserCountsTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantUserCountsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantUserCountsTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantUserCountsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenantUserCounts_WhenCalled_ShouldReturnTotalActiveAndPendingCounts()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantUsersTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantUsersTests.cs
index ce67ea9635..19ab2037c4 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantUsersTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantUsersTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantUsersTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantUsersTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenantUsers_WhenCalled_ShouldReturnUsersForThatTenantOnly()
diff --git a/application/account/Tests/Tenants/BackOffice/GetTenantsTests.cs b/application/account/Tests/Tenants/BackOffice/GetTenantsTests.cs
index 8878992949..15ca30a1b7 100644
--- a/application/account/Tests/Tenants/BackOffice/GetTenantsTests.cs
+++ b/application/account/Tests/Tenants/BackOffice/GetTenantsTests.cs
@@ -16,7 +16,7 @@
 
 namespace Account.Tests.Tenants.BackOffice;
 
-public sealed class GetTenantsTests : BackOfficeEndpointBaseTest
+public sealed class GetTenantsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenants_WhenCalled_ShouldReturnAllTenantsWithSummaryFields()
diff --git a/application/account/Tests/Users/BackOffice/GetBackOfficeUserDetailTests.cs b/application/account/Tests/Users/BackOffice/GetBackOfficeUserDetailTests.cs
index d61292d1d0..d7ed785cc6 100644
--- a/application/account/Tests/Users/BackOffice/GetBackOfficeUserDetailTests.cs
+++ b/application/account/Tests/Users/BackOffice/GetBackOfficeUserDetailTests.cs
@@ -16,7 +16,7 @@
 
 namespace Account.Tests.Users.BackOffice;
 
-public sealed class GetBackOfficeUserDetailTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeUserDetailTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeUserDetail_WhenUserExists_ShouldReturnFullProfile()
diff --git a/application/account/Tests/Users/BackOffice/GetBackOfficeUserLoginHistoryTests.cs b/application/account/Tests/Users/BackOffice/GetBackOfficeUserLoginHistoryTests.cs
index 2a2965a189..d3991f2b4e 100644
--- a/application/account/Tests/Users/BackOffice/GetBackOfficeUserLoginHistoryTests.cs
+++ b/application/account/Tests/Users/BackOffice/GetBackOfficeUserLoginHistoryTests.cs
@@ -15,7 +15,7 @@
 
 namespace Account.Tests.Users.BackOffice;
 
-public sealed class GetBackOfficeUserLoginHistoryTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeUserLoginHistoryTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeUserLoginHistory_WhenUserHasEmailAndExternalLogins_ShouldReturnUnion()
diff --git a/application/account/Tests/Users/BackOffice/GetBackOfficeUserSessionsTests.cs b/application/account/Tests/Users/BackOffice/GetBackOfficeUserSessionsTests.cs
index b5dab0b76a..d316bbefe0 100644
--- a/application/account/Tests/Users/BackOffice/GetBackOfficeUserSessionsTests.cs
+++ b/application/account/Tests/Users/BackOffice/GetBackOfficeUserSessionsTests.cs
@@ -18,7 +18,7 @@
 
 namespace Account.Tests.Users.BackOffice;
 
-public sealed class GetBackOfficeUserSessionsTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeUserSessionsTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeUserSessions_WhenUserHasSessions_ShouldReturnAllSessions()
diff --git a/application/account/Tests/Users/BackOffice/GetBackOfficeUsersTests.cs b/application/account/Tests/Users/BackOffice/GetBackOfficeUsersTests.cs
index f6dac59acf..e9e0c2de1d 100644
--- a/application/account/Tests/Users/BackOffice/GetBackOfficeUsersTests.cs
+++ b/application/account/Tests/Users/BackOffice/GetBackOfficeUsersTests.cs
@@ -17,7 +17,7 @@
 
 namespace Account.Tests.Users.BackOffice;
 
-public sealed class GetBackOfficeUsersTests : BackOfficeEndpointBaseTest
+public sealed class GetBackOfficeUsersTests(BackOfficeWebApplicationFactory factory) : BackOfficeEndpointBaseTest(factory), IClassFixture<BackOfficeWebApplicationFactory>
 {
     [Fact]
     public async Task GetBackOfficeUsers_WhenSearchByEmail_ShouldReturnMatchingUsersAcrossTenants()

From 61ae3c8a3adf7f316ce4f747cc1abde6ddf78a34 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 12:48:40 +0200
Subject: [PATCH 02/10] Share WebApplicationFactory across Account API tests
 via IClassFixture

---
 .../account/Tests/AccountTestContext.cs       |  20 +++
 .../Tests/AccountWebApplicationFactory.cs     | 136 ++++++++++++++++++
 .../Authentication/GetUserSessionsTests.cs    |   2 +-
 .../Tests/Authentication/LogoutTests.cs       |   2 +-
 .../RefreshAuthenticationTokensTests.cs       |   4 +-
 .../Authentication/RevokeSessionTests.cs      |   2 +-
 .../Tests/Authentication/SwitchTenantTests.cs |   2 +-
 .../Billing/ConfirmPaymentMethodSetupTests.cs |   2 +-
 .../Tests/Billing/GetPaymentHistoryTests.cs   |   2 +-
 .../RetryPendingInvoicePaymentTests.cs        |   2 +-
 .../Tests/Billing/UpdateBillingInfoTests.cs   |   2 +-
 .../CompleteEmailLoginTests.cs                |   2 +-
 .../ResendEmailLoginCodeTests.cs              |   2 +-
 .../StartEmailLoginTests.cs                   |   2 +-
 application/account/Tests/EndpointBaseTest.cs | 129 +++++------------
 .../CustomExceptionHandlingTests.cs           |   2 +-
 .../Tests/Signups/CompleteEmailSignupTests.cs |  21 ++-
 .../Tests/Signups/StartEmailSignupTests.cs    |   2 +-
 .../AcknowledgeStripeWebhookTests.cs          |   2 +-
 .../Subscriptions/BillingEventAppendTests.cs  |   2 +-
 .../Subscriptions/CancelSubscriptionTests.cs  |   2 +-
 .../Domain/BillingEventRepositoryTests.cs     |   2 +-
 .../SubscriptionRepositoryDriftScopeTests.cs  |   2 +-
 .../Domain/SubscriptionRepositoryTests.cs     |   2 +-
 .../EventLogReconciliationTests.cs            |   2 +-
 .../Subscriptions/GetCheckoutPreviewTests.cs  |   2 +-
 .../GetCurrentSubscriptionTests.cs            |   2 +-
 .../Subscriptions/GetPricingCatalogTests.cs   |   2 +-
 .../Subscriptions/GetUpgradePreviewTests.cs   |   2 +-
 .../Subscriptions/LedgerCorrectnessTests.cs   |   2 +-
 ...ocessPendingStripeEventsCatalogGapTests.cs |   2 +-
 ...ocessPendingStripeEventsDetectModeTests.cs |   2 +-
 .../ProcessPendingStripeEventsTests.cs        |   2 +-
 .../ReactivateSubscriptionTests.cs            |   2 +-
 .../Subscriptions/ScheduleDowngradeTests.cs   |   2 +-
 .../StartSubscriptionCheckoutTests.cs         |   2 +-
 .../StripeEventPayloadDivergenceTests.cs      |   2 +-
 .../Subscriptions/UpgradeSubscriptionTests.cs |   2 +-
 .../Tests/Tenants/DeleteTenantTests.cs        |   2 +-
 .../Tests/Tenants/GetCurrentTenantTests.cs    |   2 +-
 .../Tests/Tenants/GetTenantsForUserTests.cs   |   2 +-
 .../Tests/Tenants/RemoveTenantLogoTests.cs    |   2 +-
 .../Tests/Tenants/UpdateCurrentTenantTests.cs |   2 +-
 .../Tests/Tenants/UpdateTenantLogoTests.cs    |   4 +-
 .../Tests/Users/BulkDeleteUsersTests.cs       |   2 +-
 .../Tests/Users/BulkPurgeUsersTests.cs        |   2 +-
 .../account/Tests/Users/ChangeLocaleTests.cs  |   2 +-
 .../account/Tests/Users/ChangeThemeTests.cs   |   2 +-
 .../Tests/Users/ChangeUserRoleTests.cs        |   2 +-
 .../Tests/Users/ChangeZoomLevelTests.cs       |   2 +-
 .../Tests/Users/DeclineInvitationTests.cs     |   2 +-
 .../account/Tests/Users/DeleteUserTests.cs    |   2 +-
 .../Tests/Users/EmptyRecycleBinTests.cs       |   2 +-
 .../Tests/Users/GetCurrentUserTests.cs        |   2 +-
 .../Tests/Users/GetDeletedUsersTests.cs       |   2 +-
 .../account/Tests/Users/GetUserByIdTests.cs   |   4 +-
 .../Tests/Users/GetUserSummaryTests.cs        |   2 +-
 .../account/Tests/Users/GetUsersTests.cs      |   4 +-
 .../account/Tests/Users/InviteUserTests.cs    |   2 +-
 .../account/Tests/Users/PurgeUserTests.cs     |   2 +-
 .../account/Tests/Users/RestoreUserTests.cs   |   2 +-
 .../Tests/Users/UpdateCurrentUserTests.cs     |   2 +-
 .../Tests/Workers/BillingDriftWorkerTests.cs  |   2 +-
 63 files changed, 275 insertions(+), 157 deletions(-)
 create mode 100644 application/account/Tests/AccountTestContext.cs
 create mode 100644 application/account/Tests/AccountWebApplicationFactory.cs

diff --git a/application/account/Tests/AccountTestContext.cs b/application/account/Tests/AccountTestContext.cs
new file mode 100644
index 0000000000..76f6c8d3ef
--- /dev/null
+++ b/application/account/Tests/AccountTestContext.cs
@@ -0,0 +1,20 @@
+using Account.Integrations.Stripe;
+using Microsoft.Data.Sqlite;
+using SharedKernel.Integrations.Email;
+using SharedKernel.Tests.Telemetry;
+
+namespace Account.Tests;
+
+// Per-test state surfaced to the shared AccountWebApplicationFactory via AsyncLocal so that each
+// test sees its own database, telemetry collector, email client substitute, and Stripe state while
+// the host stays shared across the test class.
+public sealed class AccountTestContext
+{
+    public required SqliteConnection Connection { get; init; }
+
+    public required TelemetryEventsCollectorSpy TelemetryCollector { get; init; }
+
+    public required IEmailClient EmailClient { get; init; }
+
+    public required MockStripeState StripeState { get; init; }
+}
diff --git a/application/account/Tests/AccountWebApplicationFactory.cs b/application/account/Tests/AccountWebApplicationFactory.cs
new file mode 100644
index 0000000000..0b02ebca01
--- /dev/null
+++ b/application/account/Tests/AccountWebApplicationFactory.cs
@@ -0,0 +1,136 @@
+using Account.Database;
+using Account.Integrations.Stripe;
+using Microsoft.ApplicationInsights;
+using Microsoft.ApplicationInsights.Channel;
+using Microsoft.ApplicationInsights.Extensibility;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
+using NSubstitute;
+using SharedKernel.ExecutionContext;
+using SharedKernel.Integrations.Email;
+using SharedKernel.SinglePageApp;
+using SharedKernel.Telemetry;
+
+namespace Account.Tests;
+
+// Shared host for all Account API endpoint tests in a class. Constructed once via xUnit's
+// IClassFixture, the host wires its DbContext, telemetry collector, email client, and Stripe
+// state to a per-test AccountTestContext stored in an AsyncLocal — so the same host can serve
+// every test in the class while each test still has isolated state.
+public class AccountWebApplicationFactory : WebApplicationFactory<Program>
+{
+    // Tests use the in-memory test server (WebApplicationFactory); no real listener is bound.
+    // SinglePageAppConfiguration only consumes this as a URI for CSP construction.
+    private const string TestPublicUrl = "https://localhost";
+
+    private readonly AsyncLocal<AccountTestContext?> _currentContext = new();
+
+    public AccountWebApplicationFactory()
+    {
+        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.PublicUrlKey, TestPublicUrl);
+        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.CdnUrlKey, $"{TestPublicUrl}/account");
+        Environment.SetEnvironmentVariable(
+            "APPLICATIONINSIGHTS_CONNECTION_STRING",
+            "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://localhost;LiveEndpoint=https://localhost"
+        );
+        Environment.SetEnvironmentVariable("Stripe__AllowMockProvider", "true");
+        Environment.SetEnvironmentVariable("Stripe__PublishableKey", "pk_test_mock_publishable_key");
+        // ASP.NET uses a cryptographic double-submit antiforgery pattern that encrypts the user's
+        // ClaimUid in the token, which is complex to replicate in tests; the middleware honors this
+        // env var to bypass validation.
+        Environment.SetEnvironmentVariable("BypassAntiforgeryValidation", "true");
+    }
+
+    private AccountTestContext CurrentContext => _currentContext.Value
+                                                 ?? throw new InvalidOperationException("AccountTestContext is not set. Call BeginTest before resolving services.");
+
+    // Sets the per-test context for the calling logical-call context. The returned scope clears the
+    // context on Dispose so the AsyncLocal does not leak past the test instance lifetime.
+    public IDisposable BeginTest(AccountTestContext context)
+    {
+        _currentContext.Value = context;
+        return new TestScope(this);
+    }
+
+    // TestServer.PreserveExecutionContext defaults to false, which means the calling test's
+    // ExecutionContext (and therefore the AsyncLocal-stored AccountTestContext) does not flow into
+    // request handling. Enabling it preserves the flow so per-request DI resolutions see the
+    // current test's context.
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        var host = base.CreateHost(builder);
+        if (host.Services.GetRequiredService<IServer>() is TestServer testServer)
+        {
+            testServer.PreserveExecutionContext = true;
+        }
+
+        return host;
+    }
+
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
+    {
+        builder.ConfigureLogging(logging => logging.AddFilter(_ => false));
+
+        builder.ConfigureAppConfiguration((_, configuration) =>
+            {
+                // Account-api hosts both the user-facing and back-office SPAs scoped via RequireHost
+                // on each MapFallback. The TestServer sends requests to "localhost" by default, so
+                // configure Hostnames:App to match for the user-facing SPA shell.
+                configuration.AddInMemoryCollection(new Dictionary<string, string?>
+                    {
+                        ["Hostnames:App"] = "localhost"
+                    }
+                );
+            }
+        );
+
+        builder.ConfigureTestServices(services =>
+            {
+                services.Remove(services.Single(d => d.ServiceType == typeof(IDbContextOptionsConfiguration<AccountDbContext>)));
+                services.AddDbContext<AccountDbContext>((_, options) => options.UseSqlite(CurrentContext.Connection).UseSnakeCaseNamingConvention());
+
+                services.AddScoped<ITelemetryEventsCollector>(_ => CurrentContext.TelemetryCollector);
+
+                // Replace the production singleton with a transient that resolves the per-test
+                // instance from the current AccountTestContext. MockStripeClient is keyed-scoped
+                // and captures MockStripeState per scope, so this delegates state mutations to the
+                // active test.
+                services.RemoveAll(typeof(MockStripeState));
+                services.AddTransient<MockStripeState>(_ => CurrentContext.StripeState);
+
+                services.Remove(services.Single(d => d.ServiceType == typeof(IEmailClient)));
+                services.AddTransient<IEmailClient>(_ => CurrentContext.EmailClient);
+
+                services.AddSingleton(new TelemetryClient(new TelemetryConfiguration { TelemetryChannel = Substitute.For<ITelemetryChannel>() }));
+                services.AddScoped<IExecutionContext, HttpExecutionContext>();
+
+                ConfigureAdditionalTestServices(services);
+            }
+        );
+    }
+
+    protected virtual void ConfigureAdditionalTestServices(IServiceCollection services)
+    {
+    }
+
+    private void EndTest()
+    {
+        _currentContext.Value = null;
+    }
+
+    private sealed class TestScope(AccountWebApplicationFactory factory) : IDisposable
+    {
+        public void Dispose()
+        {
+            factory.EndTest();
+        }
+    }
+}
diff --git a/application/account/Tests/Authentication/GetUserSessionsTests.cs b/application/account/Tests/Authentication/GetUserSessionsTests.cs
index 5deba35890..6c7de28856 100644
--- a/application/account/Tests/Authentication/GetUserSessionsTests.cs
+++ b/application/account/Tests/Authentication/GetUserSessionsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Authentication;
 
-public sealed class GetUserSessionsTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetUserSessionsTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetUserSessions_WhenUserHasSessions_ShouldReturnSessions()
diff --git a/application/account/Tests/Authentication/LogoutTests.cs b/application/account/Tests/Authentication/LogoutTests.cs
index 6675fa41d8..8e2aff2cc6 100644
--- a/application/account/Tests/Authentication/LogoutTests.cs
+++ b/application/account/Tests/Authentication/LogoutTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Authentication;
 
-public sealed class LogoutTests : EndpointBaseTest<AccountDbContext>
+public sealed class LogoutTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task Logout_WhenAuthenticatedAsOwner_ShouldRevokeSessionAndCollectLogoutEvent()
diff --git a/application/account/Tests/Authentication/RefreshAuthenticationTokensTests.cs b/application/account/Tests/Authentication/RefreshAuthenticationTokensTests.cs
index 5d8d5796a5..f60e8d94fc 100644
--- a/application/account/Tests/Authentication/RefreshAuthenticationTokensTests.cs
+++ b/application/account/Tests/Authentication/RefreshAuthenticationTokensTests.cs
@@ -12,11 +12,11 @@
 
 namespace Account.Tests.Authentication;
 
-public sealed class RefreshAuthenticationTokensTests : EndpointBaseTest<AccountDbContext>
+public sealed class RefreshAuthenticationTokensTests : EndpointBaseTest<AccountDbContext>, IClassFixture<AccountWebApplicationFactory>
 {
     private readonly RefreshTokenGenerator _refreshTokenGenerator;
 
-    public RefreshAuthenticationTokensTests()
+    public RefreshAuthenticationTokensTests(AccountWebApplicationFactory factory) : base(factory)
     {
         using var serviceScope = Provider.CreateScope();
         _refreshTokenGenerator = serviceScope.ServiceProvider.GetRequiredService<RefreshTokenGenerator>();
diff --git a/application/account/Tests/Authentication/RevokeSessionTests.cs b/application/account/Tests/Authentication/RevokeSessionTests.cs
index 1a4ad8c021..a5642711ac 100644
--- a/application/account/Tests/Authentication/RevokeSessionTests.cs
+++ b/application/account/Tests/Authentication/RevokeSessionTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Authentication;
 
-public sealed class RevokeSessionTests : EndpointBaseTest<AccountDbContext>
+public sealed class RevokeSessionTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task RevokeSession_WhenValid_ShouldRevokeSession()
diff --git a/application/account/Tests/Authentication/SwitchTenantTests.cs b/application/account/Tests/Authentication/SwitchTenantTests.cs
index b3e46989e1..97bcbef1e2 100644
--- a/application/account/Tests/Authentication/SwitchTenantTests.cs
+++ b/application/account/Tests/Authentication/SwitchTenantTests.cs
@@ -14,7 +14,7 @@
 
 namespace Account.Tests.Authentication;
 
-public sealed class SwitchTenantTests : EndpointBaseTest<AccountDbContext>
+public sealed class SwitchTenantTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task SwitchTenant_WhenUserExistsInTargetTenant_ShouldSwitchSuccessfully()
diff --git a/application/account/Tests/Billing/ConfirmPaymentMethodSetupTests.cs b/application/account/Tests/Billing/ConfirmPaymentMethodSetupTests.cs
index b6fd6d6f37..0c600d4545 100644
--- a/application/account/Tests/Billing/ConfirmPaymentMethodSetupTests.cs
+++ b/application/account/Tests/Billing/ConfirmPaymentMethodSetupTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Billing;
 
-public sealed class ConfirmPaymentMethodSetupTests : EndpointBaseTest<AccountDbContext>
+public sealed class ConfirmPaymentMethodSetupTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ConfirmPaymentMethodSetup_WhenValid_ShouldSucceed()
diff --git a/application/account/Tests/Billing/GetPaymentHistoryTests.cs b/application/account/Tests/Billing/GetPaymentHistoryTests.cs
index 07092e322d..0358aa3e52 100644
--- a/application/account/Tests/Billing/GetPaymentHistoryTests.cs
+++ b/application/account/Tests/Billing/GetPaymentHistoryTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Billing;
 
-public sealed class GetPaymentHistoryTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetPaymentHistoryTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetPaymentHistory_WhenTransactionsExist_ShouldReturnPaginatedHistory()
diff --git a/application/account/Tests/Billing/RetryPendingInvoicePaymentTests.cs b/application/account/Tests/Billing/RetryPendingInvoicePaymentTests.cs
index 82741bc65e..7512cfb2cf 100644
--- a/application/account/Tests/Billing/RetryPendingInvoicePaymentTests.cs
+++ b/application/account/Tests/Billing/RetryPendingInvoicePaymentTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Billing;
 
-public sealed class RetryPendingInvoicePaymentTests : EndpointBaseTest<AccountDbContext>
+public sealed class RetryPendingInvoicePaymentTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task RetryPendingInvoicePayment_WhenOpenInvoicePaid_ShouldReturnPaid()
diff --git a/application/account/Tests/Billing/UpdateBillingInfoTests.cs b/application/account/Tests/Billing/UpdateBillingInfoTests.cs
index f02e634c4c..7508c1302b 100644
--- a/application/account/Tests/Billing/UpdateBillingInfoTests.cs
+++ b/application/account/Tests/Billing/UpdateBillingInfoTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.Billing;
 
-public sealed class UpdateBillingInfoTests : EndpointBaseTest<AccountDbContext>
+public sealed class UpdateBillingInfoTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task UpdateBillingInfo_WhenValid_ShouldSucceed()
diff --git a/application/account/Tests/EmailAuthentication/CompleteEmailLoginTests.cs b/application/account/Tests/EmailAuthentication/CompleteEmailLoginTests.cs
index 78439eb492..f4d0d5c6fa 100644
--- a/application/account/Tests/EmailAuthentication/CompleteEmailLoginTests.cs
+++ b/application/account/Tests/EmailAuthentication/CompleteEmailLoginTests.cs
@@ -17,7 +17,7 @@
 
 namespace Account.Tests.EmailAuthentication;
 
-public sealed class CompleteEmailLoginTests : EndpointBaseTest<AccountDbContext>
+public sealed class CompleteEmailLoginTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string CorrectOneTimePassword = "UNLOCK"; // UNLOCK is a special global OTP for development and tests
     private const string WrongOneTimePassword = "FAULTY";
diff --git a/application/account/Tests/EmailAuthentication/ResendEmailLoginCodeTests.cs b/application/account/Tests/EmailAuthentication/ResendEmailLoginCodeTests.cs
index bf3939275f..e87cf2a85b 100644
--- a/application/account/Tests/EmailAuthentication/ResendEmailLoginCodeTests.cs
+++ b/application/account/Tests/EmailAuthentication/ResendEmailLoginCodeTests.cs
@@ -17,7 +17,7 @@
 
 namespace Account.Tests.EmailAuthentication;
 
-public sealed class ResendEmailLoginCodeTests : EndpointBaseTest<AccountDbContext>
+public sealed class ResendEmailLoginCodeTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ResendEmailLoginCode_WhenValid_ShouldSendNewVerificationCode()
diff --git a/application/account/Tests/EmailAuthentication/StartEmailLoginTests.cs b/application/account/Tests/EmailAuthentication/StartEmailLoginTests.cs
index f1d8b3f335..a80b30f11b 100644
--- a/application/account/Tests/EmailAuthentication/StartEmailLoginTests.cs
+++ b/application/account/Tests/EmailAuthentication/StartEmailLoginTests.cs
@@ -18,7 +18,7 @@
 
 namespace Account.Tests.EmailAuthentication;
 
-public sealed class StartEmailLoginTests : EndpointBaseTest<AccountDbContext>
+public sealed class StartEmailLoginTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task StartEmailLogin_WhenValidEmailAndUserExists_ShouldReturnSuccess()
diff --git a/application/account/Tests/EndpointBaseTest.cs b/application/account/Tests/EndpointBaseTest.cs
index 2afea90fa0..1553bed049 100644
--- a/application/account/Tests/EndpointBaseTest.cs
+++ b/application/account/Tests/EndpointBaseTest.cs
@@ -7,55 +7,38 @@
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.Extensibility;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
 using SharedKernel.Authentication;
 using SharedKernel.Authentication.TokenGeneration;
 using SharedKernel.ExecutionContext;
 using SharedKernel.Integrations.Email;
-using SharedKernel.SinglePageApp;
 using SharedKernel.Telemetry;
 using SharedKernel.Tests.Telemetry;
 
 namespace Account.Tests;
 
+// Base class for Account API endpoint tests. Each derived class declares
+// IClassFixture<AccountWebApplicationFactory> (or a subclass) to share a single host across its
+// tests; per-test isolation is preserved by the AccountTestContext routed through the fixture's
+// AsyncLocal slot.
 public abstract class EndpointBaseTest<TContext> : IDisposable where TContext : DbContext
 {
-    // Tests use the in-memory test server (WebApplicationFactory); no real listener is bound.
-    // SinglePageAppConfiguration only consumes this as a URI for CSP construction.
-    private const string TestPublicUrl = "https://localhost";
     protected readonly AccessTokenGenerator AccessTokenGenerator;
     protected readonly IEmailClient EmailClient;
     protected readonly Faker Faker = new();
     protected readonly ServiceCollection Services;
     protected readonly TimeProvider TimeProvider;
-    private readonly WebApplicationFactory<Program> _webApplicationFactory;
-    protected TelemetryEventsCollectorSpy TelemetryEventsCollectorSpy;
+    private readonly AccountWebApplicationFactory _factory;
+    private readonly IDisposable _testScope;
 
-    protected EndpointBaseTest()
+    protected EndpointBaseTest(AccountWebApplicationFactory factory)
     {
-        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.PublicUrlKey, TestPublicUrl);
-        Environment.SetEnvironmentVariable(SinglePageAppConfiguration.CdnUrlKey, $"{TestPublicUrl}/account");
-        Environment.SetEnvironmentVariable(
-            "APPLICATIONINSIGHTS_CONNECTION_STRING",
-            "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://localhost;LiveEndpoint=https://localhost"
-        );
-        Environment.SetEnvironmentVariable("Stripe__AllowMockProvider", "true");
-        Environment.SetEnvironmentVariable("Stripe__PublishableKey", "pk_test_mock_publishable_key");
-
-        Services = new ServiceCollection();
+        _factory = factory;
         TimeProvider = TimeProvider.System;
 
-        Services.AddLogging();
-        Services.AddTransient<DatabaseSeeder>();
-
         // Create connection using shared cache mode so isolated connections can access the same in-memory database
         Connection = new SqliteConnection($"Data Source=TestDb_{Guid.NewGuid():N};Mode=Memory;Cache=Shared");
         Connection.Open();
@@ -80,19 +63,32 @@ protected EndpointBaseTest()
             command.ExecuteNonQuery();
         }
 
-        Services.AddDbContext<TContext>(options => { options.UseSqlite(Connection).UseSnakeCaseNamingConvention(); });
-
-        Services.AddAccountServices();
-
         TelemetryEventsCollectorSpy = new TelemetryEventsCollectorSpy(new TelemetryEventsCollector());
-        Services.AddScoped<ITelemetryEventsCollector>(_ => TelemetryEventsCollectorSpy);
-
         EmailClient = Substitute.For<IEmailClient>();
-        Services.AddScoped<IEmailClient>(_ => EmailClient);
+        StripeState = new MockStripeState();
 
-        var telemetryChannel = Substitute.For<ITelemetryChannel>();
-        Services.AddSingleton(new TelemetryClient(new TelemetryConfiguration { TelemetryChannel = telemetryChannel }));
+        // BeginTest must run before any service resolution on the shared host so the host's
+        // hosted services (PlatformCurrencyStartupResolver) and per-request DI lookups see the
+        // per-test state.
+        _testScope = factory.BeginTest(new AccountTestContext
+            {
+                Connection = Connection,
+                TelemetryCollector = TelemetryEventsCollectorSpy,
+                EmailClient = EmailClient,
+                StripeState = StripeState
+            }
+        );
 
+        // The local Services collection is unit-test scaffolding (not part of the WAF). Tests can
+        // resolve handlers and repositories directly via Provider without going through HTTP.
+        Services = new ServiceCollection();
+        Services.AddLogging();
+        Services.AddTransient<DatabaseSeeder>();
+        Services.AddDbContext<TContext>(options => options.UseSqlite(Connection).UseSnakeCaseNamingConvention());
+        Services.AddAccountServices();
+        Services.AddScoped<ITelemetryEventsCollector>(_ => TelemetryEventsCollectorSpy);
+        Services.AddScoped<IEmailClient>(_ => EmailClient);
+        Services.AddSingleton(new TelemetryClient(new TelemetryConfiguration { TelemetryChannel = Substitute.For<ITelemetryChannel>() }));
         Services.AddScoped<IExecutionContext, HttpExecutionContext>();
 
         // Make sure the database is created
@@ -102,71 +98,30 @@ protected EndpointBaseTest()
 
         AccessTokenGenerator = serviceScope.ServiceProvider.GetRequiredService<AccessTokenGenerator>();
 
-        _webApplicationFactory = new WebApplicationFactory<Program>().WithWebHostBuilder(builder =>
-            {
-                builder.ConfigureLogging(logging =>
-                    {
-                        logging.AddFilter(_ => false); // Suppress all logs during tests
-                    }
-                );
-
-                builder.ConfigureAppConfiguration((_, configuration) =>
-                    {
-                        // Account-api hosts both the user-facing and back-office SPAs scoped via RequireHost
-                        // on each MapFallback. The TestServer sends requests to "localhost" by default, so
-                        // configure Hostnames:App to match for the user-facing SPA shell.
-                        configuration.AddInMemoryCollection(new Dictionary<string, string?>
-                            {
-                                ["Hostnames:App"] = "localhost"
-                            }
-                        );
-                    }
-                );
-
-                builder.ConfigureTestServices(services =>
-                    {
-                        // Replace the default DbContext in the WebApplication to use an in-memory SQLite database
-                        services.Remove(services.Single(d => d.ServiceType == typeof(IDbContextOptionsConfiguration<TContext>)));
-                        services.AddDbContext<TContext>(options => { options.UseSqlite(Connection).UseSnakeCaseNamingConvention(); });
-
-                        TelemetryEventsCollectorSpy = new TelemetryEventsCollectorSpy(new TelemetryEventsCollector());
-                        services.AddScoped<ITelemetryEventsCollector>(_ => TelemetryEventsCollectorSpy);
-
-                        services.Remove(services.Single(d => d.ServiceType == typeof(IEmailClient)));
-                        services.AddTransient<IEmailClient>(_ => EmailClient);
-
-                        RegisterMockLoggers(services);
-
-                        services.AddScoped<IExecutionContext, HttpExecutionContext>();
-                    }
-                );
-            }
-        );
-
-        AnonymousHttpClient = _webApplicationFactory.CreateClient();
+        AnonymousHttpClient = factory.CreateClient();
         AnonymousHttpClient.DefaultRequestHeaders.Add("Cookie", $"{OAuthProviderFactory.UseMockProviderCookieName}=true");
 
         var ownerUserInfo = CreateUserInfo(DatabaseSeeder.Tenant1Owner, DatabaseSeeder.Tenant1OwnerSession.Id);
         var ownerAccessToken = AccessTokenGenerator.Generate(ownerUserInfo);
-        AuthenticatedOwnerHttpClient = _webApplicationFactory.CreateClient();
+        AuthenticatedOwnerHttpClient = factory.CreateClient();
         AuthenticatedOwnerHttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", ownerAccessToken);
         AuthenticatedOwnerHttpClient.DefaultRequestHeaders.Add("Cookie", $"{OAuthProviderFactory.UseMockProviderCookieName}=true");
 
         var memberUserInfo = CreateUserInfo(DatabaseSeeder.Tenant1Member, DatabaseSeeder.Tenant1MemberSession.Id);
         var memberAccessToken = AccessTokenGenerator.Generate(memberUserInfo);
-        AuthenticatedMemberHttpClient = _webApplicationFactory.CreateClient();
+        AuthenticatedMemberHttpClient = factory.CreateClient();
         AuthenticatedMemberHttpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", memberAccessToken);
         AuthenticatedMemberHttpClient.DefaultRequestHeaders.Add("Cookie", $"{OAuthProviderFactory.UseMockProviderCookieName}=true");
-
-        // Set the environment variable to bypass antiforgery validation on the server. ASP.NET uses a cryptographic
-        // double-submit pattern that encrypts the user's ClaimUid in the token, which is complex to replicate in tests
-        Environment.SetEnvironmentVariable("BypassAntiforgeryValidation", "true");
     }
 
     protected SqliteConnection Connection { get; }
 
     protected DatabaseSeeder DatabaseSeeder { get; }
 
+    protected TelemetryEventsCollectorSpy TelemetryEventsCollectorSpy { get; }
+
+    protected MockStripeState StripeState { get; }
+
     protected ServiceProvider Provider
     {
         get
@@ -183,9 +138,7 @@ protected ServiceProvider Provider
 
     protected HttpClient AuthenticatedMemberHttpClient { get; }
 
-    protected MockStripeState StripeState => _webApplicationFactory.Services.GetRequiredService<MockStripeState>();
-
-    protected IServiceProvider WebApplicationServices => _webApplicationFactory.Services;
+    protected IServiceProvider WebApplicationServices => _factory.Services;
 
     public void Dispose()
     {
@@ -193,10 +146,6 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    protected virtual void RegisterMockLoggers(IServiceCollection services)
-    {
-    }
-
     // SonarLint complains if the virtual keyword is missing, as it is required to correctly implement the dispose pattern.
     [UsedImplicitly]
     protected virtual void Dispose(bool disposing)
@@ -204,7 +153,7 @@ protected virtual void Dispose(bool disposing)
         if (!disposing) return;
         Provider.Dispose();
         Connection.Close();
-        _webApplicationFactory.Dispose();
+        _testScope.Dispose();
     }
 
     private static UserInfo CreateUserInfo(User user, SessionId sessionId)
diff --git a/application/account/Tests/SharedKernel/CustomExceptionHandlingTests.cs b/application/account/Tests/SharedKernel/CustomExceptionHandlingTests.cs
index 99d920d32a..11622d9d1e 100644
--- a/application/account/Tests/SharedKernel/CustomExceptionHandlingTests.cs
+++ b/application/account/Tests/SharedKernel/CustomExceptionHandlingTests.cs
@@ -8,7 +8,7 @@
 
 namespace Account.Tests.SharedKernel;
 
-public sealed class CustomExceptionHandlingTests : EndpointBaseTest<AccountDbContext>
+public sealed class CustomExceptionHandlingTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private readonly WebApplicationFactory<Program> _webApplicationFactory = new();
 
diff --git a/application/account/Tests/Signups/CompleteEmailSignupTests.cs b/application/account/Tests/Signups/CompleteEmailSignupTests.cs
index ecd59c7a1f..d37fcf9609 100644
--- a/application/account/Tests/Signups/CompleteEmailSignupTests.cs
+++ b/application/account/Tests/Signups/CompleteEmailSignupTests.cs
@@ -14,15 +14,18 @@
 
 namespace Account.Tests.Signups;
 
-public sealed class CompleteEmailSignupTests : EndpointBaseTest<AccountDbContext>
+public sealed class CompleteEmailSignupTests : EndpointBaseTest<AccountDbContext>, IClassFixture<CompleteEmailSignupFactory>
 {
     private const string CorrectOneTimePassword = "UNLOCK"; // UNLOCK is a special global OTP for development and tests
     private const string WrongOneTimePassword = "FAULTY";
-    private readonly ILogger<TenantCreatedEventHandler> _tenantCreatedEventHandlerLogger = Substitute.For<ILogger<TenantCreatedEventHandler>>();
+    private readonly ILogger<TenantCreatedEventHandler> _tenantCreatedEventHandlerLogger;
 
-    protected override void RegisterMockLoggers(IServiceCollection services)
+    public CompleteEmailSignupTests(CompleteEmailSignupFactory factory) : base(factory)
     {
-        services.AddSingleton(_tenantCreatedEventHandlerLogger);
+        _tenantCreatedEventHandlerLogger = factory.TenantCreatedEventHandlerLogger;
+        // Substitute is class-scoped (lives on the IClassFixture); reset between tests so received
+        // calls from a prior test in this class don't bleed into this test's assertions.
+        _tenantCreatedEventHandlerLogger.ClearReceivedCalls();
     }
 
     [Fact]
@@ -176,3 +179,13 @@ private async Task<EmailLoginId> StartSignup(string email)
         return responseBody!.EmailLoginId;
     }
 }
+
+public sealed class CompleteEmailSignupFactory : AccountWebApplicationFactory
+{
+    public ILogger<TenantCreatedEventHandler> TenantCreatedEventHandlerLogger { get; } = Substitute.For<ILogger<TenantCreatedEventHandler>>();
+
+    protected override void ConfigureAdditionalTestServices(IServiceCollection services)
+    {
+        services.AddSingleton(TenantCreatedEventHandlerLogger);
+    }
+}
diff --git a/application/account/Tests/Signups/StartEmailSignupTests.cs b/application/account/Tests/Signups/StartEmailSignupTests.cs
index 812d2b6db3..764abaf8fe 100644
--- a/application/account/Tests/Signups/StartEmailSignupTests.cs
+++ b/application/account/Tests/Signups/StartEmailSignupTests.cs
@@ -15,7 +15,7 @@
 
 namespace Account.Tests.Signups;
 
-public sealed class StartEmailSignupTests : EndpointBaseTest<AccountDbContext>
+public sealed class StartEmailSignupTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task StartSignup_WhenEmailIsValid_ShouldReturnSuccess()
diff --git a/application/account/Tests/Subscriptions/AcknowledgeStripeWebhookTests.cs b/application/account/Tests/Subscriptions/AcknowledgeStripeWebhookTests.cs
index 334ffe57df..8c5a681a38 100644
--- a/application/account/Tests/Subscriptions/AcknowledgeStripeWebhookTests.cs
+++ b/application/account/Tests/Subscriptions/AcknowledgeStripeWebhookTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class AcknowledgeStripeWebhookTests : EndpointBaseTest<AccountDbContext>
+public sealed class AcknowledgeStripeWebhookTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string WebhookUrl = "/api/account/subscriptions/stripe-webhook";
 
diff --git a/application/account/Tests/Subscriptions/BillingEventAppendTests.cs b/application/account/Tests/Subscriptions/BillingEventAppendTests.cs
index 5ef19b25bc..9b4de40038 100644
--- a/application/account/Tests/Subscriptions/BillingEventAppendTests.cs
+++ b/application/account/Tests/Subscriptions/BillingEventAppendTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class BillingEventAppendTests : EndpointBaseTest<AccountDbContext>
+public sealed class BillingEventAppendTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string WebhookUrl = "/api/account/subscriptions/stripe-webhook";
 
diff --git a/application/account/Tests/Subscriptions/CancelSubscriptionTests.cs b/application/account/Tests/Subscriptions/CancelSubscriptionTests.cs
index b9aa91c139..3b6f9fa5a3 100644
--- a/application/account/Tests/Subscriptions/CancelSubscriptionTests.cs
+++ b/application/account/Tests/Subscriptions/CancelSubscriptionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class CancelSubscriptionTests : EndpointBaseTest<AccountDbContext>
+public sealed class CancelSubscriptionTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task CancelSubscription_WhenActiveSubscription_ShouldSucceed()
diff --git a/application/account/Tests/Subscriptions/Domain/BillingEventRepositoryTests.cs b/application/account/Tests/Subscriptions/Domain/BillingEventRepositoryTests.cs
index 535d5b5cbc..aba32aa441 100644
--- a/application/account/Tests/Subscriptions/Domain/BillingEventRepositoryTests.cs
+++ b/application/account/Tests/Subscriptions/Domain/BillingEventRepositoryTests.cs
@@ -16,7 +16,7 @@ namespace Account.Tests.Subscriptions.Domain;
 ///     soft-deleted, and must not exclude the row from cross-tenant back-office reads. Without this guarantee
 ///     the historical MRR trend silently rewrites itself every time a tenant churns.
 /// </summary>
-public sealed class BillingEventRepositoryTests : EndpointBaseTest<AccountDbContext>
+public sealed class BillingEventRepositoryTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task WhenTenantIsSoftDeleted_BillingEventRowsRemainQueryable()
diff --git a/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryDriftScopeTests.cs b/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryDriftScopeTests.cs
index 5c6e2ef00d..c96a020e62 100644
--- a/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryDriftScopeTests.cs
+++ b/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryDriftScopeTests.cs
@@ -16,7 +16,7 @@ namespace Account.Tests.Subscriptions.Domain;
 ///     this is what guarantees that cancelled tenants (Plan reset to Basis, customer id retained, billing
 ///     history intact) keep being audited for drift instead of silently falling off the radar.
 /// </summary>
-public sealed class SubscriptionRepositoryDriftScopeTests : EndpointBaseTest<AccountDbContext>
+public sealed class SubscriptionRepositoryDriftScopeTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetSubscriptionsDueForDriftCheckUnfilteredAsync_WhenSubscriptionsHaveMixedStaleness_ShouldReturnOnlyStaleOnesWithStripeCustomer()
diff --git a/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryTests.cs b/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryTests.cs
index 192c9878aa..bb9ae0c8f3 100644
--- a/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryTests.cs
+++ b/application/account/Tests/Subscriptions/Domain/SubscriptionRepositoryTests.cs
@@ -16,7 +16,7 @@ namespace Account.Tests.Subscriptions.Domain;
 ///     cascade, must not flip the row to soft-deleted, and must not exclude the row from cross-tenant
 ///     back-office reads. Without this guarantee the MRR ledger silently corrupts on every churn.
 /// </summary>
-public sealed class SubscriptionRepositoryTests : EndpointBaseTest<AccountDbContext>
+public sealed class SubscriptionRepositoryTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task WhenTenantIsSoftDeleted_SubscriptionRowsRemainQueryable()
diff --git a/application/account/Tests/Subscriptions/EventLogReconciliationTests.cs b/application/account/Tests/Subscriptions/EventLogReconciliationTests.cs
index 77856942f6..a79808b45d 100644
--- a/application/account/Tests/Subscriptions/EventLogReconciliationTests.cs
+++ b/application/account/Tests/Subscriptions/EventLogReconciliationTests.cs
@@ -16,7 +16,7 @@ namespace Account.Tests.Subscriptions;
 ///     <c>stripe_events</c> archive as recovered rows. The replayer then reads from the local
 ///     archive — which is now complete — and emits the corresponding <c>billing_events</c>.
 /// </summary>
-public sealed class EventLogReconciliationTests : EndpointBaseTest<AccountDbContext>
+public sealed class EventLogReconciliationTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string WebhookUrl = "/api/account/subscriptions/stripe-webhook";
 
diff --git a/application/account/Tests/Subscriptions/GetCheckoutPreviewTests.cs b/application/account/Tests/Subscriptions/GetCheckoutPreviewTests.cs
index b7386090f2..d2a5792c45 100644
--- a/application/account/Tests/Subscriptions/GetCheckoutPreviewTests.cs
+++ b/application/account/Tests/Subscriptions/GetCheckoutPreviewTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class GetCheckoutPreviewTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetCheckoutPreviewTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetCheckoutPreview_WhenStandardPlan_ShouldReturnPreview()
diff --git a/application/account/Tests/Subscriptions/GetCurrentSubscriptionTests.cs b/application/account/Tests/Subscriptions/GetCurrentSubscriptionTests.cs
index baae9c5669..59bd33daab 100644
--- a/application/account/Tests/Subscriptions/GetCurrentSubscriptionTests.cs
+++ b/application/account/Tests/Subscriptions/GetCurrentSubscriptionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class GetCurrentSubscriptionTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetCurrentSubscriptionTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetCurrentSubscription_WhenExists_ShouldReturnSubscription()
diff --git a/application/account/Tests/Subscriptions/GetPricingCatalogTests.cs b/application/account/Tests/Subscriptions/GetPricingCatalogTests.cs
index 8f4081b120..85d73c5a25 100644
--- a/application/account/Tests/Subscriptions/GetPricingCatalogTests.cs
+++ b/application/account/Tests/Subscriptions/GetPricingCatalogTests.cs
@@ -8,7 +8,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class GetPricingCatalogTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetPricingCatalogTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetPricingCatalog_WhenCalled_ShouldReturnPlans()
diff --git a/application/account/Tests/Subscriptions/GetUpgradePreviewTests.cs b/application/account/Tests/Subscriptions/GetUpgradePreviewTests.cs
index 0968d8b95c..99d818719d 100644
--- a/application/account/Tests/Subscriptions/GetUpgradePreviewTests.cs
+++ b/application/account/Tests/Subscriptions/GetUpgradePreviewTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class GetUpgradePreviewTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetUpgradePreviewTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetUpgradePreview_WhenStandardToPremium_ShouldReturnPreview()
diff --git a/application/account/Tests/Subscriptions/LedgerCorrectnessTests.cs b/application/account/Tests/Subscriptions/LedgerCorrectnessTests.cs
index 7dd99fcb1d..72090ec4b1 100644
--- a/application/account/Tests/Subscriptions/LedgerCorrectnessTests.cs
+++ b/application/account/Tests/Subscriptions/LedgerCorrectnessTests.cs
@@ -23,7 +23,7 @@ namespace Account.Tests.Subscriptions;
 ///     M17 — the AmountExcludingTax tax-greater-than-display clamp must emit a structured warning log
 ///     + telemetry + drift discrepancy so the masked LTV anomaly stays visible.
 /// </summary>
-public sealed class LedgerCorrectnessTests : EndpointBaseTest<AccountDbContext>
+public sealed class LedgerCorrectnessTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ExecuteAsync_WhenEventsListFailsMidPagination_AnchorDoesNotAdvance()
diff --git a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsCatalogGapTests.cs b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsCatalogGapTests.cs
index a46b000928..d1ae4dc973 100644
--- a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsCatalogGapTests.cs
+++ b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsCatalogGapTests.cs
@@ -17,7 +17,7 @@ namespace Account.Tests.Subscriptions;
 ///     ScheduledPriceAmount write when the result is null, emits a structured warning + the
 ///     StripePriceCatalogLookupMissed telemetry event, and lets the transaction commit normally.
 /// </summary>
-public sealed class ProcessPendingStripeEventsCatalogGapTests : EndpointBaseTest<AccountDbContext>
+public sealed class ProcessPendingStripeEventsCatalogGapTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string WebhookUrl = "/api/account/subscriptions/stripe-webhook";
 
diff --git a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsDetectModeTests.cs b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsDetectModeTests.cs
index 9389084354..eb59089cb8 100644
--- a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsDetectModeTests.cs
+++ b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsDetectModeTests.cs
@@ -20,7 +20,7 @@ namespace Account.Tests.Subscriptions;
 ///     <c>SetStripeSubscription</c>, no <c>SetPaymentTransactions</c>, no <c>AdvanceLastSyncedStripeEventCreatedAt</c>,
 ///     no <c>billing_events</c> rows appended, and no recovered <c>stripe_events</c> rows inserted.
 /// </summary>
-public sealed class ProcessPendingStripeEventsDetectModeTests : EndpointBaseTest<AccountDbContext>
+public sealed class ProcessPendingStripeEventsDetectModeTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ProcessPendingStripeEvents_WhenDetectMode_AndSubscriptionDriftsFromStripe_ShouldRecordDriftWithoutMutatingOtherFields()
diff --git a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsTests.cs b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsTests.cs
index 2857779c40..ed8afe6fe7 100644
--- a/application/account/Tests/Subscriptions/ProcessPendingStripeEventsTests.cs
+++ b/application/account/Tests/Subscriptions/ProcessPendingStripeEventsTests.cs
@@ -18,7 +18,7 @@ namespace Account.Tests.Subscriptions;
 ///     the latest persisted <see cref="BillingEvent" />; without that seed an events.list anchor that has
 ///     aged past Stripe's 30-day window would replay against phantom-zero defaults and silently rewrite MRR.
 /// </summary>
-public sealed class ProcessPendingStripeEventsTests : EndpointBaseTest<AccountDbContext>
+public sealed class ProcessPendingStripeEventsTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ExecuteAsync_WhenAnchorAgesOutOfEventsListWindow_ReplaysWithSeededStateNotPhantomZero()
diff --git a/application/account/Tests/Subscriptions/ReactivateSubscriptionTests.cs b/application/account/Tests/Subscriptions/ReactivateSubscriptionTests.cs
index 6eb3e7f69e..b521198785 100644
--- a/application/account/Tests/Subscriptions/ReactivateSubscriptionTests.cs
+++ b/application/account/Tests/Subscriptions/ReactivateSubscriptionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class ReactivateSubscriptionTests : EndpointBaseTest<AccountDbContext>
+public sealed class ReactivateSubscriptionTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ReactivateSubscription_WhenCancelled_ShouldSucceed()
diff --git a/application/account/Tests/Subscriptions/ScheduleDowngradeTests.cs b/application/account/Tests/Subscriptions/ScheduleDowngradeTests.cs
index 4c83767077..473c2548ec 100644
--- a/application/account/Tests/Subscriptions/ScheduleDowngradeTests.cs
+++ b/application/account/Tests/Subscriptions/ScheduleDowngradeTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class ScheduleDowngradeTests : EndpointBaseTest<AccountDbContext>
+public sealed class ScheduleDowngradeTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ScheduleDowngrade_WhenPremiumToStandard_ShouldSucceed()
diff --git a/application/account/Tests/Subscriptions/StartSubscriptionCheckoutTests.cs b/application/account/Tests/Subscriptions/StartSubscriptionCheckoutTests.cs
index 4a1adde8cf..02ba227d5d 100644
--- a/application/account/Tests/Subscriptions/StartSubscriptionCheckoutTests.cs
+++ b/application/account/Tests/Subscriptions/StartSubscriptionCheckoutTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class StartSubscriptionCheckoutTests : EndpointBaseTest<AccountDbContext>
+public sealed class StartSubscriptionCheckoutTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task StartSubscriptionCheckout_WhenNoSavedPaymentMethod_ShouldReturnCheckoutSession()
diff --git a/application/account/Tests/Subscriptions/StripeEventPayloadDivergenceTests.cs b/application/account/Tests/Subscriptions/StripeEventPayloadDivergenceTests.cs
index 28de5ed249..d91231d7c9 100644
--- a/application/account/Tests/Subscriptions/StripeEventPayloadDivergenceTests.cs
+++ b/application/account/Tests/Subscriptions/StripeEventPayloadDivergenceTests.cs
@@ -15,7 +15,7 @@ namespace Account.Tests.Subscriptions;
 ///     row is preserved unchanged and a <c>StripeEventPayloadMismatch</c> telemetry event is emitted
 ///     so the drift banner can surface it.
 /// </summary>
-public sealed class StripeEventPayloadDivergenceTests : EndpointBaseTest<AccountDbContext>
+public sealed class StripeEventPayloadDivergenceTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     private const string WebhookUrl = "/api/account/subscriptions/stripe-webhook";
 
diff --git a/application/account/Tests/Subscriptions/UpgradeSubscriptionTests.cs b/application/account/Tests/Subscriptions/UpgradeSubscriptionTests.cs
index b75e660837..6279262737 100644
--- a/application/account/Tests/Subscriptions/UpgradeSubscriptionTests.cs
+++ b/application/account/Tests/Subscriptions/UpgradeSubscriptionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Subscriptions;
 
-public sealed class UpgradeSubscriptionTests : EndpointBaseTest<AccountDbContext>
+public sealed class UpgradeSubscriptionTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task UpgradeSubscription_WhenStandardToPremium_ShouldSucceed()
diff --git a/application/account/Tests/Tenants/DeleteTenantTests.cs b/application/account/Tests/Tenants/DeleteTenantTests.cs
index 73e37b2597..49ddf69a17 100644
--- a/application/account/Tests/Tenants/DeleteTenantTests.cs
+++ b/application/account/Tests/Tenants/DeleteTenantTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class DeleteTenantTests : EndpointBaseTest<AccountDbContext>
+public sealed class DeleteTenantTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task DeleteTenant_WhenTenantDoesNotExists_ShouldReturnNotFound()
diff --git a/application/account/Tests/Tenants/GetCurrentTenantTests.cs b/application/account/Tests/Tenants/GetCurrentTenantTests.cs
index b12d20505a..9e6dfb5acd 100644
--- a/application/account/Tests/Tenants/GetCurrentTenantTests.cs
+++ b/application/account/Tests/Tenants/GetCurrentTenantTests.cs
@@ -6,7 +6,7 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class GetCurrentTenantTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetCurrentTenantTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetCurrentTenant_WhenTenantExists_ShouldReturnTenantWithValidContract()
diff --git a/application/account/Tests/Tenants/GetTenantsForUserTests.cs b/application/account/Tests/Tenants/GetTenantsForUserTests.cs
index 87fde3a27c..4599bbfffb 100644
--- a/application/account/Tests/Tenants/GetTenantsForUserTests.cs
+++ b/application/account/Tests/Tenants/GetTenantsForUserTests.cs
@@ -14,7 +14,7 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class GetTenantsForUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetTenantsForUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetTenants_UserWithMultipleTenants_ReturnsAllTenants()
diff --git a/application/account/Tests/Tenants/RemoveTenantLogoTests.cs b/application/account/Tests/Tenants/RemoveTenantLogoTests.cs
index d5eaf1cc0f..5ed959f98d 100644
--- a/application/account/Tests/Tenants/RemoveTenantLogoTests.cs
+++ b/application/account/Tests/Tenants/RemoveTenantLogoTests.cs
@@ -7,7 +7,7 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class RemoveTenantLogoTests : EndpointBaseTest<AccountDbContext>
+public sealed class RemoveTenantLogoTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task RemoveTenantLogo_WhenOwnerUser_ShouldSucceed()
diff --git a/application/account/Tests/Tenants/UpdateCurrentTenantTests.cs b/application/account/Tests/Tenants/UpdateCurrentTenantTests.cs
index 9e111bd23d..8990954c2f 100644
--- a/application/account/Tests/Tenants/UpdateCurrentTenantTests.cs
+++ b/application/account/Tests/Tenants/UpdateCurrentTenantTests.cs
@@ -9,7 +9,7 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class UpdateCurrentTenantTests : EndpointBaseTest<AccountDbContext>
+public sealed class UpdateCurrentTenantTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task UpdateCurrentTenant_WhenValid_ShouldUpdateTenant()
diff --git a/application/account/Tests/Tenants/UpdateTenantLogoTests.cs b/application/account/Tests/Tenants/UpdateTenantLogoTests.cs
index bd658d335b..dfd39b34b4 100644
--- a/application/account/Tests/Tenants/UpdateTenantLogoTests.cs
+++ b/application/account/Tests/Tenants/UpdateTenantLogoTests.cs
@@ -7,9 +7,9 @@
 
 namespace Account.Tests.Tenants;
 
-public sealed class UpdateTenantLogoTests : EndpointBaseTest<AccountDbContext>
+public sealed class UpdateTenantLogoTests : EndpointBaseTest<AccountDbContext>, IClassFixture<AccountWebApplicationFactory>
 {
-    public UpdateTenantLogoTests()
+    public UpdateTenantLogoTests(AccountWebApplicationFactory factory) : base(factory)
     {
         // Set up blob storage URL for tests - tests won't actually upload files
         Environment.SetEnvironmentVariable("BLOB_STORAGE_URL", "https://test.blob.core.windows.net");
diff --git a/application/account/Tests/Users/BulkDeleteUsersTests.cs b/application/account/Tests/Users/BulkDeleteUsersTests.cs
index 1d7c74c1af..3e1c9a0239 100644
--- a/application/account/Tests/Users/BulkDeleteUsersTests.cs
+++ b/application/account/Tests/Users/BulkDeleteUsersTests.cs
@@ -13,7 +13,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class BulkDeleteUsersTests : EndpointBaseTest<AccountDbContext>
+public sealed class BulkDeleteUsersTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task BulkDeleteUsers_WhenUsersExist_ShouldSoftDeleteUsers()
diff --git a/application/account/Tests/Users/BulkPurgeUsersTests.cs b/application/account/Tests/Users/BulkPurgeUsersTests.cs
index dc8176296b..f63478020f 100644
--- a/application/account/Tests/Users/BulkPurgeUsersTests.cs
+++ b/application/account/Tests/Users/BulkPurgeUsersTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class BulkPurgeUsersTests : EndpointBaseTest<AccountDbContext>
+public sealed class BulkPurgeUsersTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task BulkPurgeUsers_WhenOwnerDeletesMultipleDeletedUsers_ShouldPermanentlyDeleteAllSpecifiedUsers()
diff --git a/application/account/Tests/Users/ChangeLocaleTests.cs b/application/account/Tests/Users/ChangeLocaleTests.cs
index b31464b9a3..d9b1c7f245 100644
--- a/application/account/Tests/Users/ChangeLocaleTests.cs
+++ b/application/account/Tests/Users/ChangeLocaleTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class ChangeLocaleTests : EndpointBaseTest<AccountDbContext>
+public sealed class ChangeLocaleTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ChangeLocale_WhenValidLocale_ShouldUpdateUserLocaleAndCollectEvent()
diff --git a/application/account/Tests/Users/ChangeThemeTests.cs b/application/account/Tests/Users/ChangeThemeTests.cs
index 53e846ae9b..1978428fb7 100644
--- a/application/account/Tests/Users/ChangeThemeTests.cs
+++ b/application/account/Tests/Users/ChangeThemeTests.cs
@@ -8,7 +8,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class ChangeThemeTests : EndpointBaseTest<AccountDbContext>
+public sealed class ChangeThemeTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ChangeTheme_WhenValid_ShouldCollectTelemetryEvent()
diff --git a/application/account/Tests/Users/ChangeUserRoleTests.cs b/application/account/Tests/Users/ChangeUserRoleTests.cs
index f5ab90dc9a..a6a8a2d0ba 100644
--- a/application/account/Tests/Users/ChangeUserRoleTests.cs
+++ b/application/account/Tests/Users/ChangeUserRoleTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class ChangeUserRoleTests : EndpointBaseTest<AccountDbContext>
+public sealed class ChangeUserRoleTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ChangeUserRole_WhenOwnerChangesAnotherUserRole_ShouldSucceed()
diff --git a/application/account/Tests/Users/ChangeZoomLevelTests.cs b/application/account/Tests/Users/ChangeZoomLevelTests.cs
index d23162e96f..3d31aca8a4 100644
--- a/application/account/Tests/Users/ChangeZoomLevelTests.cs
+++ b/application/account/Tests/Users/ChangeZoomLevelTests.cs
@@ -8,7 +8,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class ChangeZoomLevelTests : EndpointBaseTest<AccountDbContext>
+public sealed class ChangeZoomLevelTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ChangeZoomLevel_WhenValid_ShouldCollectTelemetryEvent()
diff --git a/application/account/Tests/Users/DeclineInvitationTests.cs b/application/account/Tests/Users/DeclineInvitationTests.cs
index f23ca9946e..00b099f377 100644
--- a/application/account/Tests/Users/DeclineInvitationTests.cs
+++ b/application/account/Tests/Users/DeclineInvitationTests.cs
@@ -14,7 +14,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class DeclineInvitationTests : EndpointBaseTest<AccountDbContext>
+public sealed class DeclineInvitationTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task DeclineInvitation_WhenValidInviteExists_ShouldDeleteUserAndCollectTelemetry()
diff --git a/application/account/Tests/Users/DeleteUserTests.cs b/application/account/Tests/Users/DeleteUserTests.cs
index 1aa7c57c4b..c666466956 100644
--- a/application/account/Tests/Users/DeleteUserTests.cs
+++ b/application/account/Tests/Users/DeleteUserTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class DeleteUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class DeleteUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task DeleteUser_WhenUserDoesNotExists_ShouldReturnNotFound()
diff --git a/application/account/Tests/Users/EmptyRecycleBinTests.cs b/application/account/Tests/Users/EmptyRecycleBinTests.cs
index 53a9eb8aab..e23968230c 100644
--- a/application/account/Tests/Users/EmptyRecycleBinTests.cs
+++ b/application/account/Tests/Users/EmptyRecycleBinTests.cs
@@ -11,7 +11,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class EmptyRecycleBinTests : EndpointBaseTest<AccountDbContext>
+public sealed class EmptyRecycleBinTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task EmptyRecycleBin_WhenOwnerEmptiesRecycleBin_ShouldPermanentlyDeleteAllUsers()
diff --git a/application/account/Tests/Users/GetCurrentUserTests.cs b/application/account/Tests/Users/GetCurrentUserTests.cs
index ce6301ceed..65f522c712 100644
--- a/application/account/Tests/Users/GetCurrentUserTests.cs
+++ b/application/account/Tests/Users/GetCurrentUserTests.cs
@@ -6,7 +6,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class GetCurrentUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetCurrentUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetLoggedInUser_WhenUserExists_ShouldReturnUserWithValidContract()
diff --git a/application/account/Tests/Users/GetDeletedUsersTests.cs b/application/account/Tests/Users/GetDeletedUsersTests.cs
index 7599281c5c..dc35f619d1 100644
--- a/application/account/Tests/Users/GetDeletedUsersTests.cs
+++ b/application/account/Tests/Users/GetDeletedUsersTests.cs
@@ -12,7 +12,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class GetDeletedUsersTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetDeletedUsersTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetDeletedUsers_WhenOwner_ShouldReturnDeletedUsers()
diff --git a/application/account/Tests/Users/GetUserByIdTests.cs b/application/account/Tests/Users/GetUserByIdTests.cs
index ce461487ab..c32563b7b4 100644
--- a/application/account/Tests/Users/GetUserByIdTests.cs
+++ b/application/account/Tests/Users/GetUserByIdTests.cs
@@ -11,11 +11,11 @@
 
 namespace Account.Tests.Users;
 
-public sealed class GetUserByIdTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetUserByIdTests : EndpointBaseTest<AccountDbContext>, IClassFixture<AccountWebApplicationFactory>
 {
     private readonly UserId _userId = UserId.NewId();
 
-    public GetUserByIdTests()
+    public GetUserByIdTests(AccountWebApplicationFactory factory) : base(factory)
     {
         Connection.Insert("users", [
                 ("tenant_id", DatabaseSeeder.Tenant1.Id.ToString()),
diff --git a/application/account/Tests/Users/GetUserSummaryTests.cs b/application/account/Tests/Users/GetUserSummaryTests.cs
index 8eed028b9e..6b03af675c 100644
--- a/application/account/Tests/Users/GetUserSummaryTests.cs
+++ b/application/account/Tests/Users/GetUserSummaryTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class GetUserSummaryTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetUserSummaryTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task GetUserSummary_WhenUsersHaveVariousLastSeenDates_ShouldCountActiveUsersCorrectly()
diff --git a/application/account/Tests/Users/GetUsersTests.cs b/application/account/Tests/Users/GetUsersTests.cs
index 06e4f4a001..8011025a16 100644
--- a/application/account/Tests/Users/GetUsersTests.cs
+++ b/application/account/Tests/Users/GetUsersTests.cs
@@ -10,14 +10,14 @@
 
 namespace Account.Tests.Users;
 
-public sealed class GetUsersTests : EndpointBaseTest<AccountDbContext>
+public sealed class GetUsersTests : EndpointBaseTest<AccountDbContext>, IClassFixture<AccountWebApplicationFactory>
 {
     private const string Email = "willgates@email.com";
     private const string FirstName = "William Henry";
     private const string LastName = "Gates";
     private const UserRole UserRole = Features.Users.Domain.UserRole.Member;
 
-    public GetUsersTests()
+    public GetUsersTests(AccountWebApplicationFactory factory) : base(factory)
     {
         Connection.Insert("users", [
                 ("tenant_id", DatabaseSeeder.Tenant1.Id.ToString()),
diff --git a/application/account/Tests/Users/InviteUserTests.cs b/application/account/Tests/Users/InviteUserTests.cs
index a759d44ff9..de2f996922 100644
--- a/application/account/Tests/Users/InviteUserTests.cs
+++ b/application/account/Tests/Users/InviteUserTests.cs
@@ -17,7 +17,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class InviteUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class InviteUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task InviteUser_WhenTenantNameNotSet_ShouldReturnBadRequest()
diff --git a/application/account/Tests/Users/PurgeUserTests.cs b/application/account/Tests/Users/PurgeUserTests.cs
index 881a30052f..03713d5087 100644
--- a/application/account/Tests/Users/PurgeUserTests.cs
+++ b/application/account/Tests/Users/PurgeUserTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class PurgeUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class PurgeUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task PurgeUser_WhenOwnerDeletesSoftDeletedUser_ShouldSucceed()
diff --git a/application/account/Tests/Users/RestoreUserTests.cs b/application/account/Tests/Users/RestoreUserTests.cs
index 85d833f592..85ab8487b0 100644
--- a/application/account/Tests/Users/RestoreUserTests.cs
+++ b/application/account/Tests/Users/RestoreUserTests.cs
@@ -10,7 +10,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class RestoreUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class RestoreUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task RestoreUser_WhenOwnerRestoresDeletedUser_ShouldSucceed()
diff --git a/application/account/Tests/Users/UpdateCurrentUserTests.cs b/application/account/Tests/Users/UpdateCurrentUserTests.cs
index 5ffbc745a6..b2117f3457 100644
--- a/application/account/Tests/Users/UpdateCurrentUserTests.cs
+++ b/application/account/Tests/Users/UpdateCurrentUserTests.cs
@@ -8,7 +8,7 @@
 
 namespace Account.Tests.Users;
 
-public sealed class UpdateCurrentUserTests : EndpointBaseTest<AccountDbContext>
+public sealed class UpdateCurrentUserTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task UpdateCurrentUser_WhenValid_ShouldUpdateUser()
diff --git a/application/account/Tests/Workers/BillingDriftWorkerTests.cs b/application/account/Tests/Workers/BillingDriftWorkerTests.cs
index d94b6d2fdd..ad3990786e 100644
--- a/application/account/Tests/Workers/BillingDriftWorkerTests.cs
+++ b/application/account/Tests/Workers/BillingDriftWorkerTests.cs
@@ -27,7 +27,7 @@ namespace Account.Tests.Workers;
 ///     iteration-token linkage to <see cref="BillingDriftIterationTimeout" /> (M13), and
 ///     resilience-on-per-subscription-failure so one bad row cannot kill the entire pass.
 /// </summary>
-public sealed class BillingDriftWorkerTests : EndpointBaseTest<AccountDbContext>
+public sealed class BillingDriftWorkerTests(AccountWebApplicationFactory factory) : EndpointBaseTest<AccountDbContext>(factory), IClassFixture<AccountWebApplicationFactory>
 {
     [Fact]
     public async Task ExecuteAsync_RunsOnePassThenExits_WithoutPeriodicTimer()

From f4bf496443155f54cd9fd10e55f420f100d6ebcb Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 13:26:29 +0200
Subject: [PATCH 03/10] Extract SonarCloud into a dedicated workflow that runs
 once per push against PlatformPlatform.slnx

---
 .github/workflows/account.yml    | 23 +-------
 .github/workflows/main.yml       | 23 +-------
 .github/workflows/sonarcloud.yml | 97 ++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 40 deletions(-)
 create mode 100644 .github/workflows/sonarcloud.yml

diff --git a/.github/workflows/account.yml b/.github/workflows/account.yml
index ad54332a29..b0f5bd4564 100644
--- a/.github/workflows/account.yml
+++ b/.github/workflows/account.yml
@@ -93,32 +93,15 @@ jobs:
           # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
           dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID
 
-      - name: Setup Java JDK for SonarScanner
-        uses: actions/setup-java@v5
-        with:
-          distribution: "microsoft"
-          java-version: "17"
-
       - name: Build Email Templates
         working-directory: application
         run: npx turbo run build --filter=@repo/emails
 
-      - name: Run Tests with SonarScanner Analysis
+      - name: Run Tests
         working-directory: application
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]] || [[ "${{ vars.SONAR_ORGANIZATION }}" == "" ]] || [[ "${{ secrets.SONAR_TOKEN }}" == "" ]]; then
-            echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
-            dotnet build account/Account.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }} &&
-            dotnet test account/Account.slnf --no-build
-          else
-            dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.host.url="https://sonarcloud.io" &&
-            dotnet build account/Account.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }} &&
-            dotnet test account/Account.slnf --no-build &&
-            dotnet sonarscanner end
-          fi
+          dotnet build account/Account.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }}
+          dotnet test account/Account.slnf --no-build
 
       - name: Build Frontend Artifacts
         if: ${{ steps.determine_deployment.outputs.deploy_staging == 'true' }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2939359338..97a8fcadb4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -93,32 +93,15 @@ jobs:
           # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
           dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID
 
-      - name: Setup Java JDK for SonarScanner
-        uses: actions/setup-java@v5
-        with:
-          distribution: "microsoft"
-          java-version: "17"
-
       - name: Build Email Templates
         working-directory: application
         run: npx turbo run build --filter=@repo/emails
 
-      - name: Run Tests with SonarScanner Analysis
+      - name: Run Tests
         working-directory: application
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]] || [[ "${{ vars.SONAR_ORGANIZATION }}" == "" ]] || [[ "${{ secrets.SONAR_TOKEN }}" == "" ]]; then
-            echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
-            dotnet build main/Main.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }} &&
-            dotnet test main/Main.slnf --no-build
-          else
-            dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.host.url="https://sonarcloud.io" &&
-            dotnet build main/Main.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }} &&
-            dotnet test main/Main.slnf --no-build &&
-            dotnet sonarscanner end
-          fi
+          dotnet build main/Main.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }}
+          dotnet test main/Main.slnf --no-build
 
       - name: Build Frontend Artifacts
         if: ${{ steps.determine_deployment.outputs.deploy_staging == 'true' }}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 0000000000..f4860c15d0
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,97 @@
+name: SonarCloud
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "application/*"
+      - "application/shared-kernel/**"
+      - "application/shared-webapp/**"
+      - "application/account/**"
+      - "application/main/**"
+      - "application/AppGateway/**"
+      - ".github/workflows/sonarcloud.yml"
+      - "!**.md"
+  pull_request:
+    paths:
+      - "application/*"
+      - "application/shared-kernel/**"
+      - "application/shared-webapp/**"
+      - "application/account/**"
+      - "application/main/**"
+      - "application/AppGateway/**"
+      - ".github/workflows/sonarcloud.yml"
+      - "!**.md"
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+  pull-requests: write
+
+jobs:
+  sonarcloud:
+    name: SonarCloud Analysis
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Generate and Set User Secret for Token Signing Key
+        working-directory: application/shared-kernel/SharedKernel
+        run: |
+          # Extract UserSecretsId from the .csproj file
+          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.csproj)
+
+          # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
+          dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID
+
+      - name: Setup Java JDK for SonarScanner
+        uses: actions/setup-java@v5
+        with:
+          distribution: "microsoft"
+          java-version: "17"
+
+      - name: Build Email Templates
+        working-directory: application
+        run: npx turbo run build --filter=@repo/emails
+
+      - name: Run SonarCloud Analysis
+        working-directory: application
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]] || [[ "${{ vars.SONAR_ORGANIZATION }}" == "" ]] || [[ "${{ secrets.SONAR_TOKEN }}" == "" ]]; then
+            echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
+            exit 0
+          fi
+
+          dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.host.url="https://sonarcloud.io" &&
+          dotnet build PlatformPlatform.slnx --no-restore &&
+          dotnet test PlatformPlatform.slnx --no-build &&
+          dotnet sonarscanner end

From 6182eb62d0fcc0be0cc7ecd79a043c33b523e7b9 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 13:27:38 +0200
Subject: [PATCH 04/10] Split Code Style and Linting into parallel jobs for
 linting and formatting

---
 .github/workflows/account.yml     | 61 ++++++++++++++++++++++++-------
 .github/workflows/app-gateway.yml | 39 +++++++++++++++++++-
 .github/workflows/main.yml        | 61 ++++++++++++++++++++++++-------
 3 files changed, 133 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/account.yml b/.github/workflows/account.yml
index b0f5bd4564..482c783810 100644
--- a/.github/workflows/account.yml
+++ b/.github/workflows/account.yml
@@ -142,8 +142,8 @@ jobs:
           name: account-workers
           path: application/account/Workers/publish/**/*
 
-  code-style-and-linting:
-    name: Code Style and Linting
+  code-linting:
+    name: Code Linting
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
 
@@ -187,17 +187,6 @@ jobs:
             exit 1
           fi
 
-      - name: Check for Code Formatting Issues
-        working-directory: developer-cli
-        run: |
-          dotnet run format --backend --self-contained-system account
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system account' from /developer-cli folder locally and commit the formatted code."
-            exit 1
-          }
-
       - name: Build Frontend Artifacts
         working-directory: application
         run: npm run build
@@ -217,6 +206,52 @@ jobs:
             exit 1
           }
 
+  code-formatting:
+    name: Code Formatting
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Build Backend Solution
+        working-directory: application
+        run: dotnet build account/Account.slnf --no-restore
+
+      - name: Check for Code Formatting Issues
+        working-directory: developer-cli
+        run: |
+          dotnet run format --backend --self-contained-system account
+
+          # Check for any changes made by the code formatter
+          git diff --exit-code || {
+            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system account' from /developer-cli folder locally and commit the formatted code."
+            exit 1
+          }
+
   database-migrations-stage:
     name: Database Staging
     if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}
diff --git a/.github/workflows/app-gateway.yml b/.github/workflows/app-gateway.yml
index c9eec8c347..b5f2b99da8 100644
--- a/.github/workflows/app-gateway.yml
+++ b/.github/workflows/app-gateway.yml
@@ -94,8 +94,8 @@ jobs:
           name: app-gateway
           path: application/AppGateway/publish/**/*
 
-  code-style-and-linting:
-    name: Code Style and Linting
+  code-linting:
+    name: Code Linting
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
 
@@ -139,6 +139,41 @@ jobs:
             exit 1
           fi
 
+  code-formatting:
+    name: Code Formatting
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Build Backend Solution
+        working-directory: application
+        run: dotnet build PlatformPlatform.slnx --no-restore
+
       - name: Check for Code Formatting Issues
         working-directory: developer-cli
         run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 97a8fcadb4..086bd3de20 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -137,8 +137,8 @@ jobs:
           name: main-workers
           path: application/main/Workers/publish/**/*
 
-  code-style-and-linting:
-    name: Code Style and Linting
+  code-linting:
+    name: Code Linting
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
 
@@ -182,17 +182,6 @@ jobs:
             exit 1
           fi
 
-      - name: Check for Code Formatting Issues
-        working-directory: developer-cli
-        run: |
-          dotnet run format --backend --self-contained-system main
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system main' from /developer-cli folder locally and commit the formatted code."
-            exit 1
-          }
-
       - name: Build Frontend Artifacts
         working-directory: application
         run: npm run build
@@ -212,6 +201,52 @@ jobs:
             exit 1
           }
 
+  code-formatting:
+    name: Code Formatting
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Build Backend Solution
+        working-directory: application
+        run: dotnet build main/Main.slnf --no-restore
+
+      - name: Check for Code Formatting Issues
+        working-directory: developer-cli
+        run: |
+          dotnet run format --backend --self-contained-system main
+
+          # Check for any changes made by the code formatter
+          git diff --exit-code || {
+            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system main' from /developer-cli folder locally and commit the formatted code."
+            exit 1
+          }
+
   database-migrations-stage:
     name: Database Staging
     if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}

From eeda67107c6b07d218aafc59c0bfbb5a308074ad Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 13:36:46 +0200
Subject: [PATCH 05/10] Reuse Build and Test outputs in Database Plan job to
 skip redundant rebuild

---
 .github/workflows/_migrate-database.yml | 12 +++++++++---
 .github/workflows/account.yml           | 12 ++++++++++++
 .github/workflows/main.yml              | 12 ++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/_migrate-database.yml b/.github/workflows/_migrate-database.yml
index cb354e20d6..6b11505d56 100644
--- a/.github/workflows/_migrate-database.yml
+++ b/.github/workflows/_migrate-database.yml
@@ -32,6 +32,10 @@ on:
       apply_migrations:
         required: true
         type: boolean
+      build_artifact_name:
+        description: "Name of the artifact uploaded by the caller's build-and-test job that contains application/**/bin and application/**/obj"
+        required: true
+        type: string
 
     outputs:
       has_migrations_to_apply:
@@ -68,9 +72,11 @@ jobs:
         working-directory: application
         run: dotnet tool restore
 
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build ${{ inputs.relative_startup_project }}
+      - name: Download Backend Build Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          name: ${{ inputs.build_artifact_name }}
+          path: application
 
       - name: Login to Azure
         uses: azure/login@v3
diff --git a/.github/workflows/account.yml b/.github/workflows/account.yml
index 482c783810..692a5642d8 100644
--- a/.github/workflows/account.yml
+++ b/.github/workflows/account.yml
@@ -103,6 +103,16 @@ jobs:
           dotnet build account/Account.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }}
           dotnet test account/Account.slnf --no-build
 
+      - name: Save Backend Build Artifacts for Migration Plan
+        if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: account-build
+          path: |
+            application/**/bin
+            application/**/obj
+          retention-days: 1
+
       - name: Build Frontend Artifacts
         if: ${{ steps.determine_deployment.outputs.deploy_staging == 'true' }}
         working-directory: application
@@ -268,6 +278,7 @@ jobs:
       relative_startup_project: account/Api/Account.Api.csproj
       db_context: AccountDbContext
       apply_migrations: ${{ needs.build-and-test.outputs.deploy_staging == 'true' }}
+      build_artifact_name: account-build
 
   api-stage:
     name: API Staging
@@ -340,6 +351,7 @@ jobs:
       relative_startup_project: account/Api/Account.Api.csproj
       db_context: AccountDbContext
       apply_migrations: true
+      build_artifact_name: account-build
 
   api-prod1:
     name: API Production
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 086bd3de20..d2e1c492b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -103,6 +103,16 @@ jobs:
           dotnet build main/Main.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} /p:DeploymentCommitHash=${{ github.event.pull_request.head.sha || github.sha }} /p:DeploymentGithubActionId=${{ github.run_id }}
           dotnet test main/Main.slnf --no-build
 
+      - name: Save Backend Build Artifacts for Migration Plan
+        if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: main-build
+          path: |
+            application/**/bin
+            application/**/obj
+          retention-days: 1
+
       - name: Build Frontend Artifacts
         if: ${{ steps.determine_deployment.outputs.deploy_staging == 'true' }}
         working-directory: application
@@ -263,6 +273,7 @@ jobs:
       relative_startup_project: main/Api/Main.Api.csproj
       db_context: MainDbContext
       apply_migrations: ${{ needs.build-and-test.outputs.deploy_staging == 'true' }}
+      build_artifact_name: main-build
 
   api-stage:
     name: API Staging
@@ -316,6 +327,7 @@ jobs:
       relative_startup_project: main/Api/Main.Api.csproj
       db_context: MainDbContext
       apply_migrations: true
+      build_artifact_name: main-build
 
   api-prod1:
     name: API Production

From cb4a829fabf9e716cdfaf9ba01ec558e0ec3e525 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 14:07:29 +0200
Subject: [PATCH 06/10] Combine SonarCloud, lint, and format into a single
 code-style workflow with scope detection

---
 .github/workflows/_migrate-database.yml |   7 +
 .github/workflows/account.yml           | 111 ----------
 .github/workflows/app-gateway.yml       |  92 ---------
 .github/workflows/code-style.yml        | 258 ++++++++++++++++++++++++
 .github/workflows/main.yml              | 111 ----------
 .github/workflows/sonarcloud.yml        |  97 ---------
 6 files changed, 265 insertions(+), 411 deletions(-)
 create mode 100644 .github/workflows/code-style.yml
 delete mode 100644 .github/workflows/sonarcloud.yml

diff --git a/.github/workflows/_migrate-database.yml b/.github/workflows/_migrate-database.yml
index 6b11505d56..fc9e8aeca8 100644
--- a/.github/workflows/_migrate-database.yml
+++ b/.github/workflows/_migrate-database.yml
@@ -78,6 +78,13 @@ jobs:
           name: ${{ inputs.build_artifact_name }}
           path: application
 
+      # The artifact carries bin/ and obj/ but not the global NuGet package cache.
+      # `dotnet ef --no-build` loads compiled assemblies that reference packages by
+      # absolute path under ~/.nuget/packages — those must exist on this runner.
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore ${{ inputs.relative_startup_project }}
+
       - name: Login to Azure
         uses: azure/login@v3
         with:
diff --git a/.github/workflows/account.yml b/.github/workflows/account.yml
index 692a5642d8..b1865f44ab 100644
--- a/.github/workflows/account.yml
+++ b/.github/workflows/account.yml
@@ -151,117 +151,6 @@ jobs:
         with:
           name: account-workers
           path: application/account/Workers/publish/**/*
-
-  code-linting:
-    name: Code Linting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build account/Account.slnf --no-restore
-
-      - name: Run Code Linting
-        working-directory: developer-cli
-        run: |
-          dotnet run lint --backend --self-contained-system account | tee lint-output.log
-
-          if ! grep -q "No backend issues found!" lint-output.log; then
-            echo "Code linting issues found."
-            exit 1
-          fi
-
-      - name: Build Frontend Artifacts
-        working-directory: application
-        run: npm run build
-
-      - name: Run Lint
-        working-directory: developer-cli
-        run: dotnet run -- lint --frontend
-
-      - name: Run Format
-        working-directory: developer-cli
-        run: |
-          dotnet run -- format --frontend
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --frontend' locally and commit the formatted code."
-            exit 1
-          }
-
-  code-formatting:
-    name: Code Formatting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build account/Account.slnf --no-restore
-
-      - name: Check for Code Formatting Issues
-        working-directory: developer-cli
-        run: |
-          dotnet run format --backend --self-contained-system account
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system account' from /developer-cli folder locally and commit the formatted code."
-            exit 1
-          }
-
   database-migrations-stage:
     name: Database Staging
     if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}
diff --git a/.github/workflows/app-gateway.yml b/.github/workflows/app-gateway.yml
index b5f2b99da8..7f15e0a3e2 100644
--- a/.github/workflows/app-gateway.yml
+++ b/.github/workflows/app-gateway.yml
@@ -93,98 +93,6 @@ jobs:
         with:
           name: app-gateway
           path: application/AppGateway/publish/**/*
-
-  code-linting:
-    name: Code Linting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build PlatformPlatform.slnx --no-restore
-
-      - name: Run Code Linting
-        working-directory: developer-cli
-        run: |
-          dotnet run lint --backend | tee lint-output.log
-
-          if ! grep -q "No backend issues found!" lint-output.log; then
-            echo "Code linting issues found."
-            exit 1
-          fi
-
-  code-formatting:
-    name: Code Formatting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build PlatformPlatform.slnx --no-restore
-
-      - name: Check for Code Formatting Issues
-        working-directory: developer-cli
-        run: |
-          dotnet run format --backend
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run format --backend' from /developer-cli folder locally and commit the formatted code."
-            exit 1
-          }
-
   api-stage:
     name: Staging
     if: ${{ needs.build-and-test.outputs.deploy_staging == 'true' }}
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
new file mode 100644
index 0000000000..71c4a2c971
--- /dev/null
+++ b/.github/workflows/code-style.yml
@@ -0,0 +1,258 @@
+name: Code Style
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "application/**"
+      - "developer-cli/**"
+      - ".github/workflows/code-style.yml"
+      - "!**.md"
+  pull_request:
+    paths:
+      - "application/**"
+      - "developer-cli/**"
+      - ".github/workflows/code-style.yml"
+      - "!**.md"
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+  pull-requests: write
+
+jobs:
+  detect-changes:
+    name: Detect Changes
+    runs-on: ubuntu-24.04
+    outputs:
+      backend_scope: ${{ steps.scope.outputs.backend_scope }}
+      backend_label: ${{ steps.scope.outputs.backend_label }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+        with:
+          # Need history to diff against the base ref
+          fetch-depth: 0
+
+      - name: Resolve Backend Scope
+        id: scope
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.sha || format('{0}~1', github.sha) }}
+          HEAD_REF: ${{ github.event.pull_request.head.sha || github.sha }}
+        run: |
+          # Run scoped commands only when exactly one SCS's backend changed and nothing shared.
+          # Anything shared (shared-kernel, AppGateway, root, or developer-cli) forces a full pass,
+          # since per-SCS slnf scopes don't cover those projects.
+          changed=$(git diff --name-only "$BASE_REF" "$HEAD_REF")
+
+          account=false
+          main=false
+          other=false
+
+          while IFS= read -r path; do
+            case "$path" in
+              application/account/Api/*|application/account/Core/*|application/account/Workers/*|application/account/Tests/*)
+                account=true ;;
+              application/main/Api/*|application/main/Core/*|application/main/Workers/*|application/main/Tests/*)
+                main=true ;;
+              application/AppGateway/*|application/shared-kernel/*|developer-cli/*)
+                other=true ;;
+              application/*)
+                # Files directly under application/ (slnx, package.json, etc.) — treat as shared.
+                # Subdirectories matched the cases above.
+                other=true ;;
+            esac
+          done <<< "$changed"
+
+          if [[ "$other" == "true" ]] || { [[ "$account" == "true" ]] && [[ "$main" == "true" ]]; }; then
+            echo "backend_scope=" >> "$GITHUB_OUTPUT"
+            echo "backend_label=full backend (PlatformPlatform.slnx)" >> "$GITHUB_OUTPUT"
+          elif [[ "$account" == "true" ]]; then
+            echo "backend_scope=--self-contained-system account" >> "$GITHUB_OUTPUT"
+            echo "backend_label=account only" >> "$GITHUB_OUTPUT"
+          elif [[ "$main" == "true" ]]; then
+            echo "backend_scope=--self-contained-system main" >> "$GITHUB_OUTPUT"
+            echo "backend_label=main only" >> "$GITHUB_OUTPUT"
+          else
+            echo "backend_scope=" >> "$GITHUB_OUTPUT"
+            echo "backend_label=full backend (default — no backend paths matched)" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Print Scope
+        run: echo "Backend scope - ${{ steps.scope.outputs.backend_label }}"
+
+  code-linting:
+    name: Code Linting
+    needs: detect-changes
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Build Backend Solution
+        working-directory: developer-cli
+        run: dotnet run -- build --backend ${{ needs.detect-changes.outputs.backend_scope }} --quiet
+
+      - name: Run Backend Linting
+        working-directory: developer-cli
+        run: |
+          dotnet run lint --backend ${{ needs.detect-changes.outputs.backend_scope }} --no-build | tee lint-output.log
+
+          if ! grep -q "No backend issues found!" lint-output.log; then
+            echo "Code linting issues found."
+            exit 1
+          fi
+
+      - name: Build Frontend Artifacts
+        working-directory: application
+        run: npm run build
+
+      - name: Run Frontend Linting
+        working-directory: developer-cli
+        run: dotnet run -- lint --frontend
+
+      - name: Run Frontend Format Check
+        working-directory: developer-cli
+        run: |
+          dotnet run -- format --frontend
+
+          git diff --exit-code || {
+            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --frontend' locally and commit the formatted code."
+            exit 1
+          }
+
+  code-formatting:
+    name: Code Formatting
+    needs: detect-changes
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Build Backend Solution
+        working-directory: developer-cli
+        run: dotnet run -- build --backend ${{ needs.detect-changes.outputs.backend_scope }} --quiet
+
+      - name: Check for Code Formatting Issues
+        working-directory: developer-cli
+        run: |
+          dotnet run format --backend ${{ needs.detect-changes.outputs.backend_scope }} --no-build
+
+          git diff --exit-code || {
+            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --backend ${{ needs.detect-changes.outputs.backend_scope }}' locally and commit the formatted code."
+            exit 1
+          }
+
+  sonarcloud:
+    name: SonarCloud Analysis
+    needs: detect-changes
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Install Node Modules
+        working-directory: application
+        run: npm ci
+
+      - name: Setup .NET Core SDK
+        uses: actions/setup-dotnet@v5
+        with:
+          global-json-file: application/global.json
+
+      - name: Restore .NET Tools
+        working-directory: application
+        run: dotnet tool restore
+
+      - name: Restore .NET Dependencies
+        working-directory: application
+        run: dotnet restore
+
+      - name: Generate and Set User Secret for Token Signing Key
+        working-directory: application/shared-kernel/SharedKernel
+        run: |
+          # Extract UserSecretsId from the .csproj file
+          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.csproj)
+
+          # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
+          dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID
+
+      - name: Setup Java JDK for SonarScanner
+        uses: actions/setup-java@v5
+        with:
+          distribution: "microsoft"
+          java-version: "17"
+
+      - name: Build Email Templates
+        working-directory: application
+        run: npx turbo run build --filter=@repo/emails
+
+      - name: Run SonarCloud Analysis
+        working-directory: application
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]] || [[ "${{ vars.SONAR_ORGANIZATION }}" == "" ]] || [[ "${{ secrets.SONAR_TOKEN }}" == "" ]]; then
+            echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
+            exit 0
+          fi
+
+          dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.host.url="https://sonarcloud.io" &&
+          dotnet build PlatformPlatform.slnx --no-restore &&
+          dotnet test PlatformPlatform.slnx --no-build &&
+          dotnet sonarscanner end
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2e1c492b5..0d8d14396d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -146,117 +146,6 @@ jobs:
         with:
           name: main-workers
           path: application/main/Workers/publish/**/*
-
-  code-linting:
-    name: Code Linting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build main/Main.slnf --no-restore
-
-      - name: Run Code Linting
-        working-directory: developer-cli
-        run: |
-          dotnet run lint --backend --self-contained-system main | tee lint-output.log
-
-          if ! grep -q "No backend issues found!" lint-output.log; then
-            echo "Code linting issues found."
-            exit 1
-          fi
-
-      - name: Build Frontend Artifacts
-        working-directory: application
-        run: npm run build
-
-      - name: Run Lint
-        working-directory: developer-cli
-        run: dotnet run -- lint --frontend
-
-      - name: Run Format
-        working-directory: developer-cli
-        run: |
-          dotnet run -- format --frontend
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --frontend' locally and commit the formatted code."
-            exit 1
-          }
-
-  code-formatting:
-    name: Code Formatting
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Build Backend Solution
-        working-directory: application
-        run: dotnet build main/Main.slnf --no-restore
-
-      - name: Check for Code Formatting Issues
-        working-directory: developer-cli
-        run: |
-          dotnet run format --backend --self-contained-system main
-
-          # Check for any changes made by the code formatter
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run format --backend --self-contained-system main' from /developer-cli folder locally and commit the formatted code."
-            exit 1
-          }
-
   database-migrations-stage:
     name: Database Staging
     if: ${{ vars.STAGING_CLUSTER_ENABLED == 'true' }}
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
deleted file mode 100644
index f4860c15d0..0000000000
--- a/.github/workflows/sonarcloud.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: SonarCloud
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "application/*"
-      - "application/shared-kernel/**"
-      - "application/shared-webapp/**"
-      - "application/account/**"
-      - "application/main/**"
-      - "application/AppGateway/**"
-      - ".github/workflows/sonarcloud.yml"
-      - "!**.md"
-  pull_request:
-    paths:
-      - "application/*"
-      - "application/shared-kernel/**"
-      - "application/shared-webapp/**"
-      - "application/account/**"
-      - "application/main/**"
-      - "application/AppGateway/**"
-      - ".github/workflows/sonarcloud.yml"
-      - "!**.md"
-  workflow_dispatch:
-
-permissions:
-  id-token: write
-  contents: read
-  pull-requests: write
-
-jobs:
-  sonarcloud:
-    name: SonarCloud Analysis
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js Environment
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-
-      - name: Install Node Modules
-        working-directory: application
-        run: npm ci
-
-      - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: application/global.json
-
-      - name: Restore .NET Tools
-        working-directory: application
-        run: dotnet tool restore
-
-      - name: Restore .NET Dependencies
-        working-directory: application
-        run: dotnet restore
-
-      - name: Generate and Set User Secret for Token Signing Key
-        working-directory: application/shared-kernel/SharedKernel
-        run: |
-          # Extract UserSecretsId from the .csproj file
-          USER_SECRETS_ID=$(grep -oP '(?<=<UserSecretsId>).*?(?=</UserSecretsId>)' SharedKernel.csproj)
-
-          # Generate a 512-bit key and set it as a user secret that can be use for token signing when running tests
-          dotnet user-secrets set "authentication-token-signing-key" "$(openssl rand -base64 64)" --id $USER_SECRETS_ID
-
-      - name: Setup Java JDK for SonarScanner
-        uses: actions/setup-java@v5
-        with:
-          distribution: "microsoft"
-          java-version: "17"
-
-      - name: Build Email Templates
-        working-directory: application
-        run: npx turbo run build --filter=@repo/emails
-
-      - name: Run SonarCloud Analysis
-        working-directory: application
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]] || [[ "${{ vars.SONAR_ORGANIZATION }}" == "" ]] || [[ "${{ secrets.SONAR_TOKEN }}" == "" ]]; then
-            echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
-            exit 0
-          fi
-
-          dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.host.url="https://sonarcloud.io" &&
-          dotnet build PlatformPlatform.slnx --no-restore &&
-          dotnet test PlatformPlatform.slnx --no-build &&
-          dotnet sonarscanner end

From d95c1b0dbf49f5b41a2a27f5c767056eca36fa74 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 15:10:09 +0200
Subject: [PATCH 07/10] Default pp format to changed-only and add --all-files
 for full sweep

---
 .claude/skills/format/SKILL.md          |   5 +-
 .github/workflows/code-style.yml        |  20 ++-
 developer-cli/Commands/FormatCommand.cs | 163 +++++++++---------------
 3 files changed, 79 insertions(+), 109 deletions(-)

diff --git a/.claude/skills/format/SKILL.md b/.claude/skills/format/SKILL.md
index f4e4eb6b49..cfeabcce19 100644
--- a/.claude/skills/format/SKILL.md
+++ b/.claude/skills/format/SKILL.md
@@ -6,7 +6,7 @@ description: Auto-format code via the developer CLI - backend (.NET via JetBrain
 # Format
 
 ```bash
-dotnet run --project developer-cli -- format [--backend] [--frontend] [--cli] [--self-contained-system <name>] [--no-build] --quiet
+dotnet run --project developer-cli -- format [--backend] [--frontend] [--cli] [--self-contained-system <name>] [--no-build] [--all-files] --quiet
 ```
 
 Use `developer-cli` exactly as written - do not expand to an absolute worktree path.
@@ -16,8 +16,9 @@ Use `developer-cli` exactly as written - do not expand to an absolute worktree p
 - `--cli` - the developer CLI itself
 - `--self-contained-system <name>` - narrows backend formatting to one SCS (e.g. `account`, `main`)
 - `--no-build` - skip the `dotnet tool restore` step (faster after a recent run)
+- `--all-files` - format every file in the solution. Default is to format only `.cs` files changed against `origin/main` (faster).
 
-No arguments formats everything. Unformatted code fails CI - commit all changes, never revert.
+No arguments formats everything (changed-only by default). Unformatted code fails CI - commit all changes, never revert.
 
 After `build` succeeds, run `format`, `lint`, `test` in parallel with `--no-build`.
 
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 71c4a2c971..685710b917 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -29,6 +29,7 @@ jobs:
     outputs:
       backend_scope: ${{ steps.scope.outputs.backend_scope }}
       backend_label: ${{ steps.scope.outputs.backend_label }}
+      format_all_files_flag: ${{ steps.scope.outputs.format_all_files_flag }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
@@ -80,8 +81,21 @@ jobs:
             echo "backend_label=full backend (default — no backend paths matched)" >> "$GITHUB_OUTPUT"
           fi
 
+          # Force --all-files when the JetBrains tool manifest moves. Tool upgrades change the
+          # cleanupcode rule set, so latent formatting drift in untouched files needs reformatting
+          # in the same PR. Otherwise the next PR that happens to touch one of those files fails CI.
+          if echo "$changed" | grep -q '^application/dotnet-tools.json$'; then
+            echo "format_all_files_flag=--all-files" >> "$GITHUB_OUTPUT"
+            echo "format_label=all files (JetBrains tools upgraded)" >> "$GITHUB_OUTPUT"
+          else
+            echo "format_all_files_flag=" >> "$GITHUB_OUTPUT"
+            echo "format_label=changed .cs files only" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Print Scope
-        run: echo "Backend scope - ${{ steps.scope.outputs.backend_label }}"
+        run: |
+          echo "Backend scope - ${{ steps.scope.outputs.backend_label }}"
+          echo "Format scope  - ${{ steps.scope.outputs.format_label }}"
 
   code-linting:
     name: Code Linting
@@ -184,10 +198,10 @@ jobs:
       - name: Check for Code Formatting Issues
         working-directory: developer-cli
         run: |
-          dotnet run format --backend ${{ needs.detect-changes.outputs.backend_scope }} --no-build
+          dotnet run format --backend ${{ needs.detect-changes.outputs.backend_scope }} ${{ needs.detect-changes.outputs.format_all_files_flag }} --no-build
 
           git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --backend ${{ needs.detect-changes.outputs.backend_scope }}' locally and commit the formatted code."
+            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --backend ${{ needs.detect-changes.outputs.backend_scope }} ${{ needs.detect-changes.outputs.format_all_files_flag }}' locally and commit the formatted code."
             exit 1
           }
 
diff --git a/developer-cli/Commands/FormatCommand.cs b/developer-cli/Commands/FormatCommand.cs
index 3448a97504..dbbd9fe8b0 100644
--- a/developer-cli/Commands/FormatCommand.cs
+++ b/developer-cli/Commands/FormatCommand.cs
@@ -1,7 +1,5 @@
 using System.CommandLine;
 using System.Diagnostics;
-using System.Text.Json;
-using System.Xml.Linq;
 using DeveloperCli.Installation;
 using DeveloperCli.Utilities;
 using Spectre.Console;
@@ -17,6 +15,7 @@ public FormatCommand() : base("format", "Formats code to match code styling rule
         var cliOption = new Option<bool>("--cli", "-c") { Description = "Format developer-cli code" };
         var selfContainedSystemOption = new Option<string?>("<self-contained-system>", "--self-contained-system", "-s") { Description = "The name of the self-contained system to format (e.g., main, account, back-office)" };
         var noBuildOption = new Option<bool>("--no-build") { Description = "Skip building and restoring before formatting" };
+        var allFilesOption = new Option<bool>("--all-files") { Description = "Format every file in the solution. Default is to format only .cs files changed against origin/main." };
         var quietOption = new Option<bool>("--quiet", "-q") { Description = "Minimal output mode" };
 
         Options.Add(backendOption);
@@ -24,6 +23,7 @@ public FormatCommand() : base("format", "Formats code to match code styling rule
         Options.Add(cliOption);
         Options.Add(selfContainedSystemOption);
         Options.Add(noBuildOption);
+        Options.Add(allFilesOption);
         Options.Add(quietOption);
 
         SetAction(parseResult => Execute(
@@ -32,12 +32,13 @@ public FormatCommand() : base("format", "Formats code to match code styling rule
                 parseResult.GetValue(cliOption),
                 parseResult.GetValue(selfContainedSystemOption),
                 parseResult.GetValue(noBuildOption),
+                parseResult.GetValue(allFilesOption),
                 parseResult.GetValue(quietOption)
             )
         );
     }
 
-    private static void Execute(bool backend, bool frontend, bool developerCli, string? selfContainedSystem, bool noBuild, bool quiet)
+    private static void Execute(bool backend, bool frontend, bool developerCli, string? selfContainedSystem, bool noBuild, bool allFiles, bool quiet)
     {
         var noFlags = !backend && !frontend && !developerCli;
         var formatBackend = backend || noFlags;
@@ -60,7 +61,7 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
             if (formatBackend)
             {
                 Prerequisite.Ensure(Prerequisite.Dotnet);
-                RunBackendFormat(selfContainedSystem, noBuild, quiet);
+                RunBackendFormat(selfContainedSystem, noBuild, allFiles, quiet);
                 backendTime = Stopwatch.GetElapsedTime(startTime);
             }
 
@@ -74,7 +75,7 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
             if (formatDeveloperCli)
             {
                 Prerequisite.Ensure(Prerequisite.Dotnet);
-                RunDeveloperCliFormat(noBuild, quiet);
+                RunDeveloperCliFormat(noBuild, allFiles, quiet);
                 developerCliTime = Stopwatch.GetElapsedTime(startTime) - backendTime - frontendTime;
             }
 
@@ -124,40 +125,37 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
         }
     }
 
-    private static void RunBackendFormat(string? selfContainedSystem, bool noBuild, bool quiet)
+    private static void RunBackendFormat(string? selfContainedSystem, bool noBuild, bool allFiles, bool quiet)
     {
         var solutionFile = SelfContainedSystemHelper.GetSolutionFile(selfContainedSystem);
 
         if (!quiet) AnsiConsole.MarkupLine("[blue]Running backend code format...[/]");
 
-        if (!noBuild)
-        {
-            ProcessHelper.Run("dotnet tool restore", solutionFile.Directory!.FullName, "Tool restore", quiet);
-        }
-
-        // .slnx files are not yet supported by JetBrains tools, so we need to create a temporary .slnf file
-        var createTemporarySolutionFile = solutionFile.Extension.Equals(".slnx", StringComparison.OrdinalIgnoreCase);
-        var jetbrainsSupportedSolutionFile = string.Empty;
-        try
+        var includeArgument = string.Empty;
+        if (!allFiles)
         {
-            jetbrainsSupportedSolutionFile = createTemporarySolutionFile
-                ? CreateTemporaryJetBrainsCompatibleSolutionFile(solutionFile)
-                : solutionFile.FullName;
+            var changedCsFiles = GetChangedCsFiles(solutionFile.Directory!.FullName);
+            if (changedCsFiles.Length == 0)
+            {
+                if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping backend format.[/]");
+                return;
+            }
 
-            ProcessHelper.Run(
-                $"""dotnet jb cleanupcode {jetbrainsSupportedSolutionFile} --profile=".NET only" --no-build""",
-                solutionFile.Directory!.FullName,
-                "Format",
-                quiet
-            );
+            includeArgument = $""" --include="{string.Join(";", changedCsFiles)}" """.TrimEnd();
+            if (!quiet) AnsiConsole.MarkupLine($"[blue]Formatting {changedCsFiles.Length} changed file(s)...[/]");
         }
-        finally
+
+        if (!noBuild)
         {
-            if (createTemporarySolutionFile && File.Exists(jetbrainsSupportedSolutionFile))
-            {
-                File.Delete(jetbrainsSupportedSolutionFile);
-            }
+            ProcessHelper.Run("dotnet tool restore", solutionFile.Directory!.FullName, "Tool restore", quiet);
         }
+
+        ProcessHelper.Run(
+            $"""dotnet jb cleanupcode {solutionFile.FullName} --profile=".NET only" --no-build{includeArgument}""",
+            solutionFile.Directory!.FullName,
+            "Format",
+            quiet
+        );
     }
 
     private static void RunFrontendFormat(bool quiet)
@@ -166,96 +164,53 @@ private static void RunFrontendFormat(bool quiet)
         ProcessHelper.Run("npm run format", Configuration.ApplicationFolder, "Frontend format", quiet);
     }
 
-    private static void RunDeveloperCliFormat(bool noBuild, bool quiet)
+    private static void RunDeveloperCliFormat(bool noBuild, bool allFiles, bool quiet)
     {
         var solutionFile = new FileInfo(Path.Combine(Configuration.CliFolder, "DeveloperCli.slnx"));
 
         if (!quiet) AnsiConsole.MarkupLine("[blue]Running developer-cli code format...[/]");
 
-        if (!noBuild)
-        {
-            ProcessHelper.Run("dotnet tool restore", solutionFile.Directory!.FullName, "Tool restore", quiet);
-        }
-
-        // .slnx files are not yet supported by JetBrains tools, so we need to create a temporary .slnf file
-        var jetbrainsSupportedSolutionFile = CreateTemporaryJetBrainsCompatibleSolutionFile(solutionFile);
-        try
+        var includeArgument = string.Empty;
+        if (!allFiles)
         {
-            ProcessHelper.Run(
-                $"""dotnet jb cleanupcode {jetbrainsSupportedSolutionFile} --profile=".NET only" --no-build""",
-                solutionFile.Directory!.FullName,
-                "Format",
-                quiet
-            );
-        }
-        finally
-        {
-            if (File.Exists(jetbrainsSupportedSolutionFile))
+            var changedCsFiles = GetChangedCsFiles(solutionFile.Directory!.FullName);
+            if (changedCsFiles.Length == 0)
             {
-                File.Delete(jetbrainsSupportedSolutionFile);
+                if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping developer-cli format.[/]");
+                return;
             }
+
+            includeArgument = $""" --include="{string.Join(";", changedCsFiles)}" """.TrimEnd();
+            if (!quiet) AnsiConsole.MarkupLine($"[blue]Formatting {changedCsFiles.Length} changed file(s)...[/]");
         }
-    }
 
-    /// <summary>
-    ///     Creates a temporary Solution Filter (.slnf) file that JetBrains tools can work with.
-    /// </summary>
-    /// <remarks>
-    ///     This is a temporary workaround until JetBrains tools support the new .NET 9.2 .slnx format.
-    ///     The method extracts all projects from the .slnx file and creates a compatible .slnf file that can be used
-    ///     with the JetBrains cleanupcode tool, even if the soluition filter file points to the .slnx file.
-    ///     This method can be removed when JetBrains "dotnet jb cleanupcode" adds native support for the .slnx format.
-    /// </remarks>
-    /// <param name="solutionFile">The .slnx solution file</param>
-    /// <returns>Path to the temporary .slnf file</returns>
-    private static string CreateTemporaryJetBrainsCompatibleSolutionFile(FileInfo solutionFile)
-    {
-        // Create content following the official .NET Solution File structure
-        var solutionFilterFileContent = new
+        if (!noBuild)
         {
-            solution = new
-            {
-                path = solutionFile.FullName,
-                projects = ExtractProjectPathsFromSlnx(solutionFile)
-            }
-        };
-
-        // Create the temporary file path
-        var temporarySolutionFile = $"{Path.GetTempFileName()}.slnf";
+            ProcessHelper.Run("dotnet tool restore", solutionFile.Directory!.FullName, "Tool restore", quiet);
+        }
 
-        // Write the .slnf file
-        File.WriteAllText(
-            temporarySolutionFile,
-            JsonSerializer.Serialize(solutionFilterFileContent, new JsonSerializerOptions { WriteIndented = true })
+        ProcessHelper.Run(
+            $"""dotnet jb cleanupcode {solutionFile.FullName} --profile=".NET only" --no-build{includeArgument}""",
+            solutionFile.Directory!.FullName,
+            "Format",
+            quiet
         );
-
-        return temporarySolutionFile;
     }
 
-    private static List<string> ExtractProjectPathsFromSlnx(FileInfo solutionFile)
+    // Returns relative paths (relative to solutionDirectory) of .cs files changed compared to origin/main.
+    // Fetches origin/main first so this works on shallow CI clones; the fetch is best-effort and silent on failure.
+    private static string[] GetChangedCsFiles(string solutionDirectory)
     {
-        var projectPaths = new List<string>();
-
-        try
-        {
-            var xDocument = XDocument.Load(solutionFile.FullName);
-            var projectElements = xDocument.Descendants("Project");
-
-            foreach (var projectElement in projectElements)
-            {
-                var pathAttribute = projectElement.Attribute("Path");
-                if (pathAttribute is not null)
-                {
-                    projectPaths.Add(Path.Combine(solutionFile.Directory!.FullName, pathAttribute.Value));
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            AnsiConsole.MarkupLine($"[red]ERROR:[/] Failed to parse .slnx file: {ex.Message}");
-            Environment.Exit(1);
-        }
-
-        return projectPaths;
+        ProcessHelper.StartProcess("git fetch origin main --depth=1", Configuration.SourceCodeFolder, true, exitOnError: false);
+        var output = ProcessHelper.StartProcess("git diff --name-only origin/main -- \"*.cs\"", Configuration.SourceCodeFolder, true, exitOnError: false);
+        if (string.IsNullOrWhiteSpace(output)) return [];
+
+        var repoRoot = Configuration.SourceCodeFolder;
+        return output
+            .Split('\n', StringSplitOptions.RemoveEmptyEntries)
+            .Select(relativePath => Path.GetFullPath(Path.Combine(repoRoot, relativePath.Trim())))
+            .Where(fullPath => fullPath.StartsWith(solutionDirectory, StringComparison.OrdinalIgnoreCase) && File.Exists(fullPath))
+            .Select(fullPath => Path.GetRelativePath(solutionDirectory, fullPath))
+            .ToArray();
     }
 }

From 3496dca927011806c9691e3c9e8b591364a46b49 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 15:20:18 +0200
Subject: [PATCH 08/10] Add --changed-only to developer-cli lint command
 (opt-in) and rename detect-changes to detect-scope

---
 .claude/skills/lint/SKILL.md            | 22 ++++++++----
 .github/workflows/code-style.yml        | 28 ++++++++-------
 developer-cli/Commands/FormatCommand.cs | 20 ++---------
 developer-cli/Commands/LintCommand.cs   | 45 +++++++++++++++++++++----
 developer-cli/Utilities/GitHelper.cs    | 18 ++++++++++
 5 files changed, 89 insertions(+), 44 deletions(-)

diff --git a/.claude/skills/lint/SKILL.md b/.claude/skills/lint/SKILL.md
index 48bffa3b8e..78a0a34d31 100644
--- a/.claude/skills/lint/SKILL.md
+++ b/.claude/skills/lint/SKILL.md
@@ -6,7 +6,7 @@ description: Lint code via the developer CLI - backend (.NET via JetBrains inspe
 # Lint
 
 ```bash
-dotnet run --project developer-cli -- lint [--backend] [--frontend] [--cli] [--self-contained-system <name>] [--no-build] --quiet
+dotnet run --project developer-cli -- lint [--backend] [--frontend] [--cli] [--self-contained-system <name>] [--no-build] [--changed-only] --quiet
 ```
 
 Use `developer-cli` exactly as written - do not expand to an absolute worktree path.
@@ -16,18 +16,28 @@ Use `developer-cli` exactly as written - do not expand to an absolute worktree p
 - `--cli` - the developer CLI itself
 - `--self-contained-system <name>` - narrows backend linting to one SCS (e.g. `account`, `main`)
 - `--no-build` - skip the rebuild step (faster after a recent build)
+- `--changed-only` - lint only `.cs` files changed against `origin/main` (much faster; see guidance below)
 
-No arguments lints everything. Every finding fails CI regardless of severity - fix all of them.
+No arguments lints the whole solution. Every finding fails CI regardless of severity - fix all of them.
 
 After `build` succeeds, run `format`, `lint`, `test` in parallel with `--no-build`. Backend lint is slow - run last. Frontend lint often needs code rewrites - run after each bigger change.
 
+## When to use `--changed-only`
+
+Inspectcode has cross-file rules ("unused public method", "member can be private", flow analysis across method calls). `--changed-only` only inspects the listed files - it doesn't catch issues in untouched files that became invalid because of edits elsewhere.
+
+- **Routine work:** use `--changed-only`. Most lint findings are local (style, naming, hints) and the saving is large (~4m → ~30s).
+- **Larger changes that affect other files** (refactoring a public API, deleting a method's only caller, changing a widely-used type): omit `--changed-only` and lint the full solution.
+
+CI always lints the full solution, so anything missed by a local `--changed-only` run gets caught before merge.
+
 ## Examples
 
 ```bash
-dotnet run --project developer-cli -- lint --quiet                                          # everything
-dotnet run --project developer-cli -- lint --backend --quiet                                # all backend
-dotnet run --project developer-cli -- lint --frontend --quiet                               # frontend
-dotnet run --project developer-cli -- lint --backend --self-contained-system main --quiet   # one SCS
+dotnet run --project developer-cli -- lint --quiet                                                # everything (full solution)
+dotnet run --project developer-cli -- lint --backend --changed-only --quiet                       # backend, changed files only (recommended for routine work)
+dotnet run --project developer-cli -- lint --frontend --quiet                                     # frontend
+dotnet run --project developer-cli -- lint --backend --self-contained-system main --quiet         # one SCS, full
 ```
 
 ## Always pass --quiet
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 685710b917..a981cf0ae8 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -23,13 +23,14 @@ permissions:
   pull-requests: write
 
 jobs:
-  detect-changes:
-    name: Detect Changes
+  detect-scope:
+    name: Detect Scope
     runs-on: ubuntu-24.04
     outputs:
       backend_scope: ${{ steps.scope.outputs.backend_scope }}
       backend_label: ${{ steps.scope.outputs.backend_label }}
       format_all_files_flag: ${{ steps.scope.outputs.format_all_files_flag }}
+      format_label: ${{ steps.scope.outputs.format_label }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
@@ -82,8 +83,9 @@ jobs:
           fi
 
           # Force --all-files when the JetBrains tool manifest moves. Tool upgrades change the
-          # cleanupcode rule set, so latent formatting drift in untouched files needs reformatting
-          # in the same PR. Otherwise the next PR that happens to touch one of those files fails CI.
+          # inspectcode + cleanupcode rule sets, so latent issues in untouched files need to be
+          # caught in the same PR. Otherwise the next PR that happens to touch one of those files
+          # fails CI on issues it didn't introduce.
           if echo "$changed" | grep -q '^application/dotnet-tools.json$'; then
             echo "format_all_files_flag=--all-files" >> "$GITHUB_OUTPUT"
             echo "format_label=all files (JetBrains tools upgraded)" >> "$GITHUB_OUTPUT"
@@ -95,11 +97,11 @@ jobs:
       - name: Print Scope
         run: |
           echo "Backend scope - ${{ steps.scope.outputs.backend_label }}"
-          echo "Format scope  - ${{ steps.scope.outputs.format_label }}"
+          echo "Format mode   - ${{ steps.scope.outputs.format_label }}"
 
   code-linting:
     name: Code Linting
-    needs: detect-changes
+    needs: detect-scope
     runs-on: ubuntu-24.04
 
     steps:
@@ -130,12 +132,12 @@ jobs:
 
       - name: Build Backend Solution
         working-directory: developer-cli
-        run: dotnet run -- build --backend ${{ needs.detect-changes.outputs.backend_scope }} --quiet
+        run: dotnet run -- build --backend ${{ needs.detect-scope.outputs.backend_scope }} --quiet
 
       - name: Run Backend Linting
         working-directory: developer-cli
         run: |
-          dotnet run lint --backend ${{ needs.detect-changes.outputs.backend_scope }} --no-build | tee lint-output.log
+          dotnet run lint --backend ${{ needs.detect-scope.outputs.backend_scope }} --no-build | tee lint-output.log
 
           if ! grep -q "No backend issues found!" lint-output.log; then
             echo "Code linting issues found."
@@ -162,7 +164,7 @@ jobs:
 
   code-formatting:
     name: Code Formatting
-    needs: detect-changes
+    needs: detect-scope
     runs-on: ubuntu-24.04
 
     steps:
@@ -193,21 +195,21 @@ jobs:
 
       - name: Build Backend Solution
         working-directory: developer-cli
-        run: dotnet run -- build --backend ${{ needs.detect-changes.outputs.backend_scope }} --quiet
+        run: dotnet run -- build --backend ${{ needs.detect-scope.outputs.backend_scope }} --quiet
 
       - name: Check for Code Formatting Issues
         working-directory: developer-cli
         run: |
-          dotnet run format --backend ${{ needs.detect-changes.outputs.backend_scope }} ${{ needs.detect-changes.outputs.format_all_files_flag }} --no-build
+          dotnet run format --backend ${{ needs.detect-scope.outputs.backend_scope }} ${{ needs.detect-scope.outputs.format_all_files_flag }} --no-build
 
           git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --backend ${{ needs.detect-changes.outputs.backend_scope }} ${{ needs.detect-changes.outputs.format_all_files_flag }}' locally and commit the formatted code."
+            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --backend ${{ needs.detect-scope.outputs.backend_scope }} ${{ needs.detect-scope.outputs.format_all_files_flag }}' locally and commit the formatted code."
             exit 1
           }
 
   sonarcloud:
     name: SonarCloud Analysis
-    needs: detect-changes
+    needs: detect-scope
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/developer-cli/Commands/FormatCommand.cs b/developer-cli/Commands/FormatCommand.cs
index dbbd9fe8b0..6eeff2525b 100644
--- a/developer-cli/Commands/FormatCommand.cs
+++ b/developer-cli/Commands/FormatCommand.cs
@@ -134,7 +134,7 @@ private static void RunBackendFormat(string? selfContainedSystem, bool noBuild,
         var includeArgument = string.Empty;
         if (!allFiles)
         {
-            var changedCsFiles = GetChangedCsFiles(solutionFile.Directory!.FullName);
+            var changedCsFiles = GitHelper.GetChangedCsFilesInDirectory(solutionFile.Directory!.FullName);
             if (changedCsFiles.Length == 0)
             {
                 if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping backend format.[/]");
@@ -173,7 +173,7 @@ private static void RunDeveloperCliFormat(bool noBuild, bool allFiles, bool quie
         var includeArgument = string.Empty;
         if (!allFiles)
         {
-            var changedCsFiles = GetChangedCsFiles(solutionFile.Directory!.FullName);
+            var changedCsFiles = GitHelper.GetChangedCsFilesInDirectory(solutionFile.Directory!.FullName);
             if (changedCsFiles.Length == 0)
             {
                 if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping developer-cli format.[/]");
@@ -197,20 +197,4 @@ private static void RunDeveloperCliFormat(bool noBuild, bool allFiles, bool quie
         );
     }
 
-    // Returns relative paths (relative to solutionDirectory) of .cs files changed compared to origin/main.
-    // Fetches origin/main first so this works on shallow CI clones; the fetch is best-effort and silent on failure.
-    private static string[] GetChangedCsFiles(string solutionDirectory)
-    {
-        ProcessHelper.StartProcess("git fetch origin main --depth=1", Configuration.SourceCodeFolder, true, exitOnError: false);
-        var output = ProcessHelper.StartProcess("git diff --name-only origin/main -- \"*.cs\"", Configuration.SourceCodeFolder, true, exitOnError: false);
-        if (string.IsNullOrWhiteSpace(output)) return [];
-
-        var repoRoot = Configuration.SourceCodeFolder;
-        return output
-            .Split('\n', StringSplitOptions.RemoveEmptyEntries)
-            .Select(relativePath => Path.GetFullPath(Path.Combine(repoRoot, relativePath.Trim())))
-            .Where(fullPath => fullPath.StartsWith(solutionDirectory, StringComparison.OrdinalIgnoreCase) && File.Exists(fullPath))
-            .Select(fullPath => Path.GetRelativePath(solutionDirectory, fullPath))
-            .ToArray();
-    }
 }
diff --git a/developer-cli/Commands/LintCommand.cs b/developer-cli/Commands/LintCommand.cs
index 1d8e0195d5..7be89c167a 100644
--- a/developer-cli/Commands/LintCommand.cs
+++ b/developer-cli/Commands/LintCommand.cs
@@ -16,6 +16,7 @@ public class LintCommand : Command
         var cliOption = new Option<bool>("--cli", "-c") { Description = "Run developer-cli linting" };
         var selfContainedSystemOption = new Option<string?>("<self-contained-system>", "--self-contained-system", "-s") { Description = "The name of the self-contained system to lint (e.g., main, account, back-office)" };
         var noBuildOption = new Option<bool>("--no-build") { Description = "Skip building and restoring the solution before running linting" };
+        var changedOnlyOption = new Option<bool>("--changed-only") { Description = "Lint only .cs files changed against origin/main. Default is to lint the full solution. Recommended for routine local runs; CI always lints the full solution." };
         var quietOption = new Option<bool>("--quiet", "-q") { Description = "Minimal output mode" };
 
         Options.Add(backendOption);
@@ -23,6 +24,7 @@ public class LintCommand : Command
         Options.Add(cliOption);
         Options.Add(selfContainedSystemOption);
         Options.Add(noBuildOption);
+        Options.Add(changedOnlyOption);
         Options.Add(quietOption);
 
         SetAction(parseResult => Execute(
@@ -31,12 +33,13 @@ public class LintCommand : Command
                 parseResult.GetValue(cliOption),
                 parseResult.GetValue(selfContainedSystemOption),
                 parseResult.GetValue(noBuildOption),
+                parseResult.GetValue(changedOnlyOption),
                 parseResult.GetValue(quietOption)
             )
         );
     }
 
-    private static void Execute(bool backend, bool frontend, bool developerCli, string? selfContainedSystem, bool noBuild, bool quiet)
+    private static void Execute(bool backend, bool frontend, bool developerCli, string? selfContainedSystem, bool noBuild, bool changedOnly, bool quiet)
     {
         var noFlags = !backend && !frontend && !developerCli;
         var lintBackend = backend || noFlags;
@@ -54,7 +57,7 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
             if (lintBackend)
             {
                 Prerequisite.Ensure(Prerequisite.Dotnet);
-                hasIssues = RunBackendLinting(selfContainedSystem, noBuild, quiet);
+                hasIssues = RunBackendLinting(selfContainedSystem, noBuild, changedOnly, quiet);
                 backendTime = Stopwatch.GetElapsedTime(startTime);
             }
 
@@ -69,7 +72,7 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
             if (lintDeveloperCli)
             {
                 Prerequisite.Ensure(Prerequisite.Dotnet);
-                var developerCliHasIssues = RunDeveloperCliLinting(noBuild, quiet);
+                var developerCliHasIssues = RunDeveloperCliLinting(noBuild, changedOnly, quiet);
                 hasIssues = hasIssues || developerCliHasIssues;
                 developerCliTime = Stopwatch.GetElapsedTime(startTime) - backendTime - frontendTime;
             }
@@ -119,10 +122,24 @@ private static void Execute(bool backend, bool frontend, bool developerCli, stri
         }
     }
 
-    private static bool RunBackendLinting(string? selfContainedSystem, bool noBuild, bool quiet)
+    private static bool RunBackendLinting(string? selfContainedSystem, bool noBuild, bool changedOnly, bool quiet)
     {
         var solutionFile = SelfContainedSystemHelper.GetSolutionFile(selfContainedSystem);
 
+        var includeArgument = string.Empty;
+        if (changedOnly)
+        {
+            var changedCsFiles = GitHelper.GetChangedCsFilesInDirectory(solutionFile.Directory!.FullName);
+            if (changedCsFiles.Length == 0)
+            {
+                if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping backend linting.[/]");
+                return false;
+            }
+
+            includeArgument = $""" --include="{string.Join(";", changedCsFiles)}" """.TrimEnd();
+            if (!quiet) AnsiConsole.MarkupLine($"[blue]Linting {changedCsFiles.Length} changed file(s)...[/]");
+        }
+
         if (!noBuild)
         {
             if (!quiet) AnsiConsole.MarkupLine("[blue]Running backend code linting...[/]");
@@ -142,7 +159,7 @@ private static bool RunBackendLinting(string? selfContainedSystem, bool noBuild,
         // but those attributes are mandatory for cross-client email rendering and cannot be removed.
         // The dist folder is gitignored build output, not source.
         ProcessHelper.Run(
-            $"dotnet jb inspectcode {solutionFile.Name} --no-build --no-restore --output=result.json --severity=SUGGESTION --exclude=**/emails/dist/**",
+            $"dotnet jb inspectcode {solutionFile.Name} --no-build --no-restore --output=result.json --severity=SUGGESTION --exclude=**/emails/dist/**{includeArgument}",
             solutionFile.Directory!.FullName,
             "Linting",
             quiet
@@ -229,10 +246,24 @@ private static bool CheckMissingTranslations(bool quiet)
         return true;
     }
 
-    private static bool RunDeveloperCliLinting(bool noBuild, bool quiet)
+    private static bool RunDeveloperCliLinting(bool noBuild, bool changedOnly, bool quiet)
     {
         var solutionFile = new FileInfo(Path.Combine(Configuration.CliFolder, "DeveloperCli.slnx"));
 
+        var includeArgument = string.Empty;
+        if (changedOnly)
+        {
+            var changedCsFiles = GitHelper.GetChangedCsFilesInDirectory(solutionFile.Directory!.FullName);
+            if (changedCsFiles.Length == 0)
+            {
+                if (!quiet) AnsiConsole.MarkupLine("[green]No changed C# files found, skipping developer-cli linting.[/]");
+                return false;
+            }
+
+            includeArgument = $""" --include="{string.Join(";", changedCsFiles)}" """.TrimEnd();
+            if (!quiet) AnsiConsole.MarkupLine($"[blue]Linting {changedCsFiles.Length} changed file(s)...[/]");
+        }
+
         if (!noBuild)
         {
             if (!quiet) AnsiConsole.MarkupLine("[blue]Running developer-cli code linting...[/]");
@@ -248,7 +279,7 @@ private static bool RunDeveloperCliLinting(bool noBuild, bool quiet)
         }
 
         ProcessHelper.Run(
-            $"dotnet jb inspectcode {solutionFile.Name} --no-build --no-restore --output=result.json --severity=SUGGESTION",
+            $"dotnet jb inspectcode {solutionFile.Name} --no-build --no-restore --output=result.json --severity=SUGGESTION{includeArgument}",
             solutionFile.Directory!.FullName,
             "Linting",
             quiet
diff --git a/developer-cli/Utilities/GitHelper.cs b/developer-cli/Utilities/GitHelper.cs
index dffa6674aa..008bad1c83 100644
--- a/developer-cli/Utilities/GitHelper.cs
+++ b/developer-cli/Utilities/GitHelper.cs
@@ -141,6 +141,24 @@ public static void FetchFromOrigin()
         ProcessHelper.StartProcess("git fetch origin", Configuration.SourceCodeFolder);
     }
 
+    // Returns relative paths (relative to solutionDirectory) of .cs files changed compared to
+    // origin/main. Fetches origin/main first so this works on shallow CI clones; the fetch is
+    // best-effort and silent on failure.
+    public static string[] GetChangedCsFilesInDirectory(string solutionDirectory)
+    {
+        ProcessHelper.StartProcess("git fetch origin main --depth=1", Configuration.SourceCodeFolder, true, exitOnError: false);
+        var output = ProcessHelper.StartProcess("git diff --name-only origin/main -- \"*.cs\"", Configuration.SourceCodeFolder, true, exitOnError: false);
+        if (string.IsNullOrWhiteSpace(output)) return [];
+
+        var repoRoot = Configuration.SourceCodeFolder;
+        return output
+            .Split('\n', StringSplitOptions.RemoveEmptyEntries)
+            .Select(relativePath => Path.GetFullPath(Path.Combine(repoRoot, relativePath.Trim())))
+            .Where(fullPath => fullPath.StartsWith(solutionDirectory, StringComparison.OrdinalIgnoreCase) && File.Exists(fullPath))
+            .Select(fullPath => Path.GetRelativePath(solutionDirectory, fullPath))
+            .ToArray();
+    }
+
     public static void StashChanges(string message = "Stashed by Developer CLI")
     {
         ProcessHelper.StartProcess($"git stash push -m \"{message}\"", Configuration.SourceCodeFolder);

From ff348942a3199ff7565616e1bd34c7278a0be289 Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 15:26:27 +0200
Subject: [PATCH 09/10] Add frontend formatting check to Code Formatting job

---
 .github/workflows/code-style.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index a981cf0ae8..e7d74d8c8c 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -152,16 +152,6 @@ jobs:
         working-directory: developer-cli
         run: dotnet run -- lint --frontend
 
-      - name: Run Frontend Format Check
-        working-directory: developer-cli
-        run: |
-          dotnet run -- format --frontend
-
-          git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --frontend' locally and commit the formatted code."
-            exit 1
-          }
-
   code-formatting:
     name: Code Formatting
     needs: detect-scope
@@ -197,7 +187,7 @@ jobs:
         working-directory: developer-cli
         run: dotnet run -- build --backend ${{ needs.detect-scope.outputs.backend_scope }} --quiet
 
-      - name: Check for Code Formatting Issues
+      - name: Check for Backend Formatting Issues
         working-directory: developer-cli
         run: |
           dotnet run format --backend ${{ needs.detect-scope.outputs.backend_scope }} ${{ needs.detect-scope.outputs.format_all_files_flag }} --no-build
@@ -207,6 +197,20 @@ jobs:
             exit 1
           }
 
+      - name: Build Frontend Artifacts
+        working-directory: application
+        run: npm run build
+
+      - name: Check for Frontend Formatting Issues
+        working-directory: developer-cli
+        run: |
+          dotnet run -- format --frontend
+
+          git diff --exit-code || {
+            echo "Formatting issues detected. Please run 'dotnet run --project developer-cli -- format --frontend' locally and commit the formatted code."
+            exit 1
+          }
+
   sonarcloud:
     name: SonarCloud Analysis
     needs: detect-scope

From 9587ec57a575c74ddd32c502292c5bcf7cae896a Mon Sep 17 00:00:00 2001
From: Thomas Jespersen <tje@platformplatform.net>
Date: Thu, 14 May 2026 15:30:15 +0200
Subject: [PATCH 10/10] Drop trailing blank line in FormatCommand left over
 from helper extraction

---
 developer-cli/Commands/FormatCommand.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/developer-cli/Commands/FormatCommand.cs b/developer-cli/Commands/FormatCommand.cs
index 6eeff2525b..c78b906733 100644
--- a/developer-cli/Commands/FormatCommand.cs
+++ b/developer-cli/Commands/FormatCommand.cs
@@ -196,5 +196,4 @@ private static void RunDeveloperCliFormat(bool noBuild, bool allFiles, bool quie
             quiet
         );
     }
-
 }