From 2d4e4eaa5317f3f553f1bfe508880b415a630fa1 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Thu, 27 Aug 2026 22:02:25 -0500
Subject: [PATCH 01/43] Harden guided tours and usage reporting

---
 .../Models/Data/ProductTourProgress.cs        |  22 ++
 src/Exceptionless.Core/Models/User.cs         |   2 +
 .../Api/Endpoints/AdminEndpoints.cs           |  15 +
 .../Api/Endpoints/UserEndpoints.cs            |  22 ++
 .../Api/Handlers/AdminHandler.cs              | 139 +++++++
 .../Api/Handlers/UserHandler.cs               |  52 ++-
 .../Api/Messages/AdminMessages.cs             |   1 +
 .../Api/Messages/UserMessages.cs              |   1 +
 .../ClientApp/e2e/fixtures/api-client.ts      |   9 +
 .../ClientApp/e2e/fixtures/e2e-test.ts        |   8 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 271 ++++++++++++++
 .../ClientApp/package-lock.json               |   7 +
 src/Exceptionless.Web/ClientApp/package.json  |   1 +
 .../src/lib/features/admin/api.svelte.ts      |  25 ++
 .../src/lib/features/admin/models.ts          |   2 +
 .../components/assistant-panel.svelte         |   1 +
 .../events/components/events-overview.svelte  | 195 +++++-----
 .../components/investigation-list-tour.svelte |  29 ++
 .../features/product-tours/actions.svelte.ts  |  58 +++
 .../features/product-tours/catalog.test.ts    |  47 +++
 .../src/lib/features/product-tours/catalog.ts |  93 +++++
 .../product-tour-catalog-dialog.svelte        |  50 +++
 .../product-tour-welcome-dialog.svelte        |  48 +++
 ...product-tour-welcome-dialog.svelte.test.ts |  41 +++
 .../product-tour-feature-announcement.svelte  |  44 +++
 .../components/product-tour-host.svelte       | 275 ++++++++++++++
 .../product-tour-inline-callout.svelte        |  30 ++
 .../product-tour-shell-spotlight.svelte       | 119 ++++++
 .../components/product-tour-spotlight.svelte  |  74 ++++
 .../product-tours/eligibility.test.ts         |  24 ++
 .../lib/features/product-tours/eligibility.ts |   9 +
 .../product-tours/session.svelte.test.ts      |  42 +++
 .../src/lib/features/product-tours/session.ts |  66 ++++
 .../product-tours/state.svelte.test.ts        |  36 ++
 .../features/product-tours/state.svelte.ts    |  66 ++++
 .../features/product-tours/telemetry.test.ts  |  13 +
 .../lib/features/product-tours/telemetry.ts   |  16 +
 .../src/lib/features/product-tours/types.ts   |  56 +++
 .../src/lib/features/projects/api.svelte.ts   |   3 +-
 .../components/save-view-dialog.svelte        | 104 +++++-
 .../components/saved-view-picker.svelte       | 119 +++++-
 .../components/ui/sidebar/sidebar.svelte      |   1 +
 .../stacks/components/stack-card.svelte       |  11 +-
 .../src/lib/features/users/api.svelte.ts      |  46 ++-
 .../src/lib/features/users/models.ts          |  10 +-
 .../ClientApp/src/lib/generated/api.ts        |  67 ++++
 .../ClientApp/src/lib/generated/schemas.ts    |  67 ++++
 .../(app)/(components)/layouts/navbar.svelte  |   4 +-
 .../(components)/layouts/sidebar-user.svelte  |  20 +-
 .../(app)/(components)/layouts/sidebar.svelte |   4 +-
 .../(components)/navigation-command.svelte    |  31 ++
 .../navigation-command.svelte.test.ts         |  48 +++
 .../ClientApp/src/routes/(app)/+layout.svelte | 107 +++++-
 .../src/routes/(app)/event/+page.svelte       | 135 +++----
 .../event/[eventId=objectid]/+page.svelte     |   1 +
 .../src/routes/(app)/event/query-filters.ts   |  70 ++++
 .../(app)/organization/add/+page.svelte       |  40 +-
 .../[projectId]/configure/+page.svelte        |  87 ++++-
 .../src/routes/(app)/project/add/+page.svelte |  24 +-
 .../(app)/system/product-tours/+page.svelte   | 154 ++++++++
 .../src/routes/(app)/system/routes.svelte.ts  |   8 +
 .../Admin/AdminProductTourUsageResponse.cs    |  28 ++
 .../Models/Admin/ProductTourUsageSource.cs    |  44 +++
 .../Models/User/UpdateProductTourProgress.cs  |  14 +
 .../Models/User/ViewCurrentUser.cs            |  12 +-
 .../Api/Data/endpoint-manifest.json           |  26 ++
 .../Exceptionless.Tests/Api/Data/openapi.json | 343 +++++++++++++++++-
 .../AdminProductTourUsageEndpointTests.cs     | 135 +++++++
 .../Api/Endpoints/OAuthGrantEndpointTests.cs  | 280 ++++++++++++++
 .../Api/Endpoints/ProductTourEndpointTests.cs | 180 +++++++++
 .../Api/Endpoints/UserEndpointTests.cs        | 251 -------------
 .../Api/OpenApiSnapshotTests.cs               |  31 ++
 .../Serializer/Models/UserSerializerTests.cs  |  55 +++
 tests/http/admin.http                         |   4 +
 tests/http/users.http                         |  10 +
 75 files changed, 4109 insertions(+), 474 deletions(-)
 create mode 100644 src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
 create mode 100644 src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
 create mode 100644 src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
 create mode 100644 src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs
 create mode 100644 src/Exceptionless.Web/Models/User/UpdateProductTourProgress.cs
 create mode 100644 tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
 create mode 100644 tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs
 create mode 100644 tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs

diff --git a/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs b/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
new file mode 100644
index 0000000000..fbcf95fd89
--- /dev/null
+++ b/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
@@ -0,0 +1,22 @@
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+
+namespace Exceptionless.Core.Models.Data;
+
+public record ProductTourProgress
+{
+    public ProductTourStatus Status { get; set; }
+    public DateTime UpdatedUtc { get; set; }
+    public int Version { get; set; }
+}
+
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum ProductTourStatus
+{
+    [JsonStringEnumMemberName("completed")]
+    [EnumMember(Value = "completed")]
+    Completed,
+    [JsonStringEnumMemberName("dismissed")]
+    [EnumMember(Value = "dismissed")]
+    Dismissed
+}
diff --git a/src/Exceptionless.Core/Models/User.cs b/src/Exceptionless.Core/Models/User.cs
index 8168c0302e..d11525d864 100644
--- a/src/Exceptionless.Core/Models/User.cs
+++ b/src/Exceptionless.Core/Models/User.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations;
 using Exceptionless.Core.Attributes;
+using Exceptionless.Core.Models.Data;
 using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Core.Models;
@@ -25,6 +26,7 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     public ICollection<OAuthAccount> OAuthAccounts { get; init; } = new Collection<OAuthAccount>();
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; init; } = new Collection<UserOrganizationPreference>();
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; init; } = new Collection<UserSavedViewOrderPreference>();
+    public IDictionary<string, ProductTourProgress> ProductTours { get; init; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
 
     /// <summary>
     /// Gets or sets the users Full Name.
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index 7d6bbbbfe4..22bce2dc6e 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -87,6 +87,14 @@ public static IEndpointRouteBuilder MapAdminEndpoints(this IEndpointRouteBuilder
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status403Forbidden);
 
+        endpoints.MapGet("api/v2/admin/product-tour-usage", GetProductTourUsageAsync)
+            .RequireAuthorization(AuthorizationRoles.GlobalAdminPolicy)
+            .AddEndpointFilter<AutoValidationEndpointFilter>()
+            .Produces<AdminProductTourUsageResponse>(StatusCodes.Status200OK)
+            .ProducesProblem(StatusCodes.Status400BadRequest)
+            .Produces(StatusCodes.Status401Unauthorized)
+            .Produces(StatusCodes.Status403Forbidden);
+
         group.MapPost("change-plan", async (HttpContext httpContext, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper, string organizationId, string planId)
             => (await mediator.InvokeAsync<Result<object>>(new AdminChangePlan(organizationId, planId, httpContext))).ToHttpResult(resultMapper));
 
@@ -130,4 +138,11 @@ private static EventSubmissionSettings CreateEventSubmissionSettings(bool? enabl
         bool configuredEnabled = !appOptions.EventSubmissionDisabled;
         return new EventSubmissionSettings(enabledOverride ?? configuredEnabled, configuredEnabled, enabledOverride.HasValue);
     }
+
+    private static async Task<HttpIResult> GetProductTourUsageAsync(
+        IMediator mediator,
+        IMediatorResultMapper<HttpIResult> resultMapper,
+        DateTime? month = null,
+        int limit = 100)
+        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, limit))).ToHttpResult(resultMapper);
 }
diff --git a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
index 44ce3acd29..c82519ed57 100644
--- a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
@@ -1,4 +1,5 @@
 using Exceptionless.Core.Authorization;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Extensions;
 using Exceptionless.Web.Api.Filters;
 using Exceptionless.Web.Api.Infrastructure;
@@ -37,6 +38,27 @@ public static IEndpointRouteBuilder MapUserEndpoints(this IEndpointRouteBuilder
             }
         });
 
+        group.MapPut("users/me/product-tours/{tourName:regex(^[a-z0-9]+(?:-[a-z0-9]+)*$):maxlength(64)}", async (string tourName, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper, [FromBody] UpdateProductTourProgress progress)
+            => (await mediator.InvokeAsync<Result<ProductTourProgress>>(new UserMessages.UpdateCurrentUserProductTour(tourName, progress))).ToHttpResult(resultMapper))
+        .Accepts<UpdateProductTourProgress>(false, "application/json", "application/*+json")
+        .Produces<ProductTourProgress>()
+        .ProducesProblem(StatusCodes.Status400BadRequest)
+        .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
+        .ProducesProblem(StatusCodes.Status404NotFound)
+        .WithSummary("Update current user product tour progress")
+        .WithMetadata(new EndpointDocumentation {
+            RequestBodyDescription = "The versioned product tour outcome.",
+            RequestBodyRequired = true,
+            ParameterDescriptions = new() {
+                ["tourName"] = "The stable product tour name.",
+            },
+            ResponseDescriptions = new() {
+                ["400"] = "The request body is missing or malformed.",
+                ["422"] = "The product tour progress is invalid.",
+                ["404"] = "The current user could not be found.",
+            }
+        });
+
         group.MapGet("users/me/oauth-grants", async (IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
             => (await mediator.InvokeAsync<Result<IReadOnlyCollection<ViewOAuthGrant>>>(new UserMessages.GetCurrentUserOAuthGrants())).ToHttpResult(resultMapper))
         .Produces<IReadOnlyCollection<ViewOAuthGrant>>()
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 0fe5e82b12..3d5e49e9e3 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -1,3 +1,4 @@
+using Elastic.Clients.Elasticsearch.QueryDsl;
 using Exceptionless.Core;
 using Exceptionless.Core.Billing;
 using Exceptionless.Core.Extensions;
@@ -17,6 +18,8 @@
 using Foundatio.Queues;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Migrations;
+using Foundatio.Repositories.Models;
+using Foundatio.Serializer;
 using Foundatio.Storage;
 using Foundatio.Mediator;
 
@@ -38,9 +41,11 @@ public class AdminHandler(
     BillingPlans plans,
     IMigrationStateRepository migrationStateRepository,
     SampleDataService sampleDataService,
+    ITextSerializer serializer,
     TimeProvider timeProvider,
     ILoggerFactory loggerFactory)
 {
+    private const string ProductTourSourceField = EventIndex.Alias.Source + ".keyword";
     private readonly ILogger _logger = loggerFactory.CreateLogger<AdminHandler>();
 
     [HandlerEndpoint(HandlerMethod.Get, "settings", Group = "Admin")]
@@ -134,6 +139,86 @@ public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
             rows.Take(limit).ToArray());
     }
 
+    public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
+    {
+        var requestedMonth = message.Month ?? timeProvider.GetUtcNow().UtcDateTime;
+        var month = new DateTime(requestedMonth.Year, requestedMonth.Month, 1, 0, 0, 0, DateTimeKind.Utc);
+        var nextMonth = month.AddMonths(1);
+        int limit = Math.Clamp(message.Limit, 1, 500);
+
+        var countTask = eventRepository.CountAsync((IRepositoryQuery<PersistentEvent> query) => ApplyProductTourUsageFilter(query, month, nextMonth)
+            .AggregationsExpression("terms:(source~500 sum:count~1 max:date)"));
+        var recentTask = eventRepository.FindAsync(query => ApplyProductTourUsageFilter(query, month, nextMonth)
+            .SortDescending(ev => ev.Date), options => options.PageLimit(500));
+
+        await Task.WhenAll(countTask, recentTask);
+
+        var sourceBuckets = (await countTask).Aggregations.Terms<string>("terms_source")?.Buckets ?? [];
+        var parsedBuckets = sourceBuckets
+            .Select(bucket => ProductTourUsageSource.TryParse(bucket.Key, out var source)
+                ? new ProductTourUsageBucket(source, Convert.ToInt64(bucket.Aggregations.Sum("sum_count")?.Value ?? bucket.Total ?? 0), bucket.Aggregations.Max<DateTime>("max_date")?.Value)
+                : null)
+            .OfType<ProductTourUsageBucket>()
+            .ToArray();
+
+        var groupedBuckets = parsedBuckets.GroupBy(bucket => bucket.Source.TourName, StringComparer.Ordinal).ToArray();
+        string[] tourNames = groupedBuckets.Select(group => group.Key).ToArray();
+        Task<CountResult>[] uniqueUserTasks = groupedBuckets
+            .Select(group => eventRepository.CountAsync((IRepositoryQuery<PersistentEvent> query) => ApplyProductTourUsageFilter(
+                    query,
+                    month,
+                    nextMonth,
+                    group.Select(bucket => bucket.Source.Raw).ToArray())
+                .AggregationsExpression("cardinality:user")))
+            .ToArray();
+        CountResult[] uniqueUserResults = await Task.WhenAll(uniqueUserTasks);
+        var uniqueUsersByTour = tourNames
+            .Zip(uniqueUserResults, (tourName, result) => new
+            {
+                TourName = tourName,
+                UniqueUsers = Convert.ToInt64(result.Aggregations.Cardinality("cardinality_user")?.Value ?? 0)
+            })
+            .ToDictionary(item => item.TourName, item => item.UniqueUsers, StringComparer.Ordinal);
+
+        var tours = groupedBuckets
+            .Select(group =>
+            {
+                long shown = SumEvent(group, ProductTourUsageSource.ShownEvent);
+                long started = SumEvent(group, ProductTourUsageSource.StartedEvent);
+                long completed = SumEvent(group, ProductTourUsageSource.CompletedEvent);
+                long dismissed = SumEvent(group, ProductTourUsageSource.DismissedEvent);
+                long decisionDenominator = started > 0 ? started : shown;
+                long uniqueUsers = uniqueUsersByTour[group.Key];
+                DateTime? lastRunUtc = group.Select(bucket => bucket.LastUtc).Max();
+
+                return new AdminProductTourSummary(
+                    group.Key,
+                    shown,
+                    started,
+                    completed,
+                    dismissed,
+                    uniqueUsers,
+                    lastRunUtc,
+                    CalculateRate(completed, decisionDenominator),
+                    CalculateRate(dismissed, decisionDenominator));
+            })
+            .OrderByDescending(tour => tour.Started)
+            .ThenBy(tour => tour.Name, StringComparer.Ordinal)
+            .ToArray();
+
+        var recentActivity = (await recentTask).Documents
+            .Select(ev => ProductTourUsageSource.TryParse(ev.Source, out var source) ? CreateActivity(ev, source) : null)
+            .OfType<AdminProductTourActivity>()
+            .Take(limit)
+            .ToArray();
+
+        return new AdminProductTourUsageResponse(
+            month,
+            !String.IsNullOrWhiteSpace(appOptions.ExceptionlessApiKey),
+            tours,
+            recentActivity);
+    }
+
     [HandlerEndpoint(HandlerMethod.Get, "migrations", Group = "Admin")]
     public async Task<Result<object>> Handle(GetAdminMigrations message)
     {
@@ -172,6 +257,60 @@ public Task<Result<object>> Handle(GetAdminEcho message)
         });
     }
 
+    private AdminProductTourActivity CreateActivity(PersistentEvent ev, ProductTourUsageSource source)
+    {
+        var user = ev.GetUserIdentity(serializer, _logger);
+        return new AdminProductTourActivity(
+            ev.Date.UtcDateTime,
+            source.Event,
+            source.LaunchSource,
+            source.TourName,
+            user?.Identity,
+            user?.Name,
+            source.Version,
+            ev.Count ?? 1);
+    }
+
+    private static decimal? CalculateRate(long value, long denominator)
+    {
+        return denominator > 0 ? Decimal.Round(value / (decimal)denominator, 4) : null;
+    }
+
+    private static long SumEvent(IEnumerable<ProductTourUsageBucket> buckets, string eventName)
+    {
+        return buckets.Where(bucket => String.Equals(bucket.Source.Event, eventName, StringComparison.Ordinal)).Sum(bucket => bucket.Count);
+    }
+
+    private IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
+        IRepositoryQuery<PersistentEvent> query,
+        DateTime utcStart,
+        DateTime utcEnd,
+        IReadOnlyCollection<string>? sources = null)
+    {
+        query
+            .Project(appOptions.InternalProjectId)
+            .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
+            .DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date)
+            .Index(utcStart, utcEnd);
+
+        if (sources is null)
+        {
+            return query.ElasticFilter(new PrefixQuery
+            {
+                Field = ProductTourSourceField,
+                Value = ProductTourUsageSource.Prefix
+            });
+        }
+
+        return query.ElasticFilter(new TermsQuery
+        {
+            Field = ProductTourSourceField,
+            Terms = new TermsQueryField(sources.Select(source => (Elastic.Clients.Elasticsearch.FieldValue)source).ToArray())
+        });
+    }
+
+    private sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
+
     [HandlerEndpoint(HandlerMethod.Get, "assemblies", Group = "Admin")]
     public Task<Result<object>> Handle(GetAdminAssemblies message)
     {
diff --git a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
index 8a517f525d..8d9f88675d 100644
--- a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
@@ -3,6 +3,7 @@
 using Exceptionless.Core.Extensions;
 using Exceptionless.Core.Mail;
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories;
 using Exceptionless.DateTimeExtensions;
 using Exceptionless.Web.Api.Infrastructure;
@@ -14,8 +15,9 @@
 using Exceptionless.Web.Models.OAuth;
 using Exceptionless.Web.Utility;
 using Foundatio.Caching;
-using Foundatio.Repositories;
 using Foundatio.Mediator;
+using Foundatio.Repositories;
+using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Web.Api.Handlers;
 
@@ -33,6 +35,7 @@ public class UserHandler(
     IHttpContextAccessor httpContextAccessor,
     ILoggerFactory loggerFactory)
 {
+    private const int MaximumProductTours = 32;
     private readonly ICacheClient _cache = new ScopedCacheClient(cacheClient, "User");
     private readonly ILogger _logger = loggerFactory.CreateLogger<UserHandler>();
     private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
@@ -49,6 +52,53 @@ public async Task<Result<ViewCurrentUser>> Handle(GetCurrentUser message)
         };
     }
 
+    public async Task<Result<ProductTourProgress>> Handle(UpdateCurrentUserProductTour message)
+    {
+        bool maximumExceeded = false;
+        ProductTourProgress? progress = null;
+        await repository.PatchAsync(
+            GetCurrentUserId(),
+            new ActionPatch<User>(user =>
+            {
+                user.ProductTours.TryGetValue(message.TourName, out var currentProgress);
+                if (currentProgress is null && user.ProductTours.Count >= MaximumProductTours)
+                {
+                    maximumExceeded = true;
+                    return false;
+                }
+
+                if (!ShouldUpdateProductTourProgress(currentProgress, message.Progress))
+                {
+                    progress = currentProgress;
+                    return false;
+                }
+
+                progress = new ProductTourProgress
+                {
+                    Status = message.Progress.Status!.Value,
+                    UpdatedUtc = timeProvider.GetUtcNow().UtcDateTime,
+                    Version = message.Progress.Version
+                };
+                user.ProductTours[message.TourName] = progress;
+                return true;
+            }),
+            options => options.Cache());
+
+        if (maximumExceeded)
+            return Result.Invalid(ValidationError.Create("tour_name", $"A user cannot track more than {MaximumProductTours} product tours."));
+
+        return progress is null ? Result.NotFound("User not found.") : progress;
+    }
+
+    private static bool ShouldUpdateProductTourProgress(ProductTourProgress? current, UpdateProductTourProgress requested)
+    {
+        return current is null
+            || requested.Version > current.Version
+            || (requested.Version == current.Version
+                && current.Status is ProductTourStatus.Dismissed
+                && requested.Status is ProductTourStatus.Completed);
+    }
+
     public async Task<Result<IReadOnlyCollection<ViewOAuthGrant>>> Handle(GetCurrentUserOAuthGrants message)
     {
         var tokens = new List<OAuthToken>();
diff --git a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
index df738edd85..43f3144691 100644
--- a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
@@ -3,6 +3,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetAdminSettings;
 public record GetAdminStats;
 public record GetAdminAssistantUsage(DateTime? Month, int Limit, HttpContext Context);
+public record GetAdminProductTourUsage(DateTime? Month, int Limit);
 public record GetAdminMigrations;
 public record GetAdminEcho(HttpContext Context);
 public record GetAdminAssemblies;
diff --git a/src/Exceptionless.Web/Api/Messages/UserMessages.cs b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
index 7cc329710b..7973ceae86 100644
--- a/src/Exceptionless.Web/Api/Messages/UserMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
@@ -6,6 +6,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetCurrentUser;
 public record GetCurrentUserOAuthGrants;
 public record RevokeCurrentUserOAuthGrant(string Id);
+public record UpdateCurrentUserProductTour(string TourName, UpdateProductTourProgress Progress);
 public record GetUserById(string Id);
 public record GetUsersByOrganization(string OrganizationId, int Page, int Limit);
 public record UpdateUserMessage(string Id, Delta<UpdateUser> Changes);
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
index 8b3f0f6eaf..1451c7f25c 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
@@ -309,6 +309,15 @@ export class E2EApiClient {
         await expectStatus(response, [202], 'submit event');
     }
 
+    async updateProductTour(token: string, tourName: string, version: number, status: 'completed' | 'dismissed'): Promise<void> {
+        const response = await this.request.put(this.url(`users/me/product-tours/${tourName}`), {
+            data: { status, version },
+            headers: this.authHeaders(token)
+        });
+
+        await expectStatus(response, [200], 'update product tour');
+    }
+
     async waitForCurrentUserDeleted(token: string, timeoutMs = 30_000): Promise<void> {
         await waitForCondition(
             async () => !(await this.getCurrentUser(token)),
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
index 154144230d..380578c279 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
@@ -43,6 +43,7 @@ export interface E2ESecondaryProject {
 interface E2EFixtures {
     e2eApi: E2EApiClient;
     e2eCleanupPassword: string;
+    e2eDismissProductTourWelcome: boolean;
     e2eScenario: E2EScenario;
     e2eSecondaryOrganization: E2ESecondaryOrganization;
     e2eSecondaryProject: E2ESecondaryProject;
@@ -57,7 +58,9 @@ export const test = base.extend<E2EFixtures>({
 
     e2eCleanupPassword: [E2E_TEST_PASSWORD, { option: true }],
 
-    e2eScenario: async ({ e2eApi, e2eCleanupPassword, e2eUseGeneratedUser, page }, use, testInfo) => {
+    e2eDismissProductTourWelcome: [true, { option: true }],
+
+    e2eScenario: async ({ e2eApi, e2eCleanupPassword, e2eDismissProductTourWelcome, e2eUseGeneratedUser, page }, use, testInfo) => {
         const run = createRunName(e2eApi.environment.runId, testInfo);
         const userName = `Playwright User ${run}`;
         const email = `playwright-${run}@exceptionless.test`.toLowerCase();
@@ -85,6 +88,9 @@ export const test = base.extend<E2EFixtures>({
             const project = await e2eApi.createProject(userToken, organization.id, projectName);
             projectId = project.id;
             const projectToken = await e2eApi.getProjectDefaultToken(userToken, project.id);
+            if (e2eDismissProductTourWelcome) {
+                await e2eApi.updateProductTour(userToken, 'welcome', 1, 'dismissed');
+            }
 
             await page.addInitScript(
                 ({ organizationId, token }) => {
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
new file mode 100644
index 0000000000..04496a2594
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -0,0 +1,271 @@
+import type { Page, Request, Response } from '@playwright/test';
+
+import { E2E_TEST_PASSWORD, expect, test } from '../fixtures/e2e-test';
+import { seedRepresentativeEvent } from '../support/event-data';
+import { createRepresentativeEvent } from '../support/synthetic-event';
+
+test.use({ actionTimeout: 15_000, e2eUseGeneratedUser: true });
+
+test.describe('first-run welcome', () => {
+    test.use({ e2eDismissProductTourWelcome: false });
+
+    test('Browse Guides persists before the catalog opens', async ({ e2eScenario, page }) => {
+        await test.step(`show the first-run prompt for ${e2eScenario.email}`, async () => {
+            await page.goto('/next/stack');
+            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
+        });
+
+        const persisted = page.waitForResponse(isSuccessfulTourProgress('welcome'));
+        await page.getByRole('dialog', { name: 'Welcome to Exceptionless' }).getByRole('button', { name: 'Browse Guides' }).click();
+        await persisted;
+
+        const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
+        await expect(catalog).toBeVisible();
+        await catalog.getByRole('button', { name: 'Close' }).click();
+        await page.reload();
+        await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeHidden();
+    });
+});
+
+test.describe('shell and identity checkpoints', () => {
+    test.use({ e2eDismissProductTourWelcome: false });
+
+    test('supports responsive resume and never carries checkpoints across identities', async ({ e2eApi, e2eScenario, e2eSecondaryOrganization, page }) => {
+        test.setTimeout(240_000);
+        const progressWrites: string[] = [];
+        page.on('request', (request) => {
+            if (request.method() === 'PUT' && request.url().includes('/api/v2/users/me/product-tours/')) {
+                progressWrites.push(new URL(request.url()).pathname);
+            }
+        });
+
+        await test.step('closing the welcome persists dismissal', async () => {
+            await page.goto('/next/stack');
+            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
+            const dismissed = page.waitForResponse(isSuccessfulTourProgress('welcome'));
+            await page.keyboard.press('Escape');
+            await dismissed;
+            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeHidden();
+        });
+
+        await test.step('the shell tour renders on mobile and resumes on desktop with reduced motion', async () => {
+            await page.setViewportSize({ height: 844, width: 390 });
+            await startTourFromCommand(page, 'Explore Exceptionless');
+            const tour = page.locator('.driver-popover');
+            await expect(page.locator('[data-tour="app-navigation"]')).toBeVisible();
+            await expect(tour.getByText('Your workspace navigation')).toBeVisible();
+
+            await page.emulateMedia({ reducedMotion: 'reduce' });
+            await page.setViewportSize({ height: 900, width: 1440 });
+            await tour.getByRole('button', { name: 'Continue' }).click();
+            await expect(tour.getByText('Find anything quickly')).toBeVisible();
+            await page.reload();
+            await expect(tour.getByText('Find anything quickly')).toBeVisible();
+
+            const dismissed = page.waitForResponse(isSuccessfulTourProgress('ui-overview'));
+            await tour.getByRole('button', { name: 'Close' }).click();
+            await dismissed;
+            await expectProductTourSession(page, false);
+        });
+
+        await test.step('an organization change clears an active checkpoint without recording progress', async () => {
+            await mockAssistantAccess(page);
+            await page.reload();
+            await startTourFromCommand(page, 'Meet Exie');
+            await expectProductTourSession(page, true);
+            const writesBeforeSwitch = progressWrites.length;
+
+            const identityTab = await page.context().newPage();
+            await identityTab.goto('/next/stack');
+            await identityTab.evaluate((organizationId) => {
+                window.localStorage.setItem('organization', JSON.stringify(organizationId));
+            }, e2eSecondaryOrganization.organizationId);
+            await identityTab.close();
+            await expectProductTourSession(page, false);
+            expect(progressWrites).toHaveLength(writesBeforeSwitch);
+        });
+
+        await test.step('logout clears an active checkpoint without recording progress', async () => {
+            await startTourFromCommand(page, 'Meet Exie');
+            await expectProductTourSession(page, true);
+            const writesBeforeLogout = progressWrites.length;
+
+            await page.getByRole('button', { name: new RegExp(e2eScenario.userName) }).dispatchEvent('click');
+            await page.getByRole('menuitem', { name: 'Log Out' }).dispatchEvent('click');
+            await expect(page).toHaveURL(/\/next\/login/);
+            await expectProductTourSession(page, false);
+            expect(progressWrites).toHaveLength(writesBeforeLogout);
+
+            e2eScenario.userToken = await e2eApi.login(e2eScenario.email, E2E_TEST_PASSWORD);
+        });
+    });
+});
+
+test('domain workflows advance only on real success', async ({ e2eApi, e2eScenario, page }) => {
+    test.setTimeout(300_000);
+
+    await test.step('project configuration advances after creation and the first event', async () => {
+        await page.goto('/next/stack');
+        await startTourFromCommand(page, 'Configure a project');
+        await expect(page.getByRole('heading', { name: 'Add Project' })).toBeVisible();
+
+        const projectName = `Tour Project ${e2eScenario.run}`;
+        await page.getByLabel('Project Name', { exact: true }).fill(projectName);
+        await page.getByRole('button', { name: 'Continue to Client Setup' }).click();
+        await page.waitForURL(/\/next\/project\/[^/]+\/configure\?redirect=true/);
+        const projectId = page.url().match(/\/project\/([^/]+)\/configure/)?.[1];
+        expect(projectId).toBeTruthy();
+
+        await page.locator('[data-tour="project-configure-platform"]').click();
+        await page.getByRole('option', { name: 'Browser applications' }).click();
+        await page.locator('[data-product-tour-inline="configure-project"]').getByRole('button', { name: 'Continue' }).click();
+        await expect(page.getByText('Waiting for your first event')).toBeVisible();
+
+        try {
+            const token = await e2eApi.getProjectDefaultToken(e2eScenario.userToken, projectId!);
+            await e2eApi.submitEvent(
+                projectId!,
+                token.id,
+                createRepresentativeEvent({
+                    appUrl: e2eApi.environment.appUrl,
+                    message: e2eScenario.message,
+                    referenceId: e2eScenario.referenceId,
+                    runId: e2eApi.environment.runId
+                })
+            );
+            await expect(page).toHaveURL(/\/next\/event/);
+            await expectProductTourSession(page, false);
+        } finally {
+            await e2eApi.deleteProject(e2eScenario.userToken, projectId!);
+            await e2eApi.waitForProjectDeleted(e2eScenario.userToken, projectId!);
+        }
+    });
+
+    await test.step('saved-view progress retry never repeats the successful POST', async () => {
+        let createRequests = 0;
+        let progressRequests = 0;
+        const countSavedViewCreation = (request: Request) => {
+            const path = new URL(request.url()).pathname;
+            if (request.method() === 'POST' && /^\/api\/v2\/organizations\/[^/]+\/saved-views$/.test(path)) createRequests += 1;
+        };
+        const progressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/create-saved-view';
+        page.on('request', countSavedViewCreation);
+        await page.route(progressRoute, async (route) => {
+            progressRequests += 1;
+            if (progressRequests === 1) {
+                await route.fulfill({ json: { title: 'Injected progress failure' }, status: 500 });
+                return;
+            }
+
+            await route.continue();
+        });
+
+        try {
+            await page.goto('/next/event');
+            await startTourFromCommand(page, 'Create a saved view');
+            await expectProductTourSession(page, true);
+            const tour = page.locator('.driver-popover');
+            await tour.getByRole('button', { name: 'Continue' }).click();
+            await tour.getByRole('button', { name: 'Continue' }).click();
+
+            await page.getByLabel('Name', { exact: true }).fill(`Tour View ${e2eScenario.run}`);
+            await page.getByRole('button', { name: 'Continue' }).click();
+            await page.getByRole('button', { name: 'Continue' }).click();
+            await page.getByRole('button', { exact: true, name: 'Save' }).click();
+            await expect(page.getByText('Retry guide completion')).toBeVisible();
+            expect(createRequests).toBe(1);
+
+            await page.reload();
+            await expect(page.getByRole('button', { name: 'Retry guide completion' })).toBeVisible();
+            const completed = page.waitForResponse(isSuccessfulTourProgress('create-saved-view'));
+            await page.getByRole('button', { name: 'Retry guide completion' }).click();
+            await completed;
+            await expect.poll(() => createRequests).toBe(1);
+            await expectProductTourSession(page, false);
+        } finally {
+            page.off('request', countSavedViewCreation);
+            await page.unroute(progressRoute);
+        }
+    });
+
+    await test.step('investigation advances when a real error opens', async () => {
+        await seedRepresentativeEvent(e2eApi, e2eScenario.userToken, {
+            message: e2eScenario.message,
+            projectId: e2eScenario.projectId,
+            projectToken: e2eScenario.projectToken,
+            referenceId: e2eScenario.referenceId
+        });
+        await page.goto('/next/event?time=all&type=error');
+        await expect(page.getByText(e2eScenario.message).first()).toBeVisible({ timeout: 30_000 });
+        await startTourFromCommand(page, 'Investigate an error');
+        await page.locator('.driver-popover').getByRole('button', { name: 'Continue' }).click();
+        await page.locator('tr').filter({ hasText: e2eScenario.message }).first().click();
+        const callout = page.locator('[data-product-tour-inline="investigate-error"]');
+        await expect(callout.getByText('Understand the grouped issue')).toBeVisible();
+        for (const title of ['Triage deliberately', 'Inspect the occurrence', 'Begin with the overview', 'Compare every occurrence']) {
+            await callout.getByRole('button', { name: 'Continue' }).click();
+            await expect(callout.getByText(title)).toBeVisible();
+        }
+
+        const completed = page.waitForResponse(isSuccessfulTourProgress('investigate-error'));
+        await callout.getByRole('button', { name: 'Finish guide' }).click();
+        await completed;
+        await expectProductTourSession(page, false);
+        await page.reload();
+        await expect(page.locator('[data-product-tour-inline="investigate-error"]')).toBeHidden();
+    });
+
+    await test.step('Exie opens context without provider submission', async () => {
+        await mockAssistantAccess(page);
+        let chatRequests = 0;
+        const countChatRequest = (request: Request) => {
+            if (new URL(request.url()).pathname === '/api/v2/assistant/chat') chatRequests += 1;
+        };
+        page.on('request', countChatRequest);
+
+        try {
+            await page.goto('/next/stack');
+            await startTourFromCommand(page, 'Meet Exie');
+            const tour = page.locator('.driver-popover');
+            await tour.getByRole('button', { name: 'Continue' }).click();
+            await expect(tour.getByText('You control every request')).toBeVisible();
+            expect(chatRequests).toBe(0);
+        } finally {
+            page.off('request', countChatRequest);
+        }
+    });
+});
+
+async function expectProductTourSession(page: Page, present: boolean): Promise<void> {
+    const assertion = expect.poll(() => page.evaluate(() => sessionStorage.getItem('exceptionless.product-tour')));
+    if (present) {
+        await assertion.not.toBeNull();
+    } else {
+        await assertion.toBeNull();
+    }
+}
+
+function isSuccessfulTourProgress(tourName: string) {
+    return (response: Response): boolean => {
+        const path = new URL(response.url()).pathname;
+        return response.request().method() === 'PUT' && path === `/api/v2/users/me/product-tours/${tourName}` && response.status() === 200;
+    };
+}
+
+async function mockAssistantAccess(page: Page): Promise<void> {
+    await page.route(
+        (url) => url.pathname === '/api/v2/assistant/access',
+        (route) => route.fulfill({ json: { enabled: true, has_access: true, message: null, upgrade_required: false } })
+    );
+}
+
+async function startTourFromCommand(page: Page, title: string): Promise<void> {
+    const announcementStart = page.getByRole('button', { name: 'See how it works' });
+    if (title === 'Meet Exie' && (await announcementStart.isVisible())) {
+        await announcementStart.click();
+        return;
+    }
+
+    await page.getByRole('button', { name: 'Search Exceptionless' }).click();
+    await page.getByRole('dialog').getByText(title, { exact: true }).click();
+}
diff --git a/src/Exceptionless.Web/ClientApp/package-lock.json b/src/Exceptionless.Web/ClientApp/package-lock.json
index 23a4f6bd0e..483f1f2f02 100644
--- a/src/Exceptionless.Web/ClientApp/package-lock.json
+++ b/src/Exceptionless.Web/ClientApp/package-lock.json
@@ -24,6 +24,7 @@
                 "clsx": "^2.1.1",
                 "d3-scale": "^4.0.2",
                 "dompurify": "^3.4.14",
+                "driver.js": "^1.8.0",
                 "layerchart": "^2.3.0",
                 "mode-watcher": "^1.1.0",
                 "oidc-client-ts": "^3.5.0",
@@ -6069,6 +6070,12 @@
                 "url": "https://dotenvx.com"
             }
         },
+        "node_modules/driver.js": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/driver.js/-/driver.js-1.8.0.tgz",
+            "integrity": "sha512-+8/IO7h1v14IzWh2GP60N7T3PFZweXwdn5e5POuxRSBoCYUojsBxzqawPeXh3YZIibRy7EehYNEyxe7slwwtdg==",
+            "license": "MIT"
+        },
         "node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
diff --git a/src/Exceptionless.Web/ClientApp/package.json b/src/Exceptionless.Web/ClientApp/package.json
index f3fc1b0a20..f9d84a2dbd 100644
--- a/src/Exceptionless.Web/ClientApp/package.json
+++ b/src/Exceptionless.Web/ClientApp/package.json
@@ -94,6 +94,7 @@
         "clsx": "^2.1.1",
         "d3-scale": "^4.0.2",
         "dompurify": "^3.4.14",
+        "driver.js": "^1.8.0",
         "layerchart": "^2.3.0",
         "mode-watcher": "^1.1.0",
         "oidc-client-ts": "^3.5.0",
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
index 824e988995..cee4ec4d77 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
@@ -6,6 +6,7 @@ import type {
     AdminAssistantSettings,
     AdminAssistantUsage,
     AdminEventSubmissionSettings,
+    AdminProductTourUsage,
     AdminStats,
     ElasticsearchInfo,
     ElasticsearchSnapshotsResponse,
@@ -44,6 +45,7 @@ export const queryKeys = {
     migrations: ['admin', 'migrations'] as const,
     oauthApplication: (id: string | undefined) => [...queryKeys.oauthApplications, id] as const,
     oauthApplications: ['admin', 'oauth-applications'] as const,
+    productTourUsage: (month: string) => ['admin', 'product-tour-usage', month] as const,
     snapshots: ['admin', 'elasticsearch', 'snapshots'] as const,
     stats: ['admin', 'stats'] as const
 };
@@ -110,6 +112,29 @@ export function getAdminAssistantUsageQuery(month: () => string) {
     }));
 }
 
+export function getAdminProductTourUsageQuery(month: () => string) {
+    return createQuery<AdminProductTourUsage, ProblemDetails>(() => ({
+        queryFn: async ({ signal }: { signal: AbortSignal }) => {
+            const client = useFetchClient();
+            const response = await client.getJSON<AdminProductTourUsage>('admin/product-tour-usage', {
+                params: {
+                    limit: 100,
+                    month: `${month()}-01`
+                },
+                signal
+            });
+
+            if (!response.ok) {
+                throw response.problem;
+            }
+
+            return response.data!;
+        },
+        queryKey: queryKeys.productTourUsage(month()),
+        staleTime: 60 * 1000
+    }));
+}
+
 export function getAdminStatsQuery() {
     return createQuery<AdminStats, ProblemDetails>(() => ({
         queryFn: async ({ signal }: { signal: AbortSignal }) => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
index cf424cf37d..4ede3b8b22 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
@@ -1,4 +1,5 @@
 import type {
+    AdminProductTourUsageResponse,
     AssistantModelSettings,
     CountResult,
     EventSubmissionSettings,
@@ -50,6 +51,7 @@ export type AdminAssistantUsage = {
 };
 
 export type AdminEventSubmissionSettings = EventSubmissionSettings;
+export type AdminProductTourUsage = AdminProductTourUsageResponse;
 
 export type AdminStats = {
     events: CountResult;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/assistant/components/assistant-panel.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/assistant/components/assistant-panel.svelte
index 916b8454b4..7001b41ba7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/assistant/components/assistant-panel.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/assistant/components/assistant-panel.svelte
@@ -508,6 +508,7 @@
     <Sheet.Root bind:open>
         <Sheet.Content
             data-assistant-panel
+            data-tour="exie-panel"
             class="bg-background top-16! bottom-0! h-auto! w-full gap-0 sm:max-w-120!"
             onInteractOutside={handleInteractOutside}
             overlayProps={{
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index 8bd8a218c6..fdd94f0b4d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -18,13 +18,15 @@
     import * as EventsFacetedFilter from '$features/events/components/filters';
     import { getExtendedDataItems, hasErrorOrSimpleError } from '$features/events/persistent-event';
     import { getOrganizationQuery } from '$features/organizations/api.svelte';
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getProjectQuery, updateProject } from '$features/projects/api.svelte';
     import StackCard from '$features/stacks/components/stack-card.svelte';
     import Braces from '@lucide/svelte/icons/braces';
     import EventsIcon from '@lucide/svelte/icons/calendar-days';
     import ChevronLeft from '@lucide/svelte/icons/chevron-left';
     import ChevronRight from '@lucide/svelte/icons/chevron-right';
-    import { onMount, tick } from 'svelte';
     import { toast } from 'svelte-sonner';
 
     import type { PersistentEvent } from '../models/index';
@@ -46,6 +48,7 @@
         filterChanged: (filter: IFilter) => void;
         handleError: (problem: ProblemDetails) => void;
         id: string;
+        loadProjectDetails?: boolean;
         onEventLoaded?: (event: PersistentEvent) => void;
         onNavigate?: (eventId: string) => void;
         prepareStackAssistantContext?: () => void;
@@ -57,6 +60,7 @@
         filterChanged,
         handleError,
         id,
+        loadProjectDetails = true,
         onEventLoaded,
         onNavigate,
         prepareStackAssistantContext
@@ -127,6 +131,7 @@
     const navigation = $derived(eventQuery.data?.navigation);
 
     const projectQuery = getProjectQuery({
+        enabled: () => loadProjectDetails,
         route: {
             get id() {
                 return event?.project_id;
@@ -156,13 +161,44 @@
 
     let activeTab = $state<TabType>('Overview');
     let tabs = $derived<TabType[]>(getTabs(event, projectQuery.data));
-    let tabsListRef = $state<HTMLElement | null>(null);
-    let canScrollTabsLeft = $state(false);
-    let canScrollTabsRight = $state(false);
     let draggedPromotedTab = $state<null | string>(null);
     let notifiedEventId = $state('');
     let showJsonDialog = $state(false);
 
+    const tourActions = createProductTourActions();
+    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+    const investigationCopy = $derived.by(() => {
+        switch (investigationCheckpoint?.checkpointName) {
+            case 'event-occurrence':
+                return {
+                    description: 'This occurrence contains its timestamp, raw JSON, and navigation to nearby events.',
+                    title: 'Inspect the occurrence'
+                };
+            case 'filter-stack-events':
+                return {
+                    description: 'Show all events filters the list to this stack when you are ready to compare occurrences.',
+                    title: 'Compare every occurrence'
+                };
+            case 'stack-summary':
+                return {
+                    description: 'Use the grouped stack title, affected users, occurrence count, and trend to judge scope and impact.',
+                    title: 'Understand the grouped issue'
+                };
+            case 'stack-triage':
+                return {
+                    description: 'Status and options change shared issue state. Review them here; this guide will not invoke them.',
+                    title: 'Triage deliberately'
+                };
+            case 'tab-overview':
+                return {
+                    description: 'Overview summarizes the message and useful event fields. Choose other tabs when the evidence calls for them.',
+                    title: 'Begin with the overview'
+                };
+            default:
+                return undefined;
+        }
+    });
+
     $effect(() => {
         if (shouldResetActiveEventTab(!!event, projectQuery.isPending, tabs, activeTab)) {
             activeTab = 'Overview';
@@ -173,29 +209,6 @@
         return !!projectQuery.data?.promoted_tabs?.includes(tab);
     }
 
-    function updateTabsOverflow(): void {
-        if (!tabsListRef) {
-            canScrollTabsLeft = false;
-            canScrollTabsRight = false;
-            return;
-        }
-
-        const maxScrollLeft = tabsListRef.scrollWidth - tabsListRef.clientWidth;
-        canScrollTabsLeft = tabsListRef.scrollLeft > 1;
-        canScrollTabsRight = tabsListRef.scrollLeft < maxScrollLeft - 1;
-    }
-
-    function scrollTabs(direction: 'left' | 'right'): void {
-        if (!tabsListRef) {
-            return;
-        }
-
-        tabsListRef.scrollBy({
-            behavior: 'smooth',
-            left: direction === 'left' ? -tabsListRef.clientWidth / 2 : tabsListRef.clientWidth / 2
-        });
-    }
-
     function onPromoted(title: string): void {
         activeTab = title;
     }
@@ -282,6 +295,35 @@
         }
     }
 
+    async function continueInvestigationTour(): Promise<void> {
+        const checkpoint = investigationCheckpoint;
+        if (!checkpoint) {
+            return;
+        }
+        switch (checkpoint.checkpointName) {
+            case 'event-occurrence':
+                productTourCheckpoint.advance(checkpoint, 'tab-overview');
+                break;
+            case 'stack-summary':
+                productTourCheckpoint.advance(checkpoint, 'stack-triage');
+                break;
+            case 'stack-triage':
+                productTourCheckpoint.advance(checkpoint, 'event-occurrence');
+                break;
+            case 'tab-overview':
+                productTourCheckpoint.advance(checkpoint, 'filter-stack-events');
+                break;
+            default:
+                await tourActions.complete(checkpoint);
+        }
+    }
+
+    async function dismissInvestigationTour(): Promise<void> {
+        if (investigationCheckpoint) {
+            await tourActions.dismiss(investigationCheckpoint);
+        }
+    }
+
     function prepareEventAssistantContext(): void {
         if (event) {
             assistantPageContext.setPageEvent(event);
@@ -301,39 +343,28 @@
     $effect(() => {
         if (event && event.id !== notifiedEventId) {
             notifiedEventId = event.id;
-            onEventLoaded?.(event);
-        }
-    });
-
-    $effect(() => {
-        const tabCount = tabs.length;
-        void tick().then(() => {
-            if (tabCount === tabs.length) {
-                updateTabsOverflow();
+            const checkpoint = investigationCheckpoint;
+            if (checkpoint?.checkpointName === 'choose-error' && hasErrorOrSimpleError(event)) {
+                productTourCheckpoint.advance(checkpoint, 'stack-summary');
             }
-        });
-    });
-
-    onMount(() => {
-        updateTabsOverflow();
-
-        const resizeObserver = new ResizeObserver(updateTabsOverflow);
-        if (tabsListRef) {
-            resizeObserver.observe(tabsListRef);
+            onEventLoaded?.(event);
         }
-
-        window.addEventListener('resize', updateTabsOverflow);
-
-        return () => {
-            resizeObserver.disconnect();
-            window.removeEventListener('resize', updateTabsOverflow);
-        };
     });
 </script>
 
-<section>
+{#if event && investigationCopy && ['stack-summary', 'stack-triage'].includes(investigationCheckpoint?.checkpointName ?? '')}
+    <ProductTourInlineCallout
+        description={investigationCopy.description}
+        onContinue={continueInvestigationTour}
+        onDismiss={dismissInvestigationTour}
+        title={investigationCopy.title}
+        tourName="investigate-error"
+    />
+{/if}
+
+<section data-event-type={event ? (hasErrorOrSimpleError(event) ? 'error' : event.type) : undefined} data-tour={event ? 'event-details' : undefined}>
     <h4 class="text-muted-foreground mb-3 text-sm font-semibold tracking-wide uppercase">Stack</h4>
-    {#if event?.stack_id}
+    {#if loadProjectDetails && event?.stack_id}
         <StackCard
             {assistantResource}
             {filterChanged}
@@ -343,7 +374,18 @@
     {/if}
 </section>
 
-<section class="mt-2">
+{#if event && investigationCopy && ['event-occurrence', 'filter-stack-events'].includes(investigationCheckpoint?.checkpointName ?? '')}
+    <ProductTourInlineCallout
+        continueLabel={investigationCheckpoint?.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
+        description={investigationCopy.description}
+        onContinue={continueInvestigationTour}
+        onDismiss={dismissInvestigationTour}
+        title={investigationCopy.title}
+        tourName="investigate-error"
+    />
+{/if}
+
+<section class="mt-2" data-tour={event ? 'event-occurrence' : undefined}>
     <div class="mb-2 flex items-center justify-between">
         <h4 class="text-muted-foreground text-sm font-semibold tracking-wide uppercase">Event</h4>
         <div class="flex items-center gap-1">
@@ -355,6 +397,7 @@
             {#if event?.stack_id}
                 <Button
                     aria-label="Show all events"
+                    data-tour="event-stack-filter"
                     onclick={() => filterChanged(new EventsFacetedFilter.StringFilter('stack', event!.stack_id))}
                     size="icon-sm"
                     title="Show all events"
@@ -396,25 +439,19 @@
         </Table.Body>
     </Table.Root>
 
-    {#if event}
+    {#if loadProjectDetails && event && projectQuery.data?.id === event.project_id}
+        {#if investigationCheckpoint?.checkpointName === 'tab-overview' && investigationCopy}
+            <ProductTourInlineCallout
+                description={investigationCopy.description}
+                onContinue={continueInvestigationTour}
+                onDismiss={dismissInvestigationTour}
+                title={investigationCopy.title}
+                tourName="investigate-error"
+            />
+        {/if}
         <Tabs.Root class="mt-4 mb-4" bind:value={activeTab}>
-            <div class="relative">
-                {#if canScrollTabsLeft}
-                    <Button
-                        aria-label="Scroll tabs left"
-                        class="bg-background/95 absolute top-1/2 left-0 z-10 -translate-y-1/2 shadow-sm"
-                        onclick={() => scrollTabs('left')}
-                        size="icon-sm"
-                        variant="outline"
-                    >
-                        <ChevronLeft class="size-4" />
-                    </Button>
-                {/if}
-                <Tabs.List
-                    bind:ref={tabsListRef}
-                    class="no-scrollbar h-auto w-full justify-normal gap-1 overflow-x-auto overflow-y-hidden scroll-smooth p-1"
-                    onscroll={updateTabsOverflow}
-                >
+            <div>
+                <Tabs.List class="no-scrollbar h-auto w-full justify-normal gap-1 overflow-x-auto overflow-y-hidden scroll-smooth p-1">
                     {#each tabs as tab (tab)}
                         <Tabs.Trigger
                             aria-label={isPromotedTab(tab) ? `${tab}. Drag to reorder custom tab.` : undefined}
@@ -424,6 +461,7 @@
                                 draggedPromotedTab === tab && 'bg-accent/70'
                             ]}
                             draggable={isPromotedTab(tab)}
+                            data-tour={tab === 'Overview' ? 'event-tab-overview' : undefined}
                             ondragstart={(event) => handlePromotedTabDragStart(event, tab)}
                             ondragover={(event) => handlePromotedTabDragOver(event, tab)}
                             ondrop={(event) => handlePromotedTabDrop(event, tab)}
@@ -433,17 +471,6 @@
                         >
                     {/each}
                 </Tabs.List>
-                {#if canScrollTabsRight}
-                    <Button
-                        aria-label="Scroll tabs right"
-                        class="bg-background/95 absolute top-1/2 right-0 z-10 -translate-y-1/2 shadow-sm"
-                        onclick={() => scrollTabs('right')}
-                        size="icon-sm"
-                        variant="outline"
-                    >
-                        <ChevronRight class="size-4" />
-                    </Button>
-                {/if}
             </div>
 
             {#each tabs as tab (tab)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
new file mode 100644
index 0000000000..29f1dcb8de
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+
+    const actions = createProductTourActions();
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+</script>
+
+{#if checkpoint?.checkpointName === 'filter-errors'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Errors are selected. Narrow the list by project, status, date, version, tags, or search terms when you need a specific incident."
+        onDismiss={actions.dismiss}
+        onNext={(current) => {
+            productTourCheckpoint.advance(current, 'choose-error');
+        }}
+        target="[data-tour='event-filters']"
+        title="Start with the right errors"
+    />
+{:else if checkpoint?.checkpointName === 'choose-error'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Choose a real error row. The guide continues only after its detail sheet loads."
+        onDismiss={actions.dismiss}
+        target="[data-tour='event-list']"
+        title="Open a real error"
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
new file mode 100644
index 0000000000..611213ff6c
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -0,0 +1,58 @@
+import { submitFeatureUsage } from '$features/auth/exceptionless-session';
+import { putCurrentUserProductTour } from '$features/users/api.svelte';
+import { ProductTourStatus } from '$features/users/models';
+import { toast } from 'svelte-sonner';
+
+import type { ProductTourCheckpoint, ProductTourKey, ProductTourLaunchSource } from './types';
+
+import { getProductTour } from './catalog';
+import { productTourCheckpoint } from './state.svelte';
+import { buildProductTourTelemetryEvent, type ProductTourTelemetryEvent } from './telemetry';
+
+export function createProductTourActions() {
+    const progressMutation = putCurrentUserProductTour();
+
+    async function complete(checkpoint: ProductTourCheckpoint): Promise<boolean> {
+        return finish(checkpoint, ProductTourStatus.Completed);
+    }
+
+    async function dismiss(checkpoint: ProductTourCheckpoint): Promise<boolean> {
+        return finish(checkpoint, ProductTourStatus.Dismissed);
+    }
+
+    async function finish(checkpoint: ProductTourCheckpoint, status: ProductTourStatus): Promise<boolean> {
+        const definition = getProductTour(checkpoint.tourName);
+        try {
+            await progressMutation.mutateAsync({
+                progress: {
+                    status,
+                    version: definition.version
+                },
+                tourName: checkpoint.tourName
+            });
+        } catch {
+            toast.error('We could not save your guided-tour progress. Please try again.');
+            return false;
+        }
+
+        if (!productTourCheckpoint.clear(checkpoint)) {
+            return false;
+        }
+        void track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, definition.version, checkpoint.source);
+        return true;
+    }
+
+    return {
+        complete,
+        dismiss,
+        progressMutation
+    };
+}
+
+export async function track(event: ProductTourTelemetryEvent, name: ProductTourKey, version: number, source: ProductTourLaunchSource): Promise<void> {
+    try {
+        await submitFeatureUsage(buildProductTourTelemetryEvent(event, name, version, source));
+    } catch (error) {
+        console.warn('Unable to submit product tour telemetry.', error);
+    }
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
new file mode 100644
index 0000000000..c17eb9f560
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -0,0 +1,47 @@
+import { describe, expect, it } from 'vitest';
+
+import type { ProductTourContext } from './types';
+
+import { getProductTourItems, getRecommendedProductTourName, productTourCatalog } from './catalog';
+
+function context(overrides: Partial<ProductTourContext> = {}): ProductTourContext {
+    return {
+        errorEventAvailability: 'available',
+        isSetupPage: false,
+        organizationId: 'organization-id',
+        pathname: '/next',
+        projects: [],
+        ...overrides
+    };
+}
+
+describe('product tour catalog', () => {
+    it('contains only durable metadata for the five named tours', () => {
+        expect(productTourCatalog.map((tour) => tour.name)).toEqual([
+            'ui-overview',
+            'configure-project',
+            'create-saved-view',
+            'investigate-error',
+            'meet-exie'
+        ]);
+        expect(productTourCatalog.every((tour) => tour.version > 0 && tour.keywords.length > 0)).toBe(true);
+        expect(JSON.stringify(productTourCatalog)).not.toContain('data-tour');
+    });
+
+    it('recommends setup until an organization has configured projects', () => {
+        expect(getRecommendedProductTourName(context({ organizationId: undefined }))).toBe('configure-project');
+        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: false }] }))).toBe('configure-project');
+        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: true }] }))).toBe('ui-overview');
+    });
+
+    it('reports availability separately from catalog metadata', () => {
+        const items = getProductTourItems(
+            context({
+                assistantAccess: { enabled: false, has_access: false, upgrade_required: false },
+                errorEventAvailability: 'empty'
+            })
+        );
+        expect(items.find((item) => item.name === 'meet-exie')?.currentAvailability.available).toBe(false);
+        expect(items.find((item) => item.name === 'investigate-error')?.currentAvailability.available).toBe(false);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
new file mode 100644
index 0000000000..307807a260
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -0,0 +1,93 @@
+import type { ProductTourProgress } from '$features/users/models';
+
+import { resolve } from '$app/paths';
+
+import type { ProductTourContext, ProductTourDefinition, ProductTourListItem, ProductTourName } from './types';
+
+function requireApplicationShell(context: ProductTourContext) {
+    return context.isSetupPage || !context.organizationId
+        ? { available: false, reason: 'Finish organization setup to explore Exceptionless.' }
+        : { available: true };
+}
+
+function requireError(context: ProductTourContext) {
+    if (!context.organizationId) return { available: false, reason: 'Create an organization and project first.' };
+    if (context.errorEventAvailability === 'loading') return { available: false, reason: 'Checking for an accessible error report…' };
+    if (context.errorEventAvailability === 'error') return { available: false, reason: 'Error reports could not be checked. Try again shortly.' };
+    if (context.errorEventAvailability === 'empty') return { available: false, reason: 'Send an error report before starting this guide.' };
+    return { available: true };
+}
+
+function requireOrganization(context: ProductTourContext) {
+    return context.organizationId ? { available: true } : { available: false, reason: 'Create an organization and project first.' };
+}
+
+export const productTourCatalog: readonly ProductTourDefinition[] = [
+    {
+        availability: requireApplicationShell,
+        description: 'Learn navigation, command search, saved views, Exie, and where to get help.',
+        initialCheckpoint: 'navigation',
+        keywords: ['navigation', 'ui', 'search', 'command', 'help', 'saved views'],
+        name: 'ui-overview',
+        startingRoute: () => resolve('/'),
+        title: 'Explore Exceptionless',
+        version: 1
+    },
+    {
+        availability: () => ({ available: true }),
+        description: 'Create or resume a project, connect an SDK, and wait for its first real event.',
+        initialCheckpoint: 'project-name',
+        keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
+        name: 'configure-project',
+        startingRoute: (context) => (context.organizationId ? resolve('/(app)/project/add') : resolve('/(app)/organization/add')),
+        title: 'Configure a project',
+        version: 1
+    },
+    {
+        availability: requireOrganization,
+        description: 'Save the current Events configuration as a private view that only you can see.',
+        initialCheckpoint: 'open-view-menu',
+        keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
+        name: 'create-saved-view',
+        startingRoute: () => resolve('/(app)/event'),
+        title: 'Create a saved view',
+        version: 1
+    },
+    {
+        availability: requireError,
+        description: 'Open a real error, assess its stack and status, then inspect the occurrence.',
+        initialCheckpoint: 'filter-errors',
+        keywords: ['error report', 'event details', 'exception', 'filter', 'stack', 'triage'],
+        name: 'investigate-error',
+        startingRoute: () => `${resolve('/(app)/event')}?time=all&type=error`,
+        title: 'Investigate an error',
+        version: 1
+    },
+    {
+        availability: (context) =>
+            context.assistantAccess?.enabled ? { available: true } : { available: false, reason: 'Exie is not enabled by this Exceptionless installation.' },
+        description: 'See how Exie uses the current page as context without sending a prompt.',
+        initialCheckpoint: 'open-exie',
+        keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
+        name: 'meet-exie',
+        startingRoute: () => resolve('/'),
+        title: 'Meet Exie',
+        version: 1
+    }
+] as const;
+
+export function getProductTour(name: ProductTourName): ProductTourDefinition {
+    return productTourCatalog.find((tour) => tour.name === name)!;
+}
+
+export function getProductTourItems(context: ProductTourContext, progress: Record<string, ProductTourProgress> = {}): ProductTourListItem[] {
+    return productTourCatalog.map((definition) => ({
+        ...definition,
+        currentAvailability: definition.availability(context),
+        progress: progress[definition.name]
+    }));
+}
+
+export function getRecommendedProductTourName(context: ProductTourContext): ProductTourName {
+    return !context.organizationId || context.projects.some((project) => !project.is_configured) ? 'configure-project' : 'ui-overview';
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
new file mode 100644
index 0000000000..942730a992
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+    import { Badge } from '$comp/ui/badge';
+    import { Button } from '$comp/ui/button';
+    import * as Dialog from '$comp/ui/dialog';
+    import Compass from '@lucide/svelte/icons/compass';
+
+    import type { ProductTourListItem, ProductTourName } from '../../types';
+
+    interface Props {
+        items: ProductTourListItem[];
+        onStart: (name: ProductTourName) => Promise<void>;
+        open?: boolean;
+    }
+
+    let { items, onStart, open = $bindable(false) }: Props = $props();
+</script>
+
+<Dialog.Root bind:open>
+    <Dialog.Content class="max-h-[85vh] overflow-y-auto sm:max-w-2xl" data-product-tour-overlay>
+        <Dialog.Header>
+            <Dialog.Title>Guided Tours</Dialog.Title>
+            <Dialog.Description>Learn Exceptionless with short guides that use your real data.</Dialog.Description>
+        </Dialog.Header>
+
+        <div class="grid gap-3 py-2 sm:grid-cols-2">
+            {#each items as item (item.name)}
+                <section class="border-border bg-card flex min-h-44 flex-col gap-3 rounded-lg border p-4">
+                    <div class="flex items-start justify-between gap-3">
+                        <div class="bg-primary/10 text-primary flex size-9 shrink-0 items-center justify-center rounded-lg">
+                            <Compass aria-hidden="true" class="size-5" />
+                        </div>
+                        {#if item.progress?.status === 'completed' && item.progress.version >= item.version}
+                            <Badge variant="secondary">Completed</Badge>
+                        {/if}
+                    </div>
+                    <div class="flex-1">
+                        <h3 class="font-semibold">{item.title}</h3>
+                        <p class="text-muted-foreground mt-1 text-sm">{item.description}</p>
+                        {#if !item.currentAvailability.available}
+                            <p class="text-muted-foreground mt-2 text-xs">{item.currentAvailability.reason}</p>
+                        {/if}
+                    </div>
+                    <Button disabled={!item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
+                        {item.progress?.status === 'completed' && item.progress.version >= item.version ? 'Restart' : 'Start'}
+                    </Button>
+                </section>
+            {/each}
+        </div>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
new file mode 100644
index 0000000000..3fde333876
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+    import { Button } from '$comp/ui/button';
+    import * as Dialog from '$comp/ui/dialog';
+    import Compass from '@lucide/svelte/icons/compass';
+
+    import type { ProductTourListItem } from '../../types';
+
+    interface Props {
+        onBrowse: () => Promise<void>;
+        onDismiss: () => Promise<void>;
+        onStart: () => Promise<void>;
+        open?: boolean;
+        recommended: ProductTourListItem;
+    }
+
+    let { onBrowse, onDismiss, onStart, open = $bindable(false), recommended }: Props = $props();
+
+    async function onOpenChange(nextOpen: boolean): Promise<void> {
+        if (!nextOpen && open) {
+            await onDismiss();
+        }
+    }
+</script>
+
+<Dialog.Root {open} {onOpenChange}>
+    <Dialog.Content class="sm:max-w-lg" data-product-tour-overlay>
+        <Dialog.Header>
+            <div class="bg-primary/10 text-primary mb-2 flex size-11 items-center justify-center rounded-xl">
+                <Compass aria-hidden="true" />
+            </div>
+            <Dialog.Title>Welcome to Exceptionless</Dialog.Title>
+            <Dialog.Description>Take a short guided tour now, or browse the guides whenever you need them.</Dialog.Description>
+        </Dialog.Header>
+
+        <section class="border-border bg-muted/30 rounded-lg border p-4">
+            <p class="text-sm font-semibold">Recommended: {recommended.title}</p>
+            <p class="text-muted-foreground mt-1 text-sm">{recommended.description}</p>
+        </section>
+
+        <Dialog.Footer class="gap-2 sm:justify-between">
+            <Button onclick={onDismiss} variant="ghost">Skip</Button>
+            <div class="flex flex-col-reverse gap-2 sm:flex-row">
+                <Button onclick={onBrowse} variant="outline">Browse Guides</Button>
+                <Button onclick={onStart}>{recommended.name === 'configure-project' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
+            </div>
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
new file mode 100644
index 0000000000..a3744dc382
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
@@ -0,0 +1,41 @@
+import { fireEvent, render, screen } from '@testing-library/svelte';
+import { describe, expect, it, vi } from 'vitest';
+
+import ProductTourWelcomeDialog from './product-tour-welcome-dialog.svelte';
+
+const recommended = {
+    availability: vi.fn(() => ({ available: true })),
+    currentAvailability: { available: true },
+    description: 'Learn navigation and search.',
+    initialCheckpoint: 'navigation' as const,
+    keywords: ['navigation'],
+    name: 'ui-overview' as const,
+    startingRoute: vi.fn(() => '/next'),
+    title: 'Explore Exceptionless',
+    version: 1
+};
+
+describe('ProductTourWelcomeDialog', () => {
+    it('records dismissal from Escape', async () => {
+        const onBrowse = vi.fn();
+        const onDismiss = vi.fn();
+        const onStart = vi.fn();
+        render(ProductTourWelcomeDialog, { onBrowse, onDismiss, onStart, open: true, recommended });
+
+        await fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' });
+        expect(onBrowse).not.toHaveBeenCalled();
+        expect(onDismiss).toHaveBeenCalledOnce();
+        expect(onStart).not.toHaveBeenCalled();
+    });
+
+    it('provides Browse Guides and Skip choices', async () => {
+        const onBrowse = vi.fn();
+        const onDismiss = vi.fn();
+        render(ProductTourWelcomeDialog, { onBrowse, onDismiss, onStart: vi.fn(), open: true, recommended });
+
+        await fireEvent.click(screen.getByRole('button', { name: 'Browse Guides' }));
+        expect(onBrowse).toHaveBeenCalledOnce();
+        await fireEvent.click(screen.getByRole('button', { name: 'Skip' }));
+        expect(onDismiss).toHaveBeenCalledOnce();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
new file mode 100644
index 0000000000..910b93917d
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+    import * as Alert from '$comp/ui/alert';
+    import { Button } from '$comp/ui/button';
+    import Sparkles from '@lucide/svelte/icons/sparkles';
+    import X from '@lucide/svelte/icons/x';
+
+    interface Props {
+        hasAccess: boolean;
+        message?: string;
+        onDismiss: () => void;
+        onStart: () => void;
+        open?: boolean;
+    }
+
+    let { hasAccess, message, onDismiss, onStart, open = true }: Props = $props();
+</script>
+
+{#if open}
+    <Alert.Root
+        class="product-tour-feature-announcement fixed right-4 bottom-4 z-40 w-[min(24rem,calc(100vw-2rem))] shadow-lg"
+        data-product-tour-announcement="exie"
+    >
+        <Sparkles aria-hidden="true" class="text-primary mt-0.5" />
+        <div data-slot="alert-description">
+            <div class="flex items-start justify-between gap-3">
+                <div>
+                    <Alert.Title>New: Meet Exie</Alert.Title>
+                    <p class="text-muted-foreground mt-1 text-sm">
+                        {hasAccess
+                            ? 'See how Exie uses the page you are viewing as context for investigations.'
+                            : (message ?? 'Exie is available with an eligible organization plan.')}
+                    </p>
+                </div>
+                <Button aria-label="Dismiss Exie announcement" class="-mt-1 -mr-1 size-7" onclick={onDismiss} size="icon" variant="ghost">
+                    <X aria-hidden="true" class="size-4" />
+                </Button>
+            </div>
+            <div class="mt-3 flex flex-wrap gap-2">
+                <Button onclick={onStart} size="sm">See how it works</Button>
+                <Button onclick={onDismiss} size="sm" variant="outline">Dismiss</Button>
+            </div>
+        </div>
+    </Alert.Root>
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
new file mode 100644
index 0000000000..08e6b4c308
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -0,0 +1,275 @@
+<script lang="ts">
+    import type { AssistantAccess } from '$features/assistant/models';
+    import type { ViewProject } from '$features/projects/models';
+    import type { ViewCurrentUser } from '$features/users/models';
+
+    import { goto } from '$app/navigation';
+    import { resolve } from '$app/paths';
+    import { putCurrentUserProductTour } from '$features/users/api.svelte';
+    import { ProductTourStatus } from '$features/users/models';
+    import { toast } from 'svelte-sonner';
+
+    import type { ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../types';
+
+    import { createProductTourActions, track } from '../actions.svelte';
+    import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
+    import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from '../eligibility';
+    import { productTourCheckpoint } from '../state.svelte';
+    import ProductTourCatalogDialog from './dialogs/product-tour-catalog-dialog.svelte';
+    import ProductTourWelcomeDialog from './dialogs/product-tour-welcome-dialog.svelte';
+    import ProductTourFeatureAnnouncement from './product-tour-feature-announcement.svelte';
+    import ProductTourShellSpotlight from './product-tour-shell-spotlight.svelte';
+
+    interface Props {
+        assistantAccess?: AssistantAccess;
+        closeOverlays: () => void;
+        currentUser?: ViewCurrentUser;
+        errorEventAvailability: ProductTourContext['errorEventAvailability'];
+        isAnyOverlayOpen: boolean;
+        isImpersonating: boolean;
+        isSetupPage: boolean;
+        openAssistant: () => Promise<void>;
+        organizationId?: string;
+        pathname: string;
+        projects: ViewProject[];
+        requestErrorAvailability: () => void;
+        setMobileNavigationOpen: (open: boolean) => void;
+        stateSettled: boolean;
+    }
+
+    const WELCOME_VERSION = 1;
+    const EXIE_ANNOUNCEMENT_VERSION = 1;
+    const SYSTEM_PATH = resolve('/(app)/system');
+
+    let {
+        assistantAccess,
+        closeOverlays,
+        currentUser,
+        errorEventAvailability,
+        isAnyOverlayOpen,
+        isImpersonating,
+        isSetupPage,
+        openAssistant,
+        organizationId,
+        pathname,
+        projects,
+        requestErrorAvailability,
+        setMobileNavigationOpen,
+        stateSettled
+    }: Props = $props();
+
+    let catalogOpen = $state(false);
+    let catalogSource = $state<ProductTourLaunchSource>('catalog');
+    let lastTrackedAnnouncementImpression = $state('');
+    let lastTrackedWelcomeImpression = $state('');
+    let welcomeHandled = $state(false);
+
+    const actions = createProductTourActions();
+    const progressMutation = putCurrentUserProductTour();
+    const context = $derived<ProductTourContext>({
+        assistantAccess,
+        errorEventAvailability,
+        isSetupPage,
+        organizationId,
+        pathname,
+        projects
+    });
+    const items = $derived(getProductTourItems(context, currentUser?.product_tours));
+    const recommended = $derived(items.find((item) => item.name === getRecommendedProductTourName(context)) ?? items[0]!);
+    const checkpoint = $derived(productTourCheckpoint.current);
+    const welcomeOpen = $derived(
+        !!(
+            stateSettled &&
+            currentUser &&
+            !welcomeHandled &&
+            !catalogOpen &&
+            !isAnyOverlayOpen &&
+            !isImpersonating &&
+            !isSetupPage &&
+            !pathname.startsWith(SYSTEM_PATH) &&
+            shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, WELCOME_VERSION)
+        )
+    );
+    const exieAnnouncementOpen = $derived(
+        !!(
+            stateSettled &&
+            currentUser &&
+            assistantAccess?.enabled &&
+            (pathname.startsWith('/next/event') || pathname.startsWith('/next/stack')) &&
+            !isSetupPage &&
+            !isImpersonating &&
+            !checkpoint &&
+            !welcomeOpen &&
+            !catalogOpen &&
+            !isAnyOverlayOpen &&
+            !shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, WELCOME_VERSION) &&
+            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
+        )
+    );
+
+    $effect(() => {
+        if (!stateSettled) {
+            return;
+        }
+
+        if (!currentUser) {
+            productTourCheckpoint.clear();
+            return;
+        }
+
+        const active = productTourCheckpoint.current ?? productTourCheckpoint.restore(currentUser.id, organizationId);
+        if (active && (active.userId !== currentUser.id || active.organizationId !== organizationId)) {
+            productTourCheckpoint.clear(active);
+        }
+    });
+
+    $effect(() => {
+        if (!currentUser) {
+            return;
+        }
+
+        const impression = `${currentUser.id}:${WELCOME_VERSION}`;
+        if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
+            lastTrackedWelcomeImpression = impression;
+            void track('shown', 'welcome', WELCOME_VERSION, 'automatic');
+        }
+    });
+
+    $effect(() => {
+        if (!currentUser) {
+            return;
+        }
+
+        const impression = `${currentUser.id}:${EXIE_ANNOUNCEMENT_VERSION}`;
+        if (exieAnnouncementOpen && lastTrackedAnnouncementImpression !== impression) {
+            lastTrackedAnnouncementImpression = impression;
+            void track('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        }
+    });
+
+    export function openCatalog(source: ProductTourLaunchSource = 'catalog'): void {
+        closeOverlays();
+        requestErrorAvailability();
+        catalogSource = source;
+        catalogOpen = true;
+    }
+
+    export async function startTour(name: ProductTourName, source: ProductTourLaunchSource = 'catalog'): Promise<void> {
+        if (!currentUser) {
+            return;
+        }
+        const item = getItem(name);
+        if (!item.currentAvailability.available) {
+            openCatalog(source);
+            return;
+        }
+
+        const active = productTourCheckpoint.current;
+        if (active && !(await actions.dismiss(active))) {
+            return;
+        }
+
+        closeOverlays();
+        catalogOpen = false;
+        const next = productTourCheckpoint.start({
+            checkpointName: item.initialCheckpoint,
+            organizationId,
+            phase: {
+                type: 'active'
+            },
+            source,
+            tourName: name,
+            userId: currentUser.id
+        });
+        void Promise.all([track('shown', name, item.version, source), track('started', name, item.version, source)]);
+
+        const destination = item.startingRoute(context);
+        if (`${pathname}${window.location.search}` !== destination) {
+            await goto(destination);
+        }
+
+        if (next.tourName === 'meet-exie' && next.checkpointName === 'open-exie') {
+            setMobileNavigationOpen(false);
+        }
+    }
+
+    async function recordPreference(name: 'exie-announcement' | 'welcome', version: number, status: ProductTourStatus): Promise<boolean> {
+        try {
+            await progressMutation.mutateAsync({
+                progress: {
+                    status,
+                    version
+                },
+                tourName: name
+            });
+            return true;
+        } catch {
+            toast.error('We could not save your guided-tour preference. Please try again.');
+            return false;
+        }
+    }
+
+    async function onWelcomeStart(): Promise<void> {
+        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
+            return;
+        }
+        welcomeHandled = true;
+        void track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        await startTour(recommended.name, 'automatic');
+    }
+
+    async function onWelcomeBrowse(): Promise<void> {
+        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
+            return;
+        }
+        welcomeHandled = true;
+        void track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        openCatalog('catalog');
+    }
+
+    async function onWelcomeSkip(): Promise<void> {
+        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Dismissed))) {
+            return;
+        }
+        welcomeHandled = true;
+        void track('dismissed', 'welcome', WELCOME_VERSION, 'automatic');
+    }
+
+    async function onExieAnnouncementStart(): Promise<void> {
+        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
+            return;
+        }
+        void track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await startTour('meet-exie', 'feature-announcement');
+    }
+
+    async function onExieAnnouncementDismiss(): Promise<void> {
+        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
+            return;
+        }
+        void track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+    }
+
+    function getItem(name: ProductTourName): ProductTourListItem {
+        return items.find((item) => item.name === name)!;
+    }
+</script>
+
+<ProductTourWelcomeDialog open={welcomeOpen} onBrowse={onWelcomeBrowse} onDismiss={onWelcomeSkip} onStart={onWelcomeStart} {recommended} />
+
+{#if exieAnnouncementOpen && assistantAccess}
+    <ProductTourFeatureAnnouncement
+        hasAccess={assistantAccess.has_access}
+        message={assistantAccess.message}
+        onDismiss={onExieAnnouncementDismiss}
+        onStart={onExieAnnouncementStart}
+    />
+{/if}
+
+<ProductTourCatalogDialog bind:open={catalogOpen} {items} onStart={(name) => startTour(name, catalogSource)} />
+
+{#if checkpoint && (checkpoint.tourName === 'meet-exie' || checkpoint.tourName === 'ui-overview')}
+    {#key checkpoint}
+        <ProductTourShellSpotlight {assistantAccess} {checkpoint} {isAnyOverlayOpen} {openAssistant} {setMobileNavigationOpen} />
+    {/key}
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
new file mode 100644
index 0000000000..325b931d75
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+    import * as Alert from '$comp/ui/alert';
+    import { Button } from '$comp/ui/button';
+    import Info from '@lucide/svelte/icons/info';
+
+    interface Props {
+        continueLabel?: string;
+        description: string;
+        onContinue?: () => Promise<void> | void;
+        onDismiss: () => Promise<void> | void;
+        title: string;
+        tourName: string;
+    }
+
+    let { continueLabel = 'Continue', description, onContinue, onDismiss, title, tourName }: Props = $props();
+</script>
+
+<Alert.Root data-product-tour-inline={tourName}>
+    <Info aria-hidden="true" />
+    <Alert.Title>{title}</Alert.Title>
+    <Alert.Description>
+        {description}
+        <div class="mt-2 flex flex-wrap gap-2">
+            {#if onContinue}
+                <Button onclick={onContinue} size="sm" type="button">{continueLabel}</Button>
+            {/if}
+            <Button onclick={onDismiss} size="sm" type="button" variant="outline">End guide</Button>
+        </div>
+    </Alert.Description>
+</Alert.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
new file mode 100644
index 0000000000..cc38a9ab01
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
@@ -0,0 +1,119 @@
+<script lang="ts">
+    import type { AssistantAccess } from '$features/assistant/models';
+
+    import { onDestroy, onMount, untrack } from 'svelte';
+
+    import type { ProductTourCheckpoint, ProductTourCheckpointName } from '../types';
+
+    import { createProductTourActions } from '../actions.svelte';
+    import { productTourCheckpoint } from '../state.svelte';
+    import ProductTourSpotlight from './product-tour-spotlight.svelte';
+
+    interface Props {
+        assistantAccess?: AssistantAccess;
+        checkpoint: ProductTourCheckpoint;
+        isAnyOverlayOpen: boolean;
+        openAssistant: () => Promise<void>;
+        setMobileNavigationOpen: (open: boolean) => void;
+    }
+
+    interface ShellStep {
+        checkpointName: ProductTourCheckpointName;
+        description: string;
+        target: string;
+        title: string;
+    }
+
+    let { assistantAccess, checkpoint, isAnyOverlayOpen, openAssistant, setMobileNavigationOpen }: Props = $props();
+    const currentAssistantAccess = untrack(() => assistantAccess);
+    const currentCheckpoint = untrack(() => checkpoint);
+    const actions = createProductTourActions();
+    const meetExieSteps: ShellStep[] = [
+        {
+            checkpointName: 'open-exie',
+            description: 'Open Exie to see the page context available for your next question.',
+            target: '[data-tour="exie-trigger"]',
+            title: 'Open Exie'
+        },
+        {
+            checkpointName: 'exie-context',
+            description: 'Nothing is sent until you choose a prompt. Submitted requests use metered provider usage.',
+            target: '[data-tour="exie-panel"]',
+            title: 'You control every request'
+        }
+    ];
+    const uiOverviewSteps: ShellStep[] = [
+        {
+            checkpointName: 'navigation',
+            description: 'Move between dashboards, saved views, and settings from the application navigation.',
+            target: '[data-tour="app-navigation"]',
+            title: 'Your workspace navigation'
+        },
+        {
+            checkpointName: 'command-search',
+            description: 'Open search or press / to jump to pages, projects, events, stacks, and actions.',
+            target: '[data-tour="command-search"]',
+            title: 'Find anything quickly'
+        },
+        {
+            checkpointName: 'saved-views',
+            description: 'Saved views preserve filters, time, sorting, charts, stats, and columns for quick reuse.',
+            target: '[data-tour="saved-view-navigation"]',
+            title: 'Reuse configured views'
+        },
+        ...(currentAssistantAccess?.enabled
+            ? [
+                  {
+                      checkpointName: 'exie' as const,
+                      description: 'Exie can investigate the page or error you are viewing. You decide whether to send a prompt.',
+                      target: '[data-tour="exie-trigger"]',
+                      title: 'Ask Exie with context'
+                  }
+              ]
+            : []),
+        {
+            checkpointName: 'help',
+            description: 'Open Help for documentation, support, keyboard shortcuts, and guided tours.',
+            target: '[data-tour="help-menu"]',
+            title: 'Help is always nearby'
+        }
+    ];
+    const steps = currentCheckpoint.tourName === 'ui-overview' ? uiOverviewSteps : meetExieSteps;
+    const spotlight = steps.find((step) => step.checkpointName === currentCheckpoint.checkpointName);
+
+    onMount(() => {
+        setMobileNavigationOpen(currentCheckpoint.checkpointName === 'navigation');
+    });
+
+    onDestroy(() => {
+        setMobileNavigationOpen(false);
+    });
+
+    async function advance(): Promise<void> {
+        if (currentCheckpoint.tourName === 'meet-exie' && currentCheckpoint.checkpointName === 'open-exie') {
+            await openAssistant();
+            productTourCheckpoint.advance(currentCheckpoint, 'exie-context');
+            return;
+        }
+
+        const index = steps.findIndex((step) => step.checkpointName === currentCheckpoint.checkpointName);
+        const next = steps[index + 1];
+        if (next) {
+            productTourCheckpoint.advance(currentCheckpoint, next.checkpointName);
+            return;
+        }
+
+        await actions.complete(currentCheckpoint);
+    }
+</script>
+
+{#if spotlight && (!isAnyOverlayOpen || checkpoint.tourName === 'meet-exie')}
+    <ProductTourSpotlight
+        checkpoint={currentCheckpoint}
+        description={spotlight.description}
+        onDismiss={actions.dismiss}
+        onNext={advance}
+        target={spotlight.target}
+        title={spotlight.title}
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
new file mode 100644
index 0000000000..2f80f74774
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -0,0 +1,74 @@
+<script lang="ts">
+    import { driver, type Driver } from 'driver.js';
+    import { onMount } from 'svelte';
+
+    import type { ProductTourCheckpoint } from '../types';
+
+    import 'driver.js/dist/driver.css';
+
+    interface Props {
+        checkpoint: ProductTourCheckpoint;
+        description: string;
+        onDismiss: (checkpoint: ProductTourCheckpoint) => Promise<boolean>;
+        onNext?: (checkpoint: ProductTourCheckpoint) => Promise<void> | void;
+        side?: 'bottom' | 'left' | 'right' | 'top';
+        target: Element | string;
+        title: string;
+    }
+
+    let { checkpoint, description, onDismiss, onNext, side, target, title }: Props = $props();
+    let activeDriver: Driver | undefined;
+
+    onMount(() => {
+        const instance = driver({
+            allowClose: true,
+            animate: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
+            disableActiveInteraction: false,
+            onDestroyStarted: async () => {
+                if (activeDriver === instance && (await onDismiss(checkpoint))) {
+                    destroy();
+                }
+            },
+            popoverClass:
+                'max-w-sm rounded-lg border border-border bg-popover text-popover-foreground shadow-lg [&_.driver-popover-title]:text-base [&_.driver-popover-title]:font-semibold',
+            showProgress: false,
+            smoothScroll: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
+            steps: [
+                {
+                    element: target,
+                    popover: {
+                        description,
+                        doneBtnText: 'Continue',
+                        onNextClick: onNext
+                            ? async () => {
+                                  await onNext(checkpoint);
+                              }
+                            : undefined,
+                        showButtons: onNext ? ['close', 'next'] : ['close'],
+                        side,
+                        title
+                    },
+                    waitForElement: 5000
+                }
+            ]
+        });
+        activeDriver = instance;
+        instance.drive();
+
+        return destroyImmediately;
+    });
+
+    function destroy(): void {
+        const instance = activeDriver;
+        activeDriver = undefined;
+        instance?.setConfig({
+            ...instance.getConfig(),
+            onDestroyStarted: undefined
+        });
+        instance?.destroy();
+    }
+
+    function destroyImmediately(): void {
+        destroy();
+    }
+</script>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
new file mode 100644
index 0000000000..eed9c6af2a
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
@@ -0,0 +1,24 @@
+import { ProductTourStatus } from '$generated/api';
+import { describe, expect, it } from 'vitest';
+
+import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from './eligibility';
+
+describe('product tour welcome eligibility', () => {
+    it('offers legacy users and a newer welcome version', () => {
+        expect(shouldOfferProductTourWelcome(undefined, 1)).toBe(true);
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, updated_utc: '', version: 1 }, 2)).toBe(true);
+    });
+
+    it('suppresses both explicit Start and Skip outcomes for the current version', () => {
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, updated_utc: '', version: 1 }, 1)).toBe(false);
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Dismissed, updated_utc: '', version: 1 }, 1)).toBe(false);
+    });
+});
+
+describe('product tour feature announcement eligibility', () => {
+    it('offers a new announcement version until explicitly recorded', () => {
+        expect(shouldOfferProductTourAnnouncement(undefined, 1)).toBe(true);
+        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Dismissed, updated_utc: '', version: 1 }, 1)).toBe(false);
+        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Completed, updated_utc: '', version: 2 }, 1)).toBe(false);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
new file mode 100644
index 0000000000..6967783729
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
@@ -0,0 +1,9 @@
+import type { ProductTourProgress } from '$features/users/models';
+
+export function shouldOfferProductTourAnnouncement(progress: ProductTourProgress | undefined, announcementVersion: number): boolean {
+    return !progress || progress.version < announcementVersion;
+}
+
+export function shouldOfferProductTourWelcome(progress: ProductTourProgress | undefined, welcomeVersion: number): boolean {
+    return !progress || progress.version < welcomeVersion;
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
new file mode 100644
index 0000000000..a4a104d26b
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
@@ -0,0 +1,42 @@
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import type { ProductTourCheckpoint } from './types';
+
+import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
+
+const checkpoint: ProductTourCheckpoint = {
+    checkpointName: 'choose-error',
+    organizationId: 'organization-id',
+    phase: { type: 'active' },
+    source: 'command-palette',
+    tourName: 'investigate-error',
+    userId: 'user-id'
+};
+
+describe('product tour session', () => {
+    beforeEach(() => {
+        sessionStorage.clear();
+    });
+
+    it('round-trips an explicit checkpoint', () => {
+        writeProductTourSession(checkpoint);
+        expect(readProductTourSession()).toEqual(checkpoint);
+        clearProductTourSession();
+        expect(sessionStorage).toHaveLength(0);
+    });
+
+    it.each([
+        '{not-json',
+        JSON.stringify({ ...checkpoint, tourName: 'unknown-tour' }),
+        JSON.stringify({ ...checkpoint, checkpointName: 'unknown-step' }),
+        JSON.stringify({ ...checkpoint, source: 'unknown-source' }),
+        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created' } }),
+        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created', viewId: 'view-id' } }),
+        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-loaded', viewId: 'view-id' } }),
+        JSON.stringify({ ...checkpoint, userId: 42 })
+    ])('clears malformed or unknown stored state: %s', (value) => {
+        sessionStorage.setItem('exceptionless.product-tour', value);
+        expect(readProductTourSession()).toBeUndefined();
+        expect(sessionStorage).toHaveLength(0);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
new file mode 100644
index 0000000000..3baa4db065
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -0,0 +1,66 @@
+import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
+
+import { PRODUCT_TOUR_CHECKPOINTS } from './types';
+
+const SESSION_KEY = 'exceptionless.product-tour';
+const SOURCES: readonly ProductTourLaunchSource[] = ['automatic', 'catalog', 'command-palette', 'feature-announcement', 'help-menu'];
+
+export function clearProductTourSession(storage: Pick<Storage, 'removeItem'> = sessionStorage): void {
+    storage.removeItem(SESSION_KEY);
+}
+
+export function readProductTourSession(storage: Pick<Storage, 'getItem' | 'removeItem'> = sessionStorage): ProductTourCheckpoint | undefined {
+    try {
+        const value = storage.getItem(SESSION_KEY);
+        if (!value) return undefined;
+
+        const candidate: unknown = JSON.parse(value);
+        if (!isProductTourCheckpoint(candidate)) {
+            clearProductTourSession(storage);
+            return undefined;
+        }
+
+        return candidate;
+    } catch {
+        clearProductTourSession(storage);
+        return undefined;
+    }
+}
+
+export function writeProductTourSession(checkpoint: ProductTourCheckpoint, storage: Pick<Storage, 'setItem'> = sessionStorage): void {
+    storage.setItem(SESSION_KEY, JSON.stringify(checkpoint));
+}
+
+function isPhase(value: unknown, tourName: string, checkpointName: unknown): value is ProductTourPhase {
+    if (!isRecord(value) || typeof value.type !== 'string') return false;
+    if (value.type === 'active') return true;
+    return (
+        tourName === 'create-saved-view' &&
+        checkpointName === 'view-created' &&
+        (value.type === 'saved-view-created' || value.type === 'saved-view-loaded') &&
+        typeof value.viewId === 'string' &&
+        !!value.viewId
+    );
+}
+
+function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint {
+    if (!isRecord(value) || typeof value.userId !== 'string' || !value.userId || typeof value.tourName !== 'string') return false;
+    if (value.organizationId !== undefined && typeof value.organizationId !== 'string') return false;
+    if (!isProductTourLaunchSource(value.source) || !isProductTourName(value.tourName)) return false;
+
+    const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[value.tourName];
+    if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) return false;
+    return isPhase(value.phase, value.tourName, value.checkpointName);
+}
+
+function isProductTourLaunchSource(value: unknown): value is ProductTourLaunchSource {
+    return typeof value === 'string' && (SOURCES as readonly string[]).includes(value);
+}
+
+function isProductTourName(value: string): value is ProductTourName {
+    return Object.hasOwn(PRODUCT_TOUR_CHECKPOINTS, value);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
new file mode 100644
index 0000000000..a4abfb8833
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -0,0 +1,36 @@
+import { beforeEach, describe, expect, it } from 'vitest';
+
+import type { ProductTourCheckpoint } from './types';
+
+import { productTourCheckpoint } from './state.svelte';
+
+const checkpoint: ProductTourCheckpoint = {
+    checkpointName: 'navigation',
+    organizationId: 'organization-id',
+    phase: { type: 'active' },
+    source: 'catalog',
+    tourName: 'ui-overview',
+    userId: 'user-id'
+};
+
+describe('product tour checkpoint store', () => {
+    beforeEach(() => productTourCheckpoint.clear());
+
+    it('does not let stale work advance or clear a newer tour', () => {
+        const first = productTourCheckpoint.start(checkpoint);
+        const second = productTourCheckpoint.start({ ...checkpoint, source: 'help-menu' });
+
+        expect(productTourCheckpoint.advance(first, 'command-search')).toBeUndefined();
+        expect(productTourCheckpoint.clear(first)).toBe(false);
+        expect(productTourCheckpoint.current).toBe(second);
+    });
+
+    it('clears a checkpoint restored for another identity', () => {
+        productTourCheckpoint.start(checkpoint);
+        productTourCheckpoint.clear();
+        sessionStorage.setItem('exceptionless.product-tour', JSON.stringify(checkpoint));
+
+        expect(productTourCheckpoint.restore('another-user', 'organization-id')).toBeUndefined();
+        expect(sessionStorage.getItem('exceptionless.product-tour')).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
new file mode 100644
index 0000000000..5f67e71c8d
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -0,0 +1,66 @@
+import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourPhase } from './types';
+
+import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
+
+class ProductTourCheckpointStore {
+    current = $state.raw<ProductTourCheckpoint>();
+
+    advance(
+        expected: ProductTourCheckpoint,
+        checkpointName: ProductTourCheckpointName,
+        phase: ProductTourPhase = {
+            type: 'active'
+        },
+        organizationId = expected.organizationId
+    ) {
+        if (this.current !== expected) {
+            return undefined;
+        }
+        return this.save({
+            ...expected,
+            checkpointName,
+            organizationId,
+            phase
+        });
+    }
+
+    clear(expected?: ProductTourCheckpoint): boolean {
+        if (expected && this.current !== expected) {
+            return false;
+        }
+        this.current = undefined;
+        clearProductTourSession();
+        return true;
+    }
+
+    restore(userId: string, organizationId?: string): ProductTourCheckpoint | undefined {
+        if (this.current) {
+            return this.current;
+        }
+
+        const stored = readProductTourSession();
+        if (!stored) {
+            return undefined;
+        }
+
+        if (stored.userId !== userId || stored.organizationId !== organizationId) {
+            clearProductTourSession();
+            return undefined;
+        }
+
+        this.current = stored;
+        return stored;
+    }
+
+    start(checkpoint: ProductTourCheckpoint): ProductTourCheckpoint {
+        return this.save(checkpoint);
+    }
+
+    private save(checkpoint: ProductTourCheckpoint): ProductTourCheckpoint {
+        this.current = checkpoint;
+        writeProductTourSession(checkpoint);
+        return checkpoint;
+    }
+}
+
+export const productTourCheckpoint = new ProductTourCheckpointStore();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
new file mode 100644
index 0000000000..a7ff2b5165
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
@@ -0,0 +1,13 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildProductTourTelemetryEvent } from './telemetry';
+
+describe('product tour telemetry', () => {
+    it('records stable lifecycle events without resource data', () => {
+        expect(buildProductTourTelemetryEvent('started', 'ui-overview', 1, 'command-palette')).toBe('product-tour.started.ui-overview.v1.command-palette');
+    });
+
+    it('rejects invalid versions', () => {
+        expect(() => buildProductTourTelemetryEvent('started', 'meet-exie', 0, 'catalog')).toThrow();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
new file mode 100644
index 0000000000..0c8ecc8429
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
@@ -0,0 +1,16 @@
+import type { ProductTourKey, ProductTourLaunchSource } from './types';
+
+export type ProductTourTelemetryEvent = 'completed' | 'dismissed' | 'shown' | 'started';
+
+export function buildProductTourTelemetryEvent(
+    event: ProductTourTelemetryEvent,
+    name: ProductTourKey,
+    version: number,
+    source: ProductTourLaunchSource
+): string {
+    if (!Number.isSafeInteger(version) || version < 1) {
+        throw new Error('Product tour telemetry requires a positive version.');
+    }
+
+    return ['product-tour', event, name, `v${version}`, source].join('.');
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
new file mode 100644
index 0000000000..7d438257a7
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -0,0 +1,56 @@
+import type { AssistantAccess } from '$features/assistant/models';
+import type { ViewProject } from '$features/projects/models';
+import type { ProductTourProgress } from '$features/users/models';
+
+export const PRODUCT_TOUR_CHECKPOINTS = {
+    'configure-project': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event'],
+    'create-saved-view': ['open-view-menu', 'review-settings', 'name-view', 'private-view', 'save-view', 'view-created'],
+    'investigate-error': ['filter-errors', 'choose-error', 'stack-summary', 'stack-triage', 'event-occurrence', 'tab-overview', 'filter-stack-events'],
+    'meet-exie': ['open-exie', 'exie-context'],
+    'ui-overview': ['navigation', 'command-search', 'saved-views', 'exie', 'help']
+} as const;
+
+export interface ProductTourAvailability {
+    available: boolean;
+    reason?: string;
+}
+export interface ProductTourCheckpoint {
+    checkpointName: ProductTourCheckpointName;
+    organizationId?: string;
+    phase: ProductTourPhase;
+    source: ProductTourLaunchSource;
+    tourName: ProductTourName;
+    userId: string;
+}
+export type ProductTourCheckpointName = (typeof PRODUCT_TOUR_CHECKPOINTS)[ProductTourName][number];
+export interface ProductTourContext {
+    assistantAccess?: AssistantAccess;
+    errorEventAvailability: 'available' | 'empty' | 'error' | 'loading';
+    isSetupPage: boolean;
+    organizationId?: string;
+    pathname: string;
+    projects: Pick<ViewProject, 'is_configured'>[];
+}
+export interface ProductTourDefinition {
+    availability: (context: ProductTourContext) => ProductTourAvailability;
+    description: string;
+    initialCheckpoint: ProductTourCheckpointName;
+    keywords: readonly string[];
+    name: ProductTourName;
+    startingRoute: (context: ProductTourContext) => string;
+    title: string;
+    version: number;
+}
+
+export type ProductTourKey = 'exie-announcement' | 'welcome' | ProductTourName;
+
+export type ProductTourLaunchSource = 'automatic' | 'catalog' | 'command-palette' | 'feature-announcement' | 'help-menu';
+
+export interface ProductTourListItem extends ProductTourDefinition {
+    currentAvailability: ProductTourAvailability;
+    progress?: ProductTourProgress;
+}
+
+export type ProductTourName = keyof typeof PRODUCT_TOUR_CHECKPOINTS;
+
+export type ProductTourPhase = { type: 'active' } | { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
index cf35e91986..5d957ee165 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
@@ -140,6 +140,7 @@ export interface GetProjectIntegrationNotificationSettingsRequest {
 }
 
 export interface GetProjectRequest {
+    enabled?: () => boolean;
     refetchInterval?: false | number;
     route: {
         id: string | undefined;
@@ -440,7 +441,7 @@ export function getProjectQuery(request: GetProjectRequest) {
         const id = request.route.id;
 
         return {
-            enabled: () => !!accessToken.current && !!id,
+            enabled: () => !!accessToken.current && !!id && (request.enabled?.() ?? true),
             // Like event and stack reads, finish across remounts so the next observer can reuse the result.
             queryFn: async () => {
                 const client = useFetchClient();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
index 95fc6808ec..645228ecd3 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
@@ -1,10 +1,13 @@
 <script lang="ts">
+    import type { ProductTourCheckpointName } from '$features/product-tours/types';
+
     import { Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Dialog from '$comp/ui/dialog';
     import { Input } from '$comp/ui/input';
     import { Label } from '$comp/ui/label';
     import { Switch } from '$comp/ui/switch';
+    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
 
     import type { SavedView } from '../models';
 
@@ -19,16 +22,34 @@
     } from '../slugs';
 
     interface Props {
+        defaultPrivate?: boolean;
         duplicateView?: SavedView;
+        onCancel?: () => void;
         onClose: () => void;
-        onLoadView: (view: SavedView) => void;
+        onLoadView: (view: SavedView) => Promise<void> | void;
         onSave: (name: string, slug: string, isPrivate: boolean) => Promise<void>;
+        onTourContinue?: (checkpointName: ProductTourCheckpointName) => void;
         open: boolean;
+        pendingCompletion?: boolean;
         savedViews: SavedView[];
         saving: boolean;
+        tourCheckpointName?: ProductTourCheckpointName;
     }
 
-    let { duplicateView, onClose, onLoadView, onSave, open = $bindable(), savedViews, saving }: Props = $props();
+    let {
+        defaultPrivate = false,
+        duplicateView,
+        onCancel,
+        onClose,
+        onLoadView,
+        onSave,
+        onTourContinue,
+        open = $bindable(),
+        pendingCompletion = false,
+        savedViews,
+        saving,
+        tourCheckpointName
+    }: Props = $props();
 
     let saveName = $state('');
     let saveSlug = $state('');
@@ -80,14 +101,14 @@
     });
     const visibleNameError = $derived(attemptedSubmit || saveName.length > 0 ? nameError : undefined);
     const visibleSlugError = $derived(attemptedSubmit || saveName.length > 0 || saveSlug.length > 0 ? slugError : undefined);
-    const canSave = $derived(!nameError && !slugError && !saving);
+    const canSave = $derived((pendingCompletion || (!nameError && !slugError)) && !saving);
 
     $effect(() => {
         if (open) {
             saveName = '';
             saveSlug = '';
             isSlugDirty = false;
-            isPrivate = false;
+            isPrivate = defaultPrivate;
             attemptedSubmit = false;
         }
     });
@@ -107,30 +128,76 @@
 
     async function handleSave() {
         attemptedSubmit = true;
-        if (!canSave) {
+        if (saving || (!pendingCompletion && (nameError || slugError))) {
             return;
         }
 
         await onSave(trimmedName, normalizedSlug, isPrivate);
     }
+
+    function dismissTour(): void {
+        onClose();
+        onCancel?.();
+    }
 </script>
 
-<Dialog.Root bind:open>
-    <Dialog.Content class="sm:max-w-100">
+<Dialog.Root
+    {open}
+    onOpenChange={(nextOpen) => {
+        if (nextOpen || !saving) {
+            open = nextOpen;
+            if (!nextOpen) {
+                onCancel?.();
+            }
+        }
+    }}
+>
+    <Dialog.Content
+        class="sm:max-w-100"
+        data-tour="saved-view-dialog"
+        onEscapeKeydown={(event) => saving && event.preventDefault()}
+        onInteractOutside={(event) => saving && event.preventDefault()}
+    >
         <Dialog.Header>
             <Dialog.Title>Save View</Dialog.Title>
             <Dialog.Description>Save the current view configuration for quick access.</Dialog.Description>
         </Dialog.Header>
-        {#if duplicateView}
+        {#if defaultPrivate && tourCheckpointName === 'name-view'}
+            <ProductTourInlineCallout
+                description="Review the current filters, time, display options, and columns. Choose a meaningful name, then continue."
+                onContinue={() => onTourContinue?.('private-view')}
+                onDismiss={dismissTour}
+                title="Review and name your view"
+                tourName="create-saved-view"
+            />
+        {:else if defaultPrivate && tourCheckpointName === 'private-view'}
+            <ProductTourInlineCallout
+                description="Private is enabled for this guide so the practice view is visible only to you. Continue when you are ready to save it."
+                onContinue={() => onTourContinue?.('save-view')}
+                onDismiss={dismissTour}
+                title="Keep it private"
+                tourName="create-saved-view"
+            />
+        {:else if defaultPrivate && (tourCheckpointName === 'save-view' || tourCheckpointName === 'view-created')}
+            <ProductTourInlineCallout
+                description={pendingCompletion
+                    ? 'The view was created, but the guide could not save its progress. Retry to finish without creating another view.'
+                    : 'Click Save when ready. The guide completes only after the private view is successfully created and loaded.'}
+                onDismiss={dismissTour}
+                title="Create the saved view"
+                tourName="create-saved-view"
+            />
+        {/if}
+        {#if duplicateView && !pendingCompletion}
             <div class="bg-muted rounded-md p-3">
                 <Muted>
                     Current filters match <strong>"{duplicateView.name}"</strong>. You can
                     <Button
                         variant="link"
                         class="h-auto p-0 text-sm"
-                        onclick={() => {
-                            open = false;
-                            onLoadView(duplicateView);
+                        onclick={async () => {
+                            await onLoadView(duplicateView);
+                            dismissTour();
                         }}>load it</Button
                     > instead, or save with a different name.
                 </Muted>
@@ -146,6 +213,7 @@
             <div class="flex flex-col gap-2">
                 <Label for="view-name">Name</Label>
                 <Input
+                    data-tour="saved-view-name"
                     id="view-name"
                     bind:value={saveName}
                     placeholder="e.g., Production Errors"
@@ -154,6 +222,7 @@
                     aria-describedby={visibleNameError ? 'view-name-error' : undefined}
                     required
                     autofocus
+                    disabled={pendingCompletion}
                 />
                 {#if visibleNameError}
                     <p id="view-name-error" class="text-destructive text-sm">{visibleNameError}</p>
@@ -169,6 +238,7 @@
                     aria-invalid={!!visibleSlugError}
                     aria-describedby={visibleSlugError ? 'view-slug-error' : undefined}
                     required
+                    disabled={pendingCompletion}
                     oninput={() => {
                         isSlugDirty = true;
                     }}
@@ -177,17 +247,17 @@
                     <p id="view-slug-error" class="text-destructive text-sm">{visibleSlugError}</p>
                 {/if}
             </div>
-            <div class="flex items-center justify-between">
+            <div class="flex items-center justify-between" data-tour="saved-view-private">
                 <div>
                     <Label for="view-private" class="text-sm">Private</Label>
-                    <Muted>Only visible to you</Muted>
+                    <Muted>{defaultPrivate ? 'Required for this guided practice view' : 'Only visible to you'}</Muted>
                 </div>
-                <Switch id="view-private" bind:checked={isPrivate} />
+                <Switch disabled={defaultPrivate || pendingCompletion} id="view-private" bind:checked={isPrivate} />
             </div>
             <Dialog.Footer>
-                <Button variant="outline" onclick={onClose}>Cancel</Button>
-                <Button type="submit" disabled={!canSave}>
-                    {saving ? 'Saving...' : 'Save'}
+                <Button variant="outline" disabled={saving} onclick={dismissTour}>Cancel</Button>
+                <Button data-tour="saved-view-submit" type="submit" disabled={!canSave}>
+                    {saving ? 'Saving...' : pendingCompletion ? 'Retry guide completion' : 'Save'}
                 </Button>
             </Dialog.Footer>
         </form>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 2cee06835d..81fbdd3dcf 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -15,6 +15,9 @@
     import { serializeFilters } from '$features/events/components/filters/helpers.svelte';
     import { getOrganizationQuery, getOrganizationsQuery } from '$features/organizations/api.svelte';
     import { organization } from '$features/organizations/context.svelte';
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { supportsColumnWrapping } from '$features/shared/components/data-table/column-meta';
     import { getMeQuery } from '$features/users/api.svelte';
     import Building2 from '@lucide/svelte/icons/building-2';
@@ -69,7 +72,7 @@
         filters: IFilter[];
         isModified: boolean;
         onClearSavedView: () => Promise<void>;
-        onLoadView: (view: SavedView) => void;
+        onLoadView: (view: SavedView) => Promise<void> | void;
         onResetToSaved: () => void;
         onSavedViewUpdated: (view: SavedView) => void;
         savedViews: SavedView[];
@@ -114,12 +117,23 @@
         wrappedColumnIds
     }: Props = $props();
 
-    let isSaveDialogOpen = $state(false);
+    let isSaveDialogOpenManually = $state(false);
     let isRenameDialogOpen = $state(false);
     let isDeleteDialogOpen = $state(false);
     let isColumnDialogOpen = $state(false);
     let isMenuOpen = $state(false);
     let viewToDelete = $state<null | SavedView>(null);
+    const tourActions = createProductTourActions();
+    const savedViewCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'create-saved-view' ? productTourCheckpoint.current : undefined);
+    const isSaveDialogOpen = $derived(
+        isSaveDialogOpenManually || savedViewCheckpoint?.phase.type === 'saved-view-created' || savedViewCheckpoint?.phase.type === 'saved-view-loaded'
+    );
+    const pendingTourView = $derived.by(() => {
+        const phase = savedViewCheckpoint?.phase;
+        return phase?.type === 'saved-view-created' || phase?.type === 'saved-view-loaded'
+            ? savedViews.find((savedView) => savedView.id === phase.viewId)
+            : undefined;
+    });
 
     const organizationId = $derived(organization.current);
     const activeView = $derived(activeSavedView);
@@ -218,7 +232,7 @@
 
     async function openSaveDialog() {
         await tick();
-        isSaveDialogOpen = true;
+        isSaveDialogOpenManually = true;
     }
 
     async function openRenameDialog() {
@@ -259,6 +273,35 @@
             return;
         }
 
+        const checkpoint = savedViewCheckpoint;
+        if (checkpoint?.phase.type === 'saved-view-loaded') {
+            if (await tourActions.complete(checkpoint)) {
+                isSaveDialogOpenManually = false;
+            }
+            return;
+        }
+
+        if (checkpoint?.phase.type === 'saved-view-created') {
+            if (!pendingTourView) {
+                toast.error('The created view could not be loaded. Refresh and try again.');
+                return;
+            }
+
+            try {
+                await onLoadView(pendingTourView);
+                const loadedCheckpoint = productTourCheckpoint.advance(checkpoint, 'view-created', {
+                    type: 'saved-view-loaded',
+                    viewId: checkpoint.phase.viewId
+                });
+                if (loadedCheckpoint && (await tourActions.complete(loadedCheckpoint))) {
+                    isSaveDialogOpenManually = false;
+                }
+            } catch (error) {
+                toast.error(getErrorMessage(error, 'Failed to load the created view. Please try again.'));
+            }
+            return;
+        }
+
         const filterDefinitions = serializeFilters(filters);
         const body: NewSavedView = {
             columns: getSavedColumnSettings(),
@@ -277,8 +320,25 @@
 
         try {
             const result = await createMutation.mutateAsync(body);
-            isSaveDialogOpen = false;
-            onLoadView(result);
+            if (checkpoint) {
+                const createdCheckpoint = productTourCheckpoint.advance(checkpoint, 'view-created', {
+                    type: 'saved-view-created',
+                    viewId: result.id
+                });
+                await onLoadView(result);
+                const loadedCheckpoint = createdCheckpoint
+                    ? productTourCheckpoint.advance(createdCheckpoint, 'view-created', {
+                          type: 'saved-view-loaded',
+                          viewId: result.id
+                      })
+                    : undefined;
+                if (loadedCheckpoint && (await tourActions.complete(loadedCheckpoint))) {
+                    isSaveDialogOpenManually = false;
+                }
+            } else {
+                isSaveDialogOpenManually = false;
+                await onLoadView(result);
+            }
             toast.success(`Saved view "${result.name}" created.`);
         } catch (error) {
             toast.error(getErrorMessage(error, 'Failed to save view. Please try again.'));
@@ -393,7 +453,7 @@
 <DropdownMenu.Root bind:open={isMenuOpen}>
     <DropdownMenu.Trigger>
         {#snippet child({ props })}
-            <Button {...props} class="relative gap-x-1.5 px-3" size="lg" variant="outline" title="Manage View Settings">
+            <Button {...props} class="relative gap-x-1.5 px-3" data-tour="saved-view-trigger" size="lg" variant="outline" title="Manage View Settings">
                 <SlidersHorizontal class="size-4" aria-hidden="true" />
                 <span>View</span>
                 {#if isModified}
@@ -402,7 +462,7 @@
             </Button>
         {/snippet}
     </DropdownMenu.Trigger>
-    <DropdownMenu.Content align="end" class="w-64">
+    <DropdownMenu.Content align="end" class="w-64" data-tour="saved-view-settings">
         <DropdownMenu.Group>
             <DropdownMenu.Label>Saved View</DropdownMenu.Label>
             {#if activeView}
@@ -493,16 +553,57 @@
 
 {#if isSaveDialogOpen}
     <SaveViewDialog
-        bind:open={isSaveDialogOpen}
+        open={isSaveDialogOpen}
+        defaultPrivate={!!savedViewCheckpoint}
         {duplicateView}
+        onCancel={async () => {
+            if (savedViewCheckpoint) {
+                await tourActions.dismiss(savedViewCheckpoint);
+            }
+        }}
         {savedViews}
         {saving}
         onSave={handleSave}
-        onClose={() => (isSaveDialogOpen = false)}
+        onClose={() => (isSaveDialogOpenManually = false)}
+        onTourContinue={(checkpointName) => {
+            const checkpoint = savedViewCheckpoint;
+            if (checkpoint) {
+                productTourCheckpoint.advance(checkpoint, checkpointName);
+            }
+        }}
+        pendingCompletion={savedViewCheckpoint?.phase.type === 'saved-view-created' || savedViewCheckpoint?.phase.type === 'saved-view-loaded'}
+        tourCheckpointName={savedViewCheckpoint?.checkpointName}
         {onLoadView}
     />
 {/if}
 
+{#if savedViewCheckpoint?.checkpointName === 'open-view-menu'}
+    <ProductTourSpotlight
+        checkpoint={savedViewCheckpoint}
+        description="Open View settings to review what a reusable saved view can remember."
+        onDismiss={tourActions.dismiss}
+        onNext={(checkpoint) => {
+            isMenuOpen = true;
+            productTourCheckpoint.advance(checkpoint, 'review-settings');
+        }}
+        target="[data-tour='saved-view-trigger']"
+        title="Open View settings"
+    />
+{:else if savedViewCheckpoint?.checkpointName === 'review-settings'}
+    <ProductTourSpotlight
+        checkpoint={savedViewCheckpoint}
+        description="Review the filters, date range, display choices, and columns. The guide will not change them for you."
+        onDismiss={tourActions.dismiss}
+        onNext={(checkpoint) => {
+            isMenuOpen = false;
+            isSaveDialogOpenManually = true;
+            productTourCheckpoint.advance(checkpoint, 'name-view');
+        }}
+        target="[data-tour='saved-view-settings']"
+        title="Configure what the view remembers"
+    />
+{/if}
+
 {#if isRenameDialogOpen && activeView}
     <RenameViewDialog
         bind:open={isRenameDialogOpen}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
index a4122d895a..ce02f11c3f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar.svelte
@@ -40,6 +40,7 @@
 	>
 		<Sheet.Content
 			bind:ref
+			data-tour="app-navigation"
 			data-sidebar="sidebar"
 			data-slot="sidebar"
 			data-mobile="true"
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
index d28effe22b..a5dce7ded1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
@@ -173,6 +173,7 @@
 {#if stack}
     <Card.Root
         class="bg-background relative overflow-hidden ring-[color-mix(in_oklab,var(--chart-1)_42%,transparent)] before:absolute before:inset-x-0 before:top-0 before:h-1 before:bg-[linear-gradient(90deg,var(--chart-1),var(--chart-2))] before:content-['']"
+        data-tour="event-stack"
     >
         <Card.Header>
             <Card.Title class="flex flex-row items-center justify-between text-lg font-semibold">
@@ -184,10 +185,12 @@
                 <div class="ml-2 flex shrink-0 items-center gap-2">
                     <StackLogLevel {stack} />
                     <AssistantFixButton {prepareContext} resource={assistantResource} />
-                    <ButtonGroup.Root>
-                        <StackStatusDropdownMenu {stack} />
-                        <StackOptionsDropdownMenu {onDeleted} {stack} />
-                    </ButtonGroup.Root>
+                    <div data-tour="event-stack-triage">
+                        <ButtonGroup.Root>
+                            <StackStatusDropdownMenu {stack} />
+                            <StackOptionsDropdownMenu {onDeleted} {stack} />
+                        </ButtonGroup.Root>
+                    </div>
                 </div>
             </Card.Title>
         </Card.Header>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
index ff97db0e6d..3a55928f6c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
@@ -7,7 +7,16 @@ import { fetchApiJson } from '$features/shared/api/api.svelte';
 import { type FetchClientResponse, ProblemDetails, useFetchClient } from '@foundatiofx/fetchclient';
 import { createMutation, createQuery, QueryClient, useQueryClient } from '@tanstack/svelte-query';
 
-import type { OAuthGrant, UpdateEmailAddressResult, UpdateUser, UpdateUserEmailAddress, ViewCurrentUser, ViewUser } from './models';
+import type {
+    OAuthGrant,
+    ProductTourProgress,
+    UpdateEmailAddressResult,
+    UpdateProductTourProgress,
+    UpdateUser,
+    UpdateUserEmailAddress,
+    ViewCurrentUser,
+    ViewUser
+} from './models';
 
 export async function invalidateUserQueries(queryClient: QueryClient, message: WebSocketMessageValue<'UserChanged'>) {
     const { id } = message;
@@ -41,6 +50,7 @@ export const queryKeys = {
     organization: (id: string | undefined) => [...queryKeys.type, 'organization', id] as const,
     patchUser: (id: string | undefined) => [...queryKeys.id(id), 'patch'] as const,
     postEmailAddress: (id: string | undefined) => [...queryKeys.idEmailAddress(id), 'update'] as const,
+    productTour: (tourName: string | undefined) => [...queryKeys.me(), 'product-tours', tourName] as const,
     type: ['User'] as const
 };
 
@@ -68,6 +78,11 @@ export interface PostEmailAddressRequest {
     };
 }
 
+export interface PutCurrentUserProductTourRequest {
+    progress: UpdateProductTourProgress;
+    tourName: string;
+}
+
 export interface ResendVerificationEmailRequest {
     route: {
         id: string | undefined;
@@ -260,6 +275,35 @@ export function postEmailAddress(request: PostEmailAddressRequest) {
     }));
 }
 
+export function putCurrentUserProductTour() {
+    const queryClient = useQueryClient();
+    return createMutation<ProductTourProgress, ProblemDetails, PutCurrentUserProductTourRequest>(() => ({
+        enabled: () => !!accessToken.current,
+        mutationFn: async ({ progress, tourName }) => {
+            const client = useFetchClient();
+            const response = await client.putJSON<ProductTourProgress>(`users/me/product-tours/${tourName}`, progress);
+            return response.data!;
+        },
+        mutationKey: queryKeys.productTour(undefined),
+        onSuccess: (progress, { tourName }) => {
+            const currentUser = queryClient.getQueryData<ViewCurrentUser>(queryKeys.me());
+            if (!currentUser) {
+                return;
+            }
+
+            const updatedUser = {
+                ...currentUser,
+                product_tours: {
+                    ...currentUser.product_tours,
+                    [tourName]: progress
+                }
+            };
+            queryClient.setQueryData(queryKeys.me(), updatedUser);
+            queryClient.setQueryData(queryKeys.id(currentUser.id), updatedUser);
+        }
+    }));
+}
+
 export function resendVerificationEmail(request: ResendVerificationEmailRequest) {
     return createMutation<void, ProblemDetails, void>(() => ({
         enabled: () => !!accessToken.current && !!request.route.id,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/users/models.ts
index a262d71122..67d005712d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/models.ts
@@ -1,4 +1,12 @@
-export type { ViewOAuthGrant as OAuthGrant, UpdateEmailAddressResult, ViewCurrentUser, ViewUser } from '$generated/api';
+export { ProductTourStatus } from '$generated/api';
+export type {
+    ViewOAuthGrant as OAuthGrant,
+    ProductTourProgress,
+    UpdateEmailAddressResult,
+    UpdateProductTourProgress,
+    ViewCurrentUser,
+    ViewUser
+} from '$generated/api';
 
 export interface InviteUserForm {
     email: string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 8db136b95e..0c38fc5593 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -7,6 +7,11 @@ export enum StackStatus {
   Discarded = "discarded",
 }
 
+export enum ProductTourStatus {
+  Completed = "completed",
+  Dismissed = "dismissed",
+}
+
 export enum BillingStatus {
   Trialing = 0,
   Active = 1,
@@ -73,6 +78,48 @@ export interface AdminAssistantUsageResponse {
   organizations: AdminAssistantOrganizationUsage[];
 }
 
+export interface AdminProductTourActivity {
+  /** @format date-time */
+  date_utc: string;
+  event: string;
+  launch_source: string;
+  tour_name: string;
+  user_identity?: null | string;
+  user_name?: null | string;
+  /** @format int32 */
+  version: number;
+  /** @format int64 */
+  count: number;
+}
+
+export interface AdminProductTourSummary {
+  name: string;
+  /** @format int64 */
+  shown: number;
+  /** @format int64 */
+  started: number;
+  /** @format int64 */
+  completed: number;
+  /** @format int64 */
+  dismissed: number;
+  /** @format int64 */
+  unique_users: number;
+  /** @format date-time */
+  last_run_utc?: null | string;
+  /** @format double */
+  completion_rate?: null | number;
+  /** @format double */
+  dismissal_rate?: null | number;
+}
+
+export interface AdminProductTourUsageResponse {
+  /** @format date-time */
+  month: string;
+  telemetry_configured: boolean;
+  tours: AdminProductTourSummary[];
+  recent_activity: AdminProductTourActivity[];
+}
+
 export interface AssistantAccessResponse {
   enabled: boolean;
   has_access: boolean;
@@ -494,6 +541,14 @@ export interface ProblemDetails {
   instance?: null | string;
 }
 
+export interface ProductTourProgress {
+  status: ProductTourStatus;
+  /** @format date-time */
+  updated_utc: string;
+  /** @format int32 */
+  version: number;
+}
+
 export interface ResetPasswordModel {
   password_reset_token: string;
   password: string;
@@ -648,6 +703,16 @@ export interface UpdateEventSubmissionSettings {
   enabled?: null | boolean;
 }
 
+export interface UpdateProductTourProgress {
+  status?: null | ProductTourStatus;
+  /**
+   * @format int32
+   * @min 1
+   * @max 2147483647
+   */
+  version: number;
+}
+
 /** A class the tracks changes (i.e. the Delta) for a particular TEntityType. */
 export interface UpdateProject {
   name: string;
@@ -737,6 +802,7 @@ export interface User {
   o_auth_accounts: OAuthAccount[];
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
+  product_tours: Record<string, ProductTourProgress>;
   /** Gets or sets the users Full Name. */
   full_name: string;
   /** @format email */
@@ -784,6 +850,7 @@ export interface ViewCurrentUser {
   o_auth_accounts: OAuthAccount[];
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
+  product_tours: Record<string, ProductTourProgress>;
   /** @pattern ^[a-fA-F0-9]{24}$ */
   id: string;
   organization_ids: string[];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index ec58c99678..c541054d33 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,6 +27,7 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
+export const ProductTourStatusSchema = zodEnum(["completed", "dismissed"]);
 export const BillingStatusSchema = union([
   literal(0),
   literal(1),
@@ -75,6 +76,45 @@ export type AdminAssistantUsageResponseFormData = Infer<
   typeof AdminAssistantUsageResponseSchema
 >;
 
+export const AdminProductTourActivitySchema = object({
+  date_utc: iso.datetime(),
+  event: string().min(1, "Event is required"),
+  launch_source: string().min(1, "Launch source is required"),
+  tour_name: string().min(1, "Tour name is required"),
+  user_identity: string().min(1, "User identity is required").nullable(),
+  user_name: string().min(1, "User name is required").nullable(),
+  version: int32(),
+  count: int(),
+});
+export type AdminProductTourActivityFormData = Infer<
+  typeof AdminProductTourActivitySchema
+>;
+
+export const AdminProductTourSummarySchema = object({
+  name: string().min(1, "Name is required"),
+  shown: int(),
+  started: int(),
+  completed: int(),
+  dismissed: int(),
+  unique_users: int(),
+  last_run_utc: iso.datetime().nullable(),
+  completion_rate: number().nullable(),
+  dismissal_rate: number().nullable(),
+});
+export type AdminProductTourSummaryFormData = Infer<
+  typeof AdminProductTourSummarySchema
+>;
+
+export const AdminProductTourUsageResponseSchema = object({
+  month: iso.datetime(),
+  telemetry_configured: boolean(),
+  tours: array(lazy(() => AdminProductTourSummarySchema)),
+  recent_activity: array(lazy(() => AdminProductTourActivitySchema)),
+});
+export type AdminProductTourUsageResponseFormData = Infer<
+  typeof AdminProductTourUsageResponseSchema
+>;
+
 export const AssistantAccessResponseSchema = object({
   enabled: boolean(),
   has_access: boolean(),
@@ -626,6 +666,15 @@ export const ProblemDetailsSchema = object({
 });
 export type ProblemDetailsFormData = Infer<typeof ProblemDetailsSchema>;
 
+export const ProductTourProgressSchema = object({
+  status: ProductTourStatusSchema,
+  updated_utc: iso.datetime(),
+  version: int32(),
+});
+export type ProductTourProgressFormData = Infer<
+  typeof ProductTourProgressSchema
+>;
+
 export const ResetPasswordModelSchema = object({
   password_reset_token: string().length(
     40,
@@ -768,6 +817,16 @@ export type UpdateEventSubmissionSettingsFormData = Infer<
   typeof UpdateEventSubmissionSettingsSchema
 >;
 
+export const UpdateProductTourProgressSchema = object({
+  status: ProductTourStatusSchema,
+  version: int32()
+    .min(1, "Version must be at least 1")
+    .max(2147483647, "Version must be at most 2147483647"),
+});
+export type UpdateProductTourProgressFormData = Infer<
+  typeof UpdateProductTourProgressSchema
+>;
+
 export const UpdateProjectSchema = object({
   name: string().min(1, "Name is required").optional(),
   delete_bot_data_enabled: boolean().optional(),
@@ -862,6 +921,10 @@ export const UserSchema = object({
   o_auth_accounts: array(lazy(() => OAuthAccountSchema)),
   organization_preferences: array(lazy(() => UserOrganizationPreferenceSchema)),
   saved_view_orders: array(lazy(() => UserSavedViewOrderPreferenceSchema)),
+  product_tours: record(
+    string(),
+    lazy(() => ProductTourProgressSchema),
+  ),
   full_name: string().min(1, "Full name is required"),
   email_address: email(),
   avatar_file_name: string()
@@ -919,6 +982,10 @@ export const ViewCurrentUserSchema = object({
   o_auth_accounts: array(lazy(() => OAuthAccountSchema)),
   organization_preferences: array(lazy(() => UserOrganizationPreferenceSchema)),
   saved_view_orders: array(lazy(() => UserSavedViewOrderPreferenceSchema)),
+  product_tours: record(
+    string(),
+    lazy(() => ProductTourProgressSchema),
+  ),
   id: string()
     .length(24, "Id must be exactly 24 characters")
     .regex(/^[a-fA-F0-9]{24}$/, "Id has invalid format"),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
index dda09bd8e4..5998ebf0fb 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
@@ -27,7 +27,7 @@
     <div class="px-4 py-3">
         <div class="flex items-center justify-between">
             <div class="flex items-center justify-start">
-                <Sidebar.Trigger variant="outline" class="size-9" />
+                <Sidebar.Trigger data-tour="mobile-navigation-trigger" variant="outline" class="size-9" />
 
                 <A variant="ghost" class="mr-14 ml-2 flex md:min-w-62.5 lg:ml-3 dark:text-white" href={resolve('/')}>
                     {#if isMediumScreenQuery.current}
@@ -41,6 +41,7 @@
                 <Button
                     aria-label="Search Exceptionless"
                     class="w-9 justify-center sm:w-56 sm:justify-start md:w-72"
+                    data-tour="command-search"
                     onclick={openCommand}
                     size="default"
                     variant="outline"
@@ -55,6 +56,7 @@
                         aria-label={isAssistantOpen ? 'Close Exie' : 'Open Exie'}
                         class="px-2"
                         data-assistant-trigger
+                        data-tour="exie-trigger"
                         onclick={toggleAssistant}
                         title="Ask Exie"
                         variant="outline"
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
index 59cf26c487..e5536c4b63 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
@@ -23,6 +23,7 @@
     import Braces from '@lucide/svelte/icons/braces';
     import ChevronsUpDown from '@lucide/svelte/icons/chevrons-up-down';
     import Help from '@lucide/svelte/icons/circle-help';
+    import Compass from '@lucide/svelte/icons/compass';
     import CreditCard from '@lucide/svelte/icons/credit-card';
     import LogOut from '@lucide/svelte/icons/log-out';
     import Plus from '@lucide/svelte/icons/plus';
@@ -36,6 +37,7 @@
         isLoading: boolean;
         open?: boolean;
         openChat: () => void;
+        openGuidedTours: () => void;
         openKeyboardShortcuts: () => Promise<void> | void;
         organizations?: ViewOrganization[];
         user: undefined | ViewCurrentUser;
@@ -48,6 +50,7 @@
         isLoading,
         open = $bindable(false),
         openChat,
+        openGuidedTours,
         openKeyboardShortcuts,
         organizations = [],
         user
@@ -77,6 +80,12 @@
         void openKeyboardShortcuts();
     }
 
+    function onGuidedToursClick(): void {
+        onMenuClick();
+        open = false;
+        openGuidedTours();
+    }
+
     function navigateTo(href: string): void {
         onMenuClick();
         void goto(href);
@@ -131,7 +140,12 @@
             <DropdownMenu.Root bind:open>
                 <DropdownMenu.Trigger>
                     {#snippet child({ props })}
-                        <Sidebar.MenuButton size="lg" class="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground" {...props}>
+                        <Sidebar.MenuButton
+                            size="lg"
+                            class="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
+                            data-tour="help-menu"
+                            {...props}
+                        >
                             <Avatar.Root class="size-8 rounded-lg" title="Profile Image">
                                 {#await gravatar.src}
                                     <Avatar.Fallback class="rounded-lg">{gravatar.initials}</Avatar.Fallback>
@@ -225,6 +239,10 @@
                             Help
                         </DropdownMenu.SubTrigger>
                         <DropdownMenu.SubContent>
+                            <DropdownMenu.Item onSelect={onGuidedToursClick}>
+                                <Compass />
+                                <span class="w-full">Guided Tours…</span>
+                            </DropdownMenu.Item>
                             {#if isChatEnabled}
                                 <DropdownMenu.Item class="gap-2 p-2" onSelect={onChatClick}>
                                     <Help />
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
index cbc8c52715..ce2a493c5e 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
@@ -359,14 +359,14 @@
     });
 </script>
 
-<Sidebar.Root collapsible="icon" {...props}>
+<Sidebar.Root collapsible="icon" data-tour="app-navigation" {...props}>
     <Sidebar.Header class={!sidebar.isMobile ? 'mt-16' : ''}>
         {#if header}
             {@render header()}
         {/if}
     </Sidebar.Header>
     <Sidebar.Content>
-        <Sidebar.Group class="pt-0">
+        <Sidebar.Group class="pt-0" data-tour="saved-view-navigation">
             <Sidebar.Menu>
                 {#each dashboardRoutes as route (route.href)}
                     {@const Icon = route.icon}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
index d1cbdcbe14..2a19d607a3 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import type { ViewOrganization } from '$features/organizations/models';
+    import type { ProductTourListItem, ProductTourName } from '$features/product-tours/types';
     import type { ViewProject } from '$features/projects/models';
     import type { FetchClientResponse } from '@foundatiofx/fetchclient';
 
@@ -24,6 +25,7 @@
     import Building2 from '@lucide/svelte/icons/building-2';
     import CircleHelp from '@lucide/svelte/icons/circle-help';
     import CircleUserRound from '@lucide/svelte/icons/circle-user-round';
+    import Compass from '@lucide/svelte/icons/compass';
     import Eye from '@lucide/svelte/icons/eye';
     import EyeOff from '@lucide/svelte/icons/eye-off';
     import Keyboard from '@lucide/svelte/icons/keyboard';
@@ -56,6 +58,7 @@
 
     type Props = {
         askExie: (prompt: string) => Promise<void> | void;
+        guidedTours: ProductTourListItem[];
         isChatEnabled: boolean;
         isExieEnabled: boolean;
         isGlobalAdmin: boolean;
@@ -63,6 +66,7 @@
         open: boolean;
         openChat: () => void;
         openExie: () => Promise<void> | void;
+        openGuidedTours: () => void;
         openImpersonateOrganization: () => Promise<void> | void;
         openKeyboardShortcuts: () => Promise<void> | void;
         openOrganizationSwitcher: () => Promise<void> | void;
@@ -70,6 +74,7 @@
         organizations: ViewOrganization[];
         resetKey: number;
         routes: NavigationItem[];
+        startGuidedTour: (name: ProductTourName) => Promise<void>;
         stopImpersonating: () => Promise<void> | void;
     };
 
@@ -86,6 +91,7 @@
 
     let {
         askExie,
+        guidedTours,
         isChatEnabled,
         isExieEnabled,
         isGlobalAdmin,
@@ -93,6 +99,7 @@
         open = $bindable(),
         openChat,
         openExie,
+        openGuidedTours,
         openImpersonateOrganization,
         openKeyboardShortcuts,
         openOrganizationSwitcher,
@@ -100,6 +107,7 @@
         organizations,
         resetKey,
         routes,
+        startGuidedTour,
         stopImpersonating
     }: Props = $props();
     let searchText = $state('');
@@ -415,6 +423,16 @@
         openChat();
     }
 
+    function openGuidedTourCatalog(): void {
+        closeCommandWindow();
+        openGuidedTours();
+    }
+
+    async function launchGuidedTour(name: ProductTourName): Promise<void> {
+        closeCommandWindow();
+        await startGuidedTour(name);
+    }
+
     function toggleTheme(): void {
         closeCommandWindow();
         toggleMode();
@@ -556,6 +574,19 @@
                 bind:selectedActionId={selectedProjectActionId}
             />
             {#if !selectingProject}
+                <Command.Group heading="Guided Tours">
+                    {#each guidedTours.filter((tour) => tour.currentAvailability.available) as tour (tour.name)}
+                        <Command.Item keywords={[...tour.keywords]} value={`Guided Tour ${tour.title}`} onSelect={() => launchGuidedTour(tour.name)}>
+                            <Compass />
+                            <span>{tour.title}</span>
+                        </Command.Item>
+                    {/each}
+                    <Command.Item value="Browse Guided Tours help onboarding guides" onSelect={openGuidedTourCatalog}>
+                        <CircleHelp />
+                        <span>Browse Guided Tours…</span>
+                    </Command.Item>
+                </Command.Group>
+                <Command.Separator />
                 {#if isExieEnabled}
                     <Command.Group heading="Exie" value="Exie Assistant">
                         <Command.Item value="Ask Exie open assistant AI chat" onSelect={() => void openExieAssistant()}>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
index e581a26ca4..035504f0a6 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
@@ -1,3 +1,5 @@
+import type { ProductTourListItem } from '$features/product-tours/types';
+
 import { fireEvent, render, screen, waitFor } from '@testing-library/svelte';
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
@@ -53,14 +55,17 @@ import NavigationCommand from './navigation-command.svelte';
 
 type RenderOptions = {
     askExie?: (prompt: string) => Promise<void> | void;
+    guidedTours?: ProductTourListItem[];
     isChatEnabled?: boolean;
     isExieEnabled?: boolean;
     isGlobalAdmin?: boolean;
     isImpersonating?: boolean;
     openChat?: () => void;
     openExie?: () => Promise<void> | void;
+    openGuidedTours?: () => void;
     openImpersonateOrganization?: () => Promise<void> | void;
     organizations?: Array<{ id: string; name: string }>;
+    startGuidedTour?: (name: ProductTourListItem['name']) => Promise<void>;
     stopImpersonating?: () => Promise<void> | void;
 };
 
@@ -74,6 +79,7 @@ const sessionsRoute: NavigationItem = {
 function renderCommandPalette(routes: NavigationItem[] = [], options: RenderOptions = {}) {
     return render(NavigationCommand, {
         askExie: options.askExie ?? vi.fn(),
+        guidedTours: options.guidedTours ?? [],
         isChatEnabled: options.isChatEnabled ?? false,
         isExieEnabled: options.isExieEnabled ?? true,
         isGlobalAdmin: options.isGlobalAdmin ?? false,
@@ -81,6 +87,7 @@ function renderCommandPalette(routes: NavigationItem[] = [], options: RenderOpti
         open: true,
         openChat: options.openChat ?? vi.fn(),
         openExie: options.openExie ?? vi.fn(),
+        openGuidedTours: options.openGuidedTours ?? vi.fn(),
         openImpersonateOrganization: options.openImpersonateOrganization ?? vi.fn(),
         openKeyboardShortcuts: vi.fn(),
         openOrganizationSwitcher: vi.fn(),
@@ -88,6 +95,7 @@ function renderCommandPalette(routes: NavigationItem[] = [], options: RenderOpti
         organizations: (options.organizations ?? []) as never,
         resetKey: 0,
         routes: [sessionsRoute, ...routes],
+        startGuidedTour: options.startGuidedTour ?? vi.fn(),
         stopImpersonating: options.stopImpersonating ?? vi.fn()
     });
 }
@@ -319,3 +327,43 @@ describe('NavigationCommand project actions', () => {
         expect(goto).toHaveBeenCalledWith('/next/login');
     });
 });
+
+describe('NavigationCommand guided tours', () => {
+    it('launches available tours directly and opens the full catalog', async () => {
+        vi.useFakeTimers();
+        const openGuidedTours = vi.fn();
+        const startGuidedTour = vi.fn();
+        try {
+            const tourPalette = renderCommandPalette([], {
+                guidedTours: [
+                    {
+                        availability: vi.fn(() => ({ available: true })),
+                        currentAvailability: { available: true },
+                        description: 'Learn the UI.',
+                        initialCheckpoint: 'navigation',
+                        keywords: ['tour'],
+                        name: 'ui-overview',
+                        startingRoute: vi.fn(() => '/next'),
+                        title: 'Explore Exceptionless',
+                        version: 1
+                    }
+                ],
+                openGuidedTours,
+                startGuidedTour
+            });
+
+            await fireEvent.click(screen.getByText('Explore Exceptionless'));
+            expect(startGuidedTour).toHaveBeenCalledWith('ui-overview');
+            tourPalette.unmount();
+            await vi.runAllTimersAsync();
+
+            const catalogPalette = renderCommandPalette([], { openGuidedTours });
+            await fireEvent.click(screen.getByText('Browse Guided Tours…'));
+            expect(openGuidedTours).toHaveBeenCalled();
+            catalogPalette.unmount();
+            await vi.runAllTimersAsync();
+        } finally {
+            vi.useRealTimers();
+        }
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index 6994b60722..dcc8968c66 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import type { AssistantPromptRequest } from '$features/assistant/models';
+    import type { ProductTourLaunchSource, ProductTourName } from '$features/product-tours/types';
     import type { SavedView } from '$features/saved-views/models';
     import type { Snippet } from 'svelte';
 
@@ -17,6 +18,7 @@
     import { ChangePlanDialogHost, UpgradeRequiredDialog } from '$features/billing';
     import {
         createOrganizationEventNotificationRefresher,
+        getOrganizationEventsQuery,
         invalidatePersistentEventQueries,
         type OrganizationEventNotificationRefresher
     } from '$features/events/api.svelte';
@@ -36,7 +38,10 @@
     import { organization, showOrganizationNotifications } from '$features/organizations/context.svelte';
     import { premiumPage } from '$features/organizations/premium-page.svelte';
     import { getUtcMonthKey, ORGANIZATION_USAGE_ROLLOVER_CHECK_INTERVAL_MS } from '$features/organizations/utils';
-    import { invalidateProjectQueries } from '$features/projects/api.svelte';
+    import { getProductTourItems } from '$features/product-tours/catalog';
+    import ProductTourHost from '$features/product-tours/components/product-tour-host.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+    import { getOrganizationProjectsQuery, invalidateProjectQueries } from '$features/projects/api.svelte';
     import { getSavedViewsQuery, invalidateSavedViewQueries, isSavedViewDeleted, putUserSavedViewOrder } from '$features/saved-views/api.svelte';
     import { getPersonalSavedViewOrder, resolvePersonalSavedViewOrder } from '$features/saved-views/ordering';
     import { savedViewHref } from '$features/saved-views/slugs';
@@ -93,6 +98,8 @@
     let isOrganizationSwitcherOpen = $state(false);
     let isImpersonateOrganizationOpen = $state(false);
     let isUserMenuOpen = $state(false);
+    let productToursComponent = $state<ProductTourHost>();
+    let productTourErrorCheckEnabled = $state(false);
 
     // Auto-reset premium page state on navigation so pages don't need cleanup
     beforeNavigate(() => {
@@ -101,6 +108,7 @@
 
     function openCommandPalette(): void {
         commandResetKey += 1;
+        productTourErrorCheckEnabled = true;
         isCommandOpen = true;
     }
 
@@ -229,6 +237,24 @@
         isImpersonateOrganizationOpen = true;
     }
 
+    function closeProductTourOverlays(): void {
+        isAssistantOpen = false;
+        isCommandOpen = false;
+        isImpersonateOrganizationOpen = false;
+        isKeyboardShortcutsOpen = false;
+        isOrganizationSwitcherOpen = false;
+        isUserMenuOpen = false;
+    }
+
+    function openGuidedTours(source: ProductTourLaunchSource): void {
+        productTourErrorCheckEnabled = true;
+        productToursComponent?.openCatalog(source);
+    }
+
+    async function startGuidedTour(name: ProductTourName, source: ProductTourLaunchSource): Promise<void> {
+        await productToursComponent?.startTour(name, source);
+    }
+
     async function stopImpersonating(): Promise<void> {
         isCommandOpen = false;
         organization.current = organizations[0]?.id;
@@ -375,6 +401,7 @@
         void page.url.pathname;
 
         if (!currentToken) {
+            productTourCheckpoint.clear();
             queryClient.cancelQueries();
             queryClient.invalidateQueries();
             gotoLogin();
@@ -485,6 +512,42 @@
 
     const organizationsQuery = getOrganizationsQuery({});
     const organizations = $derived(organizationsQuery.data?.data ?? []);
+    const projectsQuery = getOrganizationProjectsQuery({
+        params: {
+            limit: 1000
+        },
+        route: {
+            get organizationId() {
+                return organization.current;
+            }
+        }
+    });
+    const projects = $derived(projectsQuery.data?.data ?? []);
+    const productTourErrorEventsQuery = getOrganizationEventsQuery({
+        enabled: () => productTourErrorCheckEnabled,
+        params: {
+            filter: 'type:error',
+            limit: 1,
+            mode: 'summary',
+            time: 'all'
+        },
+        route: {
+            get organizationId() {
+                return organization.current;
+            }
+        }
+    });
+    const productTourErrorEventAvailability = $derived.by(() => {
+        if (!organization.current || !productTourErrorCheckEnabled || productTourErrorEventsQuery.isPending) {
+            return 'loading' as const;
+        }
+
+        if (productTourErrorEventsQuery.isError) {
+            return 'error' as const;
+        }
+
+        return (productTourErrorEventsQuery.data?.data?.length ?? 0) > 0 ? ('available' as const) : ('empty' as const);
+    });
 
     const impersonatingOrganizationId = $derived.by(() => {
         // Only consider impersonation if user data is loaded and user has organizations
@@ -664,6 +727,24 @@
 
     const setupPath = resolve('/(app)/organization/add');
     const isSetupPage = $derived(page.url.pathname === setupPath);
+    const productTourItems = $derived(
+        meQuery.isSuccess
+            ? getProductTourItems(
+                  {
+                      assistantAccess,
+                      errorEventAvailability: productTourErrorEventAvailability,
+                      isSetupPage,
+                      organizationId: organization.current,
+                      pathname: page.url.pathname,
+                      projects
+                  },
+                  meQuery.data?.product_tours
+              )
+            : []
+    );
+    const isAnyProductTourOverlayOpen = $derived(
+        isAssistantOpen || isCommandOpen || isImpersonateOrganizationOpen || isKeyboardShortcutsOpen || isOrganizationSwitcherOpen || isUserMenuOpen
+    );
 
     $effect(() => {
         if (assistantAccessQuery.isSuccess && !isAssistantEnabled) {
@@ -725,6 +806,7 @@
                 {organizations}
                 {openChat}
                 {openKeyboardShortcuts}
+                openGuidedTours={() => openGuidedTours('help-menu')}
                 {intercomUnreadCount}
                 bind:open={isUserMenuOpen}
             />
@@ -745,16 +827,19 @@
                     isExieEnabled={isAssistantEnabled}
                     {isGlobalAdmin}
                     {isImpersonating}
+                    guidedTours={productTourItems}
                     {openChat}
                     openExie={openAssistantPanel}
                     {openImpersonateOrganization}
                     {openKeyboardShortcuts}
                     {openOrganizationSwitcher}
                     {openUserMenu}
+                    openGuidedTours={() => openGuidedTours('command-palette')}
                     {organizations}
                     resetKey={commandResetKey}
                     routes={filteredRoutes}
                     {stopImpersonating}
+                    startGuidedTour={(id) => startGuidedTour(id, 'command-palette')}
                 />
                 <KeyboardShortcutsDialog bind:open={isKeyboardShortcutsOpen} />
 
@@ -808,6 +893,26 @@
 {/snippet}
 
 {#if isAuthenticated}
+    <ProductTourHost
+        {assistantAccess}
+        bind:this={productToursComponent}
+        closeOverlays={closeProductTourOverlays}
+        currentUser={meQuery.data}
+        errorEventAvailability={productTourErrorEventAvailability}
+        isAnyOverlayOpen={isAnyProductTourOverlayOpen}
+        {isImpersonating}
+        {isSetupPage}
+        openAssistant={openAssistantPanel}
+        organizationId={organization.current}
+        pathname={page.url.pathname}
+        {projects}
+        requestErrorAvailability={() => (productTourErrorCheckEnabled = true)}
+        setMobileNavigationOpen={(open) => (sidebar.isMobile ? sidebar.setOpenMobile(open) : sidebar.setOpen(open))}
+        stateSettled={meQuery.isSuccess &&
+            organizationsQuery.isSuccess &&
+            (!organization.current || projectsQuery.isSuccess) &&
+            (!organization.current || assistantAccessQuery.isSuccess || assistantAccessQuery.isError)}
+    />
     <IntercomShell
         appId={intercomAppId || undefined}
         bootOptions={intercomBootOptions}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index f74ef8aec2..347fe88087 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import type { SavedView } from '$features/saved-views/models';
+
+    import { goto } from '$app/navigation';
     import { resolve } from '$app/paths';
     import { page } from '$app/state';
     import * as DataTable from '$comp/data-table';
@@ -42,6 +45,7 @@
         updateFilterCache
     } from '$features/events/components/filters/helpers.svelte';
     import OrganizationDefaultsFacetedFilterBuilder from '$features/events/components/filters/organization-defaults-faceted-filter-builder.svelte';
+    import InvestigationListTour from '$features/events/components/investigation-list-tour.svelte';
     import { buildEventDetailsHref, type EventSummaryModel, type SummaryTemplateKeys } from '$features/events/components/summary/index';
     import EventsBulkActionsDropdownMenu from '$features/events/components/table/events-bulk-actions-dropdown-menu.svelte';
     import EventsDataTable from '$features/events/components/table/events-data-table.svelte';
@@ -49,7 +53,9 @@
     import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { organization } from '$features/organizations/context.svelte';
     import { premiumPage } from '$features/organizations/premium-page.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import SavedViewPicker from '$features/saved-views/components/saved-view-picker.svelte';
+    import { savedViewHref } from '$features/saved-views/slugs';
     import { isSavedViewHydrationPending, isSavedViewUnavailable, useSavedViews } from '$features/saved-views/use-saved-views.svelte';
     import * as agg from '$features/shared/api/aggregations';
     import { createPageSizePreference, getSharedTableOptions, removeTableData, removeTableSelection } from '$features/shared/table.svelte';
@@ -77,8 +83,10 @@
         redirectToEventsWithFilter,
         serializeTimeQueryParam
     } from '../redirect-to-events.svelte';
+    import { getEventQueryFilters } from './query-filters';
 
     let selectedEventId: null | string = $state(null);
+    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
 
     function handleEventError(problem: ProblemDetails) {
         showBillingDialogOnUpgradeProblem(problem, organization.current);
@@ -87,12 +95,20 @@
 
     function rowClick(row: EventSummaryModel<SummaryTemplateKeys>) {
         selectedEventId = row.id;
+        const checkpoint = investigationCheckpoint;
+        if (checkpoint?.checkpointName === 'choose-error') {
+            productTourCheckpoint.advance(checkpoint, 'stack-summary');
+        }
     }
 
     function rowHref(row: EventSummaryModel<SummaryTemplateKeys>): string {
         return buildEventDetailsHref(row.id);
     }
 
+    async function loadSavedView(view: SavedView): Promise<void> {
+        await goto(savedViewHref(view));
+    }
+
     const DEFAULT_TIME_RANGE = '[now-7d TO now]';
     const DEFAULT_FILTER = '(status:open OR status:regressed)';
     const DEFAULT_FILTERS = [new DateFilter('date', DEFAULT_TIME_RANGE), new ProjectFilter([]), new StatusFilter([StackStatus.Open, StackStatus.Regressed])];
@@ -140,77 +156,6 @@
         return filter || null;
     }
 
-    function getQueryFilters(params: ListFilterQueryParams = queryParams): FacetedFilter.IFilter[] | null {
-        const filters: FacetedFilter.IFilter[] = [];
-
-        if (params.project) {
-            filters.push(new ProjectFilter(splitQueryParam(params.project)));
-        }
-
-        if (params.stack) {
-            filters.push(new StringFilter('stack', params.stack));
-        }
-
-        const bot = parseBooleanQueryParam(params.bot);
-        if (bot !== undefined) {
-            filters.push(new BooleanFilter('bot', bot));
-        }
-
-        const first = parseBooleanQueryParam(params.first);
-        if (first !== undefined) {
-            filters.push(new BooleanFilter('first', first));
-        }
-
-        if (params.level) {
-            filters.push(new LevelFilter(splitQueryParam(params.level) as never[]));
-        }
-
-        if (params.reference) {
-            filters.push(new ReferenceFilter(params.reference));
-        }
-
-        if (params.session) {
-            filters.push(new SessionFilter(params.session));
-        }
-
-        if (params.status) {
-            filters.push(new StatusFilter(splitQueryParam(params.status) as never[]));
-        }
-
-        if (params.tag) {
-            filters.push(new TagFilter(splitQueryParam(params.tag) as never[]));
-        }
-
-        if (params.type) {
-            filters.push(new TypeFilter(splitQueryParam(params.type) as never[]));
-        }
-
-        if (params.version) {
-            filters.push(new VersionFilter('version', params.version));
-        }
-
-        return filters.length > 0 ? filters : null;
-    }
-
-    function parseBooleanQueryParam(value: null | string | undefined): boolean | undefined {
-        if (value === 'true') {
-            return true;
-        }
-
-        if (value === 'false') {
-            return false;
-        }
-
-        return undefined;
-    }
-
-    function splitQueryParam(value: string): string[] {
-        return value
-            .split(',')
-            .map((item) => item.trim())
-            .filter((item) => item);
-    }
-
     function getEffectiveSort(): null | string | undefined {
         if (queryParams.sort != null) {
             return queryParams.sort || undefined;
@@ -331,7 +276,7 @@
 
     function getCurrentFiltersWithoutTime(params: ListFilterQueryParams = queryParams): FacetedFilter.IFilter[] {
         const savedViewFilters = getSavedViewFilters();
-        const queryFilters = getQueryFilters(params) ?? [];
+        const queryFilters = getEventQueryFilters(params) ?? [];
         const expressionFilters =
             params.filter != null ? getFiltersFromCache(filterCacheKey(params.filter), params.filter).filter((filter) => filter.type !== 'date') : [];
 
@@ -960,7 +905,7 @@
 <div class="flex flex-col">
     <div class="mb-4 flex flex-wrap items-start gap-2">
         <H3 class="my-0 shrink-0">{pageTitle}</H3>
-        <div class="order-3 flex w-full flex-wrap items-start gap-1.5 md:order-none md:w-auto md:min-w-0 md:flex-1">
+        <div class="order-3 flex w-full flex-wrap items-start gap-1.5 md:order-none md:w-auto md:min-w-0 md:flex-1" data-tour="event-filters">
             <FacetedFilter.Root changed={onFilterChanged} {filters} remove={onFilterRemoved}>
                 <OrganizationDefaultsFacetedFilterBuilder />
             </FacetedFilter.Root>
@@ -977,7 +922,7 @@
                     defaultAutoFillColumnId="summary"
                     filters={filters ?? []}
                     isModified={savedViewsState.isModified}
-                    onLoadView={savedViewsState.handleLoadView}
+                    onLoadView={loadSavedView}
                     onClearSavedView={savedViewsState.handleClearSavedView}
                     onResetToSaved={handleResetToSaved}
                     onSavedViewUpdated={savedViewsState.handleSavedViewUpdated}
@@ -1018,25 +963,27 @@
             />
         {/if}
 
-        <EventsDataTable
-            autoFillColumnId={savedViewsState.autoFillColumnId}
-            bind:limit={eventsQueryParameters.limit!}
-            isLoading={isSavedViewRoutePending || eventsQuery.isFetching}
-            onAutoFillColumnResized={() => savedViewsState.setAutoFillColumnId(null)}
-            {rowClick}
-            {rowHref}
-            {table}
-            wrappedColumnIds={savedViewsState.wrappedColumnIds}
-        >
-            {#snippet footerChildren()}
-                <div class="flex min-w-0 items-center gap-3">
-                    <EventsBulkActionsDropdownMenu {table} />
-                    <DataTable.Selection {table} />
-                </div>
-
-                <DataTable.Pager bind:value={eventsQueryParameters.limit!} {table} variant="floating" />
-            {/snippet}
-        </EventsDataTable>
+        <div data-tour="event-list">
+            <EventsDataTable
+                autoFillColumnId={savedViewsState.autoFillColumnId}
+                bind:limit={eventsQueryParameters.limit!}
+                isLoading={isSavedViewRoutePending || eventsQuery.isFetching}
+                onAutoFillColumnResized={() => savedViewsState.setAutoFillColumnId(null)}
+                {rowClick}
+                {rowHref}
+                {table}
+                wrappedColumnIds={savedViewsState.wrappedColumnIds}
+            >
+                {#snippet footerChildren()}
+                    <div class="flex min-w-0 items-center gap-3">
+                        <EventsBulkActionsDropdownMenu {table} />
+                        <DataTable.Selection {table} />
+                    </div>
+
+                    <DataTable.Pager bind:value={eventsQueryParameters.limit!} {table} variant="floating" />
+                {/snippet}
+            </EventsDataTable>
+        </div>
     </div>
 </div>
 
@@ -1048,3 +995,5 @@
     }}
     onError={handleEventError}
 />
+
+<InvestigationListTour />
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
index 3ec6302bf3..a14765e578 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
@@ -56,6 +56,7 @@
     {filterChanged}
     id={page.params.eventId || ''}
     {handleError}
+    loadProjectDetails={false}
     onEventLoaded={handleEventLoaded}
     onNavigate={(newId) => goto(buildEventDetailsHref(newId))}
 />
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
new file mode 100644
index 0000000000..99b0685152
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
@@ -0,0 +1,70 @@
+import type { PersistentEventKnownTypes } from '$features/events/models';
+import type { LogLevel } from '$features/events/models/event-data';
+
+import * as FacetedFilter from '$comp/faceted-filter';
+import {
+    BooleanFilter,
+    LevelFilter,
+    ProjectFilter,
+    ReferenceFilter,
+    SessionFilter,
+    StatusFilter,
+    StringFilter,
+    TagFilter,
+    TypeFilter,
+    VersionFilter
+} from '$features/events/components/filters';
+import { StackStatus } from '$features/stacks/models';
+
+import type { ListFilterQueryParams } from '../redirect-to-events.svelte';
+
+export function getEventQueryFilters(params: ListFilterQueryParams): FacetedFilter.IFilter[] | null {
+    const filters: FacetedFilter.IFilter[] = [];
+
+    if (params.project) {
+        filters.push(new ProjectFilter(splitQueryParam(params.project)));
+    }
+    if (params.stack) {
+        filters.push(new StringFilter('stack', params.stack));
+    }
+
+    addBooleanFilter(filters, 'bot', params.bot);
+    addBooleanFilter(filters, 'first', params.first);
+
+    if (params.level) {
+        filters.push(new LevelFilter(splitQueryParam(params.level) as LogLevel[]));
+    }
+    if (params.reference) {
+        filters.push(new ReferenceFilter(params.reference));
+    }
+    if (params.session) {
+        filters.push(new SessionFilter(params.session));
+    }
+    if (params.status) {
+        filters.push(new StatusFilter(splitQueryParam(params.status) as StackStatus[]));
+    }
+    if (params.tag) {
+        filters.push(new TagFilter(splitQueryParam(params.tag) as PersistentEventKnownTypes[]));
+    }
+    if (params.type) {
+        filters.push(new TypeFilter(splitQueryParam(params.type) as PersistentEventKnownTypes[]));
+    }
+    if (params.version) {
+        filters.push(new VersionFilter('version', params.version));
+    }
+
+    return filters.length > 0 ? filters : null;
+}
+
+function addBooleanFilter(filters: FacetedFilter.IFilter[], field: 'bot' | 'first', value: null | string | undefined): void {
+    if (value === 'true' || value === 'false') {
+        filters.push(new BooleanFilter(field, value === 'true'));
+    }
+}
+
+function splitQueryParam(value: string): string[] {
+    return value
+        .split(',')
+        .map((item) => item.trim())
+        .filter(Boolean);
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
index a06884acad..d966b7898a 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
@@ -15,6 +15,9 @@
     import { postOrganization } from '$features/organizations/api.svelte';
     import { organization } from '$features/organizations/context.svelte';
     import { useHideOrganizationNotifications } from '$features/organizations/hooks/use-hide-organization-notifications.svelte';
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { postProject } from '$features/projects/api.svelte';
     import { ariaInvalid, getFormErrorMessages, mapFieldErrors, problemDetailsToFormErrors } from '$features/shared/validation';
     import { ProblemDetails } from '@foundatiofx/fetchclient';
@@ -32,6 +35,8 @@
     let toastId = $state<number | string>();
     const createOrganization = postOrganization();
     const createProject = postProject();
+    const tourActions = createProductTourActions();
+    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
     const CREATE_ERROR_MESSAGE = 'Error creating setup. Please try again.';
 
     useHideOrganizationNotifications();
@@ -57,6 +62,18 @@
                         organization_id: createdOrganization.id
                     } as NewProject);
 
+                    const checkpoint = configureCheckpoint;
+                    if (checkpoint) {
+                        productTourCheckpoint.advance(
+                            checkpoint,
+                            'choose-platform',
+                            {
+                                type: 'active'
+                            },
+                            createdOrganization.id
+                        );
+                    }
+
                     toastId = toast.success('Project added successfully');
                     await goto(
                         resolve('/(app)/project/[projectId]/configure', {
@@ -92,6 +109,7 @@
     </Card.Header>
     <Card.Content>
         <form
+            data-tour="project-setup-form"
             onsubmit={(e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -108,6 +126,7 @@
                     <Field.Field data-invalid={ariaInvalid(field)}>
                         <Field.Label for={field.name}>Organization Name</Field.Label>
                         <Input
+                            data-tour="setup-organization-name"
                             id={field.name}
                             name={field.name}
                             placeholder="Enter organization name"
@@ -125,6 +144,7 @@
                     <Field.Field data-invalid={ariaInvalid(field)}>
                         <Field.Label for={field.name}>Project Name</Field.Label>
                         <Input
+                            data-tour="project-name"
                             id={field.name}
                             name={field.name}
                             placeholder="Enter project name"
@@ -139,7 +159,7 @@
             </form.Field>
             <form.Subscribe selector={(state) => state.isSubmitting}>
                 {#snippet children(isSubmitting)}
-                    <Button type="submit" class="mt-4 w-full" disabled={isSubmitting}>
+                    <Button data-tour="project-setup-submit" type="submit" class="mt-4 w-full" disabled={isSubmitting}>
                         {#if isSubmitting}
                             <Spinner /> Creating Setup...
                         {:else}
@@ -151,3 +171,21 @@
         </form>
     </Card.Content>
 </Card.Root>
+
+{#if configureCheckpoint}
+    <ProductTourSpotlight
+        checkpoint={configureCheckpoint}
+        description={configureCheckpoint.checkpointName === 'organization-name'
+            ? 'Name the organization that will own your projects and error data.'
+            : 'Name the application or service that will send events. The guide advances only after setup succeeds.'}
+        onDismiss={tourActions.dismiss}
+        onNext={configureCheckpoint.checkpointName === 'organization-name'
+            ? (checkpoint) => {
+                  productTourCheckpoint.advance(checkpoint, 'project-name');
+              }
+            : undefined}
+        side="top"
+        target={configureCheckpoint.checkpointName === 'organization-name' ? "[data-tour='setup-organization-name']" : "[data-tour='project-setup-form']"}
+        title={configureCheckpoint.checkpointName === 'organization-name' ? 'Name your organization' : 'Name your first project'}
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index 1f06feb9c1..6a0458f4ff 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -12,6 +12,11 @@
     import { openSupportChat } from '$features/intercom/chat';
     import { organization } from '$features/organizations/context.svelte';
     import { useHideOrganizationNotifications } from '$features/organizations/hooks/use-hide-organization-notifications.svelte';
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+    import { getProjectQuery } from '$features/projects/api.svelte';
     import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
     import EnableTokenDialog from '$features/tokens/components/dialogs/enable-token-dialog.svelte';
     import { ChangeType, type WebSocketMessageValue } from '$features/websockets/models';
@@ -37,6 +42,13 @@
             }
         }
     });
+    const projectQuery = getProjectQuery({
+        route: {
+            get id() {
+                return projectId;
+            }
+        }
+    });
 
     const apiKey = $derived(defaultTokenQuery.data?.id || 'YOUR_API_KEY');
     const serverUrl = (env.PUBLIC_EXCEPTIONLESS_SERVER_URL || '').trim();
@@ -47,7 +59,10 @@
     const isTokenSuspended = $derived(defaultTokenQuery.data?.is_suspended ?? false);
 
     let toastId = $state<number | string>();
+    let isProjectTypeOpen = $state(false);
     let openEnableTokenDialog = $state(false);
+    const tourActions = createProductTourActions();
+    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
 
     const enableTokenMutation = patchToken({
         route: {
@@ -419,11 +434,40 @@ public partial class App : Application {
         const message = (event as CustomEvent<WebSocketMessageValue<'PersistentEventChanged'>>).detail;
 
         if (queryParams.redirect && message.project_id === projectId && message.change_type !== ChangeType.Removed) {
+            if (configureCheckpoint && !(await tourActions.complete(configureCheckpoint))) {
+                return;
+            }
+
             toast.success('First event received. Opening Events...');
             await redirectToEventsWithFilter(organization.current, new ProjectFilter([projectId]));
         }
     });
 
+    async function refreshConfiguredProject(): Promise<void> {
+        if (!queryParams.redirect) {
+            return;
+        }
+
+        const result = await projectQuery.refetch();
+        if (!result.data?.is_configured) {
+            return;
+        }
+
+        if (configureCheckpoint && !(await tourActions.complete(configureCheckpoint))) {
+            return;
+        }
+
+        toast.success('First event received. Opening Events...');
+        await redirectToEventsWithFilter(organization.current, new ProjectFilter([projectId]));
+    }
+
+    useEventListener(window, 'focus', async () => {
+        await refreshConfiguredProject();
+    });
+    useEventListener(document, 'refresh', async () => {
+        await refreshConfiguredProject();
+    });
+
     // Use Intercom from parent provider context
     const intercom = getIntercom();
 
@@ -462,10 +506,21 @@ public partial class App : Application {
     {/if}
 
     {#if queryParams.redirect}
-        <Notification>
+        <Notification data-tour="project-configure-waiting">
             <NotificationTitle>Waiting for your first event</NotificationTitle>
             <NotificationDescription>
                 <P>Send an event from your app. When it arrives, we'll open the project Events page automatically.</P>
+                {#if configureCheckpoint}
+                    <P class="mt-2">You can leave this tab while updating your application. The guide will resume here when you return.</P>
+                    <Button
+                        class="mt-2"
+                        onclick={async () => {
+                            await tourActions.dismiss(configureCheckpoint);
+                        }}
+                        size="sm"
+                        variant="outline">End guide</Button
+                    >
+                {/if}
             </NotificationDescription>
         </Notification>
     {/if}
@@ -476,12 +531,16 @@ public partial class App : Application {
             <Select.Root
                 type="single"
                 bind:value={queryParams.type as string | undefined}
+                onOpenChange={(open) => (isProjectTypeOpen = open)}
                 onValueChange={(value) => {
                     selectedProjectType = projectTypes.find((P) => P.id === value) || null;
                     queryParams.type = value;
+                    if (configureCheckpoint?.checkpointName === 'choose-platform') {
+                        productTourCheckpoint.advance(configureCheckpoint, 'sdk-instructions');
+                    }
                 }}
             >
-                <Select.Trigger class="w-full">
+                <Select.Trigger class="w-full" data-tour="project-configure-platform">
                     <span
                         >{#if selectedProjectType}
                             {selectedProjectType.platform}: {selectedProjectType.label}
@@ -768,6 +827,30 @@ public partial class App : Application {
         {/if}
     </ol>
 
+    {#if configureCheckpoint?.checkpointName === 'sdk-instructions'}
+        <ProductTourInlineCallout
+            description="Follow these SDK instructions in your own application. When it is connected, return here and continue to wait for the first event."
+            onContinue={() => {
+                productTourCheckpoint.advance(configureCheckpoint, 'wait-for-event');
+            }}
+            onDismiss={async () => {
+                await tourActions.dismiss(configureCheckpoint);
+            }}
+            title="Connect your application"
+            tourName="configure-project"
+        />
+    {/if}
+
+    {#if configureCheckpoint?.checkpointName === 'choose-platform' && !isProjectTypeOpen}
+        <ProductTourSpotlight
+            checkpoint={configureCheckpoint}
+            description="Choose the SDK platform that matches the application you are connecting."
+            onDismiss={tourActions.dismiss}
+            target="[data-tour='project-configure-platform']"
+            title="Choose your SDK"
+        />
+    {/if}
+
     {#if selectedProjectType}
         <P
             ><strong>That's it!</strong>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
index d5211667cb..20a724a4f4 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
@@ -11,6 +11,9 @@
     import { Spinner } from '$comp/ui/spinner';
     import { showBillingDialogOnUpgradeProblem } from '$features/billing';
     import { organization } from '$features/organizations/context.svelte';
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { postProject } from '$features/projects/api.svelte';
     import { type NewProjectFormData, NewProjectSchema } from '$features/projects/schemas';
     import { ariaInvalid, getFormErrorMessages, mapFieldErrors, problemDetailsToFormErrors } from '$features/shared/validation';
@@ -21,6 +24,8 @@
 
     let toastId = $state<number | string>();
     const createProject = postProject();
+    const tourActions = createProductTourActions();
+    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
 
     const form = createForm(() => ({
         defaultValues: {
@@ -37,6 +42,10 @@
                         ...value,
                         organization_id: organization.current ?? value.organization_id
                     } as NewProject);
+                    const checkpoint = configureCheckpoint;
+                    if (checkpoint) {
+                        productTourCheckpoint.advance(checkpoint, 'choose-platform');
+                    }
                     toastId = toast.success('Project added successfully');
                     await goto(
                         resolve('/(app)/project/[projectId]/configure', {
@@ -75,6 +84,7 @@
         <Muted>Create a project, then configure a client to send your first event.</Muted>
     </div>
     <form
+        data-tour="project-setup-form"
         onsubmit={(e) => {
             e.preventDefault();
             e.stopPropagation();
@@ -91,6 +101,7 @@
                 <Field.Field data-invalid={ariaInvalid(field)}>
                     <Field.Label for={field.name}>Project Name</Field.Label>
                     <Input
+                        data-tour="project-name"
                         id={field.name}
                         name={field.name}
                         placeholder="Enter project name"
@@ -105,7 +116,7 @@
         </form.Field>
         <form.Subscribe selector={(state) => state.isSubmitting}>
             {#snippet children(isSubmitting)}
-                <Button type="submit" class="mt-4" disabled={isSubmitting}>
+                <Button data-tour="project-setup-submit" type="submit" class="mt-4" disabled={isSubmitting}>
                     {#if isSubmitting}
                         <Spinner /> Adding Project...
                     {:else}
@@ -116,3 +127,14 @@
         </form.Subscribe>
     </form>
 </div>
+
+{#if configureCheckpoint?.checkpointName === 'project-name'}
+    <ProductTourSpotlight
+        checkpoint={configureCheckpoint}
+        description="Name the application or service that will send events. Continue by submitting this form; the guide advances only after creation succeeds."
+        onDismiss={tourActions.dismiss}
+        side="top"
+        target="[data-tour='project-setup-form']"
+        title="Name your project"
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
new file mode 100644
index 0000000000..91f9d50bf1
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -0,0 +1,154 @@
+<script lang="ts">
+    import Number from '$comp/formatters/number.svelte';
+    import Percentage from '$comp/formatters/percentage.svelte';
+    import TimeAgo from '$comp/formatters/time-ago.svelte';
+    import { Muted } from '$comp/typography';
+    import { Badge } from '$comp/ui/badge';
+    import * as Card from '$comp/ui/card';
+    import { Input } from '$comp/ui/input';
+    import { Skeleton } from '$comp/ui/skeleton';
+    import * as Table from '$comp/ui/table';
+    import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
+    import { getUtcMonthKey } from '$features/admin/assistant-usage';
+
+    const currentMonth = getUtcMonthKey();
+    let selectedMonth = $state(currentMonth);
+    const usageQuery = getAdminProductTourUsageQuery(() => selectedMonth);
+    const usage = $derived(usageQuery.data);
+
+    function title(value: string): string {
+        return value
+            .split('-')
+            .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+            .join(' ');
+    }
+</script>
+
+<div class="space-y-6">
+    <div class="flex flex-wrap items-end justify-between gap-4">
+        <Muted>Tour starts, outcomes, and recent user activity recorded by Exceptionless Feature Usage events</Muted>
+        <label class="flex flex-col gap-1 text-sm font-medium">
+            Month
+            <Input class="w-40" type="month" max={currentMonth} bind:value={selectedMonth} />
+        </label>
+    </div>
+
+    {#if usageQuery.isError}
+        <Card.Root>
+            <Card.Content class="pt-6">
+                <p class="text-destructive text-sm">Failed to load guided-tour usage. Please try again.</p>
+            </Card.Content>
+        </Card.Root>
+    {:else if usage && !usage.telemetry_configured}
+        <Card.Root>
+            <Card.Header>
+                <Card.Title>Feature Usage telemetry is not configured</Card.Title>
+                <Card.Description>Configure the internal project before using this report. No tour activity is being recorded.</Card.Description>
+            </Card.Header>
+        </Card.Root>
+    {:else}
+        <Card.Root>
+            <Card.Header>
+                <Card.Title>Tour Outcomes</Card.Title>
+                <Card.Description>
+                    Tour rates use starts as the denominator. Welcome and announcement decision rates use shown prompts because they do not have a separate
+                    start event.
+                </Card.Description>
+            </Card.Header>
+            <Card.Content class="px-0">
+                {#if usageQuery.isPending}
+                    <div class="space-y-3 px-4 pb-2">
+                        {#each [0, 1, 2, 3, 4] as row (row)}
+                            <Skeleton class="h-12 w-full rounded" aria-label={`Loading tour ${row + 1}`} />
+                        {/each}
+                    </div>
+                {:else if usage?.tours.length === 0}
+                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">No guided-tour activity was recorded for this month.</p>
+                {:else}
+                    <Table.Root>
+                        <Table.Header>
+                            <Table.Row>
+                                <Table.Head class="pl-4">Tour</Table.Head>
+                                <Table.Head class="text-right">Shown</Table.Head>
+                                <Table.Head class="text-right">Started</Table.Head>
+                                <Table.Head class="text-right">Users</Table.Head>
+                                <Table.Head class="text-right">Completed</Table.Head>
+                                <Table.Head class="text-right">Dismissed</Table.Head>
+                                <Table.Head>Last Run</Table.Head>
+                            </Table.Row>
+                        </Table.Header>
+                        <Table.Body>
+                            {#each usage?.tours ?? [] as tour (tour.name)}
+                                <Table.Row>
+                                    <Table.Cell class="pl-4 font-medium">{title(tour.name)}</Table.Cell>
+                                    <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
+                                    <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
+                                    <Table.Cell class="text-right"><Number value={tour.unique_users} /></Table.Cell>
+                                    <Table.Cell class="text-right">
+                                        <Number value={tour.completed} />
+                                        <span class="text-muted-foreground ml-1 text-xs">
+                                            ({#if tour.completion_rate == null}—{:else}<Percentage percent={tour.completion_rate * 100} />{/if})
+                                        </span>
+                                    </Table.Cell>
+                                    <Table.Cell class="text-right">
+                                        <Number value={tour.dismissed} />
+                                        <span class="text-muted-foreground ml-1 text-xs">
+                                            ({#if tour.dismissal_rate == null}—{:else}<Percentage percent={tour.dismissal_rate * 100} />{/if})
+                                        </span>
+                                    </Table.Cell>
+                                    <Table.Cell>
+                                        {#if tour.last_run_utc}
+                                            <TimeAgo value={tour.last_run_utc} />
+                                        {:else}
+                                            <span class="text-muted-foreground">Never</span>
+                                        {/if}
+                                    </Table.Cell>
+                                </Table.Row>
+                            {/each}
+                        </Table.Body>
+                    </Table.Root>
+                {/if}
+            </Card.Content>
+        </Card.Root>
+
+        <Card.Root>
+            <Card.Header>
+                <Card.Title>Recent Activity</Card.Title>
+                <Card.Description>Latest identified-user tour events for investigating support and onboarding patterns.</Card.Description>
+            </Card.Header>
+            <Card.Content class="px-0">
+                {#if usage?.recent_activity.length === 0}
+                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">No recent tour activity was recorded.</p>
+                {:else}
+                    <Table.Root>
+                        <Table.Header>
+                            <Table.Row>
+                                <Table.Head class="pl-4">User</Table.Head>
+                                <Table.Head>Tour</Table.Head>
+                                <Table.Head>Event</Table.Head>
+                                <Table.Head>Source</Table.Head>
+                                <Table.Head>When</Table.Head>
+                            </Table.Row>
+                        </Table.Header>
+                        <Table.Body>
+                            {#each usage?.recent_activity ?? [] as activity (`${activity.date_utc}-${activity.user_identity}-${activity.event}-${activity.tour_name}`)}
+                                <Table.Row>
+                                    <Table.Cell class="pl-4">
+                                        <div class="font-medium">{activity.user_name || activity.user_identity || 'Unknown user'}</div>
+                                        {#if activity.user_name && activity.user_identity}
+                                            <div class="text-muted-foreground font-mono text-xs">{activity.user_identity}</div>
+                                        {/if}
+                                    </Table.Cell>
+                                    <Table.Cell>{title(activity.tour_name)} <span class="text-muted-foreground">v{activity.version}</span></Table.Cell>
+                                    <Table.Cell><Badge variant="secondary">{title(activity.event)}</Badge></Table.Cell>
+                                    <Table.Cell>{title(activity.launch_source)}</Table.Cell>
+                                    <Table.Cell><TimeAgo value={activity.date_utc} /></Table.Cell>
+                                </Table.Row>
+                            {/each}
+                        </Table.Body>
+                    </Table.Root>
+                {/if}
+            </Card.Content>
+        </Card.Root>
+    {/if}
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/routes.svelte.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/routes.svelte.ts
index 1b41f9a74a..c9ca0b4a11 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/routes.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/routes.svelte.ts
@@ -6,6 +6,7 @@ import Database from '@lucide/svelte/icons/database';
 import DatabaseZap from '@lucide/svelte/icons/database-zap';
 import KeyRound from '@lucide/svelte/icons/key-round';
 import LayoutDashboard from '@lucide/svelte/icons/layout-dashboard';
+import Map from '@lucide/svelte/icons/map';
 import Play from '@lucide/svelte/icons/play';
 import Settings from '@lucide/svelte/icons/settings';
 
@@ -62,6 +63,13 @@ export function routes(): NavigationItem[] {
             show: (context) => context.user?.roles?.includes('global') ?? false,
             title: 'Saved Views'
         },
+        {
+            group: 'System',
+            href: resolve('/(app)/system/product-tours'),
+            icon: Map,
+            show: (context) => context.user?.roles?.includes('global') ?? false,
+            title: 'Guided Tours'
+        },
         {
             group: 'System',
             href: resolve('/(app)/system/oauth-applications'),
diff --git a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
new file mode 100644
index 0000000000..5b9030501a
--- /dev/null
+++ b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
@@ -0,0 +1,28 @@
+namespace Exceptionless.Web.Models.Admin;
+
+public sealed record AdminProductTourUsageResponse(
+    DateTime Month,
+    bool TelemetryConfigured,
+    IReadOnlyCollection<AdminProductTourSummary> Tours,
+    IReadOnlyCollection<AdminProductTourActivity> RecentActivity);
+
+public sealed record AdminProductTourSummary(
+    string Name,
+    long Shown,
+    long Started,
+    long Completed,
+    long Dismissed,
+    long UniqueUsers,
+    DateTime? LastRunUtc,
+    decimal? CompletionRate,
+    decimal? DismissalRate);
+
+public sealed record AdminProductTourActivity(
+    DateTime DateUtc,
+    string Event,
+    string LaunchSource,
+    string TourName,
+    string? UserIdentity,
+    string? UserName,
+    int Version,
+    long Count);
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs
new file mode 100644
index 0000000000..abfe647aaf
--- /dev/null
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs
@@ -0,0 +1,44 @@
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace Exceptionless.Web.Models.Admin;
+
+internal sealed partial record ProductTourUsageSource(string Raw, string Event, string TourName, int Version, string LaunchSource)
+{
+    public const string Prefix = "product-tour.";
+    public const string CompletedEvent = "completed";
+    public const string DismissedEvent = "dismissed";
+    public const string ShownEvent = "shown";
+    public const string StartedEvent = "started";
+
+    private static readonly ISet<string> _events = new HashSet<string>(
+        [CompletedEvent, DismissedEvent, ShownEvent, StartedEvent],
+        StringComparer.Ordinal);
+    private static readonly ISet<string> _launchSources = new HashSet<string>(
+        ["automatic", "catalog", "command-palette", "feature-announcement", "help-menu"],
+        StringComparer.Ordinal);
+
+    public static bool TryParse(string? value, out ProductTourUsageSource source)
+    {
+        source = default!;
+        if (String.IsNullOrWhiteSpace(value))
+            return false;
+
+        var match = SourceRegex().Match(value);
+        string eventName = match.Groups["event"].Value;
+        string launchSource = match.Groups["launchSource"].Value;
+        if (!match.Success
+            || !_events.Contains(eventName)
+            || !_launchSources.Contains(launchSource)
+            || !Int32.TryParse(match.Groups["version"].ValueSpan, NumberStyles.None, CultureInfo.InvariantCulture, out int version))
+        {
+            return false;
+        }
+
+        source = new ProductTourUsageSource(value, eventName, match.Groups["tourName"].Value, version, launchSource);
+        return true;
+    }
+
+    [GeneratedRegex(@"^product-tour\.(?<event>[a-z-]+)\.(?<tourName>[a-z0-9]+(?:-[a-z0-9]+)*)\.v(?<version>[1-9][0-9]*)\.(?<launchSource>[a-z-]+)$", RegexOptions.CultureInvariant)]
+    private static partial Regex SourceRegex();
+}
diff --git a/src/Exceptionless.Web/Models/User/UpdateProductTourProgress.cs b/src/Exceptionless.Web/Models/User/UpdateProductTourProgress.cs
new file mode 100644
index 0000000000..249d265eb3
--- /dev/null
+++ b/src/Exceptionless.Web/Models/User/UpdateProductTourProgress.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using Exceptionless.Core.Models.Data;
+
+namespace Exceptionless.Web.Models;
+
+public record UpdateProductTourProgress
+{
+    [Required]
+    [EnumDataType(typeof(ProductTourStatus))]
+    public ProductTourStatus? Status { get; init; }
+
+    [Range(1, Int32.MaxValue)]
+    public int Version { get; init; }
+}
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index 0fb4c4f5a7..ed83d4093b 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -2,12 +2,20 @@
 using System.Text;
 using Exceptionless.Core.Configuration;
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 
 namespace Exceptionless.Web.Models;
 
 public record ViewCurrentUser : ViewUser
 {
-    public ViewCurrentUser(User user, IntercomOptions options)
+    public ViewCurrentUser()
+    {
+        OAuthAccounts = [];
+        OrganizationPreferences = [];
+        ProductTours = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
+    }
+
+    public ViewCurrentUser(User user, IntercomOptions options) : this()
     {
         Id = user.Id;
         OrganizationIds = user.OrganizationIds;
@@ -24,6 +32,7 @@ public ViewCurrentUser(User user, IntercomOptions options)
         Hash = HMACSHA256HashString(user.Id, options);
         HasLocalAccount = !String.IsNullOrWhiteSpace(user.Password);
         OAuthAccounts = user.OAuthAccounts;
+        ProductTours = new Dictionary<string, ProductTourProgress>(user.ProductTours, StringComparer.Ordinal);
     }
 
     public string? Hash { get; set; }
@@ -31,6 +40,7 @@ public ViewCurrentUser(User user, IntercomOptions options)
     public ICollection<OAuthAccount> OAuthAccounts { get; set; }
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; set; }
+    public IDictionary<string, ProductTourProgress> ProductTours { get; set; }
 
     private static string? HMACSHA256HashString(string value, IntercomOptions options)
     {
diff --git a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
index d258345337..2b2c591c05 100644
--- a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
+++ b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
@@ -523,6 +523,18 @@
     "authorizationRoles": [],
     "authenticationSchemes": []
   },
+  {
+    "method": "GET",
+    "route": "/api/v2/admin/product-tour-usage",
+    "displayName": "HTTP: GET api/v2/admin/product-tour-usage =\u003E GetProductTourUsageAsync",
+    "tags": [],
+    "allowAnonymous": false,
+    "authorizationPolicies": [
+      "GlobalAdminPolicy"
+    ],
+    "authorizationRoles": [],
+    "authenticationSchemes": []
+  },
   {
     "method": "GET",
     "route": "/api/v2/admin/requeue",
@@ -2712,6 +2724,20 @@
     "authorizationRoles": [],
     "authenticationSchemes": []
   },
+  {
+    "method": "PUT",
+    "route": "/api/v2/users/me/product-tours/{tourName:regex(^[a-z0-9]\u002B(?:-[a-z0-9]\u002B)*$):maxlength(64)}",
+    "displayName": "HTTP: PUT api/v2/users/me/product-tours/{tourName:regex(^[a-z0-9]\u002B(?:-[a-z0-9]\u002B)*$):maxlength(64)}",
+    "tags": [
+      "User"
+    ],
+    "allowAnonymous": false,
+    "authorizationPolicies": [
+      "UserPolicy"
+    ],
+    "authorizationRoles": [],
+    "authenticationSchemes": []
+  },
   {
     "method": "POST",
     "route": "/api/v2/users/unverify-email-address",
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 6e88d09679..6d90532c67 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -428,6 +428,60 @@
         }
       }
     },
+    "/api/v2/admin/product-tour-usage": {
+      "get": {
+        "tags": [
+          "AdminEndpoints"
+        ],
+        "parameters": [
+          {
+            "name": "month",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "format": "date-time"
+            }
+          },
+          {
+            "name": "limit",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 100
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AdminProductTourUsageResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "403": {
+            "description": "Forbidden"
+          }
+        }
+      }
+    },
     "/.well-known/oauth-authorization-server": {
       "get": {
         "tags": [
@@ -3954,6 +4008,85 @@
         }
       }
     },
+    "/api/v2/users/me/product-tours/{tourName}": {
+      "put": {
+        "tags": [
+          "User"
+        ],
+        "summary": "Update current user product tour progress",
+        "parameters": [
+          {
+            "name": "tourName",
+            "in": "path",
+            "description": "The stable product tour name.",
+            "required": true,
+            "schema": {
+              "maxLength": 64,
+              "pattern": "^[a-z0-9]\u002B(?:-[a-z0-9]\u002B)*$",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The versioned product tour outcome.",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProductTourProgress"
+              }
+            },
+            "application/*\u002Bjson": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProductTourProgress"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProductTourProgress"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The request body is missing or malformed.",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "The product tour progress is invalid.",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The current user could not be found.",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v2/users/me/oauth-grants": {
       "get": {
         "tags": [
@@ -11697,6 +11830,144 @@
           }
         }
       },
+      "AdminProductTourActivity": {
+        "required": [
+          "date_utc",
+          "event",
+          "launch_source",
+          "tour_name",
+          "user_identity",
+          "user_name",
+          "version",
+          "count"
+        ],
+        "type": "object",
+        "properties": {
+          "date_utc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "event": {
+            "type": "string"
+          },
+          "launch_source": {
+            "type": "string"
+          },
+          "tour_name": {
+            "type": "string"
+          },
+          "user_identity": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "user_name": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "version": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "count": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
+      "AdminProductTourSummary": {
+        "required": [
+          "name",
+          "shown",
+          "started",
+          "completed",
+          "dismissed",
+          "unique_users",
+          "last_run_utc",
+          "completion_rate",
+          "dismissal_rate"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "shown": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "started": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "completed": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "dismissed": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "unique_users": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "last_run_utc": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "completion_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          },
+          "dismissal_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          }
+        }
+      },
+      "AdminProductTourUsageResponse": {
+        "required": [
+          "month",
+          "telemetry_configured",
+          "tours",
+          "recent_activity"
+        ],
+        "type": "object",
+        "properties": {
+          "month": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "telemetry_configured": {
+            "type": "boolean"
+          },
+          "tours": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AdminProductTourSummary"
+            }
+          },
+          "recent_activity": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AdminProductTourActivity"
+            }
+          }
+        }
+      },
       "AssistantAccessResponse": {
         "required": [
           "enabled",
@@ -13229,6 +13500,37 @@
           }
         }
       },
+      "ProductTourProgress": {
+        "required": [
+          "status",
+          "updated_utc",
+          "version"
+        ],
+        "type": "object",
+        "properties": {
+          "status": {
+            "$ref": "#/components/schemas/ProductTourStatus"
+          },
+          "updated_utc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "version": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ProductTourStatus": {
+        "enum": [
+          "completed",
+          "dismissed"
+        ],
+        "x-enumNames": [
+          "Completed",
+          "Dismissed"
+        ]
+      },
       "ResetPasswordModel": {
         "required": [
           "password_reset_token",
@@ -13637,6 +13939,31 @@
           }
         }
       },
+      "UpdateProductTourProgress": {
+        "required": [
+          "status",
+          "version"
+        ],
+        "type": "object",
+        "properties": {
+          "status": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ProductTourStatus"
+              }
+            ]
+          },
+          "version": {
+            "maximum": 2147483647,
+            "minimum": 1,
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
       "UpdateProject": {
         "type": "object",
         "properties": {
@@ -13866,6 +14193,7 @@
           "o_auth_accounts",
           "organization_preferences",
           "saved_view_orders",
+          "product_tours",
           "email_notifications_enabled",
           "is_email_address_verified",
           "verify_email_address_token_expiration",
@@ -13931,6 +14259,12 @@
               "$ref": "#/components/schemas/UserSavedViewOrderPreference"
             }
           },
+          "product_tours": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/ProductTourProgress"
+            }
+          },
           "full_name": {
             "type": "string",
             "description": "Gets or sets the users Full Name."
@@ -14062,6 +14396,7 @@
           "o_auth_accounts",
           "organization_preferences",
           "saved_view_orders",
+          "product_tours",
           "id",
           "organization_ids",
           "full_name",
@@ -14101,6 +14436,12 @@
               "$ref": "#/components/schemas/UserSavedViewOrderPreference"
             }
           },
+          "product_tours": {
+            "type": "object",
+            "additionalProperties": {
+              "$ref": "#/components/schemas/ProductTourProgress"
+            }
+          },
           "id": {
             "maxLength": 24,
             "minLength": 24,
@@ -14947,4 +15288,4 @@
       "name": "Source Map"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
new file mode 100644
index 0000000000..78ff3aa4e9
--- /dev/null
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -0,0 +1,135 @@
+using Exceptionless.Core;
+using Exceptionless.Core.Models;
+using Exceptionless.Core.Utility;
+using Exceptionless.Tests.Extensions;
+using Exceptionless.Tests.Utility;
+using Exceptionless.Web.Models.Admin;
+using Xunit;
+
+namespace Exceptionless.Tests.Api.Endpoints;
+
+public sealed class AdminProductTourUsageEndpointTests : IntegrationTestsBase
+{
+    private readonly AppOptions _appOptions;
+
+    public AdminProductTourUsageEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    {
+        _appOptions = GetService<AppOptions>();
+    }
+
+    protected override async Task ResetDataAsync()
+    {
+        await base.ResetDataAsync();
+        await GetService<SampleDataService>().CreateDataAsync();
+    }
+
+    [Fact]
+    public async Task GetProductTourUsageAsync_AsGlobalAdmin_ReturnsInternalMonthlyUsage()
+    {
+        var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
+        TimeProvider.SetUtcNow(month.AddDays(20));
+
+        await CreateDataAsync(builder =>
+        {
+            AddUsage(builder, "product-tour.shown.ui-overview.v1.automatic", month.AddDays(1), "user-1", 2);
+            AddUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(2), "user-1");
+            AddUsage(builder, "product-tour.started.ui-overview.v1.help-menu", month.AddDays(3), "user-1");
+            AddUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(4), "user-2");
+            AddUsage(builder, "product-tour.completed.ui-overview.v1.catalog", month.AddDays(5), "user-1");
+            AddUsage(builder, "product-tour.dismissed.ui-overview.v1.catalog", month.AddDays(6), "user-2");
+            AddUsage(builder, "product-tour.started.meet-exie.v2.command-palette", month.AddDays(7), "user-3");
+            AddUsage(builder, "product-tour.shown.welcome.v1.automatic", month.AddDays(1), "user-1", 2);
+            AddUsage(builder, "product-tour.dismissed.welcome.v1.automatic", month.AddDays(2), "user-1");
+            AddUsage(builder, "product-tour.started.unknown.v1.unknown-source", month.AddDays(8), "user-4");
+
+            builder.Event()
+                .TestProject()
+                .Type(Event.KnownTypes.FeatureUsage)
+                .Source("product-tour.started.ignored-tour.v1.catalog")
+                .Date(month.AddDays(9))
+                .UserIdentity("user-5");
+            AddUsage(builder, "product-tour.started.old-tour.v1.catalog", month.AddMonths(-1), "user-6");
+        });
+
+        var response = await SendRequestAsAsync<AdminProductTourUsageResponse>(request => request
+            .AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .QueryString("month", "2026-08-01")
+            .QueryString("limit", "3")
+            .StatusCodeShouldBeOk());
+
+        Assert.NotNull(response);
+        Assert.Equal(month, response.Month);
+        Assert.Equal(!String.IsNullOrWhiteSpace(_appOptions.ExceptionlessApiKey), response.TelemetryConfigured);
+        Assert.Equal(3, response.Tours.Count);
+
+        var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "ui-overview", StringComparison.Ordinal));
+        Assert.Equal(2, overview.Shown);
+        Assert.Equal(3, overview.Started);
+        Assert.Equal(1, overview.Completed);
+        Assert.Equal(1, overview.Dismissed);
+        Assert.Equal(2, overview.UniqueUsers);
+        Assert.Equal(month.AddDays(6), overview.LastRunUtc);
+        Assert.Equal(0.3333m, overview.CompletionRate);
+        Assert.Equal(0.3333m, overview.DismissalRate);
+
+        var exie = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "meet-exie", StringComparison.Ordinal));
+        Assert.Equal(1, exie.Started);
+        Assert.Equal(1, exie.UniqueUsers);
+        Assert.Equal(month.AddDays(7), exie.LastRunUtc);
+        Assert.Equal(0m, exie.CompletionRate);
+        Assert.Equal(0m, exie.DismissalRate);
+
+        var welcome = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "welcome", StringComparison.Ordinal));
+        Assert.Equal(2, welcome.Shown);
+        Assert.Equal(1, welcome.Dismissed);
+        Assert.Equal(month.AddDays(2), welcome.LastRunUtc);
+        Assert.Equal(0.5m, welcome.DismissalRate);
+
+        Assert.Equal(3, response.RecentActivity.Count);
+        Assert.Equal(month.AddDays(7), response.RecentActivity.First().DateUtc);
+        Assert.All(response.RecentActivity, activity => Assert.StartsWith("user-", activity.UserIdentity));
+    }
+
+    [Fact]
+    public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonth()
+    {
+        TimeProvider.SetUtcNow(new DateTime(2026, 9, 17, 12, 0, 0, DateTimeKind.Utc));
+
+        var response = await SendRequestAsAsync<AdminProductTourUsageResponse>(request => request
+            .AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .StatusCodeShouldBeOk());
+
+        Assert.NotNull(response);
+        Assert.Equal(new DateTime(2026, 9, 1, 0, 0, 0, DateTimeKind.Utc), response.Month);
+        Assert.Empty(response.Tours);
+        Assert.Empty(response.RecentActivity);
+    }
+
+    [Fact]
+    public Task GetProductTourUsageAsync_AsOrganizationUser_ReturnsForbidden()
+    {
+        return SendRequestAsync(request => request
+            .AsTestOrganizationUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .StatusCodeShouldBeForbidden());
+    }
+
+    private void AddUsage(
+        DataBuilder builder,
+        string source,
+        DateTime dateUtc,
+        string userIdentity,
+        int count = 1)
+    {
+        builder.Event()
+            .Organization(SampleDataService.TEST_ORG_ID)
+            .Project(_appOptions.InternalProjectId)
+            .Type(Event.KnownTypes.FeatureUsage)
+            .Source(source)
+            .Date(dateUtc)
+            .UserIdentity(userIdentity, $"Name {userIdentity}")
+            .Mutate(ev => ev.Count = count);
+    }
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs
new file mode 100644
index 0000000000..e125d7ff0f
--- /dev/null
+++ b/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs
@@ -0,0 +1,280 @@
+using Exceptionless.Core.Authorization;
+using Exceptionless.Core.Extensions;
+using Exceptionless.Core.Models;
+using Exceptionless.Core.Repositories;
+using Exceptionless.Core.Services;
+using Exceptionless.Core.Utility;
+using Exceptionless.Tests.Extensions;
+using Exceptionless.Web.Models.OAuth;
+using Foundatio.Repositories;
+using Foundatio.Repositories.Utility;
+using Xunit;
+
+namespace Exceptionless.Tests.Api.Endpoints;
+
+public sealed class OAuthGrantEndpointTests : IntegrationTestsBase
+{
+    private readonly IOAuthApplicationRepository _oauthApplicationRepository;
+    private readonly IOAuthTokenRepository _oauthTokenRepository;
+    private readonly IUserRepository _userRepository;
+
+    public OAuthGrantEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    {
+        _oauthApplicationRepository = GetService<IOAuthApplicationRepository>();
+        _oauthTokenRepository = GetService<IOAuthTokenRepository>();
+        _userRepository = GetService<IUserRepository>();
+    }
+
+    protected override async Task ResetDataAsync()
+    {
+        await base.ResetDataAsync();
+        await GetService<SampleDataService>().CreateDataAsync();
+    }
+
+    [Fact]
+    public async Task GetOAuthGrantsAsync_WithActiveOAuthTokens_ReturnsGroupedApplications()
+    {
+        // Arrange
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+
+        const string clientId = "test-oauth-grant-client";
+        await CreateOAuthApplicationAsync(clientId, "Test AI Client");
+        string grantId = StringExtensions.GetNewToken();
+        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], grantId: grantId);
+        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.StacksRead], grantId: grantId);
+        await CreateOAuthGrantTokenAsync(user.Id, "disabled-oauth-grant-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], isDisabled: true);
+
+        // Act
+        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
+            .AsTestOrganizationUser()
+            .AppendPath("users/me/oauth-grants")
+            .StatusCodeShouldBeOk()
+        );
+
+        // Assert
+        Assert.NotNull(grants);
+        var grant = Assert.Single(grants);
+        Assert.Equal(clientId, grant.ClientId);
+        Assert.Equal("Test AI Client", grant.ApplicationName);
+        Assert.Contains(SampleDataService.TEST_ORG_ID, grant.OrganizationIds);
+        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
+        Assert.Contains(AuthorizationRoles.StacksRead, grant.Scopes);
+        Assert.Equal(2, grant.Resources.Count);
+        Assert.Contains(grant.Resources, resource => String.Equals(resource.Resource, "http://localhost:7110/mcp", StringComparison.Ordinal) && resource.Scopes.Contains(AuthorizationRoles.McpRead));
+        Assert.Contains(grant.Resources, resource => String.Equals(resource.Resource, "http://localhost:7110/api/v2", StringComparison.Ordinal) && resource.Scopes.Contains(AuthorizationRoles.StacksRead));
+    }
+
+    [Fact]
+    public async Task GetOAuthGrantsAsync_WhenDisabledTokensExceedPageLimit_ReturnsActiveGrant()
+    {
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+        const string clientId = "paged-oauth-grant-client";
+        await CreateOAuthApplicationAsync(clientId, "Paged OAuth Grant Client");
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var disabledTokens = Enumerable.Range(0, 1005)
+            .Select(i => CreateOAuthGrantToken(user.Id, $"disabled-paged-client-{i}", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], utcNow.AddMinutes(1), isDisabled: true))
+            .ToArray();
+        await _oauthTokenRepository.AddAsync(disabledTokens, o => o.ImmediateConsistency());
+        string grantId = StringExtensions.GetNewToken();
+        await _oauthTokenRepository.AddAsync(CreateOAuthGrantToken(
+            user.Id,
+            clientId,
+            "http://localhost:7110/mcp",
+            [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess],
+            utcNow,
+            grantId: grantId), o => o.ImmediateConsistency());
+
+        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
+            .AsTestOrganizationUser()
+            .AppendPath("users/me/oauth-grants")
+            .StatusCodeShouldBeOk()
+        );
+
+        Assert.NotNull(grants);
+        var grant = Assert.Single(grants);
+        Assert.Equal(clientId, grant.ClientId);
+        Assert.Equal("Paged OAuth Grant Client", grant.ApplicationName);
+        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_WithCurrentUserGrant_DisablesAllClientTokens()
+    {
+        // Arrange
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+
+        const string clientId = "test-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Revoked AI Client");
+        await CreateOAuthApplicationAsync("unrelated-revoke-client", "Unrelated AI Client");
+        var firstToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
+        var secondToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess]);
+        var unrelatedToken = await CreateOAuthGrantTokenAsync(user.Id, "unrelated-revoke-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
+
+        // Act
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", firstToken.GrantId!)
+            .StatusCodeShouldBeNoContent()
+        );
+
+        // Assert
+        var revokedFirstToken = await _oauthTokenRepository.GetByIdAsync(firstToken.Id, o => o.ImmediateConsistency());
+        var revokedSecondToken = await _oauthTokenRepository.GetByIdAsync(secondToken.Id, o => o.ImmediateConsistency());
+        var stillActiveToken = await _oauthTokenRepository.GetByIdAsync(unrelatedToken.Id, o => o.ImmediateConsistency());
+        Assert.NotNull(revokedFirstToken);
+        Assert.NotNull(revokedSecondToken);
+        Assert.NotNull(stillActiveToken);
+        Assert.True(revokedFirstToken.IsDisabled);
+        Assert.True(revokedSecondToken.IsDisabled);
+        Assert.Null(revokedFirstToken.RefreshTokenHash);
+        Assert.Null(revokedSecondToken.RefreshTokenHash);
+        Assert.False(stillActiveToken.IsDisabled);
+        Assert.NotNull(stillActiveToken.RefreshTokenHash);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_WhenClientTokensExceedPageLimit_DisablesAllClientTokens()
+    {
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+        const string clientId = "paged-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Paged Revoke Client");
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var tokens = Enumerable.Range(0, 1005)
+            .Select(i => CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], utcNow))
+            .ToList();
+        string targetGrantId = StringExtensions.GetNewToken();
+        var targetToken = CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], utcNow, grantId: targetGrantId);
+        tokens.Add(targetToken);
+        await _oauthTokenRepository.AddAsync(tokens, o => o.ImmediateConsistency());
+
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", targetGrantId)
+            .StatusCodeShouldBeNoContent()
+        );
+
+        var results = await _oauthTokenRepository.GetByUserIdAndClientIdForUpdateAsync(user.Id, clientId, o => o.ImmediateConsistency().SearchAfterPaging().PageLimit(1000));
+        int tokenCount = 0;
+        do
+        {
+            foreach (var token in results.Documents)
+            {
+                tokenCount++;
+                Assert.True(token.IsDisabled);
+                Assert.Null(token.RefreshTokenHash);
+            }
+        } while (await results.NextPageAsync());
+
+        Assert.Equal(tokens.Count, tokenCount);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_ForAnotherUserGrant_ReturnsNotFound()
+    {
+        // Arrange
+        var freeUser = await _userRepository.GetByEmailAddressAsync(SampleDataService.FREE_USER_EMAIL);
+        Assert.NotNull(freeUser);
+
+        const string clientId = "other-user-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Other User AI Client");
+        var token = await CreateOAuthGrantTokenAsync(freeUser.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], organizationIds: [SampleDataService.FREE_ORG_ID]);
+
+        // Act
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", token.GrantId!)
+            .StatusCodeShouldBeNotFound()
+        );
+
+        // Assert
+        var storedToken = await _oauthTokenRepository.GetByIdAsync(token.Id, o => o.ImmediateConsistency());
+        Assert.NotNull(storedToken);
+        Assert.False(storedToken.IsDisabled);
+        Assert.NotNull(storedToken.RefreshTokenHash);
+    }
+    private Task<OAuthApplication> CreateOAuthApplicationAsync(string clientId, string name)
+    {
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var application = new OAuthApplication
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            ClientId = clientId,
+            Name = name,
+            RedirectUris = ["http://localhost/callback"],
+            Scopes =
+            [
+                AuthorizationRoles.McpRead,
+                AuthorizationRoles.ProjectsRead,
+                AuthorizationRoles.StacksRead,
+                AuthorizationRoles.StacksWrite,
+                AuthorizationRoles.EventsRead,
+                AuthorizationRoles.OfflineAccess
+            ],
+            CreatedByUserId = OAuthApplication.SystemUserId,
+            UpdatedByUserId = OAuthApplication.SystemUserId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+
+        return _oauthApplicationRepository.AddAsync(application, o => o.ImmediateConsistency());
+    }
+
+    private async Task<OAuthToken> CreateOAuthGrantTokenAsync(string userId, string clientId, string resource, string[] scopes, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
+    {
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
+        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
+        var token = new OAuthToken
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            UserId = userId,
+            ClientId = clientId,
+            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
+            Resource = resource,
+            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
+            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
+            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
+            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
+            ExpiresUtc = utcNow.AddHours(1),
+            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
+            IsDisabled = isDisabled,
+            CreatedBy = userId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+
+        await _oauthTokenRepository.AddAsync(token, o => o.ImmediateConsistency());
+        return token;
+    }
+
+    private static OAuthToken CreateOAuthGrantToken(string userId, string clientId, string resource, string[] scopes, DateTime utcNow, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
+    {
+        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
+        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
+        return new OAuthToken
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            UserId = userId,
+            ClientId = clientId,
+            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
+            Resource = resource,
+            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
+            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
+            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
+            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
+            ExpiresUtc = utcNow.AddHours(1),
+            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
+            IsDisabled = isDisabled,
+            CreatedBy = userId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+    }
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
new file mode 100644
index 0000000000..915684c221
--- /dev/null
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -0,0 +1,180 @@
+using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
+using Exceptionless.Core.Repositories;
+using Exceptionless.Core.Utility;
+using Exceptionless.Tests.Extensions;
+using Exceptionless.Web.Models;
+using Foundatio.Repositories;
+using Xunit;
+
+namespace Exceptionless.Tests.Api.Endpoints;
+
+public sealed class ProductTourEndpointTests : IntegrationTestsBase
+{
+    private readonly IUserRepository _userRepository;
+
+    public ProductTourEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    {
+        _userRepository = GetService<IUserRepository>();
+    }
+
+    protected override async Task ResetDataAsync()
+    {
+        await base.ResetDataAsync();
+        await GetService<SampleDataService>().CreateDataAsync();
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_NewProgress_PersistsAndReturnsProgress()
+    {
+        var currentUser = await GetTestOrganizationUserAsync();
+
+        var progress = await SendRequestAsAsync<ProductTourProgress>(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Dismissed, Version = 1 })
+            .StatusCodeShouldBeOk());
+
+        Assert.NotNull(progress);
+        Assert.Equal(ProductTourStatus.Dismissed, progress.Status);
+        Assert.Equal(1, progress.Version);
+
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(progress, persistedUser.ProductTours["ui-overview"]);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStoredValue()
+    {
+        var currentUser = await GetTestOrganizationUserAsync();
+        await UpdateProgressAsync("meet-exie", ProductTourStatus.Completed, 3);
+
+        var replacement = await UpdateProgressAsync("meet-exie", ProductTourStatus.Dismissed, 1);
+
+        Assert.Equal(ProductTourStatus.Completed, replacement.Status);
+        Assert.Equal(3, replacement.Version);
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(replacement, persistedUser.ProductTours["meet-exie"]);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_CompletedProgress_ReplacesDismissedProgressForSameVersion()
+    {
+        var currentUser = await GetTestOrganizationUserAsync();
+        await UpdateProgressAsync("meet-exie", ProductTourStatus.Dismissed, 3);
+
+        var replacement = await UpdateProgressAsync("meet-exie", ProductTourStatus.Completed, 3);
+
+        Assert.Equal(ProductTourStatus.Completed, replacement.Status);
+        Assert.Equal(3, replacement.Version);
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(replacement, persistedUser.ProductTours["meet-exie"]);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_MoreThanThirtyTwoNames_ReturnsUnprocessableEntity()
+    {
+        var currentUser = await GetTestOrganizationUserAsync();
+        var user = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(user);
+        foreach (int index in Enumerable.Range(0, 32))
+        {
+            user.ProductTours[$"guide-{index}"] = new ProductTourProgress
+            {
+                Status = ProductTourStatus.Dismissed,
+                UpdatedUtc = TimeProvider.GetUtcNow().UtcDateTime,
+                Version = 1
+            };
+        }
+        await _userRepository.SaveAsync(user, options => options.Cache().ImmediateConsistency());
+
+        await SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "guide-32")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
+            .StatusCodeShouldBeUnprocessableEntity());
+
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(32, persistedUser.ProductTours.Count);
+        Assert.DoesNotContain("guide-32", persistedUser.ProductTours);
+    }
+
+    [Fact]
+    public Task UpdateCurrentUserProductTourAsync_InvalidTourName_DoesNotMatchRoute()
+    {
+        return SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "Invalid--Tour")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
+            .StatusCodeShouldBeNotFound());
+    }
+
+    [Fact]
+    public Task UpdateCurrentUserProductTourAsync_AnonymousUser_ReturnsUnauthorized()
+    {
+        return SendRequestAsync(request => request
+            .Put()
+            .AppendPaths("users", "me", "product-tours", "welcome")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Dismissed, Version = 1 })
+            .StatusCodeShouldBeUnauthorized());
+    }
+
+    [Fact]
+    public Task UpdateCurrentUserProductTourAsync_MissingBody_ReturnsBadRequest()
+    {
+        return SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .StatusCodeShouldBeBadRequest());
+    }
+
+    [Theory]
+    [InlineData(0)]
+    [InlineData(-1)]
+    public Task UpdateCurrentUserProductTourAsync_NonPositiveVersion_ReturnsUnprocessableEntity(int version)
+    {
+        return SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "invalid-version")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = version })
+            .StatusCodeShouldBeUnprocessableEntity());
+    }
+
+    [Fact]
+    public Task UpdateCurrentUserProductTourAsync_UndefinedStatus_ReturnsUnprocessableEntity()
+    {
+        return SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", "invalid-status")
+            .Content(new { Status = 999, Version = 1 })
+            .StatusCodeShouldBeUnprocessableEntity());
+    }
+
+    private async Task<ProductTourProgress> UpdateProgressAsync(string tourName, ProductTourStatus status, int version)
+    {
+        var progress = await SendRequestAsAsync<ProductTourProgress>(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", tourName)
+            .Content(new UpdateProductTourProgress { Status = status, Version = version })
+            .StatusCodeShouldBeOk());
+
+        return Assert.IsType<ProductTourProgress>(progress);
+    }
+
+    private async Task<User> GetTestOrganizationUserAsync()
+    {
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        return Assert.IsType<User>(user);
+    }
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
index 2bcd528a36..f05a690a5b 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
@@ -8,7 +8,6 @@
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Web.Api.Results;
 using Exceptionless.Web.Models;
-using Exceptionless.Web.Models.OAuth;
 using Exceptionless.Web.Utility;
 using FluentRest;
 using Foundatio.Repositories;
@@ -20,14 +19,10 @@ namespace Exceptionless.Tests.Api.Endpoints;
 public sealed class UserEndpointTests : IntegrationTestsBase
 {
     private readonly IUserRepository _userRepository;
-    private readonly IOAuthApplicationRepository _oauthApplicationRepository;
-    private readonly IOAuthTokenRepository _oauthTokenRepository;
 
     public UserEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
     {
         _userRepository = GetService<IUserRepository>();
-        _oauthApplicationRepository = GetService<IOAuthApplicationRepository>();
-        _oauthTokenRepository = GetService<IOAuthTokenRepository>();
     }
 
     protected override async Task ResetDataAsync()
@@ -432,174 +427,6 @@ public async Task GetCurrentUserAsync_WithAvatar_ReturnsRoutableAvatarUrl()
         Assert.Equal($"/api/v2/users/{currentUser.Id}/avatar/avatar.png", user.AvatarUrl);
     }
 
-    [Fact]
-    public async Task GetOAuthGrantsAsync_WithActiveOAuthTokens_ReturnsGroupedApplications()
-    {
-        // Arrange
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-
-        const string clientId = "test-oauth-grant-client";
-        await CreateOAuthApplicationAsync(clientId, "Test AI Client");
-        string grantId = StringExtensions.GetNewToken();
-        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], grantId: grantId);
-        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.StacksRead], grantId: grantId);
-        await CreateOAuthGrantTokenAsync(user.Id, "disabled-oauth-grant-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], isDisabled: true);
-
-        // Act
-        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
-            .AsTestOrganizationUser()
-            .AppendPath("users/me/oauth-grants")
-            .StatusCodeShouldBeOk()
-        );
-
-        // Assert
-        Assert.NotNull(grants);
-        var grant = Assert.Single(grants);
-        Assert.Equal(clientId, grant.ClientId);
-        Assert.Equal("Test AI Client", grant.ApplicationName);
-        Assert.Contains(SampleDataService.TEST_ORG_ID, grant.OrganizationIds);
-        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
-        Assert.Contains(AuthorizationRoles.StacksRead, grant.Scopes);
-        Assert.Equal(2, grant.Resources.Count);
-        Assert.Contains(grant.Resources, r => r.Resource == "http://localhost:7110/mcp" && r.Scopes.Contains(AuthorizationRoles.McpRead));
-        Assert.Contains(grant.Resources, r => r.Resource == "http://localhost:7110/api/v2" && r.Scopes.Contains(AuthorizationRoles.StacksRead));
-    }
-
-    [Fact]
-    public async Task GetOAuthGrantsAsync_WhenDisabledTokensExceedPageLimit_ReturnsActiveGrant()
-    {
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        const string clientId = "paged-oauth-grant-client";
-        await CreateOAuthApplicationAsync(clientId, "Paged OAuth Grant Client");
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var disabledTokens = Enumerable.Range(0, 1005)
-            .Select(i => CreateOAuthGrantToken(user.Id, $"disabled-paged-client-{i}", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], utcNow.AddMinutes(1), isDisabled: true))
-            .ToArray();
-        await _oauthTokenRepository.AddAsync(disabledTokens, o => o.ImmediateConsistency());
-        string grantId = StringExtensions.GetNewToken();
-        await _oauthTokenRepository.AddAsync(CreateOAuthGrantToken(
-            user.Id,
-            clientId,
-            "http://localhost:7110/mcp",
-            [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess],
-            utcNow,
-            grantId: grantId), o => o.ImmediateConsistency());
-
-        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
-            .AsTestOrganizationUser()
-            .AppendPath("users/me/oauth-grants")
-            .StatusCodeShouldBeOk()
-        );
-
-        Assert.NotNull(grants);
-        var grant = Assert.Single(grants);
-        Assert.Equal(clientId, grant.ClientId);
-        Assert.Equal("Paged OAuth Grant Client", grant.ApplicationName);
-        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_WithCurrentUserGrant_DisablesAllClientTokens()
-    {
-        // Arrange
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-
-        const string clientId = "test-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Revoked AI Client");
-        await CreateOAuthApplicationAsync("unrelated-revoke-client", "Unrelated AI Client");
-        var firstToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
-        var secondToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess]);
-        var unrelatedToken = await CreateOAuthGrantTokenAsync(user.Id, "unrelated-revoke-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
-
-        // Act
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", firstToken.GrantId!)
-            .StatusCodeShouldBeNoContent()
-        );
-
-        // Assert
-        var revokedFirstToken = await _oauthTokenRepository.GetByIdAsync(firstToken.Id, o => o.ImmediateConsistency());
-        var revokedSecondToken = await _oauthTokenRepository.GetByIdAsync(secondToken.Id, o => o.ImmediateConsistency());
-        var stillActiveToken = await _oauthTokenRepository.GetByIdAsync(unrelatedToken.Id, o => o.ImmediateConsistency());
-        Assert.NotNull(revokedFirstToken);
-        Assert.NotNull(revokedSecondToken);
-        Assert.NotNull(stillActiveToken);
-        Assert.True(revokedFirstToken.IsDisabled);
-        Assert.True(revokedSecondToken.IsDisabled);
-        Assert.Null(revokedFirstToken.RefreshTokenHash);
-        Assert.Null(revokedSecondToken.RefreshTokenHash);
-        Assert.False(stillActiveToken.IsDisabled);
-        Assert.NotNull(stillActiveToken.RefreshTokenHash);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_WhenClientTokensExceedPageLimit_DisablesAllClientTokens()
-    {
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        const string clientId = "paged-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Paged Revoke Client");
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var tokens = Enumerable.Range(0, 1005)
-            .Select(i => CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], utcNow))
-            .ToList();
-        string targetGrantId = StringExtensions.GetNewToken();
-        var targetToken = CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], utcNow, grantId: targetGrantId);
-        tokens.Add(targetToken);
-        await _oauthTokenRepository.AddAsync(tokens, o => o.ImmediateConsistency());
-
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", targetGrantId)
-            .StatusCodeShouldBeNoContent()
-        );
-
-        var results = await _oauthTokenRepository.GetByUserIdAndClientIdForUpdateAsync(user.Id, clientId, o => o.ImmediateConsistency().SearchAfterPaging().PageLimit(1000));
-        int tokenCount = 0;
-        do
-        {
-            foreach (var token in results.Documents)
-            {
-                tokenCount++;
-                Assert.True(token.IsDisabled);
-                Assert.Null(token.RefreshTokenHash);
-            }
-        } while (await results.NextPageAsync());
-
-        Assert.Equal(tokens.Count, tokenCount);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_ForAnotherUserGrant_ReturnsNotFound()
-    {
-        // Arrange
-        var freeUser = await _userRepository.GetByEmailAddressAsync(SampleDataService.FREE_USER_EMAIL);
-        Assert.NotNull(freeUser);
-
-        const string clientId = "other-user-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Other User AI Client");
-        var token = await CreateOAuthGrantTokenAsync(freeUser.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], organizationIds: [SampleDataService.FREE_ORG_ID]);
-
-        // Act
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", token.GrantId!)
-            .StatusCodeShouldBeNotFound()
-        );
-
-        // Assert
-        var storedToken = await _oauthTokenRepository.GetByIdAsync(token.Id, o => o.ImmediateConsistency());
-        Assert.NotNull(storedToken);
-        Assert.False(storedToken.IsDisabled);
-        Assert.NotNull(storedToken.RefreshTokenHash);
-    }
 
     [Fact]
     public async Task UploadAvatarAsync_ImageOverGlobalRequestLimit_ReturnsUpdatedUser()
@@ -962,84 +789,6 @@ await SendRequestAsync(r => r
         Assert.Null(updatedUser.VerifyEmailAddressToken);
     }
 
-    private Task<OAuthApplication> CreateOAuthApplicationAsync(string clientId, string name)
-    {
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var application = new OAuthApplication
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            ClientId = clientId,
-            Name = name,
-            RedirectUris = ["http://localhost/callback"],
-            Scopes =
-            [
-                AuthorizationRoles.McpRead,
-                AuthorizationRoles.ProjectsRead,
-                AuthorizationRoles.StacksRead,
-                AuthorizationRoles.StacksWrite,
-                AuthorizationRoles.EventsRead,
-                AuthorizationRoles.OfflineAccess
-            ],
-            CreatedByUserId = OAuthApplication.SystemUserId,
-            UpdatedByUserId = OAuthApplication.SystemUserId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-
-        return _oauthApplicationRepository.AddAsync(application, o => o.ImmediateConsistency());
-    }
-
-    private async Task<OAuthToken> CreateOAuthGrantTokenAsync(string userId, string clientId, string resource, string[] scopes, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
-    {
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
-        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
-        var token = new OAuthToken
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            UserId = userId,
-            ClientId = clientId,
-            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
-            Resource = resource,
-            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
-            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
-            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
-            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
-            ExpiresUtc = utcNow.AddHours(1),
-            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
-            IsDisabled = isDisabled,
-            CreatedBy = userId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-
-        await _oauthTokenRepository.AddAsync(token, o => o.ImmediateConsistency());
-        return token;
-    }
-
-    private static OAuthToken CreateOAuthGrantToken(string userId, string clientId, string resource, string[] scopes, DateTime utcNow, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
-    {
-        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
-        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
-        return new OAuthToken
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            UserId = userId,
-            ClientId = clientId,
-            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
-            Resource = resource,
-            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
-            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
-            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
-            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
-            ExpiresUtc = utcNow.AddHours(1),
-            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
-            IsDisabled = isDisabled,
-            CreatedBy = userId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-    }
 
     private async Task<ViewUser> GetTestOrganizationUserAsync()
     {
diff --git a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
index 9d85fa6956..35384c37f2 100644
--- a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
+++ b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
@@ -61,6 +61,17 @@ public async Task GetOpenApiJson_Default_ContainsExpectedRoutesOperationsAndResp
         Assert.True(projectsPost.TryGetProperty("requestBody", out _));
         AssertResponseCodes(projectsPost, "201");
 
+        Assert.True(paths.TryGetProperty("/api/v2/users/me/product-tours/{tourName}", out var productTourPath));
+        Assert.True(productTourPath.TryGetProperty("put", out var productTourPut));
+        Assert.True(productTourPut.TryGetProperty("requestBody", out _));
+        AssertResponseCodes(productTourPut, "200", "404", "422");
+        AssertResponseSchema(productTourPut, "200", "ProductTourProgress");
+
+        Assert.True(paths.TryGetProperty("/api/v2/admin/product-tour-usage", out var productTourUsagePath));
+        Assert.True(productTourUsagePath.TryGetProperty("get", out var productTourUsageGet));
+        AssertResponseCodes(productTourUsageGet, "200", "400", "401", "403");
+        AssertResponseSchema(productTourUsageGet, "200", "AdminProductTourUsageResponse");
+
         Assert.True(paths.TryGetProperty("/api/v2/assistant/chat", out var assistantChatPath));
         Assert.True(assistantChatPath.TryGetProperty("post", out var assistantChatPost));
         AssertResponseCodes(assistantChatPost, "200", "400", "401", "403", "404", "426", "429", "503");
@@ -100,6 +111,11 @@ public async Task GetOpenApiJson_Default_ContainsExpectedSchemasAndSecuritySchem
         Assert.True(schemas.TryGetProperty("NewProject", out _));
         Assert.True(schemas.TryGetProperty("SavedViewColumnSettings", out var savedViewColumnSettings));
         Assert.True(schemas.TryGetProperty("TokenResult", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourProgress", out _));
+        Assert.True(schemas.TryGetProperty("UpdateProductTourProgress", out _));
+        Assert.True(schemas.TryGetProperty("AdminProductTourActivity", out _));
+        Assert.True(schemas.TryGetProperty("AdminProductTourSummary", out _));
+        Assert.True(schemas.TryGetProperty("AdminProductTourUsageResponse", out _));
         Assert.True(schemas.TryGetProperty("ViewOrganization", out _));
 
         var savedViewColumnProperties = savedViewColumnSettings.GetProperty("properties");
@@ -167,6 +183,7 @@ public async Task GetOpenApiJson_MigratedContracts_PreserveControllerMetadata()
         AssertDictionaryValueSchema(document.RootElement, "ViewSavedView", "columns", "SavedViewColumnSettings");
         AssertRequiredJsonRequestBody(paths, "/api/v2/users/{id}", "patch", "UpdateUser");
         AssertRequiredJsonRequestBody(paths, "/api/v2/users/{id}", "put", "UpdateUser");
+        AssertRequiredJsonRequestBody(paths, "/api/v2/users/me/product-tours/{tourName}", "put", "UpdateProductTourProgress");
 
         AssertRequestContentTypes(paths, "/api/v1/error", "post", "application/json", "text/plain");
         AssertRequestContentTypes(paths, "/api/v1/events", "post", "application/json", "text/plain");
@@ -290,6 +307,20 @@ private static void AssertResponseCodes(JsonElement operation, params string[] e
             Assert.True(responses.TryGetProperty(statusCode, out _), $"Expected response status code '{statusCode}'.");
     }
 
+    private static void AssertResponseSchema(JsonElement operation, string statusCode, string expectedSchema)
+    {
+        string? schema = operation
+            .GetProperty("responses")
+            .GetProperty(statusCode)
+            .GetProperty("content")
+            .GetProperty("application/json")
+            .GetProperty("schema")
+            .GetProperty("$ref")
+            .GetString();
+
+        Assert.Equal($"#/components/schemas/{expectedSchema}", schema);
+    }
+
     private static void AssertPathResponseCodes(JsonElement paths, string path, string method, params string[] expectedStatusCodes)
     {
         var operation = paths.GetProperty(path).GetProperty(method);
diff --git a/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs b/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
index 9d3e9d4c42..fdb4f5b9bf 100644
--- a/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
+++ b/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
@@ -1,4 +1,5 @@
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Foundatio.Serializer;
 using Xunit;
 
@@ -238,6 +239,60 @@ public void Deserialize_SnakeCaseJson_PreservesOrganizationIds()
         Assert.Contains("client", user.Roles);
     }
 
+    [Fact]
+    public void Deserialize_User_PreservesProductTourProgress()
+    {
+        var original = new User
+        {
+            Id = "tour-user",
+            FullName = "Tour User",
+            EmailAddress = "tour@example.com",
+            IsEmailAddressVerified = true,
+            ProductTours = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal)
+            {
+                ["welcome"] = new()
+                {
+                    Version = 1,
+                    Status = ProductTourStatus.Dismissed,
+                    UpdatedUtc = FixedDateTime
+                },
+                ["ui-overview"] = new()
+                {
+                    Version = 2,
+                    Status = ProductTourStatus.Completed,
+                    UpdatedUtc = FixedDateTime.AddMinutes(1)
+                }
+            }
+        };
+
+        string? json = _serializer.SerializeToString(original);
+        var deserialized = _serializer.Deserialize<User>(json);
+
+        Assert.NotNull(deserialized);
+        Assert.Equal(2, deserialized.ProductTours.Count);
+        Assert.Equal(ProductTourStatus.Dismissed, deserialized.ProductTours["welcome"].Status);
+        Assert.Equal(2, deserialized.ProductTours["ui-overview"].Version);
+        Assert.Equal(ProductTourStatus.Completed, deserialized.ProductTours["ui-overview"].Status);
+    }
+
+    [Fact]
+    public void Deserialize_LegacyUserWithoutProductTours_ReturnsEmptyCollection()
+    {
+        const string json = """
+            {
+                "id": "legacy-user",
+                "full_name": "Legacy User",
+                "email_address": "legacy@example.com",
+                "is_email_address_verified": true
+            }
+            """;
+
+        var user = _serializer.Deserialize<User>(json);
+
+        Assert.NotNull(user);
+        Assert.Empty(user.ProductTours);
+    }
+
     [Fact]
     public void Deserialize_SnakeCaseJson_PreservesOAuthAccounts()
     {
diff --git a/tests/http/admin.http b/tests/http/admin.http
index ca66456788..e887ce5045 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -116,6 +116,10 @@ Content-Type: application/json
     "enabled": null
 }
 
+### Product Tour Usage
+GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01&limit=100
+Authorization: Bearer {{token}}
+
 ### Suspend
 POST {{apiUrl}}/organizations/{{organizationId}}/suspend?code=1
 Authorization: Bearer {{token}}
diff --git a/tests/http/users.http b/tests/http/users.http
index 38b9d2cee5..2fc983c203 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -26,6 +26,16 @@ Authorization: Bearer {{token}}
 @avatarFile = ./avatar.png
 @oauthGrantId = replace-with-oauth-grant-id
 
+### Record Product Tour Progress
+PUT {{apiUrl}}/users/me/product-tours/ui-overview
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+    "version": 1,
+    "status": "completed"
+}
+
 ### Get OAuth Grants
 GET {{apiUrl}}/users/me/oauth-grants
 Authorization: Bearer {{token}}

From 5042273bf8fd303ea268586925ab1a43f2dc328d Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 28 Aug 2026 02:08:12 -0500
Subject: [PATCH 02/43] Keep guided tours out of setup flows

---
 .../ClientApp/e2e/tests/chart-refresh.e2e.ts  |  1 +
 .../product-tours/eligibility.test.ts         | 13 ++-
 .../lib/features/product-tours/eligibility.ts |  6 ++
 .../sessions-dashboard-chart.svelte           | 87 +++++++++----------
 .../ClientApp/src/routes/(app)/+layout.svelte |  6 +-
 5 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
index 729f62728e..b192730f74 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
@@ -4,6 +4,7 @@ import { expect, test } from '../fixtures/e2e-test';
 
 test('dashboard charts stay mounted while list data refreshes', async ({ e2eApi, page }) => {
     const userToken = await e2eApi.login();
+    await e2eApi.updateProductTour(userToken, 'welcome', 1, 'dismissed');
     const organizations = await e2eApi.getOrganizations(userToken);
     const organizationId = organizations[0]?.id;
     expect(organizationId).toBeTruthy();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
index eed9c6af2a..65b7d7b3f1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
@@ -1,7 +1,18 @@
 import { ProductTourStatus } from '$generated/api';
 import { describe, expect, it } from 'vitest';
 
-import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from './eligibility';
+import { isProductTourSetupRoute, shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from './eligibility';
+
+describe('product tour setup routes', () => {
+    it.each(['/(app)/organization/add', '/(app)/project/add', '/(app)/project/[projectId]/configure'])('suppresses automatic tours on %s', (routeId) => {
+        expect(isProductTourSetupRoute(routeId)).toBe(true);
+    });
+
+    it('allows automatic tours after setup', () => {
+        expect(isProductTourSetupRoute('/(app)/stack')).toBe(false);
+        expect(isProductTourSetupRoute(null)).toBe(false);
+    });
+});
 
 describe('product tour welcome eligibility', () => {
     it('offers legacy users and a newer welcome version', () => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
index 6967783729..882d52d3f8 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
@@ -1,5 +1,11 @@
 import type { ProductTourProgress } from '$features/users/models';
 
+const SETUP_ROUTE_IDS = new Set(['/(app)/organization/add', '/(app)/project/[projectId]/configure', '/(app)/project/add']);
+
+export function isProductTourSetupRoute(routeId: null | string): boolean {
+    return !!routeId && SETUP_ROUTE_IDS.has(routeId);
+}
+
 export function shouldOfferProductTourAnnouncement(progress: ProductTourProgress | undefined, announcementVersion: number): boolean {
     return !progress || progress.version < announcementVersion;
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
index b76f528af6..ee57bbeeb2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
@@ -49,51 +49,50 @@
     ];
 </script>
 
-<Chart.Shell class={className}>
-    {#if isLoading}
-        <Skeleton class="h-16 w-full rounded" />
-    {:else}
-        <Chart.Container config={chartConfig} class="h-16 w-full">
-            <AreaChart
-                {data}
-                x="date"
-                xScale={scaleUtc()}
-                yDomain={[0, Math.max(1, Math.max(...data.map((d) => Math.max(d.sessions, d.users))))]}
-                {series}
-                axis={false}
-                grid={false}
-                brush={{
-                    onBrushEnd: (e) => {
-                        if (!e.brush.active) {
-                            return;
-                        }
-
-                        const [start, end] = e.brush.x;
-                        if (start instanceof Date && end instanceof Date) {
-                            onRangeSelect?.(start, end);
-                        }
+<Chart.Shell class={`relative ${className}`}>
+    <Chart.Container config={chartConfig} class="h-16 w-full">
+        <AreaChart
+            {data}
+            x="date"
+            xScale={scaleUtc()}
+            yDomain={[0, Math.max(1, Math.max(...data.map((d) => Math.max(d.sessions, d.users))))]}
+            {series}
+            axis={false}
+            grid={false}
+            brush={{
+                onBrushEnd: (e) => {
+                    if (!e.brush.active) {
+                        return;
                     }
-                }}
-                props={{
-                    area: {
-                        curve: curveLinear
-                    },
-                    canvas: {
-                        class: 'cursor-crosshair'
-                    },
-                    svg: {
-                        class: 'cursor-crosshair'
+
+                    const [start, end] = e.brush.x;
+                    if (start instanceof Date && end instanceof Date) {
+                        onRangeSelect?.(start, end);
                     }
-                }}
-            >
-                {#snippet tooltip()}
-                    <Chart.Tooltip
-                        class="min-w-62.5"
-                        indicator="line"
-                        labelFormatter={(v) => (v instanceof Date ? formatDateLabel(v) : typeof v === 'number' ? formatDateLabel(new Date(v)) : String(v))}
-                    />
-                {/snippet}
-            </AreaChart>
-        </Chart.Container>
+                }
+            }}
+            props={{
+                area: {
+                    curve: curveLinear
+                },
+                canvas: {
+                    class: 'cursor-crosshair'
+                },
+                svg: {
+                    class: 'cursor-crosshair'
+                }
+            }}
+        >
+            {#snippet tooltip()}
+                <Chart.Tooltip
+                    class="min-w-62.5"
+                    indicator="line"
+                    labelFormatter={(v) => (v instanceof Date ? formatDateLabel(v) : typeof v === 'number' ? formatDateLabel(new Date(v)) : String(v))}
+                />
+            {/snippet}
+        </AreaChart>
+    </Chart.Container>
+    {#if isLoading}
+        <Skeleton class="absolute inset-0 h-16 w-full rounded" />
     {/if}
 </Chart.Shell>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index dcc8968c66..df33ceb996 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -40,6 +40,7 @@
     import { getUtcMonthKey, ORGANIZATION_USAGE_ROLLOVER_CHECK_INTERVAL_MS } from '$features/organizations/utils';
     import { getProductTourItems } from '$features/product-tours/catalog';
     import ProductTourHost from '$features/product-tours/components/product-tour-host.svelte';
+    import { isProductTourSetupRoute } from '$features/product-tours/eligibility';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getOrganizationProjectsQuery, invalidateProjectQueries } from '$features/projects/api.svelte';
     import { getSavedViewsQuery, invalidateSavedViewQueries, isSavedViewDeleted, putUserSavedViewOrder } from '$features/saved-views/api.svelte';
@@ -727,13 +728,14 @@
 
     const setupPath = resolve('/(app)/organization/add');
     const isSetupPage = $derived(page.url.pathname === setupPath);
+    const suppressAutomaticProductTours = $derived(isProductTourSetupRoute(page.route.id));
     const productTourItems = $derived(
         meQuery.isSuccess
             ? getProductTourItems(
                   {
                       assistantAccess,
                       errorEventAvailability: productTourErrorEventAvailability,
-                      isSetupPage,
+                      isSetupPage: suppressAutomaticProductTours,
                       organizationId: organization.current,
                       pathname: page.url.pathname,
                       projects
@@ -901,7 +903,7 @@
         errorEventAvailability={productTourErrorEventAvailability}
         isAnyOverlayOpen={isAnyProductTourOverlayOpen}
         {isImpersonating}
-        {isSetupPage}
+        isSetupPage={suppressAutomaticProductTours}
         openAssistant={openAssistantPanel}
         organizationId={organization.current}
         pathname={page.url.pathname}

From fd0af38708c0f5d6415c2b4a80e685a17dc8c93b Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 28 Aug 2026 07:59:41 -0500
Subject: [PATCH 03/43] Refine product tour usage aggregation

---
 .../Models/Data/ProductTours.cs               |  32 ++++
 .../Repositories/EventRepository.cs           | 165 +++++++++++++++++-
 .../Interfaces/IEventRepository.cs            |   1 +
 .../Repositories/ProductTourUsageResult.cs    |  15 ++
 .../Api/Handlers/AdminHandler.cs              |  96 ++--------
 .../Api/Handlers/UserHandler.cs               |  17 +-
 .../ClientApp/src/lib/generated/api.ts        |   1 -
 .../ClientApp/src/lib/generated/schemas.ts    |   1 -
 .../(app)/system/product-tours/+page.svelte   |   7 -
 .../Admin/AdminProductTourUsageResponse.cs    |   1 -
 .../Models/Admin/ProductTourUsageSource.cs    |  44 -----
 .../Exceptionless.Tests/Api/Data/openapi.json |   4 -
 .../AdminProductTourUsageEndpointTests.cs     |   3 +-
 .../Api/Endpoints/ProductTourEndpointTests.cs |  42 ++---
 .../Repositories/EventRepositoryTests.cs      |  61 +++++++
 15 files changed, 312 insertions(+), 178 deletions(-)
 create mode 100644 src/Exceptionless.Core/Models/Data/ProductTours.cs
 create mode 100644 src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
 delete mode 100644 src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
new file mode 100644
index 0000000000..7db7b59467
--- /dev/null
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -0,0 +1,32 @@
+using System.Collections.Frozen;
+
+namespace Exceptionless.Core.Models.Data;
+
+public static class ProductTours
+{
+    public const string ConfigureProject = "configure-project";
+    public const string CreateSavedView = "create-saved-view";
+    public const string ExieAnnouncement = "exie-announcement";
+    public const string InvestigateError = "investigate-error";
+    public const string MeetExie = "meet-exie";
+    public const string UiOverview = "ui-overview";
+    public const string Welcome = "welcome";
+
+    public static IReadOnlyDictionary<string, int> Versions { get; } = new Dictionary<string, int>(StringComparer.Ordinal)
+    {
+        [ConfigureProject] = 1,
+        [CreateSavedView] = 1,
+        [ExieAnnouncement] = 1,
+        [InvestigateError] = 1,
+        [MeetExie] = 1,
+        [UiOverview] = 1,
+        [Welcome] = 1
+    }.ToFrozenDictionary(StringComparer.Ordinal);
+
+    public static bool IsKnown(string name) => Versions.ContainsKey(name);
+
+    public static bool IsValid(string name, int version)
+    {
+        return Versions.TryGetValue(name, out int currentVersion) && version > 0 && version <= currentVersion;
+    }
+}
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 3fba37a69d..35a2355fa2 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -1,16 +1,22 @@
-using Elastic.Clients.Elasticsearch.QueryDsl;
+using Elastic.Clients.Elasticsearch.Aggregations;
+using Elastic.Clients.Elasticsearch.QueryDsl;
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories.Configuration;
 using Exceptionless.Core.Repositories.Queries;
 using Exceptionless.Core.Validation;
 using Exceptionless.DateTimeExtensions;
 using Foundatio.Repositories;
+using Foundatio.Repositories.Elasticsearch.Extensions;
+using Foundatio.Repositories.Exceptions;
 using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Core.Repositories;
 
 public class EventRepository : RepositoryOwnedByOrganizationAndProject<PersistentEvent>, IEventRepository
 {
+    private static readonly string[] _productTourEvents = ["completed", "dismissed", "shown", "started"];
+    private static readonly string[] _productTourLaunchSources = ["automatic", "catalog", "command-palette", "feature-announcement", "help-menu"];
     private readonly TimeProvider _timeProvider;
 
     public EventRepository(ExceptionlessElasticConfiguration configuration, AppOptions options, MiniValidationValidator validator)
@@ -82,6 +88,163 @@ public Task<FindResults<PersistentEvent>> GetByReferenceIdAsync(string projectId
         return FindAsync(q => q.Project(projectId).FieldEquals(e => e.ReferenceId, referenceId).SortDescending(e => e.Date), o => o.PageLimit(10));
     }
 
+    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime utcStart, DateTime utcEnd, int recentLimit = 500)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(projectId);
+        ArgumentOutOfRangeException.ThrowIfLessThan(recentLimit, 1);
+        if (utcEnd <= utcStart)
+            throw new ArgumentOutOfRangeException(nameof(utcEnd), "The end date must be later than the start date.");
+
+        var sourcesByTour = ProductTours.Versions.ToDictionary(
+            pair => pair.Key,
+            pair => CreateProductTourSources(pair.Key, pair.Value),
+            StringComparer.Ordinal);
+        var sourcesByName = sourcesByTour.Values
+            .SelectMany(sources => sources)
+            .ToDictionary(source => source.Raw, StringComparer.Ordinal);
+        string[] allSources = sourcesByName.Keys.ToArray();
+
+        var aggregationTask = GetProductTourUsageToursAsync(projectId, utcStart, utcEnd, sourcesByTour, allSources);
+        var recentTask = FindAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
+            .SortDescending(ev => ev.Date), options => options.PageLimit(recentLimit));
+
+        await Task.WhenAll(aggregationTask, recentTask);
+        var recentEvents = (await recentTask).Documents
+            .Select(ev => ev.Source is not null && sourcesByName.TryGetValue(ev.Source, out var source) ? new ProductTourUsageEvent(ev, source) : null)
+            .OfType<ProductTourUsageEvent>()
+            .ToArray();
+        return new ProductTourUsageResult(await aggregationTask, recentEvents);
+    }
+
+    private async Task<IReadOnlyCollection<ProductTourUsageTour>> GetProductTourUsageToursAsync(
+        string projectId,
+        DateTime utcStart,
+        DateTime utcEnd,
+        IReadOnlyDictionary<string, ProductTourUsageSource[]> sourcesByTour,
+        string[] allSources)
+    {
+        var query = ApplyProductTourUsageFilter(NewQuery(), projectId, utcStart, utcEnd, allSources);
+        var options = ConfigureOptions(null);
+        await OnBeforeQueryAsync(query, options, typeof(PersistentEvent));
+        await RefreshForConsistency(query, options);
+
+        var search = (await CreateSearchDescriptorAsync(query, options))
+            .Size(0)
+            .Aggregations(CreateProductTourAggregations(sourcesByTour));
+        var response = await _client.SearchAsync<PersistentEvent>(search);
+        _logger.LogRequest(response);
+
+        if (!response.IsValidResponse)
+            throw new DocumentException($"Error getting product tour usage: {response.ElasticsearchServerError?.Error?.Reason}", response.ApiCallDetails.OriginalException);
+
+        var tours = new List<ProductTourUsageTour>();
+        foreach ((string tourName, ProductTourUsageSource[] sources) in sourcesByTour)
+        {
+            if (response.Aggregations is null
+                || !response.Aggregations.TryGetValue(tourName, out var aggregate)
+                || aggregate is not FilterAggregate filterAggregate
+                || filterAggregate.Aggregations is null)
+                continue;
+
+            if (!filterAggregate.Aggregations.TryGetValue("sources", out var sourceAggregate) || sourceAggregate is not StringTermsAggregate sourceTerms)
+                continue;
+
+            var buckets = new List<ProductTourUsageBucket>();
+            foreach (var bucket in sourceTerms.Buckets)
+            {
+                if (!bucket.Key.TryGetString(out string? sourceValue))
+                    continue;
+
+                var source = sources.FirstOrDefault(source => String.Equals(source.Raw, sourceValue, StringComparison.Ordinal));
+                if (source is null)
+                    continue;
+
+                long count = bucket.Aggregations is { } bucketAggregations
+                    && bucketAggregations.TryGetValue("count", out var countAggregate)
+                    && countAggregate is SumAggregate sum
+                    ? Convert.ToInt64(sum.Value)
+                    : bucket.DocCount;
+                DateTime? lastUtc = bucket.Aggregations is { } lastAggregations
+                    && lastAggregations.TryGetValue("last", out var lastAggregate)
+                    && lastAggregate is MaxAggregate max
+                    ? max.ValueAsString is null ? null : DateTime.Parse(max.ValueAsString, null, System.Globalization.DateTimeStyles.RoundtripKind)
+                    : null;
+                buckets.Add(new ProductTourUsageBucket(source, count, lastUtc));
+            }
+
+            long uniqueUsers = filterAggregate.Aggregations.TryGetValue("users", out var usersAggregate) && usersAggregate is CardinalityAggregate cardinality
+                ? Convert.ToInt64(cardinality.Value)
+                : 0;
+            if (buckets.Count > 0)
+                tours.Add(new ProductTourUsageTour(tourName, uniqueUsers, buckets));
+        }
+
+        return tours;
+    }
+
+    private IDictionary<string, Aggregation> CreateProductTourAggregations(IReadOnlyDictionary<string, ProductTourUsageSource[]> sourcesByTour)
+    {
+        string sourceField = ElasticIndex.MappingResolver.GetNonAnalyzedFieldName(InferField(ev => ev.Source))!;
+        string userPath = EventIndexExtensions.DataPath<UserInfo>(Event.KnownDataKeys.UserInfo, user => user.Identity);
+        string userField = ElasticIndex.MappingResolver.GetNonAnalyzedFieldName(userPath) ?? userPath;
+        var aggregations = new Dictionary<string, Aggregation>(StringComparer.Ordinal);
+
+        foreach ((string tourName, ProductTourUsageSource[] sources) in sourcesByTour)
+        {
+            aggregations[tourName] = new Aggregation
+            {
+                Filter = new TermsQuery
+                {
+                    Field = sourceField,
+                    Terms = new TermsQueryField(sources.Select(source => (Elastic.Clients.Elasticsearch.FieldValue)source.Raw).ToArray())
+                },
+                Aggregations = new Dictionary<string, Aggregation>
+                {
+                    ["sources"] = new Aggregation
+                    {
+                        Terms = new TermsAggregation { Field = sourceField, Size = sources.Length },
+                        Aggregations = new Dictionary<string, Aggregation>
+                        {
+                            ["count"] = new SumAggregation { Field = InferField(ev => ev.Count), Missing = 1 },
+                            ["last"] = new MaxAggregation { Field = InferField(ev => ev.Date) }
+                        }
+                    },
+                    ["users"] = new CardinalityAggregation { Field = userField }
+                }
+            };
+        }
+
+        return aggregations;
+    }
+
+    private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
+        IRepositoryQuery<PersistentEvent> query,
+        string projectId,
+        DateTime utcStart,
+        DateTime utcEnd,
+        string[] sources)
+    {
+        return query
+            .Project(projectId)
+            .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
+            .FieldEquals(ev => ev.Source, sources)
+            .DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date)
+            .Index(utcStart, utcEnd);
+    }
+
+    private static ProductTourUsageSource[] CreateProductTourSources(string tourName, int currentVersion)
+    {
+        return Enumerable.Range(1, currentVersion)
+            .SelectMany(version => _productTourEvents.SelectMany(eventName => _productTourLaunchSources.Select(launchSource =>
+                new ProductTourUsageSource(
+                    $"product-tour.{eventName}.{tourName}.v{version}.{launchSource}",
+                    eventName,
+                    tourName,
+                    version,
+                    launchSource))))
+            .ToArray();
+    }
+
     public async Task<PreviousAndNextEventIdResult> GetPreviousAndNextEventIdsAsync(PersistentEvent ev, AppFilter? systemFilter = null, DateTime? utcStart = null, DateTime? utcEnd = null)
     {
         var previous = GetPreviousEventIdAsync(ev, systemFilter, utcStart, utcEnd);
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
index c7c2272cbc..9545942087 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
@@ -13,6 +13,7 @@ public interface IEventRepository : IRepositoryOwnedByOrganizationAndProject<Per
     Task<bool> UpdateSessionStartLastActivityAsync(string id, DateTime lastActivityUtc, bool isSessionEnd = false, bool hasError = false, bool sendNotifications = true);
     Task<long> RemoveAllAsync(string organizationId, string? clientIpAddress, DateTime? utcStart, DateTime? utcEnd, CommandOptionsDescriptor<PersistentEvent>? options = null);
     Task<long> RemoveAllByStackIdsAsync(string[] stackIds);
+    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime utcStart, DateTime utcEnd, int recentLimit = 500);
 }
 
 public static class EventRepositoryExtensions
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
new file mode 100644
index 0000000000..21a159cc36
--- /dev/null
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -0,0 +1,15 @@
+using Exceptionless.Core.Models;
+
+namespace Exceptionless.Core.Repositories;
+
+public sealed record ProductTourUsageResult(
+    IReadOnlyCollection<ProductTourUsageTour> Tours,
+    IReadOnlyCollection<ProductTourUsageEvent> RecentEvents);
+
+public sealed record ProductTourUsageTour(string Name, long UniqueUsers, IReadOnlyCollection<ProductTourUsageBucket> Buckets);
+
+public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
+
+public sealed record ProductTourUsageEvent(PersistentEvent Event, ProductTourUsageSource Source);
+
+public sealed record ProductTourUsageSource(string Raw, string Event, string TourName, int Version, string LaunchSource);
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 3d5e49e9e3..1365831d71 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -1,4 +1,3 @@
-using Elastic.Clients.Elasticsearch.QueryDsl;
 using Exceptionless.Core;
 using Exceptionless.Core.Billing;
 using Exceptionless.Core.Extensions;
@@ -45,7 +44,6 @@ public class AdminHandler(
     TimeProvider timeProvider,
     ILoggerFactory loggerFactory)
 {
-    private const string ProductTourSourceField = EventIndex.Alias.Source + ".keyword";
     private readonly ILogger _logger = loggerFactory.CreateLogger<AdminHandler>();
 
     [HandlerEndpoint(HandlerMethod.Get, "settings", Group = "Admin")]
@@ -83,7 +81,7 @@ public async Task<Result<object>> Handle(GetAdminStats message)
     public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
     {
         var requestedMonth = message.Month ?? timeProvider.GetUtcNow().UtcDateTime;
-        var month = new DateTime(requestedMonth.Year, requestedMonth.Month, 1, 0, 0, 0, DateTimeKind.Utc);
+        var month = requestedMonth.ToUniversalTime().StartOfMonth();
         var results = await organizationRepository.FindAsync(
             query => query.FieldEquals(organization => organization.AssistantUsage.First().Date, month),
             options => options.SearchAfterPaging().PageLimit(500));
@@ -142,62 +140,28 @@ public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
     public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
     {
         var requestedMonth = message.Month ?? timeProvider.GetUtcNow().UtcDateTime;
-        var month = new DateTime(requestedMonth.Year, requestedMonth.Month, 1, 0, 0, 0, DateTimeKind.Utc);
+        var month = requestedMonth.ToUniversalTime().StartOfMonth();
         var nextMonth = month.AddMonths(1);
         int limit = Math.Clamp(message.Limit, 1, 500);
 
-        var countTask = eventRepository.CountAsync((IRepositoryQuery<PersistentEvent> query) => ApplyProductTourUsageFilter(query, month, nextMonth)
-            .AggregationsExpression("terms:(source~500 sum:count~1 max:date)"));
-        var recentTask = eventRepository.FindAsync(query => ApplyProductTourUsageFilter(query, month, nextMonth)
-            .SortDescending(ev => ev.Date), options => options.PageLimit(500));
-
-        await Task.WhenAll(countTask, recentTask);
-
-        var sourceBuckets = (await countTask).Aggregations.Terms<string>("terms_source")?.Buckets ?? [];
-        var parsedBuckets = sourceBuckets
-            .Select(bucket => ProductTourUsageSource.TryParse(bucket.Key, out var source)
-                ? new ProductTourUsageBucket(source, Convert.ToInt64(bucket.Aggregations.Sum("sum_count")?.Value ?? bucket.Total ?? 0), bucket.Aggregations.Max<DateTime>("max_date")?.Value)
-                : null)
-            .OfType<ProductTourUsageBucket>()
-            .ToArray();
-
-        var groupedBuckets = parsedBuckets.GroupBy(bucket => bucket.Source.TourName, StringComparer.Ordinal).ToArray();
-        string[] tourNames = groupedBuckets.Select(group => group.Key).ToArray();
-        Task<CountResult>[] uniqueUserTasks = groupedBuckets
-            .Select(group => eventRepository.CountAsync((IRepositoryQuery<PersistentEvent> query) => ApplyProductTourUsageFilter(
-                    query,
-                    month,
-                    nextMonth,
-                    group.Select(bucket => bucket.Source.Raw).ToArray())
-                .AggregationsExpression("cardinality:user")))
-            .ToArray();
-        CountResult[] uniqueUserResults = await Task.WhenAll(uniqueUserTasks);
-        var uniqueUsersByTour = tourNames
-            .Zip(uniqueUserResults, (tourName, result) => new
+        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth);
+        var tours = usage.Tours
+            .Select(tour =>
             {
-                TourName = tourName,
-                UniqueUsers = Convert.ToInt64(result.Aggregations.Cardinality("cardinality_user")?.Value ?? 0)
-            })
-            .ToDictionary(item => item.TourName, item => item.UniqueUsers, StringComparer.Ordinal);
-
-        var tours = groupedBuckets
-            .Select(group =>
-            {
-                long shown = SumEvent(group, ProductTourUsageSource.ShownEvent);
-                long started = SumEvent(group, ProductTourUsageSource.StartedEvent);
-                long completed = SumEvent(group, ProductTourUsageSource.CompletedEvent);
-                long dismissed = SumEvent(group, ProductTourUsageSource.DismissedEvent);
+                long shown = SumEvent(tour.Buckets, "shown");
+                long started = SumEvent(tour.Buckets, "started");
+                long completed = SumEvent(tour.Buckets, "completed");
+                long dismissed = SumEvent(tour.Buckets, "dismissed");
                 long decisionDenominator = started > 0 ? started : shown;
-                long uniqueUsers = uniqueUsersByTour[group.Key];
-                DateTime? lastRunUtc = group.Select(bucket => bucket.LastUtc).Max();
+                DateTime? lastRunUtc = tour.Buckets.Select(bucket => bucket.LastUtc).Max();
 
                 return new AdminProductTourSummary(
-                    group.Key,
+                    tour.Name,
                     shown,
                     started,
                     completed,
                     dismissed,
-                    uniqueUsers,
+                    tour.UniqueUsers,
                     lastRunUtc,
                     CalculateRate(completed, decisionDenominator),
                     CalculateRate(dismissed, decisionDenominator));
@@ -206,15 +170,13 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             .ThenBy(tour => tour.Name, StringComparer.Ordinal)
             .ToArray();
 
-        var recentActivity = (await recentTask).Documents
-            .Select(ev => ProductTourUsageSource.TryParse(ev.Source, out var source) ? CreateActivity(ev, source) : null)
-            .OfType<AdminProductTourActivity>()
+        var recentActivity = usage.RecentEvents
+            .Select(item => CreateActivity(item.Event, item.Source))
             .Take(limit)
             .ToArray();
 
         return new AdminProductTourUsageResponse(
             month,
-            !String.IsNullOrWhiteSpace(appOptions.ExceptionlessApiKey),
             tours,
             recentActivity);
     }
@@ -281,36 +243,6 @@ private static long SumEvent(IEnumerable<ProductTourUsageBucket> buckets, string
         return buckets.Where(bucket => String.Equals(bucket.Source.Event, eventName, StringComparison.Ordinal)).Sum(bucket => bucket.Count);
     }
 
-    private IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
-        IRepositoryQuery<PersistentEvent> query,
-        DateTime utcStart,
-        DateTime utcEnd,
-        IReadOnlyCollection<string>? sources = null)
-    {
-        query
-            .Project(appOptions.InternalProjectId)
-            .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
-            .DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date)
-            .Index(utcStart, utcEnd);
-
-        if (sources is null)
-        {
-            return query.ElasticFilter(new PrefixQuery
-            {
-                Field = ProductTourSourceField,
-                Value = ProductTourUsageSource.Prefix
-            });
-        }
-
-        return query.ElasticFilter(new TermsQuery
-        {
-            Field = ProductTourSourceField,
-            Terms = new TermsQueryField(sources.Select(source => (Elastic.Clients.Elasticsearch.FieldValue)source).ToArray())
-        });
-    }
-
-    private sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
-
     [HandlerEndpoint(HandlerMethod.Get, "assemblies", Group = "Admin")]
     public Task<Result<object>> Handle(GetAdminAssemblies message)
     {
diff --git a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
index 8d9f88675d..387f60a0d2 100644
--- a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
@@ -35,7 +35,6 @@ public class UserHandler(
     IHttpContextAccessor httpContextAccessor,
     ILoggerFactory loggerFactory)
 {
-    private const int MaximumProductTours = 32;
     private readonly ICacheClient _cache = new ScopedCacheClient(cacheClient, "User");
     private readonly ILogger _logger = loggerFactory.CreateLogger<UserHandler>();
     private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
@@ -54,19 +53,18 @@ public async Task<Result<ViewCurrentUser>> Handle(GetCurrentUser message)
 
     public async Task<Result<ProductTourProgress>> Handle(UpdateCurrentUserProductTour message)
     {
-        bool maximumExceeded = false;
+        if (!ProductTours.IsKnown(message.TourName))
+            return Result.Invalid(ValidationError.Create("tour_name", "Unknown product tour."));
+
+        if (!ProductTours.IsValid(message.TourName, message.Progress.Version))
+            return Result.Invalid(ValidationError.Create("version", "The product tour version is not supported."));
+
         ProductTourProgress? progress = null;
         await repository.PatchAsync(
             GetCurrentUserId(),
             new ActionPatch<User>(user =>
             {
                 user.ProductTours.TryGetValue(message.TourName, out var currentProgress);
-                if (currentProgress is null && user.ProductTours.Count >= MaximumProductTours)
-                {
-                    maximumExceeded = true;
-                    return false;
-                }
-
                 if (!ShouldUpdateProductTourProgress(currentProgress, message.Progress))
                 {
                     progress = currentProgress;
@@ -84,9 +82,6 @@ await repository.PatchAsync(
             }),
             options => options.Cache());
 
-        if (maximumExceeded)
-            return Result.Invalid(ValidationError.Create("tour_name", $"A user cannot track more than {MaximumProductTours} product tours."));
-
         return progress is null ? Result.NotFound("User not found.") : progress;
     }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 0c38fc5593..9110f2cdf7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -115,7 +115,6 @@ export interface AdminProductTourSummary {
 export interface AdminProductTourUsageResponse {
   /** @format date-time */
   month: string;
-  telemetry_configured: boolean;
   tours: AdminProductTourSummary[];
   recent_activity: AdminProductTourActivity[];
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index c541054d33..0eb7c6d692 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -107,7 +107,6 @@ export type AdminProductTourSummaryFormData = Infer<
 
 export const AdminProductTourUsageResponseSchema = object({
   month: iso.datetime(),
-  telemetry_configured: boolean(),
   tours: array(lazy(() => AdminProductTourSummarySchema)),
   recent_activity: array(lazy(() => AdminProductTourActivitySchema)),
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 91f9d50bf1..d20d291eb6 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -39,13 +39,6 @@
                 <p class="text-destructive text-sm">Failed to load guided-tour usage. Please try again.</p>
             </Card.Content>
         </Card.Root>
-    {:else if usage && !usage.telemetry_configured}
-        <Card.Root>
-            <Card.Header>
-                <Card.Title>Feature Usage telemetry is not configured</Card.Title>
-                <Card.Description>Configure the internal project before using this report. No tour activity is being recorded.</Card.Description>
-            </Card.Header>
-        </Card.Root>
     {:else}
         <Card.Root>
             <Card.Header>
diff --git a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
index 5b9030501a..04b1b616f8 100644
--- a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
@@ -2,7 +2,6 @@ namespace Exceptionless.Web.Models.Admin;
 
 public sealed record AdminProductTourUsageResponse(
     DateTime Month,
-    bool TelemetryConfigured,
     IReadOnlyCollection<AdminProductTourSummary> Tours,
     IReadOnlyCollection<AdminProductTourActivity> RecentActivity);
 
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs
deleted file mode 100644
index abfe647aaf..0000000000
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageSource.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System.Globalization;
-using System.Text.RegularExpressions;
-
-namespace Exceptionless.Web.Models.Admin;
-
-internal sealed partial record ProductTourUsageSource(string Raw, string Event, string TourName, int Version, string LaunchSource)
-{
-    public const string Prefix = "product-tour.";
-    public const string CompletedEvent = "completed";
-    public const string DismissedEvent = "dismissed";
-    public const string ShownEvent = "shown";
-    public const string StartedEvent = "started";
-
-    private static readonly ISet<string> _events = new HashSet<string>(
-        [CompletedEvent, DismissedEvent, ShownEvent, StartedEvent],
-        StringComparer.Ordinal);
-    private static readonly ISet<string> _launchSources = new HashSet<string>(
-        ["automatic", "catalog", "command-palette", "feature-announcement", "help-menu"],
-        StringComparer.Ordinal);
-
-    public static bool TryParse(string? value, out ProductTourUsageSource source)
-    {
-        source = default!;
-        if (String.IsNullOrWhiteSpace(value))
-            return false;
-
-        var match = SourceRegex().Match(value);
-        string eventName = match.Groups["event"].Value;
-        string launchSource = match.Groups["launchSource"].Value;
-        if (!match.Success
-            || !_events.Contains(eventName)
-            || !_launchSources.Contains(launchSource)
-            || !Int32.TryParse(match.Groups["version"].ValueSpan, NumberStyles.None, CultureInfo.InvariantCulture, out int version))
-        {
-            return false;
-        }
-
-        source = new ProductTourUsageSource(value, eventName, match.Groups["tourName"].Value, version, launchSource);
-        return true;
-    }
-
-    [GeneratedRegex(@"^product-tour\.(?<event>[a-z-]+)\.(?<tourName>[a-z0-9]+(?:-[a-z0-9]+)*)\.v(?<version>[1-9][0-9]*)\.(?<launchSource>[a-z-]+)$", RegexOptions.CultureInvariant)]
-    private static partial Regex SourceRegex();
-}
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 6d90532c67..1e66d57d00 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -11941,7 +11941,6 @@
       "AdminProductTourUsageResponse": {
         "required": [
           "month",
-          "telemetry_configured",
           "tours",
           "recent_activity"
         ],
@@ -11951,9 +11950,6 @@
             "type": "string",
             "format": "date-time"
           },
-          "telemetry_configured": {
-            "type": "boolean"
-          },
           "tours": {
             "type": "array",
             "items": {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 78ff3aa4e9..7367b4f277 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -37,7 +37,7 @@ await CreateDataAsync(builder =>
             AddUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(4), "user-2");
             AddUsage(builder, "product-tour.completed.ui-overview.v1.catalog", month.AddDays(5), "user-1");
             AddUsage(builder, "product-tour.dismissed.ui-overview.v1.catalog", month.AddDays(6), "user-2");
-            AddUsage(builder, "product-tour.started.meet-exie.v2.command-palette", month.AddDays(7), "user-3");
+            AddUsage(builder, "product-tour.started.meet-exie.v1.command-palette", month.AddDays(7), "user-3");
             AddUsage(builder, "product-tour.shown.welcome.v1.automatic", month.AddDays(1), "user-1", 2);
             AddUsage(builder, "product-tour.dismissed.welcome.v1.automatic", month.AddDays(2), "user-1");
             AddUsage(builder, "product-tour.started.unknown.v1.unknown-source", month.AddDays(8), "user-4");
@@ -60,7 +60,6 @@ await CreateDataAsync(builder =>
 
         Assert.NotNull(response);
         Assert.Equal(month, response.Month);
-        Assert.Equal(!String.IsNullOrWhiteSpace(_appOptions.ExceptionlessApiKey), response.TelemetryConfigured);
         Assert.Equal(3, response.Tours.Count);
 
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "ui-overview", StringComparison.Ordinal));
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 915684c221..e68ddc0fb9 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -49,9 +49,15 @@ public async Task UpdateCurrentUserProductTourAsync_NewProgress_PersistsAndRetur
     public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStoredValue()
     {
         var currentUser = await GetTestOrganizationUserAsync();
-        await UpdateProgressAsync("meet-exie", ProductTourStatus.Completed, 3);
+        currentUser.ProductTours[ProductTours.MeetExie] = new ProductTourProgress
+        {
+            Status = ProductTourStatus.Completed,
+            UpdatedUtc = TimeProvider.GetUtcNow().UtcDateTime,
+            Version = 3
+        };
+        await _userRepository.SaveAsync(currentUser, options => options.Cache().ImmediateConsistency());
 
-        var replacement = await UpdateProgressAsync("meet-exie", ProductTourStatus.Dismissed, 1);
+        var replacement = await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Dismissed, 1);
 
         Assert.Equal(ProductTourStatus.Completed, replacement.Status);
         Assert.Equal(3, replacement.Version);
@@ -64,45 +70,32 @@ public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStore
     public async Task UpdateCurrentUserProductTourAsync_CompletedProgress_ReplacesDismissedProgressForSameVersion()
     {
         var currentUser = await GetTestOrganizationUserAsync();
-        await UpdateProgressAsync("meet-exie", ProductTourStatus.Dismissed, 3);
+        await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Dismissed, 1);
 
-        var replacement = await UpdateProgressAsync("meet-exie", ProductTourStatus.Completed, 3);
+        var replacement = await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Completed, 1);
 
         Assert.Equal(ProductTourStatus.Completed, replacement.Status);
-        Assert.Equal(3, replacement.Version);
+        Assert.Equal(1, replacement.Version);
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
         Assert.Equal(replacement, persistedUser.ProductTours["meet-exie"]);
     }
 
     [Fact]
-    public async Task UpdateCurrentUserProductTourAsync_MoreThanThirtyTwoNames_ReturnsUnprocessableEntity()
+    public async Task UpdateCurrentUserProductTourAsync_UnknownTourName_ReturnsUnprocessableEntity()
     {
         var currentUser = await GetTestOrganizationUserAsync();
-        var user = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
-        Assert.NotNull(user);
-        foreach (int index in Enumerable.Range(0, 32))
-        {
-            user.ProductTours[$"guide-{index}"] = new ProductTourProgress
-            {
-                Status = ProductTourStatus.Dismissed,
-                UpdatedUtc = TimeProvider.GetUtcNow().UtcDateTime,
-                Version = 1
-            };
-        }
-        await _userRepository.SaveAsync(user, options => options.Cache().ImmediateConsistency());
 
         await SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "guide-32")
+            .AppendPaths("users", "me", "product-tours", "unknown-tour")
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
             .StatusCodeShouldBeUnprocessableEntity());
 
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
-        Assert.Equal(32, persistedUser.ProductTours.Count);
-        Assert.DoesNotContain("guide-32", persistedUser.ProductTours);
+        Assert.DoesNotContain("unknown-tour", persistedUser.ProductTours);
     }
 
     [Fact]
@@ -139,12 +132,13 @@ public Task UpdateCurrentUserProductTourAsync_MissingBody_ReturnsBadRequest()
     [Theory]
     [InlineData(0)]
     [InlineData(-1)]
-    public Task UpdateCurrentUserProductTourAsync_NonPositiveVersion_ReturnsUnprocessableEntity(int version)
+    [InlineData(2)]
+    public Task UpdateCurrentUserProductTourAsync_UnsupportedVersion_ReturnsUnprocessableEntity(int version)
     {
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "invalid-version")
+            .AppendPaths("users", "me", "product-tours", "ui-overview")
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = version })
             .StatusCodeShouldBeUnprocessableEntity());
     }
@@ -155,7 +149,7 @@ public Task UpdateCurrentUserProductTourAsync_UndefinedStatus_ReturnsUnprocessab
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "invalid-status")
+            .AppendPaths("users", "me", "product-tours", "ui-overview")
             .Content(new { Status = 999, Version = 1 })
             .StatusCodeShouldBeUnprocessableEntity());
     }
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 95c5d2b628..dd037d56b7 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Exceptionless.Core;
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories;
@@ -16,6 +17,7 @@ namespace Exceptionless.Tests.Repositories;
 public sealed class EventRepositoryTests : IntegrationTestsBase
 {
     private readonly List<Tuple<string, DateTime>> _ids = new();
+    private readonly AppOptions _appOptions;
     private readonly Exceptionless.Helpers.RandomEventGenerator _randomEventGenerator;
     private readonly EventData _eventData;
     private readonly IEventRepository _repository;
@@ -25,6 +27,7 @@ public sealed class EventRepositoryTests : IntegrationTestsBase
 
     public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
     {
+        _appOptions = GetService<AppOptions>();
         _randomEventGenerator = GetService<Exceptionless.Helpers.RandomEventGenerator>();
         _eventData = GetService<EventData>();
         _repository = GetService<IEventRepository>();
@@ -33,6 +36,52 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
         _serializer = GetService<ITextSerializer>();
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_KnownSources_ReturnsPerTourAggregations()
+    {
+        var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
+        await CreateDataAsync(builder =>
+        {
+            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(1), "user-1", 2);
+            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.help-menu", month.AddDays(2), "user-1");
+            AddProductTourUsage(builder, "product-tour.completed.ui-overview.v1.catalog", month.AddDays(3), "user-2");
+            AddProductTourUsage(builder, "product-tour.shown.welcome.v1.automatic", month.AddDays(4), "user-3");
+            AddProductTourUsage(builder, "product-tour.started.ui-overview.v2.catalog", month.AddDays(5), "user-4");
+            AddProductTourUsage(builder, "product-tour.started.unknown-tour.v1.catalog", month.AddDays(6), "user-5");
+            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddMonths(-1), "user-6");
+            builder.Event()
+                .Organization(TestConstants.OrganizationId)
+                .Project(_appOptions.InternalProjectId)
+                .Type(Event.KnownTypes.FeatureUsage)
+                .Source("product-tour.started.ui-overview.v1.catalog")
+                .Date(month.AddDays(8))
+                .UserIdentity("user-8");
+            builder.Event()
+                .TestProject()
+                .Type(Event.KnownTypes.FeatureUsage)
+                .Source("product-tour.started.ui-overview.v1.catalog")
+                .Date(month.AddDays(7))
+                .UserIdentity("user-7");
+        });
+
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1));
+
+        Assert.Equal(5, result.RecentEvents.Count);
+        Assert.Equal(2, result.Tours.Count);
+        var overview = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.UiOverview, StringComparison.Ordinal));
+        Assert.Equal(3, overview.UniqueUsers);
+        Assert.Equal(4, overview.Buckets.Where(bucket => String.Equals(bucket.Source.Event, "started", StringComparison.Ordinal)).Sum(bucket => bucket.Count));
+        Assert.Equal(1, overview.Buckets.Where(bucket => String.Equals(bucket.Source.Event, "completed", StringComparison.Ordinal)).Sum(bucket => bucket.Count));
+        Assert.Equal(month.AddDays(8), overview.Buckets.Max(bucket => bucket.LastUtc));
+
+        var welcome = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.Welcome, StringComparison.Ordinal));
+        Assert.Equal(1, welcome.UniqueUsers);
+        Assert.Equal(1, Assert.Single(welcome.Buckets).Count);
+
+        Assert.Equal(month.AddDays(8), result.RecentEvents.First().Event.Date);
+        Assert.All(result.RecentEvents, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
+    }
+
     [Fact]
     public async Task GetAsync()
     {
@@ -245,6 +294,18 @@ public async Task RemoveAllByClientIpAndDateAsync()
         Assert.Empty(events);
     }
 
+    private void AddProductTourUsage(DataBuilder builder, string source, DateTime dateUtc, string userIdentity, int count = 1)
+    {
+        builder.Event()
+            .Organization(TestConstants.OrganizationId)
+            .Project(_appOptions.InternalProjectId)
+            .Type(Event.KnownTypes.FeatureUsage)
+            .Source(source)
+            .Date(dateUtc)
+            .UserIdentity(userIdentity)
+            .Mutate(ev => ev.Count = count);
+    }
+
     private async Task CreateDataAsync()
     {
         var baseDate = DateTime.UtcNow.SubtractHours(1);

From 3f89b0204a4ad5ca139f5b27a1d8d895ef36c2d6 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 28 Aug 2026 08:56:27 -0500
Subject: [PATCH 04/43] Tighten guided tours implementation

---
 .../Api/Endpoints/UserEndpoints.cs            |  2 +-
 .../src/lib/features/admin/models.ts          |  7 +-
 .../events/components/events-overview.svelte  | 89 +++++++++++++++++--
 .../features/product-tours/actions.svelte.ts  |  2 +-
 .../components/product-tour-host.svelte       | 12 +--
 .../src/lib/features/projects/api.svelte.ts   |  3 +-
 .../saved-views/use-saved-views.svelte.ts     |  6 +-
 .../sessions-dashboard-chart.svelte           | 87 +++++++++---------
 .../src/lib/features/users/api.svelte.ts      |  5 ++
 .../src/routes/(app)/event/+page.svelte       | 10 +--
 .../event/[eventId=objectid]/+page.svelte     |  1 -
 .../Models/User/ViewCurrentUser.cs            | 11 +--
 .../Exceptionless.Tests/Api/Data/openapi.json |  5 --
 .../Api/OpenApiSnapshotTests.cs               |  7 +-
 14 files changed, 152 insertions(+), 95 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
index c82519ed57..96f0464734 100644
--- a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
@@ -40,7 +40,7 @@ public static IEndpointRouteBuilder MapUserEndpoints(this IEndpointRouteBuilder
 
         group.MapPut("users/me/product-tours/{tourName:regex(^[a-z0-9]+(?:-[a-z0-9]+)*$):maxlength(64)}", async (string tourName, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper, [FromBody] UpdateProductTourProgress progress)
             => (await mediator.InvokeAsync<Result<ProductTourProgress>>(new UserMessages.UpdateCurrentUserProductTour(tourName, progress))).ToHttpResult(resultMapper))
-        .Accepts<UpdateProductTourProgress>(false, "application/json", "application/*+json")
+        .Accepts<UpdateProductTourProgress>(false, "application/json")
         .Produces<ProductTourProgress>()
         .ProducesProblem(StatusCodes.Status400BadRequest)
         .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
index 4ede3b8b22..f128097c5e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
@@ -1,13 +1,13 @@
 import type {
-    AdminProductTourUsageResponse,
     AssistantModelSettings,
     CountResult,
-    EventSubmissionSettings,
     UpdateAssistantEnabledSettings,
     UpdateAssistantSettings,
     UpdateEventSubmissionSettings
 } from '$generated/api';
 
+export type { EventSubmissionSettings as AdminEventSubmissionSettings, AdminProductTourUsageResponse as AdminProductTourUsage } from '$generated/api';
+
 export enum MigrationType {
     Versioned = 0,
     VersionedAndResumable = 1,
@@ -50,9 +50,6 @@ export type AdminAssistantUsage = {
     turns: number;
 };
 
-export type AdminEventSubmissionSettings = EventSubmissionSettings;
-export type AdminProductTourUsage = AdminProductTourUsageResponse;
-
 export type AdminStats = {
     events: CountResult;
     organizations: CountResult;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index fdd94f0b4d..5875d9c512 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -27,6 +27,7 @@
     import EventsIcon from '@lucide/svelte/icons/calendar-days';
     import ChevronLeft from '@lucide/svelte/icons/chevron-left';
     import ChevronRight from '@lucide/svelte/icons/chevron-right';
+    import { onMount, tick } from 'svelte';
     import { toast } from 'svelte-sonner';
 
     import type { PersistentEvent } from '../models/index';
@@ -48,7 +49,6 @@
         filterChanged: (filter: IFilter) => void;
         handleError: (problem: ProblemDetails) => void;
         id: string;
-        loadProjectDetails?: boolean;
         onEventLoaded?: (event: PersistentEvent) => void;
         onNavigate?: (eventId: string) => void;
         prepareStackAssistantContext?: () => void;
@@ -60,7 +60,6 @@
         filterChanged,
         handleError,
         id,
-        loadProjectDetails = true,
         onEventLoaded,
         onNavigate,
         prepareStackAssistantContext
@@ -131,7 +130,6 @@
     const navigation = $derived(eventQuery.data?.navigation);
 
     const projectQuery = getProjectQuery({
-        enabled: () => loadProjectDetails,
         route: {
             get id() {
                 return event?.project_id;
@@ -161,6 +159,9 @@
 
     let activeTab = $state<TabType>('Overview');
     let tabs = $derived<TabType[]>(getTabs(event, projectQuery.data));
+    let tabsListRef = $state<HTMLElement | null>(null);
+    let canScrollTabsLeft = $state(false);
+    let canScrollTabsRight = $state(false);
     let draggedPromotedTab = $state<null | string>(null);
     let notifiedEventId = $state('');
     let showJsonDialog = $state(false);
@@ -209,6 +210,29 @@
         return !!projectQuery.data?.promoted_tabs?.includes(tab);
     }
 
+    function updateTabsOverflow(): void {
+        if (!tabsListRef) {
+            canScrollTabsLeft = false;
+            canScrollTabsRight = false;
+            return;
+        }
+
+        const maxScrollLeft = tabsListRef.scrollWidth - tabsListRef.clientWidth;
+        canScrollTabsLeft = tabsListRef.scrollLeft > 1;
+        canScrollTabsRight = tabsListRef.scrollLeft < maxScrollLeft - 1;
+    }
+
+    function scrollTabs(direction: 'left' | 'right'): void {
+        if (!tabsListRef) {
+            return;
+        }
+
+        tabsListRef.scrollBy({
+            behavior: 'smooth',
+            left: direction === 'left' ? -tabsListRef.clientWidth / 2 : tabsListRef.clientWidth / 2
+        });
+    }
+
     function onPromoted(title: string): void {
         activeTab = title;
     }
@@ -350,6 +374,31 @@
             onEventLoaded?.(event);
         }
     });
+
+    $effect(() => {
+        const tabCount = tabs.length;
+        void tick().then(() => {
+            if (tabCount === tabs.length) {
+                updateTabsOverflow();
+            }
+        });
+    });
+
+    onMount(() => {
+        updateTabsOverflow();
+
+        const resizeObserver = new ResizeObserver(updateTabsOverflow);
+        if (tabsListRef) {
+            resizeObserver.observe(tabsListRef);
+        }
+
+        window.addEventListener('resize', updateTabsOverflow);
+
+        return () => {
+            resizeObserver.disconnect();
+            window.removeEventListener('resize', updateTabsOverflow);
+        };
+    });
 </script>
 
 {#if event && investigationCopy && ['stack-summary', 'stack-triage'].includes(investigationCheckpoint?.checkpointName ?? '')}
@@ -364,7 +413,7 @@
 
 <section data-event-type={event ? (hasErrorOrSimpleError(event) ? 'error' : event.type) : undefined} data-tour={event ? 'event-details' : undefined}>
     <h4 class="text-muted-foreground mb-3 text-sm font-semibold tracking-wide uppercase">Stack</h4>
-    {#if loadProjectDetails && event?.stack_id}
+    {#if event?.stack_id}
         <StackCard
             {assistantResource}
             {filterChanged}
@@ -439,7 +488,7 @@
         </Table.Body>
     </Table.Root>
 
-    {#if loadProjectDetails && event && projectQuery.data?.id === event.project_id}
+    {#if event}
         {#if investigationCheckpoint?.checkpointName === 'tab-overview' && investigationCopy}
             <ProductTourInlineCallout
                 description={investigationCopy.description}
@@ -450,8 +499,23 @@
             />
         {/if}
         <Tabs.Root class="mt-4 mb-4" bind:value={activeTab}>
-            <div>
-                <Tabs.List class="no-scrollbar h-auto w-full justify-normal gap-1 overflow-x-auto overflow-y-hidden scroll-smooth p-1">
+            <div class="relative">
+                {#if canScrollTabsLeft}
+                    <Button
+                        aria-label="Scroll tabs left"
+                        class="bg-background/95 absolute top-1/2 left-0 z-10 -translate-y-1/2 shadow-sm"
+                        onclick={() => scrollTabs('left')}
+                        size="icon-sm"
+                        variant="outline"
+                    >
+                        <ChevronLeft class="size-4" />
+                    </Button>
+                {/if}
+                <Tabs.List
+                    bind:ref={tabsListRef}
+                    class="no-scrollbar h-auto w-full justify-normal gap-1 overflow-x-auto overflow-y-hidden scroll-smooth p-1"
+                    onscroll={updateTabsOverflow}
+                >
                     {#each tabs as tab (tab)}
                         <Tabs.Trigger
                             aria-label={isPromotedTab(tab) ? `${tab}. Drag to reorder custom tab.` : undefined}
@@ -471,6 +535,17 @@
                         >
                     {/each}
                 </Tabs.List>
+                {#if canScrollTabsRight}
+                    <Button
+                        aria-label="Scroll tabs right"
+                        class="bg-background/95 absolute top-1/2 right-0 z-10 -translate-y-1/2 shadow-sm"
+                        onclick={() => scrollTabs('right')}
+                        size="icon-sm"
+                        variant="outline"
+                    >
+                        <ChevronRight class="size-4" />
+                    </Button>
+                {/if}
             </div>
 
             {#each tabs as tab (tab)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 611213ff6c..2a2764fb8e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -38,7 +38,7 @@ export function createProductTourActions() {
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        void track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, definition.version, checkpoint.source);
+        await track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, definition.version, checkpoint.source);
         return true;
     }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 08e6b4c308..d0b49f5a71 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -181,7 +181,7 @@
             tourName: name,
             userId: currentUser.id
         });
-        void Promise.all([track('shown', name, item.version, source), track('started', name, item.version, source)]);
+        await Promise.all([track('shown', name, item.version, source), track('started', name, item.version, source)]);
 
         const destination = item.startingRoute(context);
         if (`${pathname}${window.location.search}` !== destination) {
@@ -214,7 +214,7 @@
             return;
         }
         welcomeHandled = true;
-        void track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('completed', 'welcome', WELCOME_VERSION, 'automatic');
         await startTour(recommended.name, 'automatic');
     }
 
@@ -223,7 +223,7 @@
             return;
         }
         welcomeHandled = true;
-        void track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('completed', 'welcome', WELCOME_VERSION, 'automatic');
         openCatalog('catalog');
     }
 
@@ -232,14 +232,14 @@
             return;
         }
         welcomeHandled = true;
-        void track('dismissed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('dismissed', 'welcome', WELCOME_VERSION, 'automatic');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        void track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         await startTour('meet-exie', 'feature-announcement');
     }
 
@@ -247,7 +247,7 @@
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
-        void track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
     }
 
     function getItem(name: ProductTourName): ProductTourListItem {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
index 5d957ee165..cf35e91986 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/projects/api.svelte.ts
@@ -140,7 +140,6 @@ export interface GetProjectIntegrationNotificationSettingsRequest {
 }
 
 export interface GetProjectRequest {
-    enabled?: () => boolean;
     refetchInterval?: false | number;
     route: {
         id: string | undefined;
@@ -441,7 +440,7 @@ export function getProjectQuery(request: GetProjectRequest) {
         const id = request.route.id;
 
         return {
-            enabled: () => !!accessToken.current && !!id && (request.enabled?.() ?? true),
+            enabled: () => !!accessToken.current && !!id,
             // Like event and stack reads, finish across remounts so the next observer can reuse the result.
             queryFn: async () => {
                 const client = useFetchClient();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
index 7a9d2d4737..331a8884b9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
@@ -99,7 +99,7 @@ export interface UseSavedViewsReturn {
     autoFillColumnId: AutoFillColumnSelection;
     canModifySavedView: boolean;
     handleClearSavedView: () => Promise<void>;
-    handleLoadView: (view: SavedView) => void;
+    handleLoadView: (view: SavedView) => Promise<void>;
     handleResetToSaved: () => void;
     handleSavedViewUpdated: (view: SavedView) => void;
     hydratedSavedViewId: string | undefined;
@@ -1209,9 +1209,9 @@ export function useSavedViews(options: UseSavedViewsOptions): UseSavedViewsRetur
         })
     );
 
-    function handleLoadView(view: SavedView) {
+    async function handleLoadView(view: SavedView): Promise<void> {
         if (options.baseHref) {
-            goto(savedViewHref(view));
+            await goto(savedViewHref(view));
             return;
         }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
index ee57bbeeb2..b76f528af6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/sessions/components/sessions-dashboard-chart.svelte
@@ -49,50 +49,51 @@
     ];
 </script>
 
-<Chart.Shell class={`relative ${className}`}>
-    <Chart.Container config={chartConfig} class="h-16 w-full">
-        <AreaChart
-            {data}
-            x="date"
-            xScale={scaleUtc()}
-            yDomain={[0, Math.max(1, Math.max(...data.map((d) => Math.max(d.sessions, d.users))))]}
-            {series}
-            axis={false}
-            grid={false}
-            brush={{
-                onBrushEnd: (e) => {
-                    if (!e.brush.active) {
-                        return;
-                    }
+<Chart.Shell class={className}>
+    {#if isLoading}
+        <Skeleton class="h-16 w-full rounded" />
+    {:else}
+        <Chart.Container config={chartConfig} class="h-16 w-full">
+            <AreaChart
+                {data}
+                x="date"
+                xScale={scaleUtc()}
+                yDomain={[0, Math.max(1, Math.max(...data.map((d) => Math.max(d.sessions, d.users))))]}
+                {series}
+                axis={false}
+                grid={false}
+                brush={{
+                    onBrushEnd: (e) => {
+                        if (!e.brush.active) {
+                            return;
+                        }
 
-                    const [start, end] = e.brush.x;
-                    if (start instanceof Date && end instanceof Date) {
-                        onRangeSelect?.(start, end);
+                        const [start, end] = e.brush.x;
+                        if (start instanceof Date && end instanceof Date) {
+                            onRangeSelect?.(start, end);
+                        }
                     }
-                }
-            }}
-            props={{
-                area: {
-                    curve: curveLinear
-                },
-                canvas: {
-                    class: 'cursor-crosshair'
-                },
-                svg: {
-                    class: 'cursor-crosshair'
-                }
-            }}
-        >
-            {#snippet tooltip()}
-                <Chart.Tooltip
-                    class="min-w-62.5"
-                    indicator="line"
-                    labelFormatter={(v) => (v instanceof Date ? formatDateLabel(v) : typeof v === 'number' ? formatDateLabel(new Date(v)) : String(v))}
-                />
-            {/snippet}
-        </AreaChart>
-    </Chart.Container>
-    {#if isLoading}
-        <Skeleton class="absolute inset-0 h-16 w-full rounded" />
+                }}
+                props={{
+                    area: {
+                        curve: curveLinear
+                    },
+                    canvas: {
+                        class: 'cursor-crosshair'
+                    },
+                    svg: {
+                        class: 'cursor-crosshair'
+                    }
+                }}
+            >
+                {#snippet tooltip()}
+                    <Chart.Tooltip
+                        class="min-w-62.5"
+                        indicator="line"
+                        labelFormatter={(v) => (v instanceof Date ? formatDateLabel(v) : typeof v === 'number' ? formatDateLabel(new Date(v)) : String(v))}
+                    />
+                {/snippet}
+            </AreaChart>
+        </Chart.Container>
     {/if}
 </Chart.Shell>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
index 3a55928f6c..5795789d13 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
@@ -282,6 +282,11 @@ export function putCurrentUserProductTour() {
         mutationFn: async ({ progress, tourName }) => {
             const client = useFetchClient();
             const response = await client.putJSON<ProductTourProgress>(`users/me/product-tours/${tourName}`, progress);
+
+            if (!response.ok) {
+                throw response.problem;
+            }
+
             return response.data!;
         },
         mutationKey: queryKeys.productTour(undefined),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index 347fe88087..5d41eb6981 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -1,7 +1,4 @@
 <script lang="ts">
-    import type { SavedView } from '$features/saved-views/models';
-
-    import { goto } from '$app/navigation';
     import { resolve } from '$app/paths';
     import { page } from '$app/state';
     import * as DataTable from '$comp/data-table';
@@ -55,7 +52,6 @@
     import { premiumPage } from '$features/organizations/premium-page.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import SavedViewPicker from '$features/saved-views/components/saved-view-picker.svelte';
-    import { savedViewHref } from '$features/saved-views/slugs';
     import { isSavedViewHydrationPending, isSavedViewUnavailable, useSavedViews } from '$features/saved-views/use-saved-views.svelte';
     import * as agg from '$features/shared/api/aggregations';
     import { createPageSizePreference, getSharedTableOptions, removeTableData, removeTableSelection } from '$features/shared/table.svelte';
@@ -105,10 +101,6 @@
         return buildEventDetailsHref(row.id);
     }
 
-    async function loadSavedView(view: SavedView): Promise<void> {
-        await goto(savedViewHref(view));
-    }
-
     const DEFAULT_TIME_RANGE = '[now-7d TO now]';
     const DEFAULT_FILTER = '(status:open OR status:regressed)';
     const DEFAULT_FILTERS = [new DateFilter('date', DEFAULT_TIME_RANGE), new ProjectFilter([]), new StatusFilter([StackStatus.Open, StackStatus.Regressed])];
@@ -922,7 +914,7 @@
                     defaultAutoFillColumnId="summary"
                     filters={filters ?? []}
                     isModified={savedViewsState.isModified}
-                    onLoadView={loadSavedView}
+                    onLoadView={savedViewsState.handleLoadView}
                     onClearSavedView={savedViewsState.handleClearSavedView}
                     onResetToSaved={handleResetToSaved}
                     onSavedViewUpdated={savedViewsState.handleSavedViewUpdated}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
index a14765e578..3ec6302bf3 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/[eventId=objectid]/+page.svelte
@@ -56,7 +56,6 @@
     {filterChanged}
     id={page.params.eventId || ''}
     {handleError}
-    loadProjectDetails={false}
     onEventLoaded={handleEventLoaded}
     onNavigate={(newId) => goto(buildEventDetailsHref(newId))}
 />
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index ed83d4093b..831150634f 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -8,14 +8,7 @@ namespace Exceptionless.Web.Models;
 
 public record ViewCurrentUser : ViewUser
 {
-    public ViewCurrentUser()
-    {
-        OAuthAccounts = [];
-        OrganizationPreferences = [];
-        ProductTours = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
-    }
-
-    public ViewCurrentUser(User user, IntercomOptions options) : this()
+    public ViewCurrentUser(User user, IntercomOptions options)
     {
         Id = user.Id;
         OrganizationIds = user.OrganizationIds;
@@ -40,7 +33,7 @@ public ViewCurrentUser(User user, IntercomOptions options) : this()
     public ICollection<OAuthAccount> OAuthAccounts { get; set; }
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; set; }
-    public IDictionary<string, ProductTourProgress> ProductTours { get; set; }
+    public IDictionary<string, ProductTourProgress> ProductTours { get; set; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
 
     private static string? HMACSHA256HashString(string value, IntercomOptions options)
     {
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 1e66d57d00..0859b7dc1e 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -4034,11 +4034,6 @@
               "schema": {
                 "$ref": "#/components/schemas/UpdateProductTourProgress"
               }
-            },
-            "application/*\u002Bjson": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateProductTourProgress"
-              }
             }
           },
           "required": true
diff --git a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
index 35384c37f2..f0e22b33ad 100644
--- a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
+++ b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
@@ -183,7 +183,7 @@ public async Task GetOpenApiJson_MigratedContracts_PreserveControllerMetadata()
         AssertDictionaryValueSchema(document.RootElement, "ViewSavedView", "columns", "SavedViewColumnSettings");
         AssertRequiredJsonRequestBody(paths, "/api/v2/users/{id}", "patch", "UpdateUser");
         AssertRequiredJsonRequestBody(paths, "/api/v2/users/{id}", "put", "UpdateUser");
-        AssertRequiredJsonRequestBody(paths, "/api/v2/users/me/product-tours/{tourName}", "put", "UpdateProductTourProgress");
+        AssertRequiredJsonRequestBody(paths, "/api/v2/users/me/product-tours/{tourName}", "put", "UpdateProductTourProgress", "application/json");
 
         AssertRequestContentTypes(paths, "/api/v1/error", "post", "application/json", "text/plain");
         AssertRequestContentTypes(paths, "/api/v1/events", "post", "application/json", "text/plain");
@@ -395,13 +395,14 @@ private static void AssertRequestContentTypes(JsonElement paths, string path, st
         Assert.Equal(expectedContentTypes.Order(), content.EnumerateObject().Select(property => property.Name).Order());
     }
 
-    private static void AssertRequiredJsonRequestBody(JsonElement paths, string path, string method, string expectedSchema)
+    private static void AssertRequiredJsonRequestBody(JsonElement paths, string path, string method, string expectedSchema, params string[] expectedContentTypes)
     {
         var requestBody = paths.GetProperty(path).GetProperty(method).GetProperty("requestBody");
         Assert.True(requestBody.GetProperty("required").GetBoolean());
 
         var content = requestBody.GetProperty("content");
-        Assert.Equal(["application/*+json", "application/json"], content.EnumerateObject().Select(property => property.Name).Order());
+        string[] contentTypes = expectedContentTypes.Length > 0 ? expectedContentTypes : ["application/*+json", "application/json"];
+        Assert.Equal(contentTypes.Order(), content.EnumerateObject().Select(property => property.Name).Order());
 
         foreach (var mediaType in content.EnumerateObject())
             Assert.Equal($"#/components/schemas/{expectedSchema}", mediaType.Value.GetProperty("schema").GetProperty("$ref").GetString());

From d0b005f01c9dc3f4d42dada28c92844d9572aaa8 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 28 Aug 2026 11:39:47 -0500
Subject: [PATCH 05/43] Harden guided tour implementation

---
 .../Models/Data/ProductTours.cs               |  56 ++++++
 .../Repositories/EventRepository.cs           |   8 +-
 .../Repositories/ProductTourUsageResult.cs    |   8 +-
 .../Api/Handlers/AdminHandler.cs              |  15 +-
 .../events/components/events-overview.svelte  | 102 +---------
 .../investigation-detail-tour.svelte          | 114 +++++++++++
 .../features/product-tours/actions.svelte.ts  |   6 +-
 .../features/product-tours/catalog.test.ts    |  12 +-
 .../src/lib/features/product-tours/catalog.ts |  40 ++--
 .../components/create-saved-view-tour.svelte  | 179 ++++++++++++++++++
 .../components/product-tour-host.svelte       |  59 +++---
 .../components/product-tour-spotlight.svelte  |   5 +-
 .../product-tours/session.svelte.test.ts      |   4 +-
 .../src/lib/features/product-tours/session.ts |  17 +-
 .../product-tours/state.svelte.test.ts        |  30 ++-
 .../features/product-tours/state.svelte.ts    |  39 +++-
 .../lib/features/product-tours/telemetry.ts   |   4 +-
 .../src/lib/features/product-tours/types.ts   |  37 ++--
 .../components/save-view-dialog.svelte        |  93 ++-------
 .../components/saved-view-picker.svelte       | 123 ++----------
 .../ClientApp/src/lib/generated/api.ts        |  20 +-
 .../ClientApp/src/lib/generated/schemas.ts    |  18 +-
 .../ClientApp/src/routes/(app)/+layout.svelte |   1 +
 .../Admin/AdminProductTourUsageResponse.cs    |   6 +-
 .../Models/User/ViewCurrentUser.cs            |   1 +
 .../Exceptionless.Tests/Api/Data/openapi.json |  44 ++++-
 .../Api/Endpoints/ProductTourEndpointTests.cs |  15 ++
 .../Repositories/EventRepositoryTests.cs      |   8 +-
 28 files changed, 664 insertions(+), 400 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index 7db7b59467..2ce860ec3b 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -1,4 +1,7 @@
 using System.Collections.Frozen;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Exceptionless.Core.Extensions;
 
 namespace Exceptionless.Core.Models.Data;
 
@@ -23,10 +26,63 @@ public static class ProductTours
         [Welcome] = 1
     }.ToFrozenDictionary(StringComparer.Ordinal);
 
+    public static IReadOnlyCollection<ProductTourTelemetryEvent> TelemetryEvents { get; } = Enum.GetValues<ProductTourTelemetryEvent>();
+    public static IReadOnlyCollection<ProductTourLaunchSource> LaunchSources { get; } = Enum.GetValues<ProductTourLaunchSource>();
+
     public static bool IsKnown(string name) => Versions.ContainsKey(name);
 
     public static bool IsValid(string name, int version)
     {
         return Versions.TryGetValue(name, out int currentVersion) && version > 0 && version <= currentVersion;
     }
+
+    public static string CreateTelemetrySource(
+        ProductTourTelemetryEvent telemetryEvent,
+        string tourName,
+        int version,
+        ProductTourLaunchSource launchSource)
+    {
+        return $"product-tour.{GetTelemetryName(telemetryEvent)}.{tourName}.v{version}.{GetLaunchSourceName(launchSource)}";
+    }
+
+    public static string GetTelemetryName(ProductTourTelemetryEvent telemetryEvent) => telemetryEvent.ToString().ToLowerUnderscoredWords('-');
+
+    public static string GetLaunchSourceName(ProductTourLaunchSource launchSource) => launchSource.ToString().ToLowerUnderscoredWords('-');
+}
+
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum ProductTourTelemetryEvent
+{
+    [JsonStringEnumMemberName("completed")]
+    [EnumMember(Value = "completed")]
+    Completed,
+    [JsonStringEnumMemberName("dismissed")]
+    [EnumMember(Value = "dismissed")]
+    Dismissed,
+    [JsonStringEnumMemberName("shown")]
+    [EnumMember(Value = "shown")]
+    Shown,
+    [JsonStringEnumMemberName("started")]
+    [EnumMember(Value = "started")]
+    Started
+}
+
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum ProductTourLaunchSource
+{
+    [JsonStringEnumMemberName("automatic")]
+    [EnumMember(Value = "automatic")]
+    Automatic,
+    [JsonStringEnumMemberName("catalog")]
+    [EnumMember(Value = "catalog")]
+    Catalog,
+    [JsonStringEnumMemberName("command-palette")]
+    [EnumMember(Value = "command-palette")]
+    CommandPalette,
+    [JsonStringEnumMemberName("feature-announcement")]
+    [EnumMember(Value = "feature-announcement")]
+    FeatureAnnouncement,
+    [JsonStringEnumMemberName("help-menu")]
+    [EnumMember(Value = "help-menu")]
+    HelpMenu
 }
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 35a2355fa2..264c90241c 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -15,8 +15,6 @@ namespace Exceptionless.Core.Repositories;
 
 public class EventRepository : RepositoryOwnedByOrganizationAndProject<PersistentEvent>, IEventRepository
 {
-    private static readonly string[] _productTourEvents = ["completed", "dismissed", "shown", "started"];
-    private static readonly string[] _productTourLaunchSources = ["automatic", "catalog", "command-palette", "feature-announcement", "help-menu"];
     private readonly TimeProvider _timeProvider;
 
     public EventRepository(ExceptionlessElasticConfiguration configuration, AppOptions options, MiniValidationValidator validator)
@@ -235,10 +233,10 @@ private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
     private static ProductTourUsageSource[] CreateProductTourSources(string tourName, int currentVersion)
     {
         return Enumerable.Range(1, currentVersion)
-            .SelectMany(version => _productTourEvents.SelectMany(eventName => _productTourLaunchSources.Select(launchSource =>
+            .SelectMany(version => ProductTours.TelemetryEvents.SelectMany(telemetryEvent => ProductTours.LaunchSources.Select(launchSource =>
                 new ProductTourUsageSource(
-                    $"product-tour.{eventName}.{tourName}.v{version}.{launchSource}",
-                    eventName,
+                    ProductTours.CreateTelemetrySource(telemetryEvent, tourName, version, launchSource),
+                    telemetryEvent,
                     tourName,
                     version,
                     launchSource))))
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index 21a159cc36..b6fbc20df6 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -1,4 +1,5 @@
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 
 namespace Exceptionless.Core.Repositories;
 
@@ -12,4 +13,9 @@ public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long
 
 public sealed record ProductTourUsageEvent(PersistentEvent Event, ProductTourUsageSource Source);
 
-public sealed record ProductTourUsageSource(string Raw, string Event, string TourName, int Version, string LaunchSource);
+public sealed record ProductTourUsageSource(
+    string Raw,
+    ProductTourTelemetryEvent Event,
+    string TourName,
+    int Version,
+    ProductTourLaunchSource LaunchSource);
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 1365831d71..f9b3b1e8e1 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -3,6 +3,7 @@
 using Exceptionless.Core.Extensions;
 using Exceptionless.Core.Messaging.Models;
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Models.WorkItems;
 using Exceptionless.Core.Queues.Models;
 using Exceptionless.Core.Repositories;
@@ -144,14 +145,14 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
         var nextMonth = month.AddMonths(1);
         int limit = Math.Clamp(message.Limit, 1, 500);
 
-        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth);
+        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth, limit);
         var tours = usage.Tours
             .Select(tour =>
             {
-                long shown = SumEvent(tour.Buckets, "shown");
-                long started = SumEvent(tour.Buckets, "started");
-                long completed = SumEvent(tour.Buckets, "completed");
-                long dismissed = SumEvent(tour.Buckets, "dismissed");
+                long shown = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Shown);
+                long started = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Started);
+                long completed = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Completed);
+                long dismissed = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Dismissed);
                 long decisionDenominator = started > 0 ? started : shown;
                 DateTime? lastRunUtc = tour.Buckets.Select(bucket => bucket.LastUtc).Max();
 
@@ -238,9 +239,9 @@ private AdminProductTourActivity CreateActivity(PersistentEvent ev, ProductTourU
         return denominator > 0 ? Decimal.Round(value / (decimal)denominator, 4) : null;
     }
 
-    private static long SumEvent(IEnumerable<ProductTourUsageBucket> buckets, string eventName)
+    private static long SumEvent(IEnumerable<ProductTourUsageBucket> buckets, ProductTourTelemetryEvent telemetryEvent)
     {
-        return buckets.Where(bucket => String.Equals(bucket.Source.Event, eventName, StringComparison.Ordinal)).Sum(bucket => bucket.Count);
+        return buckets.Where(bucket => bucket.Source.Event == telemetryEvent).Sum(bucket => bucket.Count);
     }
 
     [HandlerEndpoint(HandlerMethod.Get, "assemblies", Group = "Admin")]
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index 5875d9c512..493cd91988 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -18,9 +18,6 @@
     import * as EventsFacetedFilter from '$features/events/components/filters';
     import { getExtendedDataItems, hasErrorOrSimpleError } from '$features/events/persistent-event';
     import { getOrganizationQuery } from '$features/organizations/api.svelte';
-    import { createProductTourActions } from '$features/product-tours/actions.svelte';
-    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
-    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getProjectQuery, updateProject } from '$features/projects/api.svelte';
     import StackCard from '$features/stacks/components/stack-card.svelte';
     import Braces from '@lucide/svelte/icons/braces';
@@ -34,6 +31,7 @@
 
     import { getSessionId } from '../utils';
     import { shouldResetActiveEventTab } from './events-overview-tab-state';
+    import InvestigationDetailTour from './investigation-detail-tour.svelte';
     import Environment from './views/environment.svelte';
     import Error from './views/error.svelte';
     import ExtendedData from './views/extended-data.svelte';
@@ -166,40 +164,6 @@
     let notifiedEventId = $state('');
     let showJsonDialog = $state(false);
 
-    const tourActions = createProductTourActions();
-    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
-    const investigationCopy = $derived.by(() => {
-        switch (investigationCheckpoint?.checkpointName) {
-            case 'event-occurrence':
-                return {
-                    description: 'This occurrence contains its timestamp, raw JSON, and navigation to nearby events.',
-                    title: 'Inspect the occurrence'
-                };
-            case 'filter-stack-events':
-                return {
-                    description: 'Show all events filters the list to this stack when you are ready to compare occurrences.',
-                    title: 'Compare every occurrence'
-                };
-            case 'stack-summary':
-                return {
-                    description: 'Use the grouped stack title, affected users, occurrence count, and trend to judge scope and impact.',
-                    title: 'Understand the grouped issue'
-                };
-            case 'stack-triage':
-                return {
-                    description: 'Status and options change shared issue state. Review them here; this guide will not invoke them.',
-                    title: 'Triage deliberately'
-                };
-            case 'tab-overview':
-                return {
-                    description: 'Overview summarizes the message and useful event fields. Choose other tabs when the evidence calls for them.',
-                    title: 'Begin with the overview'
-                };
-            default:
-                return undefined;
-        }
-    });
-
     $effect(() => {
         if (shouldResetActiveEventTab(!!event, projectQuery.isPending, tabs, activeTab)) {
             activeTab = 'Overview';
@@ -319,35 +283,6 @@
         }
     }
 
-    async function continueInvestigationTour(): Promise<void> {
-        const checkpoint = investigationCheckpoint;
-        if (!checkpoint) {
-            return;
-        }
-        switch (checkpoint.checkpointName) {
-            case 'event-occurrence':
-                productTourCheckpoint.advance(checkpoint, 'tab-overview');
-                break;
-            case 'stack-summary':
-                productTourCheckpoint.advance(checkpoint, 'stack-triage');
-                break;
-            case 'stack-triage':
-                productTourCheckpoint.advance(checkpoint, 'event-occurrence');
-                break;
-            case 'tab-overview':
-                productTourCheckpoint.advance(checkpoint, 'filter-stack-events');
-                break;
-            default:
-                await tourActions.complete(checkpoint);
-        }
-    }
-
-    async function dismissInvestigationTour(): Promise<void> {
-        if (investigationCheckpoint) {
-            await tourActions.dismiss(investigationCheckpoint);
-        }
-    }
-
     function prepareEventAssistantContext(): void {
         if (event) {
             assistantPageContext.setPageEvent(event);
@@ -367,10 +302,6 @@
     $effect(() => {
         if (event && event.id !== notifiedEventId) {
             notifiedEventId = event.id;
-            const checkpoint = investigationCheckpoint;
-            if (checkpoint?.checkpointName === 'choose-error' && hasErrorOrSimpleError(event)) {
-                productTourCheckpoint.advance(checkpoint, 'stack-summary');
-            }
             onEventLoaded?.(event);
         }
     });
@@ -401,15 +332,7 @@
     });
 </script>
 
-{#if event && investigationCopy && ['stack-summary', 'stack-triage'].includes(investigationCheckpoint?.checkpointName ?? '')}
-    <ProductTourInlineCallout
-        description={investigationCopy.description}
-        onContinue={continueInvestigationTour}
-        onDismiss={dismissInvestigationTour}
-        title={investigationCopy.title}
-        tourName="investigate-error"
-    />
-{/if}
+<InvestigationDetailTour {event} placement="stack" />
 
 <section data-event-type={event ? (hasErrorOrSimpleError(event) ? 'error' : event.type) : undefined} data-tour={event ? 'event-details' : undefined}>
     <h4 class="text-muted-foreground mb-3 text-sm font-semibold tracking-wide uppercase">Stack</h4>
@@ -423,16 +346,7 @@
     {/if}
 </section>
 
-{#if event && investigationCopy && ['event-occurrence', 'filter-stack-events'].includes(investigationCheckpoint?.checkpointName ?? '')}
-    <ProductTourInlineCallout
-        continueLabel={investigationCheckpoint?.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
-        description={investigationCopy.description}
-        onContinue={continueInvestigationTour}
-        onDismiss={dismissInvestigationTour}
-        title={investigationCopy.title}
-        tourName="investigate-error"
-    />
-{/if}
+<InvestigationDetailTour {event} placement="occurrence" />
 
 <section class="mt-2" data-tour={event ? 'event-occurrence' : undefined}>
     <div class="mb-2 flex items-center justify-between">
@@ -489,15 +403,7 @@
     </Table.Root>
 
     {#if event}
-        {#if investigationCheckpoint?.checkpointName === 'tab-overview' && investigationCopy}
-            <ProductTourInlineCallout
-                description={investigationCopy.description}
-                onContinue={continueInvestigationTour}
-                onDismiss={dismissInvestigationTour}
-                title={investigationCopy.title}
-                tourName="investigate-error"
-            />
-        {/if}
+        <InvestigationDetailTour {event} placement="overview" />
         <Tabs.Root class="mt-4 mb-4" bind:value={activeTab}>
             <div class="relative">
                 {#if canScrollTabsLeft}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
new file mode 100644
index 0000000000..8c7afe291d
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
@@ -0,0 +1,114 @@
+<script lang="ts">
+    import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
+    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+
+    import type { PersistentEvent } from '../models';
+
+    import { hasErrorOrSimpleError } from '../persistent-event';
+
+    interface Props {
+        event?: PersistentEvent;
+        placement: 'occurrence' | 'overview' | 'stack';
+    }
+
+    let { event, placement }: Props = $props();
+    let advancedEventId = $state('');
+
+    const actions = createProductTourActions();
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+    const copy = $derived.by(() => {
+        switch (checkpoint?.checkpointName) {
+            case 'event-occurrence':
+                return placement === 'occurrence'
+                    ? {
+                          description: 'This occurrence contains its timestamp, raw JSON, and navigation to nearby events.',
+                          title: 'Inspect the occurrence'
+                      }
+                    : undefined;
+            case 'filter-stack-events':
+                return placement === 'occurrence'
+                    ? {
+                          description: 'Show all events filters the list to this stack when you are ready to compare occurrences.',
+                          title: 'Compare every occurrence'
+                      }
+                    : undefined;
+            case 'stack-summary':
+                return placement === 'stack'
+                    ? {
+                          description: 'Use the grouped stack title, affected users, occurrence count, and trend to judge scope and impact.',
+                          title: 'Understand the grouped issue'
+                      }
+                    : undefined;
+            case 'stack-triage':
+                return placement === 'stack'
+                    ? {
+                          description: 'Status and options change shared issue state. Review them here; this guide will not invoke them.',
+                          title: 'Triage deliberately'
+                      }
+                    : undefined;
+            case 'tab-overview':
+                return placement === 'overview'
+                    ? {
+                          description: 'Overview summarizes the message and useful event fields. Choose other tabs when the evidence calls for them.',
+                          title: 'Begin with the overview'
+                      }
+                    : undefined;
+            default:
+                return undefined;
+        }
+    });
+
+    $effect(() => {
+        if (placement !== 'stack' || !event || event.id === advancedEventId) {
+            return;
+        }
+
+        advancedEventId = event.id;
+        const active = checkpoint;
+        if (active?.checkpointName === 'choose-error' && hasErrorOrSimpleError(event)) {
+            productTourCheckpoint.advance(active, 'stack-summary');
+        }
+    });
+
+    async function continueTour(): Promise<void> {
+        const active = checkpoint;
+        if (!active) {
+            return;
+        }
+
+        switch (active.checkpointName) {
+            case 'event-occurrence':
+                productTourCheckpoint.advance(active, 'tab-overview');
+                break;
+            case 'stack-summary':
+                productTourCheckpoint.advance(active, 'stack-triage');
+                break;
+            case 'stack-triage':
+                productTourCheckpoint.advance(active, 'event-occurrence');
+                break;
+            case 'tab-overview':
+                productTourCheckpoint.advance(active, 'filter-stack-events');
+                break;
+            default:
+                await actions.complete(active);
+        }
+    }
+
+    async function dismiss(): Promise<void> {
+        if (checkpoint) {
+            await actions.dismiss(checkpoint);
+        }
+    }
+</script>
+
+{#if event && checkpoint && copy}
+    <ProductTourInlineCallout
+        continueLabel={checkpoint.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
+        description={copy.description}
+        onContinue={continueTour}
+        onDismiss={dismiss}
+        title={copy.title}
+        tourName="investigate-error"
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 2a2764fb8e..e2e2951648 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -5,7 +5,6 @@ import { toast } from 'svelte-sonner';
 
 import type { ProductTourCheckpoint, ProductTourKey, ProductTourLaunchSource } from './types';
 
-import { getProductTour } from './catalog';
 import { productTourCheckpoint } from './state.svelte';
 import { buildProductTourTelemetryEvent, type ProductTourTelemetryEvent } from './telemetry';
 
@@ -21,12 +20,11 @@ export function createProductTourActions() {
     }
 
     async function finish(checkpoint: ProductTourCheckpoint, status: ProductTourStatus): Promise<boolean> {
-        const definition = getProductTour(checkpoint.tourName);
         try {
             await progressMutation.mutateAsync({
                 progress: {
                     status,
-                    version: definition.version
+                    version: checkpoint.version
                 },
                 tourName: checkpoint.tourName
             });
@@ -38,7 +36,7 @@ export function createProductTourActions() {
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        await track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, definition.version, checkpoint.source);
+        await track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, checkpoint.version, checkpoint.source);
         return true;
     }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index c17eb9f560..13f1c376f8 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -16,6 +16,8 @@ function context(overrides: Partial<ProductTourContext> = {}): ProductTourContex
 }
 
 describe('product tour catalog', () => {
+    const versions = Object.fromEntries(productTourCatalog.map((tour) => [tour.name, 1]));
+
     it('contains only durable metadata for the five named tours', () => {
         expect(productTourCatalog.map((tour) => tour.name)).toEqual([
             'ui-overview',
@@ -24,7 +26,7 @@ describe('product tour catalog', () => {
             'investigate-error',
             'meet-exie'
         ]);
-        expect(productTourCatalog.every((tour) => tour.version > 0 && tour.keywords.length > 0)).toBe(true);
+        expect(productTourCatalog.every((tour) => tour.keywords.length > 0)).toBe(true);
         expect(JSON.stringify(productTourCatalog)).not.toContain('data-tour');
     });
 
@@ -39,9 +41,15 @@ describe('product tour catalog', () => {
             context({
                 assistantAccess: { enabled: false, has_access: false, upgrade_required: false },
                 errorEventAvailability: 'empty'
-            })
+            }),
+            versions
         );
         expect(items.find((item) => item.name === 'meet-exie')?.currentAvailability.available).toBe(false);
         expect(items.find((item) => item.name === 'investigate-error')?.currentAvailability.available).toBe(false);
     });
+
+    it('uses server versions as the availability boundary', () => {
+        const items = getProductTourItems(context(), {});
+        expect(items.every((item) => !item.currentAvailability.available && item.version === 0)).toBe(true);
+    });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 307807a260..8b26d1f198 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -30,8 +30,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['navigation', 'ui', 'search', 'command', 'help', 'saved views'],
         name: 'ui-overview',
         startingRoute: () => resolve('/'),
-        title: 'Explore Exceptionless',
-        version: 1
+        title: 'Explore Exceptionless'
     },
     {
         availability: () => ({ available: true }),
@@ -40,8 +39,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'configure-project',
         startingRoute: (context) => (context.organizationId ? resolve('/(app)/project/add') : resolve('/(app)/organization/add')),
-        title: 'Configure a project',
-        version: 1
+        title: 'Configure a project'
     },
     {
         availability: requireOrganization,
@@ -50,8 +48,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
         name: 'create-saved-view',
         startingRoute: () => resolve('/(app)/event'),
-        title: 'Create a saved view',
-        version: 1
+        title: 'Create a saved view'
     },
     {
         availability: requireError,
@@ -60,8 +57,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['error report', 'event details', 'exception', 'filter', 'stack', 'triage'],
         name: 'investigate-error',
         startingRoute: () => `${resolve('/(app)/event')}?time=all&type=error`,
-        title: 'Investigate an error',
-        version: 1
+        title: 'Investigate an error'
     },
     {
         availability: (context) =>
@@ -71,21 +67,25 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
         name: 'meet-exie',
         startingRoute: () => resolve('/'),
-        title: 'Meet Exie',
-        version: 1
+        title: 'Meet Exie'
     }
 ] as const;
 
-export function getProductTour(name: ProductTourName): ProductTourDefinition {
-    return productTourCatalog.find((tour) => tour.name === name)!;
-}
-
-export function getProductTourItems(context: ProductTourContext, progress: Record<string, ProductTourProgress> = {}): ProductTourListItem[] {
-    return productTourCatalog.map((definition) => ({
-        ...definition,
-        currentAvailability: definition.availability(context),
-        progress: progress[definition.name]
-    }));
+export function getProductTourItems(
+    context: ProductTourContext,
+    versions: Record<string, number>,
+    progress: Record<string, ProductTourProgress> = {}
+): ProductTourListItem[] {
+    return productTourCatalog.map((definition) => {
+        const version = versions[definition.name] ?? 0;
+        return {
+            ...definition,
+            currentAvailability:
+                version > 0 ? definition.availability(context) : { available: false, reason: 'This guided tour is not supported by the server.' },
+            progress: progress[definition.name],
+            version
+        };
+    });
 }
 
 export function getRecommendedProductTourName(context: ProductTourContext): ProductTourName {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte
new file mode 100644
index 0000000000..adc4c9d0a5
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte
@@ -0,0 +1,179 @@
+<script lang="ts">
+    import type { SavedView } from '$features/saved-views/models';
+
+    import { toast } from 'svelte-sonner';
+
+    import type { ProductTourCheckpoint } from '../types';
+
+    import { createProductTourActions } from '../actions.svelte';
+    import { productTourCheckpoint } from '../state.svelte';
+    import ProductTourSpotlight from './product-tour-spotlight.svelte';
+
+    interface Props {
+        closeMenu: () => void;
+        onLoadView: (view: SavedView) => Promise<void> | void;
+        openMenu: () => void;
+        openSaveDialog: () => void;
+        savedViews: SavedView[];
+    }
+
+    let { closeMenu, onLoadView, openMenu, openSaveDialog, savedViews }: Props = $props();
+    const actions = createProductTourActions();
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'create-saved-view' ? productTourCheckpoint.current : undefined);
+    const pendingView = $derived.by(() => {
+        const phase = checkpoint?.phase;
+        return phase?.type === 'saved-view-created' || phase?.type === 'saved-view-loaded'
+            ? savedViews.find((savedView) => savedView.id === phase.viewId)
+            : undefined;
+    });
+
+    export function validateSave(isPrivate: boolean): boolean {
+        if (!checkpoint) {
+            return true;
+        }
+
+        if (checkpoint.checkpointName !== 'save-view') {
+            toast.error('Continue the guide before creating the practice view.');
+            return false;
+        }
+
+        if (isPrivate) {
+            return true;
+        }
+
+        toast.error('Enable Private before creating the guided practice view.');
+        return false;
+    }
+
+    export function shouldDefaultPrivate(): boolean {
+        return Boolean(checkpoint);
+    }
+
+    export async function created(view: SavedView): Promise<void> {
+        const active = checkpoint;
+        if (!active) {
+            await onLoadView(view);
+            return;
+        }
+
+        const createdCheckpoint = productTourCheckpoint.advance(active, 'view-created', {
+            type: 'saved-view-created',
+            viewId: view.id
+        });
+        if (createdCheckpoint) {
+            await loadAndComplete(createdCheckpoint, view);
+        }
+    }
+
+    export async function closed(): Promise<void> {
+        const active = checkpoint;
+        if (active?.phase.type === 'active' && ['name-view', 'private-view', 'save-view'].includes(active.checkpointName)) {
+            await actions.dismiss(active);
+        }
+    }
+
+    async function retry(): Promise<void> {
+        const active = checkpoint;
+        if (!active) {
+            return;
+        }
+
+        if (active.phase.type === 'saved-view-loaded') {
+            await actions.complete(active);
+            return;
+        }
+
+        if (active.phase.type === 'saved-view-created') {
+            if (!pendingView) {
+                toast.error('The created view could not be loaded. Refresh and try again.');
+                return;
+            }
+
+            await loadAndComplete(active, pendingView);
+        }
+    }
+
+    async function loadAndComplete(active: ProductTourCheckpoint<'create-saved-view'>, view: SavedView): Promise<void> {
+        try {
+            await onLoadView(view);
+            const loadedCheckpoint = productTourCheckpoint.advance(active, 'view-created', {
+                type: 'saved-view-loaded',
+                viewId: view.id
+            });
+            if (loadedCheckpoint) {
+                await actions.complete(loadedCheckpoint);
+            }
+        } catch {
+            toast.error('Failed to load the created view. Please try again.');
+        }
+    }
+</script>
+
+{#if checkpoint?.checkpointName === 'open-view-menu'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Open View settings to review what a reusable saved view can remember."
+        onDismiss={actions.dismiss}
+        onNext={(active) => {
+            openMenu();
+            productTourCheckpoint.advance(active, 'review-settings');
+        }}
+        target="[data-tour='saved-view-trigger']"
+        title="Open View settings"
+    />
+{:else if checkpoint?.checkpointName === 'review-settings'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Review the filters, date range, display choices, and columns. The guide will not change them for you."
+        onDismiss={actions.dismiss}
+        onNext={(active) => {
+            closeMenu();
+            openSaveDialog();
+            productTourCheckpoint.advance(active, 'name-view');
+        }}
+        target="[data-tour='saved-view-settings']"
+        title="Configure what the view remembers"
+    />
+{:else if checkpoint?.checkpointName === 'name-view'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Choose a meaningful name for the current filters, time range, display options, and columns."
+        onDismiss={actions.dismiss}
+        onNext={(active) => {
+            productTourCheckpoint.advance(active, 'private-view');
+        }}
+        target="[data-tour='saved-view-name']"
+        title="Name your view"
+    />
+{:else if checkpoint?.checkpointName === 'private-view'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Enable Private so this guided practice view is visible only to you."
+        onDismiss={actions.dismiss}
+        onNext={(active) => {
+            productTourCheckpoint.advance(active, 'save-view');
+        }}
+        target="[data-tour='saved-view-private']"
+        title="Keep it private"
+    />
+{:else if checkpoint?.checkpointName === 'save-view'}
+    <ProductTourSpotlight
+        {checkpoint}
+        description="Create the saved view when you are ready. The guide finishes after the view is successfully created and loaded."
+        onDismiss={actions.dismiss}
+        target="[data-tour='saved-view-submit']"
+        title="Create the saved view"
+    />
+{:else if checkpoint?.phase.type === 'saved-view-created' || checkpoint?.phase.type === 'saved-view-loaded'}
+    <ProductTourSpotlight
+        {checkpoint}
+        continueLabel="Retry guide completion"
+        description={checkpoint.phase.type === 'saved-view-created'
+            ? 'The view was created, but it could not be loaded. Continue to try loading it again.'
+            : 'The view was created and loaded, but guide progress could not be saved. Continue to retry.'}
+        onDismiss={actions.dismiss}
+        onNext={retry}
+        target="[data-tour='saved-view-trigger']"
+        title="Finish the saved-view guide"
+    />
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index d0b49f5a71..735ee4de5b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -37,8 +37,6 @@
         stateSettled: boolean;
     }
 
-    const WELCOME_VERSION = 1;
-    const EXIE_ANNOUNCEMENT_VERSION = 1;
     const SYSTEM_PATH = resolve('/(app)/system');
 
     let {
@@ -74,9 +72,11 @@
         pathname,
         projects
     });
-    const items = $derived(getProductTourItems(context, currentUser?.product_tours));
+    const items = $derived(getProductTourItems(context, currentUser?.product_tour_versions ?? {}, currentUser?.product_tours));
     const recommended = $derived(items.find((item) => item.name === getRecommendedProductTourName(context)) ?? items[0]!);
     const checkpoint = $derived(productTourCheckpoint.current);
+    const welcomeVersion = $derived(currentUser?.product_tour_versions.welcome ?? 0);
+    const exieAnnouncementVersion = $derived(currentUser?.product_tour_versions['exie-announcement'] ?? 0);
     const welcomeOpen = $derived(
         !!(
             stateSettled &&
@@ -87,7 +87,8 @@
             !isImpersonating &&
             !isSetupPage &&
             !pathname.startsWith(SYSTEM_PATH) &&
-            shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, WELCOME_VERSION)
+            welcomeVersion > 0 &&
+            shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, welcomeVersion)
         )
     );
     const exieAnnouncementOpen = $derived(
@@ -102,8 +103,9 @@
             !welcomeOpen &&
             !catalogOpen &&
             !isAnyOverlayOpen &&
-            !shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, WELCOME_VERSION) &&
-            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
+            !shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, welcomeVersion) &&
+            exieAnnouncementVersion > 0 &&
+            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], exieAnnouncementVersion)
         )
     );
 
@@ -128,10 +130,10 @@
             return;
         }
 
-        const impression = `${currentUser.id}:${WELCOME_VERSION}`;
+        const impression = `${currentUser.id}:${welcomeVersion}`;
         if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
             lastTrackedWelcomeImpression = impression;
-            void track('shown', 'welcome', WELCOME_VERSION, 'automatic');
+            void track('shown', 'welcome', welcomeVersion, 'automatic');
         }
     });
 
@@ -140,10 +142,10 @@
             return;
         }
 
-        const impression = `${currentUser.id}:${EXIE_ANNOUNCEMENT_VERSION}`;
+        const impression = `${currentUser.id}:${exieAnnouncementVersion}`;
         if (exieAnnouncementOpen && lastTrackedAnnouncementImpression !== impression) {
             lastTrackedAnnouncementImpression = impression;
-            void track('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+            void track('shown', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
         }
     });
 
@@ -154,7 +156,7 @@
         catalogOpen = true;
     }
 
-    export async function startTour(name: ProductTourName, source: ProductTourLaunchSource = 'catalog'): Promise<void> {
+    export async function startTour<Name extends ProductTourName>(name: Name, source: ProductTourLaunchSource = 'catalog'): Promise<void> {
         if (!currentUser) {
             return;
         }
@@ -171,16 +173,7 @@
 
         closeOverlays();
         catalogOpen = false;
-        const next = productTourCheckpoint.start({
-            checkpointName: item.initialCheckpoint,
-            organizationId,
-            phase: {
-                type: 'active'
-            },
-            source,
-            tourName: name,
-            userId: currentUser.id
-        });
+        const next = productTourCheckpoint.start(name, item.initialCheckpoint, source, currentUser.id, item.version, organizationId);
         await Promise.all([track('shown', name, item.version, source), track('started', name, item.version, source)]);
 
         const destination = item.startingRoute(context);
@@ -210,48 +203,48 @@
     }
 
     async function onWelcomeStart(): Promise<void> {
-        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Completed))) {
             return;
         }
         welcomeHandled = true;
-        await track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('completed', 'welcome', welcomeVersion, 'automatic');
         await startTour(recommended.name, 'automatic');
     }
 
     async function onWelcomeBrowse(): Promise<void> {
-        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Completed))) {
             return;
         }
         welcomeHandled = true;
-        await track('completed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('completed', 'welcome', welcomeVersion, 'automatic');
         openCatalog('catalog');
     }
 
     async function onWelcomeSkip(): Promise<void> {
-        if (!(await recordPreference('welcome', WELCOME_VERSION, ProductTourStatus.Dismissed))) {
+        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Dismissed))) {
             return;
         }
         welcomeHandled = true;
-        await track('dismissed', 'welcome', WELCOME_VERSION, 'automatic');
+        await track('dismissed', 'welcome', welcomeVersion, 'automatic');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
-        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('exie-announcement', exieAnnouncementVersion, ProductTourStatus.Completed))) {
             return;
         }
-        await track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await track('completed', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
         await startTour('meet-exie', 'feature-announcement');
     }
 
     async function onExieAnnouncementDismiss(): Promise<void> {
-        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
+        if (!(await recordPreference('exie-announcement', exieAnnouncementVersion, ProductTourStatus.Dismissed))) {
             return;
         }
-        await track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await track('dismissed', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
     }
 
-    function getItem(name: ProductTourName): ProductTourListItem {
-        return items.find((item) => item.name === name)!;
+    function getItem<Name extends ProductTourName>(name: Name): ProductTourListItem<Name> {
+        return items.find((item) => item.name === name)! as ProductTourListItem<Name>;
     }
 </script>
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index 2f80f74774..a00e3de4e7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -8,6 +8,7 @@
 
     interface Props {
         checkpoint: ProductTourCheckpoint;
+        continueLabel?: string;
         description: string;
         onDismiss: (checkpoint: ProductTourCheckpoint) => Promise<boolean>;
         onNext?: (checkpoint: ProductTourCheckpoint) => Promise<void> | void;
@@ -16,7 +17,7 @@
         title: string;
     }
 
-    let { checkpoint, description, onDismiss, onNext, side, target, title }: Props = $props();
+    let { checkpoint, continueLabel = 'Continue', description, onDismiss, onNext, side, target, title }: Props = $props();
     let activeDriver: Driver | undefined;
 
     onMount(() => {
@@ -38,7 +39,7 @@
                     element: target,
                     popover: {
                         description,
-                        doneBtnText: 'Continue',
+                        doneBtnText: continueLabel,
                         onNextClick: onNext
                             ? async () => {
                                   await onNext(checkpoint);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
index a4a104d26b..a14662905a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
@@ -10,7 +10,8 @@ const checkpoint: ProductTourCheckpoint = {
     phase: { type: 'active' },
     source: 'command-palette',
     tourName: 'investigate-error',
-    userId: 'user-id'
+    userId: 'user-id',
+    version: 1
 };
 
 describe('product tour session', () => {
@@ -30,6 +31,7 @@ describe('product tour session', () => {
         JSON.stringify({ ...checkpoint, tourName: 'unknown-tour' }),
         JSON.stringify({ ...checkpoint, checkpointName: 'unknown-step' }),
         JSON.stringify({ ...checkpoint, source: 'unknown-source' }),
+        JSON.stringify({ ...checkpoint, version: 0 }),
         JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created' } }),
         JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created', viewId: 'view-id' } }),
         JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-loaded', viewId: 'view-id' } }),
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index 3baa4db065..0b52603cc7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -1,9 +1,11 @@
+import { ProductTourLaunchSource as ProductTourLaunchSourceContract } from '$generated/api';
+
 import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
 
 import { PRODUCT_TOUR_CHECKPOINTS } from './types';
 
 const SESSION_KEY = 'exceptionless.product-tour';
-const SOURCES: readonly ProductTourLaunchSource[] = ['automatic', 'catalog', 'command-palette', 'feature-announcement', 'help-menu'];
+const SOURCES = new Set<string>(Object.values(ProductTourLaunchSourceContract));
 
 export function clearProductTourSession(storage: Pick<Storage, 'removeItem'> = sessionStorage): void {
     storage.removeItem(SESSION_KEY);
@@ -44,7 +46,16 @@ function isPhase(value: unknown, tourName: string, checkpointName: unknown): val
 }
 
 function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint {
-    if (!isRecord(value) || typeof value.userId !== 'string' || !value.userId || typeof value.tourName !== 'string') return false;
+    if (
+        !isRecord(value) ||
+        typeof value.userId !== 'string' ||
+        !value.userId ||
+        typeof value.tourName !== 'string' ||
+        typeof value.version !== 'number' ||
+        !Number.isSafeInteger(value.version) ||
+        value.version < 1
+    )
+        return false;
     if (value.organizationId !== undefined && typeof value.organizationId !== 'string') return false;
     if (!isProductTourLaunchSource(value.source) || !isProductTourName(value.tourName)) return false;
 
@@ -54,7 +65,7 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
 }
 
 function isProductTourLaunchSource(value: unknown): value is ProductTourLaunchSource {
-    return typeof value === 'string' && (SOURCES as readonly string[]).includes(value);
+    return typeof value === 'string' && SOURCES.has(value);
 }
 
 function isProductTourName(value: string): value is ProductTourName {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index a4abfb8833..d1d4d2f6f7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -10,15 +10,30 @@ const checkpoint: ProductTourCheckpoint = {
     phase: { type: 'active' },
     source: 'catalog',
     tourName: 'ui-overview',
-    userId: 'user-id'
+    userId: 'user-id',
+    version: 1
 };
 
 describe('product tour checkpoint store', () => {
     beforeEach(() => productTourCheckpoint.clear());
 
     it('does not let stale work advance or clear a newer tour', () => {
-        const first = productTourCheckpoint.start(checkpoint);
-        const second = productTourCheckpoint.start({ ...checkpoint, source: 'help-menu' });
+        const first = productTourCheckpoint.start(
+            checkpoint.tourName,
+            checkpoint.checkpointName,
+            checkpoint.source,
+            checkpoint.userId,
+            checkpoint.version,
+            checkpoint.organizationId
+        );
+        const second = productTourCheckpoint.start(
+            checkpoint.tourName,
+            checkpoint.checkpointName,
+            'help-menu',
+            checkpoint.userId,
+            checkpoint.version,
+            checkpoint.organizationId
+        );
 
         expect(productTourCheckpoint.advance(first, 'command-search')).toBeUndefined();
         expect(productTourCheckpoint.clear(first)).toBe(false);
@@ -26,7 +41,14 @@ describe('product tour checkpoint store', () => {
     });
 
     it('clears a checkpoint restored for another identity', () => {
-        productTourCheckpoint.start(checkpoint);
+        productTourCheckpoint.start(
+            checkpoint.tourName,
+            checkpoint.checkpointName,
+            checkpoint.source,
+            checkpoint.userId,
+            checkpoint.version,
+            checkpoint.organizationId
+        );
         productTourCheckpoint.clear();
         sessionStorage.setItem('exceptionless.product-tour', JSON.stringify(checkpoint));
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
index 5f67e71c8d..7ba2fcb1d4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -1,27 +1,28 @@
-import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourPhase } from './types';
+import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
 
 import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
 
 class ProductTourCheckpointStore {
     current = $state.raw<ProductTourCheckpoint>();
 
-    advance(
-        expected: ProductTourCheckpoint,
-        checkpointName: ProductTourCheckpointName,
-        phase: ProductTourPhase = {
+    advance<Name extends ProductTourCheckpoint['tourName']>(
+        expected: ProductTourCheckpoint<Name>,
+        checkpointName: ProductTourCheckpointName<Name>,
+        phase: ProductTourPhase<Name> = {
             type: 'active'
         },
         organizationId = expected.organizationId
-    ) {
+    ): ProductTourCheckpoint<Name> | undefined {
         if (this.current !== expected) {
             return undefined;
         }
-        return this.save({
+        const next = {
             ...expected,
             checkpointName,
             organizationId,
             phase
-        });
+        } as ProductTourCheckpoint<Name>;
+        return this.save(next);
     }
 
     clear(expected?: ProductTourCheckpoint): boolean {
@@ -52,11 +53,29 @@ class ProductTourCheckpointStore {
         return stored;
     }
 
-    start(checkpoint: ProductTourCheckpoint): ProductTourCheckpoint {
+    start<Name extends ProductTourName>(
+        tourName: Name,
+        checkpointName: ProductTourCheckpointName<Name>,
+        source: ProductTourLaunchSource,
+        userId: string,
+        version: number,
+        organizationId?: string
+    ): ProductTourCheckpoint<Name> {
+        const checkpoint = {
+            checkpointName,
+            organizationId,
+            phase: {
+                type: 'active'
+            },
+            source,
+            tourName,
+            userId,
+            version
+        } as ProductTourCheckpoint<Name>;
         return this.save(checkpoint);
     }
 
-    private save(checkpoint: ProductTourCheckpoint): ProductTourCheckpoint {
+    private save<Name extends ProductTourCheckpoint['tourName']>(checkpoint: ProductTourCheckpoint<Name>): ProductTourCheckpoint<Name> {
         this.current = checkpoint;
         writeProductTourSession(checkpoint);
         return checkpoint;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
index 0c8ecc8429..8eeb6df23d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
@@ -1,6 +1,8 @@
+import type { ProductTourTelemetryEvent as ProductTourTelemetryEventContract } from '$generated/api';
+
 import type { ProductTourKey, ProductTourLaunchSource } from './types';
 
-export type ProductTourTelemetryEvent = 'completed' | 'dismissed' | 'shown' | 'started';
+export type ProductTourTelemetryEvent = `${ProductTourTelemetryEventContract}`;
 
 export function buildProductTourTelemetryEvent(
     event: ProductTourTelemetryEvent,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 7d438257a7..87d794902b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -1,6 +1,7 @@
 import type { AssistantAccess } from '$features/assistant/models';
 import type { ViewProject } from '$features/projects/models';
 import type { ProductTourProgress } from '$features/users/models';
+import type { ProductTourLaunchSource as ProductTourLaunchSourceContract } from '$generated/api';
 
 export const PRODUCT_TOUR_CHECKPOINTS = {
     'configure-project': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event'],
@@ -14,15 +15,18 @@ export interface ProductTourAvailability {
     available: boolean;
     reason?: string;
 }
-export interface ProductTourCheckpoint {
-    checkpointName: ProductTourCheckpointName;
-    organizationId?: string;
-    phase: ProductTourPhase;
-    source: ProductTourLaunchSource;
-    tourName: ProductTourName;
-    userId: string;
-}
-export type ProductTourCheckpointName = (typeof PRODUCT_TOUR_CHECKPOINTS)[ProductTourName][number];
+export type ProductTourCheckpoint<Name extends ProductTourName = ProductTourName> = Name extends ProductTourName
+    ? {
+          checkpointName: ProductTourCheckpointName<Name>;
+          organizationId?: string;
+          phase: ProductTourPhase<Name>;
+          source: ProductTourLaunchSource;
+          tourName: Name;
+          userId: string;
+          version: number;
+      }
+    : never;
+export type ProductTourCheckpointName<Name extends ProductTourName = ProductTourName> = (typeof PRODUCT_TOUR_CHECKPOINTS)[Name][number];
 export interface ProductTourContext {
     assistantAccess?: AssistantAccess;
     errorEventAvailability: 'available' | 'empty' | 'error' | 'loading';
@@ -31,26 +35,27 @@ export interface ProductTourContext {
     pathname: string;
     projects: Pick<ViewProject, 'is_configured'>[];
 }
-export interface ProductTourDefinition {
+export interface ProductTourDefinition<Name extends ProductTourName = ProductTourName> {
     availability: (context: ProductTourContext) => ProductTourAvailability;
     description: string;
-    initialCheckpoint: ProductTourCheckpointName;
+    initialCheckpoint: ProductTourCheckpointName<Name>;
     keywords: readonly string[];
-    name: ProductTourName;
+    name: Name;
     startingRoute: (context: ProductTourContext) => string;
     title: string;
-    version: number;
 }
 
 export type ProductTourKey = 'exie-announcement' | 'welcome' | ProductTourName;
 
-export type ProductTourLaunchSource = 'automatic' | 'catalog' | 'command-palette' | 'feature-announcement' | 'help-menu';
+export type ProductTourLaunchSource = `${ProductTourLaunchSourceContract}`;
 
-export interface ProductTourListItem extends ProductTourDefinition {
+export interface ProductTourListItem<Name extends ProductTourName = ProductTourName> extends ProductTourDefinition<Name> {
     currentAvailability: ProductTourAvailability;
     progress?: ProductTourProgress;
+    version: number;
 }
 
 export type ProductTourName = keyof typeof PRODUCT_TOUR_CHECKPOINTS;
 
-export type ProductTourPhase = { type: 'active' } | { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string };
+export type ProductTourPhase<Name extends ProductTourName = ProductTourName> =
+    (Name extends 'create-saved-view' ? { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string } : never) | { type: 'active' };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
index 645228ecd3..4c5d0cb627 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
-    import type { ProductTourCheckpointName } from '$features/product-tours/types';
-
     import { Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Dialog from '$comp/ui/dialog';
     import { Input } from '$comp/ui/input';
     import { Label } from '$comp/ui/label';
     import { Switch } from '$comp/ui/switch';
-    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
 
     import type { SavedView } from '../models';
 
@@ -24,32 +21,15 @@
     interface Props {
         defaultPrivate?: boolean;
         duplicateView?: SavedView;
-        onCancel?: () => void;
         onClose: () => void;
-        onLoadView: (view: SavedView) => Promise<void> | void;
+        onLoadView: (view: SavedView) => void;
         onSave: (name: string, slug: string, isPrivate: boolean) => Promise<void>;
-        onTourContinue?: (checkpointName: ProductTourCheckpointName) => void;
         open: boolean;
-        pendingCompletion?: boolean;
         savedViews: SavedView[];
         saving: boolean;
-        tourCheckpointName?: ProductTourCheckpointName;
     }
 
-    let {
-        defaultPrivate = false,
-        duplicateView,
-        onCancel,
-        onClose,
-        onLoadView,
-        onSave,
-        onTourContinue,
-        open = $bindable(),
-        pendingCompletion = false,
-        savedViews,
-        saving,
-        tourCheckpointName
-    }: Props = $props();
+    let { defaultPrivate = false, duplicateView, onClose, onLoadView, onSave, open = $bindable(), savedViews, saving }: Props = $props();
 
     let saveName = $state('');
     let saveSlug = $state('');
@@ -101,7 +81,7 @@
     });
     const visibleNameError = $derived(attemptedSubmit || saveName.length > 0 ? nameError : undefined);
     const visibleSlugError = $derived(attemptedSubmit || saveName.length > 0 || saveSlug.length > 0 ? slugError : undefined);
-    const canSave = $derived((pendingCompletion || (!nameError && !slugError)) && !saving);
+    const canSave = $derived(!nameError && !slugError && !saving);
 
     $effect(() => {
         if (open) {
@@ -128,76 +108,37 @@
 
     async function handleSave() {
         attemptedSubmit = true;
-        if (saving || (!pendingCompletion && (nameError || slugError))) {
+        if (!canSave) {
             return;
         }
 
         await onSave(trimmedName, normalizedSlug, isPrivate);
     }
-
-    function dismissTour(): void {
-        onClose();
-        onCancel?.();
-    }
 </script>
 
 <Dialog.Root
-    {open}
+    bind:open
     onOpenChange={(nextOpen) => {
-        if (nextOpen || !saving) {
-            open = nextOpen;
-            if (!nextOpen) {
-                onCancel?.();
-            }
+        if (!nextOpen) {
+            onClose();
         }
     }}
 >
-    <Dialog.Content
-        class="sm:max-w-100"
-        data-tour="saved-view-dialog"
-        onEscapeKeydown={(event) => saving && event.preventDefault()}
-        onInteractOutside={(event) => saving && event.preventDefault()}
-    >
+    <Dialog.Content class="sm:max-w-100" data-tour="saved-view-dialog">
         <Dialog.Header>
             <Dialog.Title>Save View</Dialog.Title>
             <Dialog.Description>Save the current view configuration for quick access.</Dialog.Description>
         </Dialog.Header>
-        {#if defaultPrivate && tourCheckpointName === 'name-view'}
-            <ProductTourInlineCallout
-                description="Review the current filters, time, display options, and columns. Choose a meaningful name, then continue."
-                onContinue={() => onTourContinue?.('private-view')}
-                onDismiss={dismissTour}
-                title="Review and name your view"
-                tourName="create-saved-view"
-            />
-        {:else if defaultPrivate && tourCheckpointName === 'private-view'}
-            <ProductTourInlineCallout
-                description="Private is enabled for this guide so the practice view is visible only to you. Continue when you are ready to save it."
-                onContinue={() => onTourContinue?.('save-view')}
-                onDismiss={dismissTour}
-                title="Keep it private"
-                tourName="create-saved-view"
-            />
-        {:else if defaultPrivate && (tourCheckpointName === 'save-view' || tourCheckpointName === 'view-created')}
-            <ProductTourInlineCallout
-                description={pendingCompletion
-                    ? 'The view was created, but the guide could not save its progress. Retry to finish without creating another view.'
-                    : 'Click Save when ready. The guide completes only after the private view is successfully created and loaded.'}
-                onDismiss={dismissTour}
-                title="Create the saved view"
-                tourName="create-saved-view"
-            />
-        {/if}
-        {#if duplicateView && !pendingCompletion}
+        {#if duplicateView}
             <div class="bg-muted rounded-md p-3">
                 <Muted>
                     Current filters match <strong>"{duplicateView.name}"</strong>. You can
                     <Button
                         variant="link"
                         class="h-auto p-0 text-sm"
-                        onclick={async () => {
-                            await onLoadView(duplicateView);
-                            dismissTour();
+                        onclick={() => {
+                            open = false;
+                            onLoadView(duplicateView);
                         }}>load it</Button
                     > instead, or save with a different name.
                 </Muted>
@@ -222,7 +163,6 @@
                     aria-describedby={visibleNameError ? 'view-name-error' : undefined}
                     required
                     autofocus
-                    disabled={pendingCompletion}
                 />
                 {#if visibleNameError}
                     <p id="view-name-error" class="text-destructive text-sm">{visibleNameError}</p>
@@ -238,7 +178,6 @@
                     aria-invalid={!!visibleSlugError}
                     aria-describedby={visibleSlugError ? 'view-slug-error' : undefined}
                     required
-                    disabled={pendingCompletion}
                     oninput={() => {
                         isSlugDirty = true;
                     }}
@@ -250,14 +189,14 @@
             <div class="flex items-center justify-between" data-tour="saved-view-private">
                 <div>
                     <Label for="view-private" class="text-sm">Private</Label>
-                    <Muted>{defaultPrivate ? 'Required for this guided practice view' : 'Only visible to you'}</Muted>
+                    <Muted>Only visible to you</Muted>
                 </div>
-                <Switch disabled={defaultPrivate || pendingCompletion} id="view-private" bind:checked={isPrivate} />
+                <Switch id="view-private" bind:checked={isPrivate} />
             </div>
             <Dialog.Footer>
-                <Button variant="outline" disabled={saving} onclick={dismissTour}>Cancel</Button>
+                <Button variant="outline" onclick={() => (open = false)}>Cancel</Button>
                 <Button data-tour="saved-view-submit" type="submit" disabled={!canSave}>
-                    {saving ? 'Saving...' : pendingCompletion ? 'Retry guide completion' : 'Save'}
+                    {saving ? 'Saving...' : 'Save'}
                 </Button>
             </Dialog.Footer>
         </form>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 81fbdd3dcf..74ad57afcf 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -15,9 +15,7 @@
     import { serializeFilters } from '$features/events/components/filters/helpers.svelte';
     import { getOrganizationQuery, getOrganizationsQuery } from '$features/organizations/api.svelte';
     import { organization } from '$features/organizations/context.svelte';
-    import { createProductTourActions } from '$features/product-tours/actions.svelte';
-    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
-    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+    import CreateSavedViewTour from '$features/product-tours/components/create-saved-view-tour.svelte';
     import { supportsColumnWrapping } from '$features/shared/components/data-table/column-meta';
     import { getMeQuery } from '$features/users/api.svelte';
     import Building2 from '@lucide/svelte/icons/building-2';
@@ -117,23 +115,13 @@
         wrappedColumnIds
     }: Props = $props();
 
-    let isSaveDialogOpenManually = $state(false);
+    let isSaveDialogOpen = $state(false);
     let isRenameDialogOpen = $state(false);
     let isDeleteDialogOpen = $state(false);
     let isColumnDialogOpen = $state(false);
     let isMenuOpen = $state(false);
     let viewToDelete = $state<null | SavedView>(null);
-    const tourActions = createProductTourActions();
-    const savedViewCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'create-saved-view' ? productTourCheckpoint.current : undefined);
-    const isSaveDialogOpen = $derived(
-        isSaveDialogOpenManually || savedViewCheckpoint?.phase.type === 'saved-view-created' || savedViewCheckpoint?.phase.type === 'saved-view-loaded'
-    );
-    const pendingTourView = $derived.by(() => {
-        const phase = savedViewCheckpoint?.phase;
-        return phase?.type === 'saved-view-created' || phase?.type === 'saved-view-loaded'
-            ? savedViews.find((savedView) => savedView.id === phase.viewId)
-            : undefined;
-    });
+    let createSavedViewTour = $state<CreateSavedViewTour>();
 
     const organizationId = $derived(organization.current);
     const activeView = $derived(activeSavedView);
@@ -232,7 +220,7 @@
 
     async function openSaveDialog() {
         await tick();
-        isSaveDialogOpenManually = true;
+        isSaveDialogOpen = true;
     }
 
     async function openRenameDialog() {
@@ -273,32 +261,8 @@
             return;
         }
 
-        const checkpoint = savedViewCheckpoint;
-        if (checkpoint?.phase.type === 'saved-view-loaded') {
-            if (await tourActions.complete(checkpoint)) {
-                isSaveDialogOpenManually = false;
-            }
-            return;
-        }
-
-        if (checkpoint?.phase.type === 'saved-view-created') {
-            if (!pendingTourView) {
-                toast.error('The created view could not be loaded. Refresh and try again.');
-                return;
-            }
-
-            try {
-                await onLoadView(pendingTourView);
-                const loadedCheckpoint = productTourCheckpoint.advance(checkpoint, 'view-created', {
-                    type: 'saved-view-loaded',
-                    viewId: checkpoint.phase.viewId
-                });
-                if (loadedCheckpoint && (await tourActions.complete(loadedCheckpoint))) {
-                    isSaveDialogOpenManually = false;
-                }
-            } catch (error) {
-                toast.error(getErrorMessage(error, 'Failed to load the created view. Please try again.'));
-            }
+        const tour = createSavedViewTour;
+        if (tour && !tour.validateSave(isPrivate)) {
             return;
         }
 
@@ -320,25 +284,9 @@
 
         try {
             const result = await createMutation.mutateAsync(body);
-            if (checkpoint) {
-                const createdCheckpoint = productTourCheckpoint.advance(checkpoint, 'view-created', {
-                    type: 'saved-view-created',
-                    viewId: result.id
-                });
-                await onLoadView(result);
-                const loadedCheckpoint = createdCheckpoint
-                    ? productTourCheckpoint.advance(createdCheckpoint, 'view-created', {
-                          type: 'saved-view-loaded',
-                          viewId: result.id
-                      })
-                    : undefined;
-                if (loadedCheckpoint && (await tourActions.complete(loadedCheckpoint))) {
-                    isSaveDialogOpenManually = false;
-                }
-            } else {
-                isSaveDialogOpenManually = false;
-                await onLoadView(result);
-            }
+            const tourCompletion = tour ? tour.created(result) : onLoadView(result);
+            isSaveDialogOpen = false;
+            await tourCompletion;
             toast.success(`Saved view "${result.name}" created.`);
         } catch (error) {
             toast.error(getErrorMessage(error, 'Failed to save view. Please try again.'));
@@ -553,56 +501,25 @@
 
 {#if isSaveDialogOpen}
     <SaveViewDialog
-        open={isSaveDialogOpen}
-        defaultPrivate={!!savedViewCheckpoint}
+        bind:open={isSaveDialogOpen}
+        defaultPrivate={createSavedViewTour?.shouldDefaultPrivate()}
         {duplicateView}
-        onCancel={async () => {
-            if (savedViewCheckpoint) {
-                await tourActions.dismiss(savedViewCheckpoint);
-            }
-        }}
         {savedViews}
         {saving}
         onSave={handleSave}
-        onClose={() => (isSaveDialogOpenManually = false)}
-        onTourContinue={(checkpointName) => {
-            const checkpoint = savedViewCheckpoint;
-            if (checkpoint) {
-                productTourCheckpoint.advance(checkpoint, checkpointName);
-            }
-        }}
-        pendingCompletion={savedViewCheckpoint?.phase.type === 'saved-view-created' || savedViewCheckpoint?.phase.type === 'saved-view-loaded'}
-        tourCheckpointName={savedViewCheckpoint?.checkpointName}
+        onClose={() => createSavedViewTour?.closed()}
         {onLoadView}
     />
 {/if}
 
-{#if savedViewCheckpoint?.checkpointName === 'open-view-menu'}
-    <ProductTourSpotlight
-        checkpoint={savedViewCheckpoint}
-        description="Open View settings to review what a reusable saved view can remember."
-        onDismiss={tourActions.dismiss}
-        onNext={(checkpoint) => {
-            isMenuOpen = true;
-            productTourCheckpoint.advance(checkpoint, 'review-settings');
-        }}
-        target="[data-tour='saved-view-trigger']"
-        title="Open View settings"
-    />
-{:else if savedViewCheckpoint?.checkpointName === 'review-settings'}
-    <ProductTourSpotlight
-        checkpoint={savedViewCheckpoint}
-        description="Review the filters, date range, display choices, and columns. The guide will not change them for you."
-        onDismiss={tourActions.dismiss}
-        onNext={(checkpoint) => {
-            isMenuOpen = false;
-            isSaveDialogOpenManually = true;
-            productTourCheckpoint.advance(checkpoint, 'name-view');
-        }}
-        target="[data-tour='saved-view-settings']"
-        title="Configure what the view remembers"
-    />
-{/if}
+<CreateSavedViewTour
+    bind:this={createSavedViewTour}
+    closeMenu={() => (isMenuOpen = false)}
+    openMenu={() => (isMenuOpen = true)}
+    openSaveDialog={() => (isSaveDialogOpen = true)}
+    {onLoadView}
+    {savedViews}
+/>
 
 {#if isRenameDialogOpen && activeView}
     <RenameViewDialog
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 9110f2cdf7..d3244c3f8e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -7,11 +7,26 @@ export enum StackStatus {
   Discarded = "discarded",
 }
 
+export enum ProductTourTelemetryEvent {
+  Completed = "completed",
+  Dismissed = "dismissed",
+  Shown = "shown",
+  Started = "started",
+}
+
 export enum ProductTourStatus {
   Completed = "completed",
   Dismissed = "dismissed",
 }
 
+export enum ProductTourLaunchSource {
+  Automatic = "automatic",
+  Catalog = "catalog",
+  CommandPalette = "command-palette",
+  FeatureAnnouncement = "feature-announcement",
+  HelpMenu = "help-menu",
+}
+
 export enum BillingStatus {
   Trialing = 0,
   Active = 1,
@@ -81,8 +96,8 @@ export interface AdminAssistantUsageResponse {
 export interface AdminProductTourActivity {
   /** @format date-time */
   date_utc: string;
-  event: string;
-  launch_source: string;
+  event: ProductTourTelemetryEvent;
+  launch_source: ProductTourLaunchSource;
   tour_name: string;
   user_identity?: null | string;
   user_name?: null | string;
@@ -850,6 +865,7 @@ export interface ViewCurrentUser {
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
   product_tours: Record<string, ProductTourProgress>;
+  product_tour_versions: Record<string, number>;
   /** @pattern ^[a-fA-F0-9]{24}$ */
   id: string;
   organization_ids: string[];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index 0eb7c6d692..45ac028abe 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,7 +27,20 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
+export const ProductTourTelemetryEventSchema = zodEnum([
+  "completed",
+  "dismissed",
+  "shown",
+  "started",
+]);
 export const ProductTourStatusSchema = zodEnum(["completed", "dismissed"]);
+export const ProductTourLaunchSourceSchema = zodEnum([
+  "automatic",
+  "catalog",
+  "command-palette",
+  "feature-announcement",
+  "help-menu",
+]);
 export const BillingStatusSchema = union([
   literal(0),
   literal(1),
@@ -78,8 +91,8 @@ export type AdminAssistantUsageResponseFormData = Infer<
 
 export const AdminProductTourActivitySchema = object({
   date_utc: iso.datetime(),
-  event: string().min(1, "Event is required"),
-  launch_source: string().min(1, "Launch source is required"),
+  event: ProductTourTelemetryEventSchema,
+  launch_source: ProductTourLaunchSourceSchema,
   tour_name: string().min(1, "Tour name is required"),
   user_identity: string().min(1, "User identity is required").nullable(),
   user_name: string().min(1, "User name is required").nullable(),
@@ -985,6 +998,7 @@ export const ViewCurrentUserSchema = object({
     string(),
     lazy(() => ProductTourProgressSchema),
   ),
+  product_tour_versions: record(string(), number()).optional(),
   id: string()
     .length(24, "Id must be exactly 24 characters")
     .regex(/^[a-fA-F0-9]{24}$/, "Id has invalid format"),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index df33ceb996..5e77ef3470 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -740,6 +740,7 @@
                       pathname: page.url.pathname,
                       projects
                   },
+                  meQuery.data?.product_tour_versions ?? {},
                   meQuery.data?.product_tours
               )
             : []
diff --git a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
index 04b1b616f8..475360e1ed 100644
--- a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
@@ -1,3 +1,5 @@
+using Exceptionless.Core.Models.Data;
+
 namespace Exceptionless.Web.Models.Admin;
 
 public sealed record AdminProductTourUsageResponse(
@@ -18,8 +20,8 @@ public sealed record AdminProductTourSummary(
 
 public sealed record AdminProductTourActivity(
     DateTime DateUtc,
-    string Event,
-    string LaunchSource,
+    ProductTourTelemetryEvent Event,
+    ProductTourLaunchSource LaunchSource,
     string TourName,
     string? UserIdentity,
     string? UserName,
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index 831150634f..af109dfdae 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -34,6 +34,7 @@ public ViewCurrentUser(User user, IntercomOptions options)
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; set; }
     public IDictionary<string, ProductTourProgress> ProductTours { get; set; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
+    public IReadOnlyDictionary<string, int> ProductTourVersions { get; } = Exceptionless.Core.Models.Data.ProductTours.Versions;
 
     private static string? HMACSHA256HashString(string value, IntercomOptions options)
     {
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 0859b7dc1e..1b9e665694 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -11843,10 +11843,10 @@
             "format": "date-time"
           },
           "event": {
-            "type": "string"
+            "$ref": "#/components/schemas/ProductTourTelemetryEvent"
           },
           "launch_source": {
-            "type": "string"
+            "$ref": "#/components/schemas/ProductTourLaunchSource"
           },
           "tour_name": {
             "type": "string"
@@ -13491,6 +13491,22 @@
           }
         }
       },
+      "ProductTourLaunchSource": {
+        "enum": [
+          "automatic",
+          "catalog",
+          "command-palette",
+          "feature-announcement",
+          "help-menu"
+        ],
+        "x-enumNames": [
+          "Automatic",
+          "Catalog",
+          "CommandPalette",
+          "FeatureAnnouncement",
+          "HelpMenu"
+        ]
+      },
       "ProductTourProgress": {
         "required": [
           "status",
@@ -13522,6 +13538,20 @@
           "Dismissed"
         ]
       },
+      "ProductTourTelemetryEvent": {
+        "enum": [
+          "completed",
+          "dismissed",
+          "shown",
+          "started"
+        ],
+        "x-enumNames": [
+          "Completed",
+          "Dismissed",
+          "Shown",
+          "Started"
+        ]
+      },
       "ResetPasswordModel": {
         "required": [
           "password_reset_token",
@@ -14433,6 +14463,14 @@
               "$ref": "#/components/schemas/ProductTourProgress"
             }
           },
+          "product_tour_versions": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "readOnly": true
+          },
           "id": {
             "maxLength": 24,
             "minLength": 24,
@@ -15279,4 +15317,4 @@
       "name": "Source Map"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index e68ddc0fb9..4b579de86a 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories;
@@ -45,6 +46,20 @@ public async Task UpdateCurrentUserProductTourAsync_NewProgress_PersistsAndRetur
         Assert.Equal(progress, persistedUser.ProductTours["ui-overview"]);
     }
 
+    [Fact]
+    public async Task GetCurrentUserAsync_ReturnsAuthoritativeProductTourVersions()
+    {
+        var currentUser = await SendRequestAsAsync<JsonElement>(request => request
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me")
+            .StatusCodeShouldBeOk());
+
+        var versions = currentUser.GetProperty("product_tour_versions")
+            .Deserialize<Dictionary<string, int>>();
+
+        Assert.Equal(ProductTours.Versions, versions);
+    }
+
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStoredValue()
     {
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index dd037d56b7..196877c9d5 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -64,14 +64,14 @@ await CreateDataAsync(builder =>
                 .UserIdentity("user-7");
         });
 
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1));
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1), recentLimit: 3);
 
-        Assert.Equal(5, result.RecentEvents.Count);
+        Assert.Equal(3, result.RecentEvents.Count);
         Assert.Equal(2, result.Tours.Count);
         var overview = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.UiOverview, StringComparison.Ordinal));
         Assert.Equal(3, overview.UniqueUsers);
-        Assert.Equal(4, overview.Buckets.Where(bucket => String.Equals(bucket.Source.Event, "started", StringComparison.Ordinal)).Sum(bucket => bucket.Count));
-        Assert.Equal(1, overview.Buckets.Where(bucket => String.Equals(bucket.Source.Event, "completed", StringComparison.Ordinal)).Sum(bucket => bucket.Count));
+        Assert.Equal(4, overview.Buckets.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started).Sum(bucket => bucket.Count));
+        Assert.Equal(1, overview.Buckets.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Completed).Sum(bucket => bucket.Count));
         Assert.Equal(month.AddDays(8), overview.Buckets.Max(bucket => bucket.LastUtc));
 
         var welcome = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.Welcome, StringComparison.Ordinal));

From 160a65b089bfc9df5abda68bfe421b720c35d374 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 29 Aug 2026 10:23:28 -0500
Subject: [PATCH 06/43] Minimize guided tour integration surface

---
 .../components/product-tour-host.svelte       |   4 +-
 .../src/routes/(app)/event/+page.svelte       |  75 ++++-
 .../src/routes/(app)/event/query-filters.ts   |  70 -----
 .../[projectId]/configure/+page.svelte        |   5 +-
 .../(app)/system/product-tours/+page.svelte   |   6 +-
 .../Api/Endpoints/OAuthGrantEndpointTests.cs  | 280 ------------------
 .../Api/Endpoints/UserEndpointTests.cs        | 251 ++++++++++++++++
 7 files changed, 332 insertions(+), 359 deletions(-)
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
 delete mode 100644 tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 735ee4de5b..b1e9d10e1c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -37,6 +37,8 @@
         stateSettled: boolean;
     }
 
+    const EVENT_PATH = resolve('/(app)/event');
+    const STACK_PATH = resolve('/(app)/stack');
     const SYSTEM_PATH = resolve('/(app)/system');
 
     let {
@@ -96,7 +98,7 @@
             stateSettled &&
             currentUser &&
             assistantAccess?.enabled &&
-            (pathname.startsWith('/next/event') || pathname.startsWith('/next/stack')) &&
+            (pathname.startsWith(EVENT_PATH) || pathname.startsWith(STACK_PATH)) &&
             !isSetupPage &&
             !isImpersonating &&
             !checkpoint &&
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index 5d41eb6981..5b34277341 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -79,8 +79,6 @@
         redirectToEventsWithFilter,
         serializeTimeQueryParam
     } from '../redirect-to-events.svelte';
-    import { getEventQueryFilters } from './query-filters';
-
     let selectedEventId: null | string = $state(null);
     const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
 
@@ -148,6 +146,77 @@
         return filter || null;
     }
 
+    function getQueryFilters(params: ListFilterQueryParams = queryParams): FacetedFilter.IFilter[] | null {
+        const filters: FacetedFilter.IFilter[] = [];
+
+        if (params.project) {
+            filters.push(new ProjectFilter(splitQueryParam(params.project)));
+        }
+
+        if (params.stack) {
+            filters.push(new StringFilter('stack', params.stack));
+        }
+
+        const bot = parseBooleanQueryParam(params.bot);
+        if (bot !== undefined) {
+            filters.push(new BooleanFilter('bot', bot));
+        }
+
+        const first = parseBooleanQueryParam(params.first);
+        if (first !== undefined) {
+            filters.push(new BooleanFilter('first', first));
+        }
+
+        if (params.level) {
+            filters.push(new LevelFilter(splitQueryParam(params.level) as never[]));
+        }
+
+        if (params.reference) {
+            filters.push(new ReferenceFilter(params.reference));
+        }
+
+        if (params.session) {
+            filters.push(new SessionFilter(params.session));
+        }
+
+        if (params.status) {
+            filters.push(new StatusFilter(splitQueryParam(params.status) as never[]));
+        }
+
+        if (params.tag) {
+            filters.push(new TagFilter(splitQueryParam(params.tag) as never[]));
+        }
+
+        if (params.type) {
+            filters.push(new TypeFilter(splitQueryParam(params.type) as never[]));
+        }
+
+        if (params.version) {
+            filters.push(new VersionFilter('version', params.version));
+        }
+
+        return filters.length > 0 ? filters : null;
+    }
+
+    function parseBooleanQueryParam(value: null | string | undefined): boolean | undefined {
+        if (value === 'true') {
+            return true;
+        }
+
+        if (value === 'false') {
+            return false;
+        }
+
+        return undefined;
+    }
+
+    function splitQueryParam(value: string): string[] {
+        return value
+            .split(',')
+            .map((item) => item.trim())
+            .filter((item) => item);
+    }
+
     function getEffectiveSort(): null | string | undefined {
         if (queryParams.sort != null) {
             return queryParams.sort || undefined;
@@ -268,7 +337,7 @@
 
     function getCurrentFiltersWithoutTime(params: ListFilterQueryParams = queryParams): FacetedFilter.IFilter[] {
         const savedViewFilters = getSavedViewFilters();
-        const queryFilters = getEventQueryFilters(params) ?? [];
+        const queryFilters = getQueryFilters(params) ?? [];
         const expressionFilters =
             params.filter != null ? getFiltersFromCache(filterCacheKey(params.filter), params.filter).filter((filter) => filter.type !== 'date') : [];
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
deleted file mode 100644
index 99b0685152..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/query-filters.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { PersistentEventKnownTypes } from '$features/events/models';
-import type { LogLevel } from '$features/events/models/event-data';
-
-import * as FacetedFilter from '$comp/faceted-filter';
-import {
-    BooleanFilter,
-    LevelFilter,
-    ProjectFilter,
-    ReferenceFilter,
-    SessionFilter,
-    StatusFilter,
-    StringFilter,
-    TagFilter,
-    TypeFilter,
-    VersionFilter
-} from '$features/events/components/filters';
-import { StackStatus } from '$features/stacks/models';
-
-import type { ListFilterQueryParams } from '../redirect-to-events.svelte';
-
-export function getEventQueryFilters(params: ListFilterQueryParams): FacetedFilter.IFilter[] | null {
-    const filters: FacetedFilter.IFilter[] = [];
-
-    if (params.project) {
-        filters.push(new ProjectFilter(splitQueryParam(params.project)));
-    }
-    if (params.stack) {
-        filters.push(new StringFilter('stack', params.stack));
-    }
-
-    addBooleanFilter(filters, 'bot', params.bot);
-    addBooleanFilter(filters, 'first', params.first);
-
-    if (params.level) {
-        filters.push(new LevelFilter(splitQueryParam(params.level) as LogLevel[]));
-    }
-    if (params.reference) {
-        filters.push(new ReferenceFilter(params.reference));
-    }
-    if (params.session) {
-        filters.push(new SessionFilter(params.session));
-    }
-    if (params.status) {
-        filters.push(new StatusFilter(splitQueryParam(params.status) as StackStatus[]));
-    }
-    if (params.tag) {
-        filters.push(new TagFilter(splitQueryParam(params.tag) as PersistentEventKnownTypes[]));
-    }
-    if (params.type) {
-        filters.push(new TypeFilter(splitQueryParam(params.type) as PersistentEventKnownTypes[]));
-    }
-    if (params.version) {
-        filters.push(new VersionFilter('version', params.version));
-    }
-
-    return filters.length > 0 ? filters : null;
-}
-
-function addBooleanFilter(filters: FacetedFilter.IFilter[], field: 'bot' | 'first', value: null | string | undefined): void {
-    if (value === 'true' || value === 'false') {
-        filters.push(new BooleanFilter(field, value === 'true'));
-    }
-}
-
-function splitQueryParam(value: string): string[] {
-    return value
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean);
-}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index 6a0458f4ff..ab73f50656 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -444,7 +444,8 @@ public partial class App : Application {
     });
 
     async function refreshConfiguredProject(): Promise<void> {
-        if (!queryParams.redirect) {
+        const checkpoint = configureCheckpoint;
+        if (!queryParams.redirect || !checkpoint) {
             return;
         }
 
@@ -453,7 +454,7 @@ public partial class App : Application {
             return;
         }
 
-        if (configureCheckpoint && !(await tourActions.complete(configureCheckpoint))) {
+        if (!(await tourActions.complete(checkpoint))) {
             return;
         }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index d20d291eb6..ddf6b428b6 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -58,7 +58,7 @@
                 {:else if usage?.tours.length === 0}
                     <p class="text-muted-foreground px-4 py-10 text-center text-sm">No guided-tour activity was recorded for this month.</p>
                 {:else}
-                    <Table.Root>
+                    <Table.Root aria-label="Tour outcomes" class="min-w-4xl">
                         <Table.Header>
                             <Table.Row>
                                 <Table.Head class="pl-4">Tour</Table.Head>
@@ -113,7 +113,7 @@
                 {#if usage?.recent_activity.length === 0}
                     <p class="text-muted-foreground px-4 py-10 text-center text-sm">No recent tour activity was recorded.</p>
                 {:else}
-                    <Table.Root>
+                    <Table.Root aria-label="Recent guided-tour activity" class="min-w-3xl">
                         <Table.Header>
                             <Table.Row>
                                 <Table.Head class="pl-4">User</Table.Head>
@@ -124,7 +124,7 @@
                             </Table.Row>
                         </Table.Header>
                         <Table.Body>
-                            {#each usage?.recent_activity ?? [] as activity (`${activity.date_utc}-${activity.user_identity}-${activity.event}-${activity.tour_name}`)}
+                            {#each usage?.recent_activity ?? [] as activity (activity)}
                                 <Table.Row>
                                     <Table.Cell class="pl-4">
                                         <div class="font-medium">{activity.user_name || activity.user_identity || 'Unknown user'}</div>
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs
deleted file mode 100644
index e125d7ff0f..0000000000
--- a/tests/Exceptionless.Tests/Api/Endpoints/OAuthGrantEndpointTests.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-using Exceptionless.Core.Authorization;
-using Exceptionless.Core.Extensions;
-using Exceptionless.Core.Models;
-using Exceptionless.Core.Repositories;
-using Exceptionless.Core.Services;
-using Exceptionless.Core.Utility;
-using Exceptionless.Tests.Extensions;
-using Exceptionless.Web.Models.OAuth;
-using Foundatio.Repositories;
-using Foundatio.Repositories.Utility;
-using Xunit;
-
-namespace Exceptionless.Tests.Api.Endpoints;
-
-public sealed class OAuthGrantEndpointTests : IntegrationTestsBase
-{
-    private readonly IOAuthApplicationRepository _oauthApplicationRepository;
-    private readonly IOAuthTokenRepository _oauthTokenRepository;
-    private readonly IUserRepository _userRepository;
-
-    public OAuthGrantEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
-    {
-        _oauthApplicationRepository = GetService<IOAuthApplicationRepository>();
-        _oauthTokenRepository = GetService<IOAuthTokenRepository>();
-        _userRepository = GetService<IUserRepository>();
-    }
-
-    protected override async Task ResetDataAsync()
-    {
-        await base.ResetDataAsync();
-        await GetService<SampleDataService>().CreateDataAsync();
-    }
-
-    [Fact]
-    public async Task GetOAuthGrantsAsync_WithActiveOAuthTokens_ReturnsGroupedApplications()
-    {
-        // Arrange
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-
-        const string clientId = "test-oauth-grant-client";
-        await CreateOAuthApplicationAsync(clientId, "Test AI Client");
-        string grantId = StringExtensions.GetNewToken();
-        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], grantId: grantId);
-        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.StacksRead], grantId: grantId);
-        await CreateOAuthGrantTokenAsync(user.Id, "disabled-oauth-grant-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], isDisabled: true);
-
-        // Act
-        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
-            .AsTestOrganizationUser()
-            .AppendPath("users/me/oauth-grants")
-            .StatusCodeShouldBeOk()
-        );
-
-        // Assert
-        Assert.NotNull(grants);
-        var grant = Assert.Single(grants);
-        Assert.Equal(clientId, grant.ClientId);
-        Assert.Equal("Test AI Client", grant.ApplicationName);
-        Assert.Contains(SampleDataService.TEST_ORG_ID, grant.OrganizationIds);
-        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
-        Assert.Contains(AuthorizationRoles.StacksRead, grant.Scopes);
-        Assert.Equal(2, grant.Resources.Count);
-        Assert.Contains(grant.Resources, resource => String.Equals(resource.Resource, "http://localhost:7110/mcp", StringComparison.Ordinal) && resource.Scopes.Contains(AuthorizationRoles.McpRead));
-        Assert.Contains(grant.Resources, resource => String.Equals(resource.Resource, "http://localhost:7110/api/v2", StringComparison.Ordinal) && resource.Scopes.Contains(AuthorizationRoles.StacksRead));
-    }
-
-    [Fact]
-    public async Task GetOAuthGrantsAsync_WhenDisabledTokensExceedPageLimit_ReturnsActiveGrant()
-    {
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        const string clientId = "paged-oauth-grant-client";
-        await CreateOAuthApplicationAsync(clientId, "Paged OAuth Grant Client");
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var disabledTokens = Enumerable.Range(0, 1005)
-            .Select(i => CreateOAuthGrantToken(user.Id, $"disabled-paged-client-{i}", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], utcNow.AddMinutes(1), isDisabled: true))
-            .ToArray();
-        await _oauthTokenRepository.AddAsync(disabledTokens, o => o.ImmediateConsistency());
-        string grantId = StringExtensions.GetNewToken();
-        await _oauthTokenRepository.AddAsync(CreateOAuthGrantToken(
-            user.Id,
-            clientId,
-            "http://localhost:7110/mcp",
-            [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess],
-            utcNow,
-            grantId: grantId), o => o.ImmediateConsistency());
-
-        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
-            .AsTestOrganizationUser()
-            .AppendPath("users/me/oauth-grants")
-            .StatusCodeShouldBeOk()
-        );
-
-        Assert.NotNull(grants);
-        var grant = Assert.Single(grants);
-        Assert.Equal(clientId, grant.ClientId);
-        Assert.Equal("Paged OAuth Grant Client", grant.ApplicationName);
-        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_WithCurrentUserGrant_DisablesAllClientTokens()
-    {
-        // Arrange
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-
-        const string clientId = "test-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Revoked AI Client");
-        await CreateOAuthApplicationAsync("unrelated-revoke-client", "Unrelated AI Client");
-        var firstToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
-        var secondToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess]);
-        var unrelatedToken = await CreateOAuthGrantTokenAsync(user.Id, "unrelated-revoke-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
-
-        // Act
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", firstToken.GrantId!)
-            .StatusCodeShouldBeNoContent()
-        );
-
-        // Assert
-        var revokedFirstToken = await _oauthTokenRepository.GetByIdAsync(firstToken.Id, o => o.ImmediateConsistency());
-        var revokedSecondToken = await _oauthTokenRepository.GetByIdAsync(secondToken.Id, o => o.ImmediateConsistency());
-        var stillActiveToken = await _oauthTokenRepository.GetByIdAsync(unrelatedToken.Id, o => o.ImmediateConsistency());
-        Assert.NotNull(revokedFirstToken);
-        Assert.NotNull(revokedSecondToken);
-        Assert.NotNull(stillActiveToken);
-        Assert.True(revokedFirstToken.IsDisabled);
-        Assert.True(revokedSecondToken.IsDisabled);
-        Assert.Null(revokedFirstToken.RefreshTokenHash);
-        Assert.Null(revokedSecondToken.RefreshTokenHash);
-        Assert.False(stillActiveToken.IsDisabled);
-        Assert.NotNull(stillActiveToken.RefreshTokenHash);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_WhenClientTokensExceedPageLimit_DisablesAllClientTokens()
-    {
-        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        const string clientId = "paged-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Paged Revoke Client");
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var tokens = Enumerable.Range(0, 1005)
-            .Select(i => CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], utcNow))
-            .ToList();
-        string targetGrantId = StringExtensions.GetNewToken();
-        var targetToken = CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], utcNow, grantId: targetGrantId);
-        tokens.Add(targetToken);
-        await _oauthTokenRepository.AddAsync(tokens, o => o.ImmediateConsistency());
-
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", targetGrantId)
-            .StatusCodeShouldBeNoContent()
-        );
-
-        var results = await _oauthTokenRepository.GetByUserIdAndClientIdForUpdateAsync(user.Id, clientId, o => o.ImmediateConsistency().SearchAfterPaging().PageLimit(1000));
-        int tokenCount = 0;
-        do
-        {
-            foreach (var token in results.Documents)
-            {
-                tokenCount++;
-                Assert.True(token.IsDisabled);
-                Assert.Null(token.RefreshTokenHash);
-            }
-        } while (await results.NextPageAsync());
-
-        Assert.Equal(tokens.Count, tokenCount);
-    }
-
-    [Fact]
-    public async Task RevokeOAuthGrantAsync_ForAnotherUserGrant_ReturnsNotFound()
-    {
-        // Arrange
-        var freeUser = await _userRepository.GetByEmailAddressAsync(SampleDataService.FREE_USER_EMAIL);
-        Assert.NotNull(freeUser);
-
-        const string clientId = "other-user-revoke-client";
-        await CreateOAuthApplicationAsync(clientId, "Other User AI Client");
-        var token = await CreateOAuthGrantTokenAsync(freeUser.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], organizationIds: [SampleDataService.FREE_ORG_ID]);
-
-        // Act
-        await SendRequestAsync(r => r
-            .Delete()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "oauth-grants", token.GrantId!)
-            .StatusCodeShouldBeNotFound()
-        );
-
-        // Assert
-        var storedToken = await _oauthTokenRepository.GetByIdAsync(token.Id, o => o.ImmediateConsistency());
-        Assert.NotNull(storedToken);
-        Assert.False(storedToken.IsDisabled);
-        Assert.NotNull(storedToken.RefreshTokenHash);
-    }
-    private Task<OAuthApplication> CreateOAuthApplicationAsync(string clientId, string name)
-    {
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var application = new OAuthApplication
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            ClientId = clientId,
-            Name = name,
-            RedirectUris = ["http://localhost/callback"],
-            Scopes =
-            [
-                AuthorizationRoles.McpRead,
-                AuthorizationRoles.ProjectsRead,
-                AuthorizationRoles.StacksRead,
-                AuthorizationRoles.StacksWrite,
-                AuthorizationRoles.EventsRead,
-                AuthorizationRoles.OfflineAccess
-            ],
-            CreatedByUserId = OAuthApplication.SystemUserId,
-            UpdatedByUserId = OAuthApplication.SystemUserId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-
-        return _oauthApplicationRepository.AddAsync(application, o => o.ImmediateConsistency());
-    }
-
-    private async Task<OAuthToken> CreateOAuthGrantTokenAsync(string userId, string clientId, string resource, string[] scopes, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
-    {
-        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
-        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
-        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
-        var token = new OAuthToken
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            UserId = userId,
-            ClientId = clientId,
-            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
-            Resource = resource,
-            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
-            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
-            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
-            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
-            ExpiresUtc = utcNow.AddHours(1),
-            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
-            IsDisabled = isDisabled,
-            CreatedBy = userId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-
-        await _oauthTokenRepository.AddAsync(token, o => o.ImmediateConsistency());
-        return token;
-    }
-
-    private static OAuthToken CreateOAuthGrantToken(string userId, string clientId, string resource, string[] scopes, DateTime utcNow, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
-    {
-        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
-        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
-        return new OAuthToken
-        {
-            Id = ObjectId.GenerateNewId().ToString(),
-            UserId = userId,
-            ClientId = clientId,
-            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
-            Resource = resource,
-            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
-            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
-            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
-            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
-            ExpiresUtc = utcNow.AddHours(1),
-            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
-            IsDisabled = isDisabled,
-            CreatedBy = userId,
-            CreatedUtc = utcNow,
-            UpdatedUtc = utcNow
-        };
-    }
-}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
index f05a690a5b..2bcd528a36 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/UserEndpointTests.cs
@@ -8,6 +8,7 @@
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Web.Api.Results;
 using Exceptionless.Web.Models;
+using Exceptionless.Web.Models.OAuth;
 using Exceptionless.Web.Utility;
 using FluentRest;
 using Foundatio.Repositories;
@@ -19,10 +20,14 @@ namespace Exceptionless.Tests.Api.Endpoints;
 public sealed class UserEndpointTests : IntegrationTestsBase
 {
     private readonly IUserRepository _userRepository;
+    private readonly IOAuthApplicationRepository _oauthApplicationRepository;
+    private readonly IOAuthTokenRepository _oauthTokenRepository;
 
     public UserEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
     {
         _userRepository = GetService<IUserRepository>();
+        _oauthApplicationRepository = GetService<IOAuthApplicationRepository>();
+        _oauthTokenRepository = GetService<IOAuthTokenRepository>();
     }
 
     protected override async Task ResetDataAsync()
@@ -427,6 +432,174 @@ public async Task GetCurrentUserAsync_WithAvatar_ReturnsRoutableAvatarUrl()
         Assert.Equal($"/api/v2/users/{currentUser.Id}/avatar/avatar.png", user.AvatarUrl);
     }
 
+    [Fact]
+    public async Task GetOAuthGrantsAsync_WithActiveOAuthTokens_ReturnsGroupedApplications()
+    {
+        // Arrange
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+
+        const string clientId = "test-oauth-grant-client";
+        await CreateOAuthApplicationAsync(clientId, "Test AI Client");
+        string grantId = StringExtensions.GetNewToken();
+        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], grantId: grantId);
+        await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.StacksRead], grantId: grantId);
+        await CreateOAuthGrantTokenAsync(user.Id, "disabled-oauth-grant-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], isDisabled: true);
+
+        // Act
+        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
+            .AsTestOrganizationUser()
+            .AppendPath("users/me/oauth-grants")
+            .StatusCodeShouldBeOk()
+        );
+
+        // Assert
+        Assert.NotNull(grants);
+        var grant = Assert.Single(grants);
+        Assert.Equal(clientId, grant.ClientId);
+        Assert.Equal("Test AI Client", grant.ApplicationName);
+        Assert.Contains(SampleDataService.TEST_ORG_ID, grant.OrganizationIds);
+        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
+        Assert.Contains(AuthorizationRoles.StacksRead, grant.Scopes);
+        Assert.Equal(2, grant.Resources.Count);
+        Assert.Contains(grant.Resources, r => r.Resource == "http://localhost:7110/mcp" && r.Scopes.Contains(AuthorizationRoles.McpRead));
+        Assert.Contains(grant.Resources, r => r.Resource == "http://localhost:7110/api/v2" && r.Scopes.Contains(AuthorizationRoles.StacksRead));
+    }
+
+    [Fact]
+    public async Task GetOAuthGrantsAsync_WhenDisabledTokensExceedPageLimit_ReturnsActiveGrant()
+    {
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+        const string clientId = "paged-oauth-grant-client";
+        await CreateOAuthApplicationAsync(clientId, "Paged OAuth Grant Client");
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var disabledTokens = Enumerable.Range(0, 1005)
+            .Select(i => CreateOAuthGrantToken(user.Id, $"disabled-paged-client-{i}", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead], utcNow.AddMinutes(1), isDisabled: true))
+            .ToArray();
+        await _oauthTokenRepository.AddAsync(disabledTokens, o => o.ImmediateConsistency());
+        string grantId = StringExtensions.GetNewToken();
+        await _oauthTokenRepository.AddAsync(CreateOAuthGrantToken(
+            user.Id,
+            clientId,
+            "http://localhost:7110/mcp",
+            [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess],
+            utcNow,
+            grantId: grantId), o => o.ImmediateConsistency());
+
+        var grants = await SendRequestAsAsync<IReadOnlyCollection<ViewOAuthGrant>>(r => r
+            .AsTestOrganizationUser()
+            .AppendPath("users/me/oauth-grants")
+            .StatusCodeShouldBeOk()
+        );
+
+        Assert.NotNull(grants);
+        var grant = Assert.Single(grants);
+        Assert.Equal(clientId, grant.ClientId);
+        Assert.Equal("Paged OAuth Grant Client", grant.ApplicationName);
+        Assert.Contains(AuthorizationRoles.McpRead, grant.Scopes);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_WithCurrentUserGrant_DisablesAllClientTokens()
+    {
+        // Arrange
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+
+        const string clientId = "test-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Revoked AI Client");
+        await CreateOAuthApplicationAsync("unrelated-revoke-client", "Unrelated AI Client");
+        var firstToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
+        var secondToken = await CreateOAuthGrantTokenAsync(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess]);
+        var unrelatedToken = await CreateOAuthGrantTokenAsync(user.Id, "unrelated-revoke-client", "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess]);
+
+        // Act
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", firstToken.GrantId!)
+            .StatusCodeShouldBeNoContent()
+        );
+
+        // Assert
+        var revokedFirstToken = await _oauthTokenRepository.GetByIdAsync(firstToken.Id, o => o.ImmediateConsistency());
+        var revokedSecondToken = await _oauthTokenRepository.GetByIdAsync(secondToken.Id, o => o.ImmediateConsistency());
+        var stillActiveToken = await _oauthTokenRepository.GetByIdAsync(unrelatedToken.Id, o => o.ImmediateConsistency());
+        Assert.NotNull(revokedFirstToken);
+        Assert.NotNull(revokedSecondToken);
+        Assert.NotNull(stillActiveToken);
+        Assert.True(revokedFirstToken.IsDisabled);
+        Assert.True(revokedSecondToken.IsDisabled);
+        Assert.Null(revokedFirstToken.RefreshTokenHash);
+        Assert.Null(revokedSecondToken.RefreshTokenHash);
+        Assert.False(stillActiveToken.IsDisabled);
+        Assert.NotNull(stillActiveToken.RefreshTokenHash);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_WhenClientTokensExceedPageLimit_DisablesAllClientTokens()
+    {
+        var user = await _userRepository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+        const string clientId = "paged-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Paged Revoke Client");
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var tokens = Enumerable.Range(0, 1005)
+            .Select(i => CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], utcNow))
+            .ToList();
+        string targetGrantId = StringExtensions.GetNewToken();
+        var targetToken = CreateOAuthGrantToken(user.Id, clientId, "http://localhost:7110/api/v2", [AuthorizationRoles.ProjectsRead, AuthorizationRoles.OfflineAccess], utcNow, grantId: targetGrantId);
+        tokens.Add(targetToken);
+        await _oauthTokenRepository.AddAsync(tokens, o => o.ImmediateConsistency());
+
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", targetGrantId)
+            .StatusCodeShouldBeNoContent()
+        );
+
+        var results = await _oauthTokenRepository.GetByUserIdAndClientIdForUpdateAsync(user.Id, clientId, o => o.ImmediateConsistency().SearchAfterPaging().PageLimit(1000));
+        int tokenCount = 0;
+        do
+        {
+            foreach (var token in results.Documents)
+            {
+                tokenCount++;
+                Assert.True(token.IsDisabled);
+                Assert.Null(token.RefreshTokenHash);
+            }
+        } while (await results.NextPageAsync());
+
+        Assert.Equal(tokens.Count, tokenCount);
+    }
+
+    [Fact]
+    public async Task RevokeOAuthGrantAsync_ForAnotherUserGrant_ReturnsNotFound()
+    {
+        // Arrange
+        var freeUser = await _userRepository.GetByEmailAddressAsync(SampleDataService.FREE_USER_EMAIL);
+        Assert.NotNull(freeUser);
+
+        const string clientId = "other-user-revoke-client";
+        await CreateOAuthApplicationAsync(clientId, "Other User AI Client");
+        var token = await CreateOAuthGrantTokenAsync(freeUser.Id, clientId, "http://localhost:7110/mcp", [AuthorizationRoles.McpRead, AuthorizationRoles.OfflineAccess], organizationIds: [SampleDataService.FREE_ORG_ID]);
+
+        // Act
+        await SendRequestAsync(r => r
+            .Delete()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "oauth-grants", token.GrantId!)
+            .StatusCodeShouldBeNotFound()
+        );
+
+        // Assert
+        var storedToken = await _oauthTokenRepository.GetByIdAsync(token.Id, o => o.ImmediateConsistency());
+        Assert.NotNull(storedToken);
+        Assert.False(storedToken.IsDisabled);
+        Assert.NotNull(storedToken.RefreshTokenHash);
+    }
 
     [Fact]
     public async Task UploadAvatarAsync_ImageOverGlobalRequestLimit_ReturnsUpdatedUser()
@@ -789,6 +962,84 @@ await SendRequestAsync(r => r
         Assert.Null(updatedUser.VerifyEmailAddressToken);
     }
 
+    private Task<OAuthApplication> CreateOAuthApplicationAsync(string clientId, string name)
+    {
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var application = new OAuthApplication
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            ClientId = clientId,
+            Name = name,
+            RedirectUris = ["http://localhost/callback"],
+            Scopes =
+            [
+                AuthorizationRoles.McpRead,
+                AuthorizationRoles.ProjectsRead,
+                AuthorizationRoles.StacksRead,
+                AuthorizationRoles.StacksWrite,
+                AuthorizationRoles.EventsRead,
+                AuthorizationRoles.OfflineAccess
+            ],
+            CreatedByUserId = OAuthApplication.SystemUserId,
+            UpdatedByUserId = OAuthApplication.SystemUserId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+
+        return _oauthApplicationRepository.AddAsync(application, o => o.ImmediateConsistency());
+    }
+
+    private async Task<OAuthToken> CreateOAuthGrantTokenAsync(string userId, string clientId, string resource, string[] scopes, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
+    {
+        var utcNow = TimeProvider.GetUtcNow().UtcDateTime;
+        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
+        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
+        var token = new OAuthToken
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            UserId = userId,
+            ClientId = clientId,
+            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
+            Resource = resource,
+            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
+            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
+            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
+            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
+            ExpiresUtc = utcNow.AddHours(1),
+            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
+            IsDisabled = isDisabled,
+            CreatedBy = userId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+
+        await _oauthTokenRepository.AddAsync(token, o => o.ImmediateConsistency());
+        return token;
+    }
+
+    private static OAuthToken CreateOAuthGrantToken(string userId, string clientId, string resource, string[] scopes, DateTime utcNow, bool isDisabled = false, string[]? organizationIds = null, string? grantId = null)
+    {
+        var accessToken = StringExtensions.GetRandomString(OAuthService.OAuthTokenLength);
+        var refreshToken = scopes.Contains(AuthorizationRoles.OfflineAccess, StringComparer.Ordinal) ? StringExtensions.GetRandomString(OAuthService.OAuthTokenLength) : null;
+        return new OAuthToken
+        {
+            Id = ObjectId.GenerateNewId().ToString(),
+            UserId = userId,
+            ClientId = clientId,
+            GrantId = String.IsNullOrWhiteSpace(grantId) ? StringExtensions.GetNewToken() : grantId,
+            Resource = resource,
+            AccessTokenHash = OAuthService.CreateTokenHash(accessToken),
+            RefreshTokenHash = refreshToken is null ? null : OAuthService.CreateTokenHash(refreshToken),
+            Scopes = scopes.ToHashSet(StringComparer.Ordinal),
+            OrganizationIds = (organizationIds ?? [SampleDataService.TEST_ORG_ID]).ToHashSet(StringComparer.Ordinal),
+            ExpiresUtc = utcNow.AddHours(1),
+            RefreshExpiresUtc = refreshToken is not null ? utcNow.AddDays(30) : null,
+            IsDisabled = isDisabled,
+            CreatedBy = userId,
+            CreatedUtc = utcNow,
+            UpdatedUtc = utcNow
+        };
+    }
 
     private async Task<ViewUser> GetTestOrganizationUserAsync()
     {

From c58579cb1ad3e92ae7cf75bb083eb8a9e3c43e90 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 29 Aug 2026 12:09:42 -0500
Subject: [PATCH 07/43] Harden guided tour architecture

---
 .../Models/Data/ProductTourProgress.cs        |  13 +-
 .../Models/Data/ProductTours.cs               |  31 +-
 .../Repositories/EventRepository.cs           | 133 ++------
 .../Repositories/ProductTourUsageResult.cs    |   4 +-
 .../Api/Endpoints/AdminEndpoints.cs           |   2 +-
 .../Api/Handlers/AdminHandler.cs              |  32 +-
 .../Api/Handlers/UserHandler.cs               |   1 -
 .../ClientApp/e2e/fixtures/api-client.ts      |   2 +-
 .../ClientApp/e2e/fixtures/e2e-test.ts        |   2 +-
 .../ClientApp/e2e/tests/chart-refresh.e2e.ts  |   2 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  18 +-
 .../src/lib/features/admin/api.svelte.ts      |   6 +-
 .../src/lib/features/admin/models.ts          |   5 +-
 .../investigation-detail-tour.svelte          |   4 +-
 .../components/investigation-list-tour.svelte |   2 +-
 .../features/product-tours/catalog.test.ts    |  30 +-
 .../src/lib/features/product-tours/catalog.ts |  40 ++-
 .../product-tour-catalog-dialog.svelte        |   5 +-
 .../product-tour-welcome-dialog.svelte        |   2 +-
 ...product-tour-welcome-dialog.svelte.test.ts |   2 +-
 .../components/product-tour-host.svelte       |  50 ++-
 .../product-tour-shell-spotlight.svelte       |  10 +-
 ...r.svelte => saved-view-create-tour.svelte} |   4 +-
 .../product-tours/eligibility.test.ts         |  10 +-
 .../product-tours/session.svelte.test.ts      |   2 +-
 .../src/lib/features/product-tours/session.ts |   8 +-
 .../product-tours/state.svelte.test.ts        |   2 +-
 .../features/product-tours/telemetry.test.ts  |   4 +-
 .../src/lib/features/product-tours/types.ts   |  22 +-
 .../components/saved-view-picker.svelte       |  14 +-
 .../stacks/components/stack-card.svelte       |  10 +-
 .../ClientApp/src/lib/generated/api.ts        |  87 +++---
 .../ClientApp/src/lib/generated/schemas.ts    |  75 +++--
 .../navigation-command.svelte.test.ts         |   4 +-
 .../ClientApp/src/routes/(app)/+layout.svelte |   1 -
 .../src/routes/(app)/event/+page.svelte       |   2 +-
 .../(app)/organization/add/+page.svelte       |  18 +-
 .../[projectId]/configure/+page.svelte        |  61 +---
 .../src/routes/(app)/project/add/+page.svelte |   8 +-
 .../(app)/system/product-tours/+page.svelte   |   6 +-
 ...esponse.cs => ProductTourUsageResponse.cs} |  11 +-
 .../Models/User/ViewCurrentUser.cs            |   1 -
 .../Exceptionless.Tests/Api/Data/openapi.json | 285 ++++++++----------
 .../AdminProductTourUsageEndpointTests.cs     |  46 +--
 .../Api/Endpoints/ProductTourEndpointTests.cs |  57 ++--
 .../Api/OpenApiSnapshotTests.cs               |   8 +-
 .../Repositories/EventRepositoryTests.cs      |  37 +--
 .../Serializer/Models/UserSerializerTests.cs  |  20 +-
 tests/http/users.http                         |   4 +-
 49 files changed, 515 insertions(+), 688 deletions(-)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/{create-saved-view-tour.svelte => saved-view-create-tour.svelte} (98%)
 rename src/Exceptionless.Web/Models/Admin/{AdminProductTourUsageResponse.cs => ProductTourUsageResponse.cs} (62%)

diff --git a/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs b/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
index fbcf95fd89..33b1ca5ea4 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTourProgress.cs
@@ -1,22 +1,13 @@
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-
 namespace Exceptionless.Core.Models.Data;
 
 public record ProductTourProgress
 {
     public ProductTourStatus Status { get; set; }
-    public DateTime UpdatedUtc { get; set; }
     public int Version { get; set; }
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum ProductTourStatus
 {
-    [JsonStringEnumMemberName("completed")]
-    [EnumMember(Value = "completed")]
-    Completed,
-    [JsonStringEnumMemberName("dismissed")]
-    [EnumMember(Value = "dismissed")]
-    Dismissed
+    Completed = 1,
+    Dismissed = 2
 }
diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index 2ce860ec3b..bf54ebe9d1 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -7,28 +7,25 @@ namespace Exceptionless.Core.Models.Data;
 
 public static class ProductTours
 {
-    public const string ConfigureProject = "configure-project";
-    public const string CreateSavedView = "create-saved-view";
+    public const string AppOverview = "app-overview";
+    public const string AppWelcome = "app-welcome";
     public const string ExieAnnouncement = "exie-announcement";
-    public const string InvestigateError = "investigate-error";
-    public const string MeetExie = "meet-exie";
-    public const string UiOverview = "ui-overview";
-    public const string Welcome = "welcome";
+    public const string ExieOverview = "exie-overview";
+    public const string EventInvestigate = "event-investigate";
+    public const string ProjectConfigure = "project-configure";
+    public const string SavedViewCreate = "saved-view-create";
 
     public static IReadOnlyDictionary<string, int> Versions { get; } = new Dictionary<string, int>(StringComparer.Ordinal)
     {
-        [ConfigureProject] = 1,
-        [CreateSavedView] = 1,
+        [AppOverview] = 1,
+        [AppWelcome] = 1,
         [ExieAnnouncement] = 1,
-        [InvestigateError] = 1,
-        [MeetExie] = 1,
-        [UiOverview] = 1,
-        [Welcome] = 1
+        [ExieOverview] = 1,
+        [EventInvestigate] = 1,
+        [ProjectConfigure] = 1,
+        [SavedViewCreate] = 1
     }.ToFrozenDictionary(StringComparer.Ordinal);
 
-    public static IReadOnlyCollection<ProductTourTelemetryEvent> TelemetryEvents { get; } = Enum.GetValues<ProductTourTelemetryEvent>();
-    public static IReadOnlyCollection<ProductTourLaunchSource> LaunchSources { get; } = Enum.GetValues<ProductTourLaunchSource>();
-
     public static bool IsKnown(string name) => Versions.ContainsKey(name);
 
     public static bool IsValid(string name, int version)
@@ -45,9 +42,9 @@ public static string CreateTelemetrySource(
         return $"product-tour.{GetTelemetryName(telemetryEvent)}.{tourName}.v{version}.{GetLaunchSourceName(launchSource)}";
     }
 
-    public static string GetTelemetryName(ProductTourTelemetryEvent telemetryEvent) => telemetryEvent.ToString().ToLowerUnderscoredWords('-');
+    private static string GetTelemetryName(ProductTourTelemetryEvent telemetryEvent) => telemetryEvent.ToString().ToLowerUnderscoredWords('-');
 
-    public static string GetLaunchSourceName(ProductTourLaunchSource launchSource) => launchSource.ToString().ToLowerUnderscoredWords('-');
+    private static string GetLaunchSourceName(ProductTourLaunchSource launchSource) => launchSource.ToString().ToLowerUnderscoredWords('-');
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 264c90241c..ce1f494bdf 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -1,5 +1,4 @@
-using Elastic.Clients.Elasticsearch.Aggregations;
-using Elastic.Clients.Elasticsearch.QueryDsl;
+using Elastic.Clients.Elasticsearch.QueryDsl;
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories.Configuration;
@@ -8,7 +7,6 @@
 using Exceptionless.DateTimeExtensions;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Elasticsearch.Extensions;
-using Foundatio.Repositories.Exceptions;
 using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Core.Repositories;
@@ -93,126 +91,35 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
         if (utcEnd <= utcStart)
             throw new ArgumentOutOfRangeException(nameof(utcEnd), "The end date must be later than the start date.");
 
-        var sourcesByTour = ProductTours.Versions.ToDictionary(
-            pair => pair.Key,
-            pair => CreateProductTourSources(pair.Key, pair.Value),
-            StringComparer.Ordinal);
-        var sourcesByName = sourcesByTour.Values
-            .SelectMany(sources => sources)
+        var sourcesByName = ProductTours.Versions
+            .SelectMany(pair => CreateProductTourSources(pair.Key, pair.Value))
             .ToDictionary(source => source.Raw, StringComparer.Ordinal);
         string[] allSources = sourcesByName.Keys.ToArray();
+        string sourceField = InferField(ev => ev.Source);
+        string countField = InferField(ev => ev.Count);
+        string dateField = InferField(ev => ev.Date);
 
-        var aggregationTask = GetProductTourUsageToursAsync(projectId, utcStart, utcEnd, sourcesByTour, allSources);
+        var aggregationTask = CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
+            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField})"));
         var recentTask = FindAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
             .SortDescending(ev => ev.Date), options => options.PageLimit(recentLimit));
 
         await Task.WhenAll(aggregationTask, recentTask);
+        var sourceBuckets = (await aggregationTask).Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
+        var usage = sourceBuckets
+            .Select(bucket => sourcesByName.TryGetValue(bucket.Key, out var source)
+                ? new ProductTourUsageBucket(
+                    source,
+                    Convert.ToInt64(bucket.Aggregations.Sum($"sum_{countField}")?.Value ?? bucket.Total.GetValueOrDefault()),
+                    bucket.Aggregations.Max<DateTime>($"max_{dateField}")?.Value)
+                : null)
+            .OfType<ProductTourUsageBucket>()
+            .ToArray();
         var recentEvents = (await recentTask).Documents
             .Select(ev => ev.Source is not null && sourcesByName.TryGetValue(ev.Source, out var source) ? new ProductTourUsageEvent(ev, source) : null)
             .OfType<ProductTourUsageEvent>()
             .ToArray();
-        return new ProductTourUsageResult(await aggregationTask, recentEvents);
-    }
-
-    private async Task<IReadOnlyCollection<ProductTourUsageTour>> GetProductTourUsageToursAsync(
-        string projectId,
-        DateTime utcStart,
-        DateTime utcEnd,
-        IReadOnlyDictionary<string, ProductTourUsageSource[]> sourcesByTour,
-        string[] allSources)
-    {
-        var query = ApplyProductTourUsageFilter(NewQuery(), projectId, utcStart, utcEnd, allSources);
-        var options = ConfigureOptions(null);
-        await OnBeforeQueryAsync(query, options, typeof(PersistentEvent));
-        await RefreshForConsistency(query, options);
-
-        var search = (await CreateSearchDescriptorAsync(query, options))
-            .Size(0)
-            .Aggregations(CreateProductTourAggregations(sourcesByTour));
-        var response = await _client.SearchAsync<PersistentEvent>(search);
-        _logger.LogRequest(response);
-
-        if (!response.IsValidResponse)
-            throw new DocumentException($"Error getting product tour usage: {response.ElasticsearchServerError?.Error?.Reason}", response.ApiCallDetails.OriginalException);
-
-        var tours = new List<ProductTourUsageTour>();
-        foreach ((string tourName, ProductTourUsageSource[] sources) in sourcesByTour)
-        {
-            if (response.Aggregations is null
-                || !response.Aggregations.TryGetValue(tourName, out var aggregate)
-                || aggregate is not FilterAggregate filterAggregate
-                || filterAggregate.Aggregations is null)
-                continue;
-
-            if (!filterAggregate.Aggregations.TryGetValue("sources", out var sourceAggregate) || sourceAggregate is not StringTermsAggregate sourceTerms)
-                continue;
-
-            var buckets = new List<ProductTourUsageBucket>();
-            foreach (var bucket in sourceTerms.Buckets)
-            {
-                if (!bucket.Key.TryGetString(out string? sourceValue))
-                    continue;
-
-                var source = sources.FirstOrDefault(source => String.Equals(source.Raw, sourceValue, StringComparison.Ordinal));
-                if (source is null)
-                    continue;
-
-                long count = bucket.Aggregations is { } bucketAggregations
-                    && bucketAggregations.TryGetValue("count", out var countAggregate)
-                    && countAggregate is SumAggregate sum
-                    ? Convert.ToInt64(sum.Value)
-                    : bucket.DocCount;
-                DateTime? lastUtc = bucket.Aggregations is { } lastAggregations
-                    && lastAggregations.TryGetValue("last", out var lastAggregate)
-                    && lastAggregate is MaxAggregate max
-                    ? max.ValueAsString is null ? null : DateTime.Parse(max.ValueAsString, null, System.Globalization.DateTimeStyles.RoundtripKind)
-                    : null;
-                buckets.Add(new ProductTourUsageBucket(source, count, lastUtc));
-            }
-
-            long uniqueUsers = filterAggregate.Aggregations.TryGetValue("users", out var usersAggregate) && usersAggregate is CardinalityAggregate cardinality
-                ? Convert.ToInt64(cardinality.Value)
-                : 0;
-            if (buckets.Count > 0)
-                tours.Add(new ProductTourUsageTour(tourName, uniqueUsers, buckets));
-        }
-
-        return tours;
-    }
-
-    private IDictionary<string, Aggregation> CreateProductTourAggregations(IReadOnlyDictionary<string, ProductTourUsageSource[]> sourcesByTour)
-    {
-        string sourceField = ElasticIndex.MappingResolver.GetNonAnalyzedFieldName(InferField(ev => ev.Source))!;
-        string userPath = EventIndexExtensions.DataPath<UserInfo>(Event.KnownDataKeys.UserInfo, user => user.Identity);
-        string userField = ElasticIndex.MappingResolver.GetNonAnalyzedFieldName(userPath) ?? userPath;
-        var aggregations = new Dictionary<string, Aggregation>(StringComparer.Ordinal);
-
-        foreach ((string tourName, ProductTourUsageSource[] sources) in sourcesByTour)
-        {
-            aggregations[tourName] = new Aggregation
-            {
-                Filter = new TermsQuery
-                {
-                    Field = sourceField,
-                    Terms = new TermsQueryField(sources.Select(source => (Elastic.Clients.Elasticsearch.FieldValue)source.Raw).ToArray())
-                },
-                Aggregations = new Dictionary<string, Aggregation>
-                {
-                    ["sources"] = new Aggregation
-                    {
-                        Terms = new TermsAggregation { Field = sourceField, Size = sources.Length },
-                        Aggregations = new Dictionary<string, Aggregation>
-                        {
-                            ["count"] = new SumAggregation { Field = InferField(ev => ev.Count), Missing = 1 },
-                            ["last"] = new MaxAggregation { Field = InferField(ev => ev.Date) }
-                        }
-                    },
-                    ["users"] = new CardinalityAggregation { Field = userField }
-                }
-            };
-        }
-
-        return aggregations;
+        return new ProductTourUsageResult(usage, recentEvents);
     }
 
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
@@ -233,7 +140,7 @@ private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
     private static ProductTourUsageSource[] CreateProductTourSources(string tourName, int currentVersion)
     {
         return Enumerable.Range(1, currentVersion)
-            .SelectMany(version => ProductTours.TelemetryEvents.SelectMany(telemetryEvent => ProductTours.LaunchSources.Select(launchSource =>
+            .SelectMany(version => Enum.GetValues<ProductTourTelemetryEvent>().SelectMany(telemetryEvent => Enum.GetValues<ProductTourLaunchSource>().Select(launchSource =>
                 new ProductTourUsageSource(
                     ProductTours.CreateTelemetrySource(telemetryEvent, tourName, version, launchSource),
                     telemetryEvent,
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index b6fbc20df6..5db431cf37 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -4,11 +4,9 @@
 namespace Exceptionless.Core.Repositories;
 
 public sealed record ProductTourUsageResult(
-    IReadOnlyCollection<ProductTourUsageTour> Tours,
+    IReadOnlyCollection<ProductTourUsageBucket> Buckets,
     IReadOnlyCollection<ProductTourUsageEvent> RecentEvents);
 
-public sealed record ProductTourUsageTour(string Name, long UniqueUsers, IReadOnlyCollection<ProductTourUsageBucket> Buckets);
-
 public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
 
 public sealed record ProductTourUsageEvent(PersistentEvent Event, ProductTourUsageSource Source);
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index 22bce2dc6e..e67422c46b 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -90,7 +90,7 @@ public static IEndpointRouteBuilder MapAdminEndpoints(this IEndpointRouteBuilder
         endpoints.MapGet("api/v2/admin/product-tour-usage", GetProductTourUsageAsync)
             .RequireAuthorization(AuthorizationRoles.GlobalAdminPolicy)
             .AddEndpointFilter<AutoValidationEndpointFilter>()
-            .Produces<AdminProductTourUsageResponse>(StatusCodes.Status200OK)
+            .Produces<ProductTourUsageResponse>(StatusCodes.Status200OK)
             .ProducesProblem(StatusCodes.Status400BadRequest)
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status403Forbidden);
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index f9b3b1e8e1..8847922634 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -146,23 +146,23 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
         int limit = Math.Clamp(message.Limit, 1, 500);
 
         var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth, limit);
-        var tours = usage.Tours
-            .Select(tour =>
+        var tours = usage.Buckets
+            .GroupBy(bucket => bucket.Source.TourName, StringComparer.Ordinal)
+            .Select(buckets =>
             {
-                long shown = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Shown);
-                long started = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Started);
-                long completed = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Completed);
-                long dismissed = SumEvent(tour.Buckets, ProductTourTelemetryEvent.Dismissed);
+                long shown = SumEvent(buckets, ProductTourTelemetryEvent.Shown);
+                long started = SumEvent(buckets, ProductTourTelemetryEvent.Started);
+                long completed = SumEvent(buckets, ProductTourTelemetryEvent.Completed);
+                long dismissed = SumEvent(buckets, ProductTourTelemetryEvent.Dismissed);
                 long decisionDenominator = started > 0 ? started : shown;
-                DateTime? lastRunUtc = tour.Buckets.Select(bucket => bucket.LastUtc).Max();
+                DateTime? lastRunUtc = buckets.Select(bucket => bucket.LastUtc).Max();
 
-                return new AdminProductTourSummary(
-                    tour.Name,
+                return new ProductTourSummary(
+                    buckets.Key,
                     shown,
                     started,
                     completed,
                     dismissed,
-                    tour.UniqueUsers,
                     lastRunUtc,
                     CalculateRate(completed, decisionDenominator),
                     CalculateRate(dismissed, decisionDenominator));
@@ -171,15 +171,15 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             .ThenBy(tour => tour.Name, StringComparer.Ordinal)
             .ToArray();
 
-        var recentActivity = usage.RecentEvents
-            .Select(item => CreateActivity(item.Event, item.Source))
+        var recentEvents = usage.RecentEvents
+            .Select(item => CreateRecentEvent(item.Event, item.Source))
             .Take(limit)
             .ToArray();
 
-        return new AdminProductTourUsageResponse(
+        return new ProductTourUsageResponse(
             month,
             tours,
-            recentActivity);
+            recentEvents);
     }
 
     [HandlerEndpoint(HandlerMethod.Get, "migrations", Group = "Admin")]
@@ -220,10 +220,10 @@ public Task<Result<object>> Handle(GetAdminEcho message)
         });
     }
 
-    private AdminProductTourActivity CreateActivity(PersistentEvent ev, ProductTourUsageSource source)
+    private ProductTourEvent CreateRecentEvent(PersistentEvent ev, ProductTourUsageSource source)
     {
         var user = ev.GetUserIdentity(serializer, _logger);
-        return new AdminProductTourActivity(
+        return new ProductTourEvent(
             ev.Date.UtcDateTime,
             source.Event,
             source.LaunchSource,
diff --git a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
index 387f60a0d2..68e3933dfd 100644
--- a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
@@ -74,7 +74,6 @@ await repository.PatchAsync(
                 progress = new ProductTourProgress
                 {
                     Status = message.Progress.Status!.Value,
-                    UpdatedUtc = timeProvider.GetUtcNow().UtcDateTime,
                     Version = message.Progress.Version
                 };
                 user.ProductTours[message.TourName] = progress;
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
index 1451c7f25c..4092bedede 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
@@ -309,7 +309,7 @@ export class E2EApiClient {
         await expectStatus(response, [202], 'submit event');
     }
 
-    async updateProductTour(token: string, tourName: string, version: number, status: 'completed' | 'dismissed'): Promise<void> {
+    async updateProductTour(token: string, tourName: string, version: number, status: 1 | 2): Promise<void> {
         const response = await this.request.put(this.url(`users/me/product-tours/${tourName}`), {
             data: { status, version },
             headers: this.authHeaders(token)
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
index 380578c279..0b3877461f 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
@@ -89,7 +89,7 @@ export const test = base.extend<E2EFixtures>({
             projectId = project.id;
             const projectToken = await e2eApi.getProjectDefaultToken(userToken, project.id);
             if (e2eDismissProductTourWelcome) {
-                await e2eApi.updateProductTour(userToken, 'welcome', 1, 'dismissed');
+                await e2eApi.updateProductTour(userToken, 'app-welcome', 1, 2);
             }
 
             await page.addInitScript(
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
index b192730f74..5304344114 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
@@ -4,7 +4,7 @@ import { expect, test } from '../fixtures/e2e-test';
 
 test('dashboard charts stay mounted while list data refreshes', async ({ e2eApi, page }) => {
     const userToken = await e2eApi.login();
-    await e2eApi.updateProductTour(userToken, 'welcome', 1, 'dismissed');
+    await e2eApi.updateProductTour(userToken, 'app-welcome', 1, 2);
     const organizations = await e2eApi.getOrganizations(userToken);
     const organizationId = organizations[0]?.id;
     expect(organizationId).toBeTruthy();
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 04496a2594..d9021fd3e0 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -15,7 +15,7 @@ test.describe('first-run welcome', () => {
             await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
         });
 
-        const persisted = page.waitForResponse(isSuccessfulTourProgress('welcome'));
+        const persisted = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
         await page.getByRole('dialog', { name: 'Welcome to Exceptionless' }).getByRole('button', { name: 'Browse Guides' }).click();
         await persisted;
 
@@ -42,7 +42,7 @@ test.describe('shell and identity checkpoints', () => {
         await test.step('closing the welcome persists dismissal', async () => {
             await page.goto('/next/stack');
             await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
-            const dismissed = page.waitForResponse(isSuccessfulTourProgress('welcome'));
+            const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
             await page.keyboard.press('Escape');
             await dismissed;
             await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeHidden();
@@ -62,7 +62,7 @@ test.describe('shell and identity checkpoints', () => {
             await page.reload();
             await expect(tour.getByText('Find anything quickly')).toBeVisible();
 
-            const dismissed = page.waitForResponse(isSuccessfulTourProgress('ui-overview'));
+            const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
             await tour.getByRole('button', { name: 'Close' }).click();
             await dismissed;
             await expectProductTourSession(page, false);
@@ -118,7 +118,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
 
         await page.locator('[data-tour="project-configure-platform"]').click();
         await page.getByRole('option', { name: 'Browser applications' }).click();
-        await page.locator('[data-product-tour-inline="configure-project"]').getByRole('button', { name: 'Continue' }).click();
+        await page.locator('[data-product-tour-inline="project-configure"]').getByRole('button', { name: 'Continue' }).click();
         await expect(page.getByText('Waiting for your first event')).toBeVisible();
 
         try {
@@ -148,7 +148,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
             const path = new URL(request.url()).pathname;
             if (request.method() === 'POST' && /^\/api\/v2\/organizations\/[^/]+\/saved-views$/.test(path)) createRequests += 1;
         };
-        const progressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/create-saved-view';
+        const progressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/saved-view-create';
         page.on('request', countSavedViewCreation);
         await page.route(progressRoute, async (route) => {
             progressRequests += 1;
@@ -177,7 +177,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
 
             await page.reload();
             await expect(page.getByRole('button', { name: 'Retry guide completion' })).toBeVisible();
-            const completed = page.waitForResponse(isSuccessfulTourProgress('create-saved-view'));
+            const completed = page.waitForResponse(isSuccessfulTourProgress('saved-view-create'));
             await page.getByRole('button', { name: 'Retry guide completion' }).click();
             await completed;
             await expect.poll(() => createRequests).toBe(1);
@@ -200,19 +200,19 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         await startTourFromCommand(page, 'Investigate an error');
         await page.locator('.driver-popover').getByRole('button', { name: 'Continue' }).click();
         await page.locator('tr').filter({ hasText: e2eScenario.message }).first().click();
-        const callout = page.locator('[data-product-tour-inline="investigate-error"]');
+        const callout = page.locator('[data-product-tour-inline="event-investigate"]');
         await expect(callout.getByText('Understand the grouped issue')).toBeVisible();
         for (const title of ['Triage deliberately', 'Inspect the occurrence', 'Begin with the overview', 'Compare every occurrence']) {
             await callout.getByRole('button', { name: 'Continue' }).click();
             await expect(callout.getByText(title)).toBeVisible();
         }
 
-        const completed = page.waitForResponse(isSuccessfulTourProgress('investigate-error'));
+        const completed = page.waitForResponse(isSuccessfulTourProgress('event-investigate'));
         await callout.getByRole('button', { name: 'Finish guide' }).click();
         await completed;
         await expectProductTourSession(page, false);
         await page.reload();
-        await expect(page.locator('[data-product-tour-inline="investigate-error"]')).toBeHidden();
+        await expect(page.locator('[data-product-tour-inline="event-investigate"]')).toBeHidden();
     });
 
     await test.step('Exie opens context without provider submission', async () => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
index cee4ec4d77..8c5fe6d06e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
@@ -6,7 +6,6 @@ import type {
     AdminAssistantSettings,
     AdminAssistantUsage,
     AdminEventSubmissionSettings,
-    AdminProductTourUsage,
     AdminStats,
     ElasticsearchInfo,
     ElasticsearchSnapshotsResponse,
@@ -14,6 +13,7 @@ import type {
     OAuthApplication,
     OAuthApplicationRequest,
     PredefinedSavedViewDefinition,
+    ProductTourUsageResponse,
     UpdateAssistantEnabledSettingsRequest,
     UpdateAssistantSettingsRequest,
     UpdateEventSubmissionSettingsRequest
@@ -113,10 +113,10 @@ export function getAdminAssistantUsageQuery(month: () => string) {
 }
 
 export function getAdminProductTourUsageQuery(month: () => string) {
-    return createQuery<AdminProductTourUsage, ProblemDetails>(() => ({
+    return createQuery<ProductTourUsageResponse, ProblemDetails>(() => ({
         queryFn: async ({ signal }: { signal: AbortSignal }) => {
             const client = useFetchClient();
-            const response = await client.getJSON<AdminProductTourUsage>('admin/product-tour-usage', {
+            const response = await client.getJSON<ProductTourUsageResponse>('admin/product-tour-usage', {
                 params: {
                     limit: 100,
                     month: `${month()}-01`
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
index f128097c5e..06fc5b56d6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/models.ts
@@ -1,12 +1,13 @@
 import type {
     AssistantModelSettings,
     CountResult,
+    EventSubmissionSettings,
     UpdateAssistantEnabledSettings,
     UpdateAssistantSettings,
     UpdateEventSubmissionSettings
 } from '$generated/api';
 
-export type { EventSubmissionSettings as AdminEventSubmissionSettings, AdminProductTourUsageResponse as AdminProductTourUsage } from '$generated/api';
+export type { ProductTourUsageResponse } from '$generated/api';
 
 export enum MigrationType {
     Versioned = 0,
@@ -50,6 +51,8 @@ export type AdminAssistantUsage = {
     turns: number;
 };
 
+export type AdminEventSubmissionSettings = EventSubmissionSettings;
+
 export type AdminStats = {
     events: CountResult;
     organizations: CountResult;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
index 8c7afe291d..1802508462 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
@@ -16,7 +16,7 @@
     let advancedEventId = $state('');
 
     const actions = createProductTourActions();
-    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
     const copy = $derived.by(() => {
         switch (checkpoint?.checkpointName) {
             case 'event-occurrence':
@@ -109,6 +109,6 @@
         onContinue={continueTour}
         onDismiss={dismiss}
         title={copy.title}
-        tourName="investigate-error"
+        tourName="event-investigate"
     />
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
index 29f1dcb8de..07d9315c05 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
@@ -4,7 +4,7 @@
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
 
     const actions = createProductTourActions();
-    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
 </script>
 
 {#if checkpoint?.checkpointName === 'filter-errors'}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index 13f1c376f8..227a8fbfdb 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -16,24 +16,22 @@ function context(overrides: Partial<ProductTourContext> = {}): ProductTourContex
 }
 
 describe('product tour catalog', () => {
-    const versions = Object.fromEntries(productTourCatalog.map((tour) => [tour.name, 1]));
-
     it('contains only durable metadata for the five named tours', () => {
         expect(productTourCatalog.map((tour) => tour.name)).toEqual([
-            'ui-overview',
-            'configure-project',
-            'create-saved-view',
-            'investigate-error',
-            'meet-exie'
+            'app-overview',
+            'project-configure',
+            'saved-view-create',
+            'event-investigate',
+            'exie-overview'
         ]);
         expect(productTourCatalog.every((tour) => tour.keywords.length > 0)).toBe(true);
         expect(JSON.stringify(productTourCatalog)).not.toContain('data-tour');
     });
 
     it('recommends setup until an organization has configured projects', () => {
-        expect(getRecommendedProductTourName(context({ organizationId: undefined }))).toBe('configure-project');
-        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: false }] }))).toBe('configure-project');
-        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: true }] }))).toBe('ui-overview');
+        expect(getRecommendedProductTourName(context({ organizationId: undefined }))).toBe('project-configure');
+        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: false }] }))).toBe('project-configure');
+        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: true }] }))).toBe('app-overview');
     });
 
     it('reports availability separately from catalog metadata', () => {
@@ -41,15 +39,13 @@ describe('product tour catalog', () => {
             context({
                 assistantAccess: { enabled: false, has_access: false, upgrade_required: false },
                 errorEventAvailability: 'empty'
-            }),
-            versions
+            })
         );
-        expect(items.find((item) => item.name === 'meet-exie')?.currentAvailability.available).toBe(false);
-        expect(items.find((item) => item.name === 'investigate-error')?.currentAvailability.available).toBe(false);
+        expect(items.find((item) => item.name === 'exie-overview')?.currentAvailability.available).toBe(false);
+        expect(items.find((item) => item.name === 'event-investigate')?.currentAvailability.available).toBe(false);
     });
 
-    it('uses server versions as the availability boundary', () => {
-        const items = getProductTourItems(context(), {});
-        expect(items.every((item) => !item.currentAvailability.available && item.version === 0)).toBe(true);
+    it('defines a positive version for every tour', () => {
+        expect(getProductTourItems(context()).every((item) => item.version > 0)).toBe(true);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 8b26d1f198..025e60e68f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -28,36 +28,40 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         description: 'Learn navigation, command search, saved views, Exie, and where to get help.',
         initialCheckpoint: 'navigation',
         keywords: ['navigation', 'ui', 'search', 'command', 'help', 'saved views'],
-        name: 'ui-overview',
+        name: 'app-overview',
         startingRoute: () => resolve('/'),
-        title: 'Explore Exceptionless'
+        title: 'Explore Exceptionless',
+        version: 1
     },
     {
         availability: () => ({ available: true }),
         description: 'Create or resume a project, connect an SDK, and wait for its first real event.',
         initialCheckpoint: 'project-name',
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
-        name: 'configure-project',
+        name: 'project-configure',
         startingRoute: (context) => (context.organizationId ? resolve('/(app)/project/add') : resolve('/(app)/organization/add')),
-        title: 'Configure a project'
+        title: 'Configure a project',
+        version: 1
     },
     {
         availability: requireOrganization,
         description: 'Save the current Events configuration as a private view that only you can see.',
         initialCheckpoint: 'open-view-menu',
         keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
-        name: 'create-saved-view',
+        name: 'saved-view-create',
         startingRoute: () => resolve('/(app)/event'),
-        title: 'Create a saved view'
+        title: 'Create a saved view',
+        version: 1
     },
     {
         availability: requireError,
         description: 'Open a real error, assess its stack and status, then inspect the occurrence.',
         initialCheckpoint: 'filter-errors',
         keywords: ['error report', 'event details', 'exception', 'filter', 'stack', 'triage'],
-        name: 'investigate-error',
+        name: 'event-investigate',
         startingRoute: () => `${resolve('/(app)/event')}?time=all&type=error`,
-        title: 'Investigate an error'
+        title: 'Investigate an error',
+        version: 1
     },
     {
         availability: (context) =>
@@ -65,29 +69,23 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         description: 'See how Exie uses the current page as context without sending a prompt.',
         initialCheckpoint: 'open-exie',
         keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
-        name: 'meet-exie',
+        name: 'exie-overview',
         startingRoute: () => resolve('/'),
-        title: 'Meet Exie'
+        title: 'Meet Exie',
+        version: 1
     }
 ] as const;
 
-export function getProductTourItems(
-    context: ProductTourContext,
-    versions: Record<string, number>,
-    progress: Record<string, ProductTourProgress> = {}
-): ProductTourListItem[] {
+export function getProductTourItems(context: ProductTourContext, progress: Record<string, ProductTourProgress> = {}): ProductTourListItem[] {
     return productTourCatalog.map((definition) => {
-        const version = versions[definition.name] ?? 0;
         return {
             ...definition,
-            currentAvailability:
-                version > 0 ? definition.availability(context) : { available: false, reason: 'This guided tour is not supported by the server.' },
-            progress: progress[definition.name],
-            version
+            currentAvailability: definition.availability(context),
+            progress: progress[definition.name]
         };
     });
 }
 
 export function getRecommendedProductTourName(context: ProductTourContext): ProductTourName {
-    return !context.organizationId || context.projects.some((project) => !project.is_configured) ? 'configure-project' : 'ui-overview';
+    return !context.organizationId || context.projects.some((project) => !project.is_configured) ? 'project-configure' : 'app-overview';
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 942730a992..097ae08e3a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -2,6 +2,7 @@
     import { Badge } from '$comp/ui/badge';
     import { Button } from '$comp/ui/button';
     import * as Dialog from '$comp/ui/dialog';
+    import { ProductTourStatus } from '$features/users/models';
     import Compass from '@lucide/svelte/icons/compass';
 
     import type { ProductTourListItem, ProductTourName } from '../../types';
@@ -29,7 +30,7 @@
                         <div class="bg-primary/10 text-primary flex size-9 shrink-0 items-center justify-center rounded-lg">
                             <Compass aria-hidden="true" class="size-5" />
                         </div>
-                        {#if item.progress?.status === 'completed' && item.progress.version >= item.version}
+                        {#if item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version}
                             <Badge variant="secondary">Completed</Badge>
                         {/if}
                     </div>
@@ -41,7 +42,7 @@
                         {/if}
                     </div>
                     <Button disabled={!item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
-                        {item.progress?.status === 'completed' && item.progress.version >= item.version ? 'Restart' : 'Start'}
+                        {item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version ? 'Restart' : 'Start'}
                     </Button>
                 </section>
             {/each}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
index 3fde333876..5c7b70c523 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
@@ -41,7 +41,7 @@
             <Button onclick={onDismiss} variant="ghost">Skip</Button>
             <div class="flex flex-col-reverse gap-2 sm:flex-row">
                 <Button onclick={onBrowse} variant="outline">Browse Guides</Button>
-                <Button onclick={onStart}>{recommended.name === 'configure-project' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
+                <Button onclick={onStart}>{recommended.name === 'project-configure' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
             </div>
         </Dialog.Footer>
     </Dialog.Content>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
index a3744dc382..08f6bbe948 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
@@ -9,7 +9,7 @@ const recommended = {
     description: 'Learn navigation and search.',
     initialCheckpoint: 'navigation' as const,
     keywords: ['navigation'],
-    name: 'ui-overview' as const,
+    name: 'app-overview' as const,
     startingRoute: vi.fn(() => '/next'),
     title: 'Explore Exceptionless',
     version: 1
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index b1e9d10e1c..dc64f73a1f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -38,8 +38,10 @@
     }
 
     const EVENT_PATH = resolve('/(app)/event');
+    const EXIE_ANNOUNCEMENT_VERSION = 1;
     const STACK_PATH = resolve('/(app)/stack');
     const SYSTEM_PATH = resolve('/(app)/system');
+    const WELCOME_VERSION = 1;
 
     let {
         assistantAccess,
@@ -74,11 +76,9 @@
         pathname,
         projects
     });
-    const items = $derived(getProductTourItems(context, currentUser?.product_tour_versions ?? {}, currentUser?.product_tours));
+    const items = $derived(getProductTourItems(context, currentUser?.product_tours));
     const recommended = $derived(items.find((item) => item.name === getRecommendedProductTourName(context)) ?? items[0]!);
     const checkpoint = $derived(productTourCheckpoint.current);
-    const welcomeVersion = $derived(currentUser?.product_tour_versions.welcome ?? 0);
-    const exieAnnouncementVersion = $derived(currentUser?.product_tour_versions['exie-announcement'] ?? 0);
     const welcomeOpen = $derived(
         !!(
             stateSettled &&
@@ -89,8 +89,7 @@
             !isImpersonating &&
             !isSetupPage &&
             !pathname.startsWith(SYSTEM_PATH) &&
-            welcomeVersion > 0 &&
-            shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, welcomeVersion)
+            shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION)
         )
     );
     const exieAnnouncementOpen = $derived(
@@ -105,9 +104,8 @@
             !welcomeOpen &&
             !catalogOpen &&
             !isAnyOverlayOpen &&
-            !shouldOfferProductTourWelcome(currentUser.product_tours?.welcome, welcomeVersion) &&
-            exieAnnouncementVersion > 0 &&
-            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], exieAnnouncementVersion)
+            !shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) &&
+            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
         )
     );
 
@@ -132,10 +130,10 @@
             return;
         }
 
-        const impression = `${currentUser.id}:${welcomeVersion}`;
+        const impression = `${currentUser.id}:${WELCOME_VERSION}`;
         if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
             lastTrackedWelcomeImpression = impression;
-            void track('shown', 'welcome', welcomeVersion, 'automatic');
+            void track('shown', 'app-welcome', WELCOME_VERSION, 'automatic');
         }
     });
 
@@ -144,10 +142,10 @@
             return;
         }
 
-        const impression = `${currentUser.id}:${exieAnnouncementVersion}`;
+        const impression = `${currentUser.id}:${EXIE_ANNOUNCEMENT_VERSION}`;
         if (exieAnnouncementOpen && lastTrackedAnnouncementImpression !== impression) {
             lastTrackedAnnouncementImpression = impression;
-            void track('shown', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
+            void track('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         }
     });
 
@@ -183,12 +181,12 @@
             await goto(destination);
         }
 
-        if (next.tourName === 'meet-exie' && next.checkpointName === 'open-exie') {
+        if (next.tourName === 'exie-overview' && next.checkpointName === 'open-exie') {
             setMobileNavigationOpen(false);
         }
     }
 
-    async function recordPreference(name: 'exie-announcement' | 'welcome', version: number, status: ProductTourStatus): Promise<boolean> {
+    async function recordPreference(name: 'app-welcome' | 'exie-announcement', version: number, status: ProductTourStatus): Promise<boolean> {
         try {
             await progressMutation.mutateAsync({
                 progress: {
@@ -205,44 +203,44 @@
     }
 
     async function onWelcomeStart(): Promise<void> {
-        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
             return;
         }
         welcomeHandled = true;
-        await track('completed', 'welcome', welcomeVersion, 'automatic');
+        await track('completed', 'app-welcome', WELCOME_VERSION, 'automatic');
         await startTour(recommended.name, 'automatic');
     }
 
     async function onWelcomeBrowse(): Promise<void> {
-        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
             return;
         }
         welcomeHandled = true;
-        await track('completed', 'welcome', welcomeVersion, 'automatic');
+        await track('completed', 'app-welcome', WELCOME_VERSION, 'automatic');
         openCatalog('catalog');
     }
 
     async function onWelcomeSkip(): Promise<void> {
-        if (!(await recordPreference('welcome', welcomeVersion, ProductTourStatus.Dismissed))) {
+        if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
         welcomeHandled = true;
-        await track('dismissed', 'welcome', welcomeVersion, 'automatic');
+        await track('dismissed', 'app-welcome', WELCOME_VERSION, 'automatic');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
-        if (!(await recordPreference('exie-announcement', exieAnnouncementVersion, ProductTourStatus.Completed))) {
+        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        await track('completed', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
-        await startTour('meet-exie', 'feature-announcement');
+        await track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await startTour('exie-overview', 'feature-announcement');
     }
 
     async function onExieAnnouncementDismiss(): Promise<void> {
-        if (!(await recordPreference('exie-announcement', exieAnnouncementVersion, ProductTourStatus.Dismissed))) {
+        if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
-        await track('dismissed', 'exie-announcement', exieAnnouncementVersion, 'feature-announcement');
+        await track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
     }
 
     function getItem<Name extends ProductTourName>(name: Name): ProductTourListItem<Name> {
@@ -263,7 +261,7 @@
 
 <ProductTourCatalogDialog bind:open={catalogOpen} {items} onStart={(name) => startTour(name, catalogSource)} />
 
-{#if checkpoint && (checkpoint.tourName === 'meet-exie' || checkpoint.tourName === 'ui-overview')}
+{#if checkpoint && (checkpoint.tourName === 'exie-overview' || checkpoint.tourName === 'app-overview')}
     {#key checkpoint}
         <ProductTourShellSpotlight {assistantAccess} {checkpoint} {isAnyOverlayOpen} {openAssistant} {setMobileNavigationOpen} />
     {/key}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
index cc38a9ab01..e41e8616d2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
@@ -28,7 +28,7 @@
     const currentAssistantAccess = untrack(() => assistantAccess);
     const currentCheckpoint = untrack(() => checkpoint);
     const actions = createProductTourActions();
-    const meetExieSteps: ShellStep[] = [
+    const exieOverviewSteps: ShellStep[] = [
         {
             checkpointName: 'open-exie',
             description: 'Open Exie to see the page context available for your next question.',
@@ -42,7 +42,7 @@
             title: 'You control every request'
         }
     ];
-    const uiOverviewSteps: ShellStep[] = [
+    const appOverviewSteps: ShellStep[] = [
         {
             checkpointName: 'navigation',
             description: 'Move between dashboards, saved views, and settings from the application navigation.',
@@ -78,7 +78,7 @@
             title: 'Help is always nearby'
         }
     ];
-    const steps = currentCheckpoint.tourName === 'ui-overview' ? uiOverviewSteps : meetExieSteps;
+    const steps = currentCheckpoint.tourName === 'app-overview' ? appOverviewSteps : exieOverviewSteps;
     const spotlight = steps.find((step) => step.checkpointName === currentCheckpoint.checkpointName);
 
     onMount(() => {
@@ -90,7 +90,7 @@
     });
 
     async function advance(): Promise<void> {
-        if (currentCheckpoint.tourName === 'meet-exie' && currentCheckpoint.checkpointName === 'open-exie') {
+        if (currentCheckpoint.tourName === 'exie-overview' && currentCheckpoint.checkpointName === 'open-exie') {
             await openAssistant();
             productTourCheckpoint.advance(currentCheckpoint, 'exie-context');
             return;
@@ -107,7 +107,7 @@
     }
 </script>
 
-{#if spotlight && (!isAnyOverlayOpen || checkpoint.tourName === 'meet-exie')}
+{#if spotlight && (!isAnyOverlayOpen || checkpoint.tourName === 'exie-overview')}
     <ProductTourSpotlight
         checkpoint={currentCheckpoint}
         description={spotlight.description}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
similarity index 98%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
index adc4c9d0a5..69e05695ff 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/create-saved-view-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
@@ -19,7 +19,7 @@
 
     let { closeMenu, onLoadView, openMenu, openSaveDialog, savedViews }: Props = $props();
     const actions = createProductTourActions();
-    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'create-saved-view' ? productTourCheckpoint.current : undefined);
+    const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'saved-view-create' ? productTourCheckpoint.current : undefined);
     const pendingView = $derived.by(() => {
         const phase = checkpoint?.phase;
         return phase?.type === 'saved-view-created' || phase?.type === 'saved-view-loaded'
@@ -93,7 +93,7 @@
         }
     }
 
-    async function loadAndComplete(active: ProductTourCheckpoint<'create-saved-view'>, view: SavedView): Promise<void> {
+    async function loadAndComplete(active: ProductTourCheckpoint<'saved-view-create'>, view: SavedView): Promise<void> {
         try {
             await onLoadView(view);
             const loadedCheckpoint = productTourCheckpoint.advance(active, 'view-created', {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
index 65b7d7b3f1..9b2cee9e20 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
@@ -17,19 +17,19 @@ describe('product tour setup routes', () => {
 describe('product tour welcome eligibility', () => {
     it('offers legacy users and a newer welcome version', () => {
         expect(shouldOfferProductTourWelcome(undefined, 1)).toBe(true);
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, updated_utc: '', version: 1 }, 2)).toBe(true);
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, version: 1 }, 2)).toBe(true);
     });
 
     it('suppresses both explicit Start and Skip outcomes for the current version', () => {
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, updated_utc: '', version: 1 }, 1)).toBe(false);
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Dismissed, updated_utc: '', version: 1 }, 1)).toBe(false);
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, version: 1 }, 1)).toBe(false);
+        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Dismissed, version: 1 }, 1)).toBe(false);
     });
 });
 
 describe('product tour feature announcement eligibility', () => {
     it('offers a new announcement version until explicitly recorded', () => {
         expect(shouldOfferProductTourAnnouncement(undefined, 1)).toBe(true);
-        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Dismissed, updated_utc: '', version: 1 }, 1)).toBe(false);
-        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Completed, updated_utc: '', version: 2 }, 1)).toBe(false);
+        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Dismissed, version: 1 }, 1)).toBe(false);
+        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Completed, version: 2 }, 1)).toBe(false);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
index a14662905a..b548dc623c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
@@ -9,7 +9,7 @@ const checkpoint: ProductTourCheckpoint = {
     organizationId: 'organization-id',
     phase: { type: 'active' },
     source: 'command-palette',
-    tourName: 'investigate-error',
+    tourName: 'event-investigate',
     userId: 'user-id',
     version: 1
 };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index 0b52603cc7..822de6d2f3 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -1,11 +1,9 @@
-import { ProductTourLaunchSource as ProductTourLaunchSourceContract } from '$generated/api';
-
 import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
 
-import { PRODUCT_TOUR_CHECKPOINTS } from './types';
+import { PRODUCT_TOUR_CHECKPOINTS, PRODUCT_TOUR_LAUNCH_SOURCES } from './types';
 
 const SESSION_KEY = 'exceptionless.product-tour';
-const SOURCES = new Set<string>(Object.values(ProductTourLaunchSourceContract));
+const SOURCES = new Set<string>(PRODUCT_TOUR_LAUNCH_SOURCES);
 
 export function clearProductTourSession(storage: Pick<Storage, 'removeItem'> = sessionStorage): void {
     storage.removeItem(SESSION_KEY);
@@ -37,7 +35,7 @@ function isPhase(value: unknown, tourName: string, checkpointName: unknown): val
     if (!isRecord(value) || typeof value.type !== 'string') return false;
     if (value.type === 'active') return true;
     return (
-        tourName === 'create-saved-view' &&
+        tourName === 'saved-view-create' &&
         checkpointName === 'view-created' &&
         (value.type === 'saved-view-created' || value.type === 'saved-view-loaded') &&
         typeof value.viewId === 'string' &&
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index d1d4d2f6f7..fcb3e1a479 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -9,7 +9,7 @@ const checkpoint: ProductTourCheckpoint = {
     organizationId: 'organization-id',
     phase: { type: 'active' },
     source: 'catalog',
-    tourName: 'ui-overview',
+    tourName: 'app-overview',
     userId: 'user-id',
     version: 1
 };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
index a7ff2b5165..a99276303c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
@@ -4,10 +4,10 @@ import { buildProductTourTelemetryEvent } from './telemetry';
 
 describe('product tour telemetry', () => {
     it('records stable lifecycle events without resource data', () => {
-        expect(buildProductTourTelemetryEvent('started', 'ui-overview', 1, 'command-palette')).toBe('product-tour.started.ui-overview.v1.command-palette');
+        expect(buildProductTourTelemetryEvent('started', 'app-overview', 1, 'command-palette')).toBe('product-tour.started.app-overview.v1.command-palette');
     });
 
     it('rejects invalid versions', () => {
-        expect(() => buildProductTourTelemetryEvent('started', 'meet-exie', 0, 'catalog')).toThrow();
+        expect(() => buildProductTourTelemetryEvent('started', 'exie-overview', 0, 'catalog')).toThrow();
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 87d794902b..f13f8916c5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -1,16 +1,16 @@
 import type { AssistantAccess } from '$features/assistant/models';
 import type { ViewProject } from '$features/projects/models';
 import type { ProductTourProgress } from '$features/users/models';
-import type { ProductTourLaunchSource as ProductTourLaunchSourceContract } from '$generated/api';
-
 export const PRODUCT_TOUR_CHECKPOINTS = {
-    'configure-project': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event'],
-    'create-saved-view': ['open-view-menu', 'review-settings', 'name-view', 'private-view', 'save-view', 'view-created'],
-    'investigate-error': ['filter-errors', 'choose-error', 'stack-summary', 'stack-triage', 'event-occurrence', 'tab-overview', 'filter-stack-events'],
-    'meet-exie': ['open-exie', 'exie-context'],
-    'ui-overview': ['navigation', 'command-search', 'saved-views', 'exie', 'help']
+    'app-overview': ['navigation', 'command-search', 'saved-views', 'exie', 'help'],
+    'event-investigate': ['filter-errors', 'choose-error', 'stack-summary', 'stack-triage', 'event-occurrence', 'tab-overview', 'filter-stack-events'],
+    'exie-overview': ['open-exie', 'exie-context'],
+    'project-configure': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event'],
+    'saved-view-create': ['open-view-menu', 'review-settings', 'name-view', 'private-view', 'save-view', 'view-created']
 } as const;
 
+export const PRODUCT_TOUR_LAUNCH_SOURCES = ['automatic', 'catalog', 'command-palette', 'feature-announcement', 'help-menu'] as const;
+
 export interface ProductTourAvailability {
     available: boolean;
     reason?: string;
@@ -43,19 +43,19 @@ export interface ProductTourDefinition<Name extends ProductTourName = ProductTou
     name: Name;
     startingRoute: (context: ProductTourContext) => string;
     title: string;
+    version: number;
 }
 
-export type ProductTourKey = 'exie-announcement' | 'welcome' | ProductTourName;
+export type ProductTourKey = 'app-welcome' | 'exie-announcement' | ProductTourName;
 
-export type ProductTourLaunchSource = `${ProductTourLaunchSourceContract}`;
+export type ProductTourLaunchSource = (typeof PRODUCT_TOUR_LAUNCH_SOURCES)[number];
 
 export interface ProductTourListItem<Name extends ProductTourName = ProductTourName> extends ProductTourDefinition<Name> {
     currentAvailability: ProductTourAvailability;
     progress?: ProductTourProgress;
-    version: number;
 }
 
 export type ProductTourName = keyof typeof PRODUCT_TOUR_CHECKPOINTS;
 
 export type ProductTourPhase<Name extends ProductTourName = ProductTourName> =
-    (Name extends 'create-saved-view' ? { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string } : never) | { type: 'active' };
+    (Name extends 'saved-view-create' ? { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string } : never) | { type: 'active' };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 74ad57afcf..11b6ffd02f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -15,7 +15,7 @@
     import { serializeFilters } from '$features/events/components/filters/helpers.svelte';
     import { getOrganizationQuery, getOrganizationsQuery } from '$features/organizations/api.svelte';
     import { organization } from '$features/organizations/context.svelte';
-    import CreateSavedViewTour from '$features/product-tours/components/create-saved-view-tour.svelte';
+    import SavedViewCreateTour from '$features/product-tours/components/saved-view-create-tour.svelte';
     import { supportsColumnWrapping } from '$features/shared/components/data-table/column-meta';
     import { getMeQuery } from '$features/users/api.svelte';
     import Building2 from '@lucide/svelte/icons/building-2';
@@ -121,7 +121,7 @@
     let isColumnDialogOpen = $state(false);
     let isMenuOpen = $state(false);
     let viewToDelete = $state<null | SavedView>(null);
-    let createSavedViewTour = $state<CreateSavedViewTour>();
+    let savedViewCreateTour = $state<SavedViewCreateTour>();
 
     const organizationId = $derived(organization.current);
     const activeView = $derived(activeSavedView);
@@ -261,7 +261,7 @@
             return;
         }
 
-        const tour = createSavedViewTour;
+        const tour = savedViewCreateTour;
         if (tour && !tour.validateSave(isPrivate)) {
             return;
         }
@@ -502,18 +502,18 @@
 {#if isSaveDialogOpen}
     <SaveViewDialog
         bind:open={isSaveDialogOpen}
-        defaultPrivate={createSavedViewTour?.shouldDefaultPrivate()}
+        defaultPrivate={savedViewCreateTour?.shouldDefaultPrivate()}
         {duplicateView}
         {savedViews}
         {saving}
         onSave={handleSave}
-        onClose={() => createSavedViewTour?.closed()}
+        onClose={() => savedViewCreateTour?.closed()}
         {onLoadView}
     />
 {/if}
 
-<CreateSavedViewTour
-    bind:this={createSavedViewTour}
+<SavedViewCreateTour
+    bind:this={savedViewCreateTour}
     closeMenu={() => (isMenuOpen = false)}
     openMenu={() => (isMenuOpen = true)}
     openSaveDialog={() => (isSaveDialogOpen = true)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
index a5dce7ded1..c4e17c0212 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
@@ -185,12 +185,10 @@
                 <div class="ml-2 flex shrink-0 items-center gap-2">
                     <StackLogLevel {stack} />
                     <AssistantFixButton {prepareContext} resource={assistantResource} />
-                    <div data-tour="event-stack-triage">
-                        <ButtonGroup.Root>
-                            <StackStatusDropdownMenu {stack} />
-                            <StackOptionsDropdownMenu {onDeleted} {stack} />
-                        </ButtonGroup.Root>
-                    </div>
+                    <ButtonGroup.Root data-tour="event-stack-triage">
+                        <StackStatusDropdownMenu {stack} />
+                        <StackOptionsDropdownMenu {onDeleted} {stack} />
+                    </ButtonGroup.Root>
                 </div>
             </Card.Title>
         </Card.Header>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index d3244c3f8e..b4fab356dc 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -15,8 +15,8 @@ export enum ProductTourTelemetryEvent {
 }
 
 export enum ProductTourStatus {
-  Completed = "completed",
-  Dismissed = "dismissed",
+  Completed = 1,
+  Dismissed = 2,
 }
 
 export enum ProductTourLaunchSource {
@@ -93,47 +93,6 @@ export interface AdminAssistantUsageResponse {
   organizations: AdminAssistantOrganizationUsage[];
 }
 
-export interface AdminProductTourActivity {
-  /** @format date-time */
-  date_utc: string;
-  event: ProductTourTelemetryEvent;
-  launch_source: ProductTourLaunchSource;
-  tour_name: string;
-  user_identity?: null | string;
-  user_name?: null | string;
-  /** @format int32 */
-  version: number;
-  /** @format int64 */
-  count: number;
-}
-
-export interface AdminProductTourSummary {
-  name: string;
-  /** @format int64 */
-  shown: number;
-  /** @format int64 */
-  started: number;
-  /** @format int64 */
-  completed: number;
-  /** @format int64 */
-  dismissed: number;
-  /** @format int64 */
-  unique_users: number;
-  /** @format date-time */
-  last_run_utc?: null | string;
-  /** @format double */
-  completion_rate?: null | number;
-  /** @format double */
-  dismissal_rate?: null | number;
-}
-
-export interface AdminProductTourUsageResponse {
-  /** @format date-time */
-  month: string;
-  tours: AdminProductTourSummary[];
-  recent_activity: AdminProductTourActivity[];
-}
-
 export interface AssistantAccessResponse {
   enabled: boolean;
   has_access: boolean;
@@ -555,14 +514,51 @@ export interface ProblemDetails {
   instance?: null | string;
 }
 
+export interface ProductTourEvent {
+  /** @format date-time */
+  date_utc: string;
+  event: ProductTourTelemetryEvent;
+  launch_source: ProductTourLaunchSource;
+  tour_name: string;
+  user_identity?: null | string;
+  user_name?: null | string;
+  /** @format int32 */
+  version: number;
+  /** @format int64 */
+  count: number;
+}
+
 export interface ProductTourProgress {
   status: ProductTourStatus;
-  /** @format date-time */
-  updated_utc: string;
   /** @format int32 */
   version: number;
 }
 
+export interface ProductTourSummary {
+  name: string;
+  /** @format int64 */
+  shown: number;
+  /** @format int64 */
+  started: number;
+  /** @format int64 */
+  completed: number;
+  /** @format int64 */
+  dismissed: number;
+  /** @format date-time */
+  last_run_utc?: null | string;
+  /** @format double */
+  completion_rate?: null | number;
+  /** @format double */
+  dismissal_rate?: null | number;
+}
+
+export interface ProductTourUsageResponse {
+  /** @format date-time */
+  month: string;
+  tours: ProductTourSummary[];
+  recent_events: ProductTourEvent[];
+}
+
 export interface ResetPasswordModel {
   password_reset_token: string;
   password: string;
@@ -865,7 +861,6 @@ export interface ViewCurrentUser {
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
   product_tours: Record<string, ProductTourProgress>;
-  product_tour_versions: Record<string, number>;
   /** @pattern ^[a-fA-F0-9]{24}$ */
   id: string;
   organization_ids: string[];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index 45ac028abe..d963cd56a6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -33,7 +33,7 @@ export const ProductTourTelemetryEventSchema = zodEnum([
   "shown",
   "started",
 ]);
-export const ProductTourStatusSchema = zodEnum(["completed", "dismissed"]);
+export const ProductTourStatusSchema = union([literal(1), literal(2)]);
 export const ProductTourLaunchSourceSchema = zodEnum([
   "automatic",
   "catalog",
@@ -89,44 +89,6 @@ export type AdminAssistantUsageResponseFormData = Infer<
   typeof AdminAssistantUsageResponseSchema
 >;
 
-export const AdminProductTourActivitySchema = object({
-  date_utc: iso.datetime(),
-  event: ProductTourTelemetryEventSchema,
-  launch_source: ProductTourLaunchSourceSchema,
-  tour_name: string().min(1, "Tour name is required"),
-  user_identity: string().min(1, "User identity is required").nullable(),
-  user_name: string().min(1, "User name is required").nullable(),
-  version: int32(),
-  count: int(),
-});
-export type AdminProductTourActivityFormData = Infer<
-  typeof AdminProductTourActivitySchema
->;
-
-export const AdminProductTourSummarySchema = object({
-  name: string().min(1, "Name is required"),
-  shown: int(),
-  started: int(),
-  completed: int(),
-  dismissed: int(),
-  unique_users: int(),
-  last_run_utc: iso.datetime().nullable(),
-  completion_rate: number().nullable(),
-  dismissal_rate: number().nullable(),
-});
-export type AdminProductTourSummaryFormData = Infer<
-  typeof AdminProductTourSummarySchema
->;
-
-export const AdminProductTourUsageResponseSchema = object({
-  month: iso.datetime(),
-  tours: array(lazy(() => AdminProductTourSummarySchema)),
-  recent_activity: array(lazy(() => AdminProductTourActivitySchema)),
-});
-export type AdminProductTourUsageResponseFormData = Infer<
-  typeof AdminProductTourUsageResponseSchema
->;
-
 export const AssistantAccessResponseSchema = object({
   enabled: boolean(),
   has_access: boolean(),
@@ -678,15 +640,47 @@ export const ProblemDetailsSchema = object({
 });
 export type ProblemDetailsFormData = Infer<typeof ProblemDetailsSchema>;
 
+export const ProductTourEventSchema = object({
+  date_utc: iso.datetime(),
+  event: ProductTourTelemetryEventSchema,
+  launch_source: ProductTourLaunchSourceSchema,
+  tour_name: string().min(1, "Tour name is required"),
+  user_identity: string().min(1, "User identity is required").nullable(),
+  user_name: string().min(1, "User name is required").nullable(),
+  version: int32(),
+  count: int(),
+});
+export type ProductTourEventFormData = Infer<typeof ProductTourEventSchema>;
+
 export const ProductTourProgressSchema = object({
   status: ProductTourStatusSchema,
-  updated_utc: iso.datetime(),
   version: int32(),
 });
 export type ProductTourProgressFormData = Infer<
   typeof ProductTourProgressSchema
 >;
 
+export const ProductTourSummarySchema = object({
+  name: string().min(1, "Name is required"),
+  shown: int(),
+  started: int(),
+  completed: int(),
+  dismissed: int(),
+  last_run_utc: iso.datetime().nullable(),
+  completion_rate: number().nullable(),
+  dismissal_rate: number().nullable(),
+});
+export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
+
+export const ProductTourUsageResponseSchema = object({
+  month: iso.datetime(),
+  tours: array(lazy(() => ProductTourSummarySchema)),
+  recent_events: array(lazy(() => ProductTourEventSchema)),
+});
+export type ProductTourUsageResponseFormData = Infer<
+  typeof ProductTourUsageResponseSchema
+>;
+
 export const ResetPasswordModelSchema = object({
   password_reset_token: string().length(
     40,
@@ -998,7 +992,6 @@ export const ViewCurrentUserSchema = object({
     string(),
     lazy(() => ProductTourProgressSchema),
   ),
-  product_tour_versions: record(string(), number()).optional(),
   id: string()
     .length(24, "Id must be exactly 24 characters")
     .regex(/^[a-fA-F0-9]{24}$/, "Id has invalid format"),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
index 035504f0a6..093b8c446d 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
@@ -342,7 +342,7 @@ describe('NavigationCommand guided tours', () => {
                         description: 'Learn the UI.',
                         initialCheckpoint: 'navigation',
                         keywords: ['tour'],
-                        name: 'ui-overview',
+                        name: 'app-overview',
                         startingRoute: vi.fn(() => '/next'),
                         title: 'Explore Exceptionless',
                         version: 1
@@ -353,7 +353,7 @@ describe('NavigationCommand guided tours', () => {
             });
 
             await fireEvent.click(screen.getByText('Explore Exceptionless'));
-            expect(startGuidedTour).toHaveBeenCalledWith('ui-overview');
+            expect(startGuidedTour).toHaveBeenCalledWith('app-overview');
             tourPalette.unmount();
             await vi.runAllTimersAsync();
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index 5e77ef3470..df33ceb996 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -740,7 +740,6 @@
                       pathname: page.url.pathname,
                       projects
                   },
-                  meQuery.data?.product_tour_versions ?? {},
                   meQuery.data?.product_tours
               )
             : []
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index 5b34277341..323e8896fe 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -80,7 +80,7 @@
         serializeTimeQueryParam
     } from '../redirect-to-events.svelte';
     let selectedEventId: null | string = $state(null);
-    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'investigate-error' ? productTourCheckpoint.current : undefined);
+    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
 
     function handleEventError(problem: ProblemDetails) {
         showBillingDialogOnUpgradeProblem(problem, organization.current);
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
index d966b7898a..87e39c6e2f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
@@ -36,7 +36,7 @@
     const createOrganization = postOrganization();
     const createProject = postProject();
     const tourActions = createProductTourActions();
-    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
+    const projectConfigureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'project-configure' ? productTourCheckpoint.current : undefined);
     const CREATE_ERROR_MESSAGE = 'Error creating setup. Please try again.';
 
     useHideOrganizationNotifications();
@@ -62,7 +62,7 @@
                         organization_id: createdOrganization.id
                     } as NewProject);
 
-                    const checkpoint = configureCheckpoint;
+                    const checkpoint = projectConfigureCheckpoint;
                     if (checkpoint) {
                         productTourCheckpoint.advance(
                             checkpoint,
@@ -172,20 +172,22 @@
     </Card.Content>
 </Card.Root>
 
-{#if configureCheckpoint}
+{#if projectConfigureCheckpoint}
     <ProductTourSpotlight
-        checkpoint={configureCheckpoint}
-        description={configureCheckpoint.checkpointName === 'organization-name'
+        checkpoint={projectConfigureCheckpoint}
+        description={projectConfigureCheckpoint.checkpointName === 'organization-name'
             ? 'Name the organization that will own your projects and error data.'
             : 'Name the application or service that will send events. The guide advances only after setup succeeds.'}
         onDismiss={tourActions.dismiss}
-        onNext={configureCheckpoint.checkpointName === 'organization-name'
+        onNext={projectConfigureCheckpoint.checkpointName === 'organization-name'
             ? (checkpoint) => {
                   productTourCheckpoint.advance(checkpoint, 'project-name');
               }
             : undefined}
         side="top"
-        target={configureCheckpoint.checkpointName === 'organization-name' ? "[data-tour='setup-organization-name']" : "[data-tour='project-setup-form']"}
-        title={configureCheckpoint.checkpointName === 'organization-name' ? 'Name your organization' : 'Name your first project'}
+        target={projectConfigureCheckpoint.checkpointName === 'organization-name'
+            ? "[data-tour='setup-organization-name']"
+            : "[data-tour='project-setup-form']"}
+        title={projectConfigureCheckpoint.checkpointName === 'organization-name' ? 'Name your organization' : 'Name your first project'}
     />
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index ab73f50656..ab15681aa2 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -16,7 +16,6 @@
     import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
-    import { getProjectQuery } from '$features/projects/api.svelte';
     import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
     import EnableTokenDialog from '$features/tokens/components/dialogs/enable-token-dialog.svelte';
     import { ChangeType, type WebSocketMessageValue } from '$features/websockets/models';
@@ -42,14 +41,6 @@
             }
         }
     });
-    const projectQuery = getProjectQuery({
-        route: {
-            get id() {
-                return projectId;
-            }
-        }
-    });
-
     const apiKey = $derived(defaultTokenQuery.data?.id || 'YOUR_API_KEY');
     const serverUrl = (env.PUBLIC_EXCEPTIONLESS_SERVER_URL || '').trim();
     const showServerUrl = env.PUBLIC_EXCEPTIONLESS_CLIENT_SETUP_SHOW_SERVER_URL !== 'false';
@@ -62,7 +53,7 @@
     let isProjectTypeOpen = $state(false);
     let openEnableTokenDialog = $state(false);
     const tourActions = createProductTourActions();
-    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
+    const projectConfigureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'project-configure' ? productTourCheckpoint.current : undefined);
 
     const enableTokenMutation = patchToken({
         route: {
@@ -434,8 +425,8 @@ public partial class App : Application {
         const message = (event as CustomEvent<WebSocketMessageValue<'PersistentEventChanged'>>).detail;
 
         if (queryParams.redirect && message.project_id === projectId && message.change_type !== ChangeType.Removed) {
-            if (configureCheckpoint && !(await tourActions.complete(configureCheckpoint))) {
-                return;
+            if (projectConfigureCheckpoint) {
+                await tourActions.complete(projectConfigureCheckpoint);
             }
 
             toast.success('First event received. Opening Events...');
@@ -443,32 +434,6 @@ public partial class App : Application {
         }
     });
 
-    async function refreshConfiguredProject(): Promise<void> {
-        const checkpoint = configureCheckpoint;
-        if (!queryParams.redirect || !checkpoint) {
-            return;
-        }
-
-        const result = await projectQuery.refetch();
-        if (!result.data?.is_configured) {
-            return;
-        }
-
-        if (!(await tourActions.complete(checkpoint))) {
-            return;
-        }
-
-        toast.success('First event received. Opening Events...');
-        await redirectToEventsWithFilter(organization.current, new ProjectFilter([projectId]));
-    }
-
-    useEventListener(window, 'focus', async () => {
-        await refreshConfiguredProject();
-    });
-    useEventListener(document, 'refresh', async () => {
-        await refreshConfiguredProject();
-    });
-
     // Use Intercom from parent provider context
     const intercom = getIntercom();
 
@@ -511,12 +476,12 @@ public partial class App : Application {
             <NotificationTitle>Waiting for your first event</NotificationTitle>
             <NotificationDescription>
                 <P>Send an event from your app. When it arrives, we'll open the project Events page automatically.</P>
-                {#if configureCheckpoint}
+                {#if projectConfigureCheckpoint}
                     <P class="mt-2">You can leave this tab while updating your application. The guide will resume here when you return.</P>
                     <Button
                         class="mt-2"
                         onclick={async () => {
-                            await tourActions.dismiss(configureCheckpoint);
+                            await tourActions.dismiss(projectConfigureCheckpoint);
                         }}
                         size="sm"
                         variant="outline">End guide</Button
@@ -536,8 +501,8 @@ public partial class App : Application {
                 onValueChange={(value) => {
                     selectedProjectType = projectTypes.find((P) => P.id === value) || null;
                     queryParams.type = value;
-                    if (configureCheckpoint?.checkpointName === 'choose-platform') {
-                        productTourCheckpoint.advance(configureCheckpoint, 'sdk-instructions');
+                    if (projectConfigureCheckpoint?.checkpointName === 'choose-platform') {
+                        productTourCheckpoint.advance(projectConfigureCheckpoint, 'sdk-instructions');
                     }
                 }}
             >
@@ -828,23 +793,23 @@ public partial class App : Application {
         {/if}
     </ol>
 
-    {#if configureCheckpoint?.checkpointName === 'sdk-instructions'}
+    {#if projectConfigureCheckpoint?.checkpointName === 'sdk-instructions'}
         <ProductTourInlineCallout
             description="Follow these SDK instructions in your own application. When it is connected, return here and continue to wait for the first event."
             onContinue={() => {
-                productTourCheckpoint.advance(configureCheckpoint, 'wait-for-event');
+                productTourCheckpoint.advance(projectConfigureCheckpoint, 'wait-for-event');
             }}
             onDismiss={async () => {
-                await tourActions.dismiss(configureCheckpoint);
+                await tourActions.dismiss(projectConfigureCheckpoint);
             }}
             title="Connect your application"
-            tourName="configure-project"
+            tourName="project-configure"
         />
     {/if}
 
-    {#if configureCheckpoint?.checkpointName === 'choose-platform' && !isProjectTypeOpen}
+    {#if projectConfigureCheckpoint?.checkpointName === 'choose-platform' && !isProjectTypeOpen}
         <ProductTourSpotlight
-            checkpoint={configureCheckpoint}
+            checkpoint={projectConfigureCheckpoint}
             description="Choose the SDK platform that matches the application you are connecting."
             onDismiss={tourActions.dismiss}
             target="[data-tour='project-configure-platform']"
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
index 20a724a4f4..1e4ce35e85 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
@@ -25,7 +25,7 @@
     let toastId = $state<number | string>();
     const createProject = postProject();
     const tourActions = createProductTourActions();
-    const configureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'configure-project' ? productTourCheckpoint.current : undefined);
+    const projectConfigureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'project-configure' ? productTourCheckpoint.current : undefined);
 
     const form = createForm(() => ({
         defaultValues: {
@@ -42,7 +42,7 @@
                         ...value,
                         organization_id: organization.current ?? value.organization_id
                     } as NewProject);
-                    const checkpoint = configureCheckpoint;
+                    const checkpoint = projectConfigureCheckpoint;
                     if (checkpoint) {
                         productTourCheckpoint.advance(checkpoint, 'choose-platform');
                     }
@@ -128,9 +128,9 @@
     </form>
 </div>
 
-{#if configureCheckpoint?.checkpointName === 'project-name'}
+{#if projectConfigureCheckpoint?.checkpointName === 'project-name'}
     <ProductTourSpotlight
-        checkpoint={configureCheckpoint}
+        checkpoint={projectConfigureCheckpoint}
         description="Name the application or service that will send events. Continue by submitting this form; the guide advances only after creation succeeds."
         onDismiss={tourActions.dismiss}
         side="top"
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index ddf6b428b6..e83280dc99 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -64,7 +64,6 @@
                                 <Table.Head class="pl-4">Tour</Table.Head>
                                 <Table.Head class="text-right">Shown</Table.Head>
                                 <Table.Head class="text-right">Started</Table.Head>
-                                <Table.Head class="text-right">Users</Table.Head>
                                 <Table.Head class="text-right">Completed</Table.Head>
                                 <Table.Head class="text-right">Dismissed</Table.Head>
                                 <Table.Head>Last Run</Table.Head>
@@ -76,7 +75,6 @@
                                     <Table.Cell class="pl-4 font-medium">{title(tour.name)}</Table.Cell>
                                     <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
                                     <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
-                                    <Table.Cell class="text-right"><Number value={tour.unique_users} /></Table.Cell>
                                     <Table.Cell class="text-right">
                                         <Number value={tour.completed} />
                                         <span class="text-muted-foreground ml-1 text-xs">
@@ -110,7 +108,7 @@
                 <Card.Description>Latest identified-user tour events for investigating support and onboarding patterns.</Card.Description>
             </Card.Header>
             <Card.Content class="px-0">
-                {#if usage?.recent_activity.length === 0}
+                {#if usage?.recent_events.length === 0}
                     <p class="text-muted-foreground px-4 py-10 text-center text-sm">No recent tour activity was recorded.</p>
                 {:else}
                     <Table.Root aria-label="Recent guided-tour activity" class="min-w-3xl">
@@ -124,7 +122,7 @@
                             </Table.Row>
                         </Table.Header>
                         <Table.Body>
-                            {#each usage?.recent_activity ?? [] as activity (activity)}
+                            {#each usage?.recent_events ?? [] as activity (activity)}
                                 <Table.Row>
                                     <Table.Cell class="pl-4">
                                         <div class="font-medium">{activity.user_name || activity.user_identity || 'Unknown user'}</div>
diff --git a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
similarity index 62%
rename from src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
rename to src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index 475360e1ed..066201a888 100644
--- a/src/Exceptionless.Web/Models/Admin/AdminProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -2,23 +2,22 @@
 
 namespace Exceptionless.Web.Models.Admin;
 
-public sealed record AdminProductTourUsageResponse(
+public sealed record ProductTourUsageResponse(
     DateTime Month,
-    IReadOnlyCollection<AdminProductTourSummary> Tours,
-    IReadOnlyCollection<AdminProductTourActivity> RecentActivity);
+    IReadOnlyCollection<ProductTourSummary> Tours,
+    IReadOnlyCollection<ProductTourEvent> RecentEvents);
 
-public sealed record AdminProductTourSummary(
+public sealed record ProductTourSummary(
     string Name,
     long Shown,
     long Started,
     long Completed,
     long Dismissed,
-    long UniqueUsers,
     DateTime? LastRunUtc,
     decimal? CompletionRate,
     decimal? DismissalRate);
 
-public sealed record AdminProductTourActivity(
+public sealed record ProductTourEvent(
     DateTime DateUtc,
     ProductTourTelemetryEvent Event,
     ProductTourLaunchSource LaunchSource,
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index af109dfdae..831150634f 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -34,7 +34,6 @@ public ViewCurrentUser(User user, IntercomOptions options)
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; set; }
     public IDictionary<string, ProductTourProgress> ProductTours { get; set; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
-    public IReadOnlyDictionary<string, int> ProductTourVersions { get; } = Exceptionless.Core.Models.Data.ProductTours.Versions;
 
     private static string? HMACSHA256HashString(string value, IntercomOptions options)
     {
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 1b9e665694..afd36a8459 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -458,7 +458,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/AdminProductTourUsageResponse"
+                  "$ref": "#/components/schemas/ProductTourUsageResponse"
                 }
               }
             }
@@ -11825,140 +11825,6 @@
           }
         }
       },
-      "AdminProductTourActivity": {
-        "required": [
-          "date_utc",
-          "event",
-          "launch_source",
-          "tour_name",
-          "user_identity",
-          "user_name",
-          "version",
-          "count"
-        ],
-        "type": "object",
-        "properties": {
-          "date_utc": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "event": {
-            "$ref": "#/components/schemas/ProductTourTelemetryEvent"
-          },
-          "launch_source": {
-            "$ref": "#/components/schemas/ProductTourLaunchSource"
-          },
-          "tour_name": {
-            "type": "string"
-          },
-          "user_identity": {
-            "type": [
-              "null",
-              "string"
-            ]
-          },
-          "user_name": {
-            "type": [
-              "null",
-              "string"
-            ]
-          },
-          "version": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "count": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
-      "AdminProductTourSummary": {
-        "required": [
-          "name",
-          "shown",
-          "started",
-          "completed",
-          "dismissed",
-          "unique_users",
-          "last_run_utc",
-          "completion_rate",
-          "dismissal_rate"
-        ],
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "shown": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "started": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "completed": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "dismissed": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "unique_users": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "last_run_utc": {
-            "type": [
-              "null",
-              "string"
-            ],
-            "format": "date-time"
-          },
-          "completion_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
-          },
-          "dismissal_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
-          }
-        }
-      },
-      "AdminProductTourUsageResponse": {
-        "required": [
-          "month",
-          "tours",
-          "recent_activity"
-        ],
-        "type": "object",
-        "properties": {
-          "month": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "tours": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/AdminProductTourSummary"
-            }
-          },
-          "recent_activity": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/AdminProductTourActivity"
-            }
-          }
-        }
-      },
       "AssistantAccessResponse": {
         "required": [
           "enabled",
@@ -13491,6 +13357,54 @@
           }
         }
       },
+      "ProductTourEvent": {
+        "required": [
+          "date_utc",
+          "event",
+          "launch_source",
+          "tour_name",
+          "user_identity",
+          "user_name",
+          "version",
+          "count"
+        ],
+        "type": "object",
+        "properties": {
+          "date_utc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "event": {
+            "$ref": "#/components/schemas/ProductTourTelemetryEvent"
+          },
+          "launch_source": {
+            "$ref": "#/components/schemas/ProductTourLaunchSource"
+          },
+          "tour_name": {
+            "type": "string"
+          },
+          "user_identity": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "user_name": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "version": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "count": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
       "ProductTourLaunchSource": {
         "enum": [
           "automatic",
@@ -13510,7 +13424,6 @@
       "ProductTourProgress": {
         "required": [
           "status",
-          "updated_utc",
           "version"
         ],
         "type": "object",
@@ -13518,10 +13431,6 @@
           "status": {
             "$ref": "#/components/schemas/ProductTourStatus"
           },
-          "updated_utc": {
-            "type": "string",
-            "format": "date-time"
-          },
           "version": {
             "type": "integer",
             "format": "int32"
@@ -13530,14 +13439,70 @@
       },
       "ProductTourStatus": {
         "enum": [
-          "completed",
-          "dismissed"
+          1,
+          2
         ],
+        "type": "integer",
         "x-enumNames": [
           "Completed",
           "Dismissed"
         ]
       },
+      "ProductTourSummary": {
+        "required": [
+          "name",
+          "shown",
+          "started",
+          "completed",
+          "dismissed",
+          "last_run_utc",
+          "completion_rate",
+          "dismissal_rate"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "shown": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "started": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "completed": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "dismissed": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "last_run_utc": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "completion_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          },
+          "dismissal_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          }
+        }
+      },
       "ProductTourTelemetryEvent": {
         "enum": [
           "completed",
@@ -13552,6 +13517,32 @@
           "Started"
         ]
       },
+      "ProductTourUsageResponse": {
+        "required": [
+          "month",
+          "tours",
+          "recent_events"
+        ],
+        "type": "object",
+        "properties": {
+          "month": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "tours": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProductTourSummary"
+            }
+          },
+          "recent_events": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProductTourEvent"
+            }
+          }
+        }
+      },
       "ResetPasswordModel": {
         "required": [
           "password_reset_token",
@@ -14463,14 +14454,6 @@
               "$ref": "#/components/schemas/ProductTourProgress"
             }
           },
-          "product_tour_versions": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "readOnly": true
-          },
           "id": {
             "maxLength": 24,
             "minLength": 24,
@@ -15317,4 +15300,4 @@
       "name": "Source Map"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 7367b4f277..b1c73bf755 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -1,5 +1,6 @@
 using Exceptionless.Core;
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Utility;
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Tests.Utility;
@@ -26,20 +27,21 @@ protected override async Task ResetDataAsync()
     [Fact]
     public async Task GetProductTourUsageAsync_AsGlobalAdmin_ReturnsInternalMonthlyUsage()
     {
+        // Arrange
         var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
         TimeProvider.SetUtcNow(month.AddDays(20));
 
         await CreateDataAsync(builder =>
         {
-            AddUsage(builder, "product-tour.shown.ui-overview.v1.automatic", month.AddDays(1), "user-1", 2);
-            AddUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(2), "user-1");
-            AddUsage(builder, "product-tour.started.ui-overview.v1.help-menu", month.AddDays(3), "user-1");
-            AddUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(4), "user-2");
-            AddUsage(builder, "product-tour.completed.ui-overview.v1.catalog", month.AddDays(5), "user-1");
-            AddUsage(builder, "product-tour.dismissed.ui-overview.v1.catalog", month.AddDays(6), "user-2");
-            AddUsage(builder, "product-tour.started.meet-exie.v1.command-palette", month.AddDays(7), "user-3");
-            AddUsage(builder, "product-tour.shown.welcome.v1.automatic", month.AddDays(1), "user-1", 2);
-            AddUsage(builder, "product-tour.dismissed.welcome.v1.automatic", month.AddDays(2), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-1", 2);
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(2), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.HelpMenu), month.AddDays(3), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(4), "user-2");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(5), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(6), "user-2");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.ExieOverview, 1, ProductTourLaunchSource.CommandPalette), month.AddDays(7), "user-3");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-1", 2);
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(2), "user-1");
             AddUsage(builder, "product-tour.started.unknown.v1.unknown-source", month.AddDays(8), "user-4");
 
             builder.Event()
@@ -51,64 +53,68 @@ await CreateDataAsync(builder =>
             AddUsage(builder, "product-tour.started.old-tour.v1.catalog", month.AddMonths(-1), "user-6");
         });
 
-        var response = await SendRequestAsAsync<AdminProductTourUsageResponse>(request => request
+        // Act
+        var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
             .QueryString("month", "2026-08-01")
             .QueryString("limit", "3")
             .StatusCodeShouldBeOk());
 
+        // Assert
         Assert.NotNull(response);
         Assert.Equal(month, response.Month);
         Assert.Equal(3, response.Tours.Count);
 
-        var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "ui-overview", StringComparison.Ordinal));
+        var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
         Assert.Equal(2, overview.Shown);
         Assert.Equal(3, overview.Started);
         Assert.Equal(1, overview.Completed);
         Assert.Equal(1, overview.Dismissed);
-        Assert.Equal(2, overview.UniqueUsers);
         Assert.Equal(month.AddDays(6), overview.LastRunUtc);
         Assert.Equal(0.3333m, overview.CompletionRate);
         Assert.Equal(0.3333m, overview.DismissalRate);
 
-        var exie = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "meet-exie", StringComparison.Ordinal));
+        var exie = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.ExieOverview, StringComparison.Ordinal));
         Assert.Equal(1, exie.Started);
-        Assert.Equal(1, exie.UniqueUsers);
         Assert.Equal(month.AddDays(7), exie.LastRunUtc);
         Assert.Equal(0m, exie.CompletionRate);
         Assert.Equal(0m, exie.DismissalRate);
 
-        var welcome = Assert.Single(response.Tours, tour => String.Equals(tour.Name, "welcome", StringComparison.Ordinal));
+        var welcome = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppWelcome, StringComparison.Ordinal));
         Assert.Equal(2, welcome.Shown);
         Assert.Equal(1, welcome.Dismissed);
         Assert.Equal(month.AddDays(2), welcome.LastRunUtc);
         Assert.Equal(0.5m, welcome.DismissalRate);
 
-        Assert.Equal(3, response.RecentActivity.Count);
-        Assert.Equal(month.AddDays(7), response.RecentActivity.First().DateUtc);
-        Assert.All(response.RecentActivity, activity => Assert.StartsWith("user-", activity.UserIdentity));
+        Assert.Equal(3, response.RecentEvents.Count);
+        Assert.Equal(month.AddDays(7), response.RecentEvents.First().DateUtc);
+        Assert.All(response.RecentEvents, productTourEvent => Assert.StartsWith("user-", productTourEvent.UserIdentity));
     }
 
     [Fact]
     public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonth()
     {
+        // Arrange
         TimeProvider.SetUtcNow(new DateTime(2026, 9, 17, 12, 0, 0, DateTimeKind.Utc));
 
-        var response = await SendRequestAsAsync<AdminProductTourUsageResponse>(request => request
+        // Act
+        var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
             .StatusCodeShouldBeOk());
 
+        // Assert
         Assert.NotNull(response);
         Assert.Equal(new DateTime(2026, 9, 1, 0, 0, 0, DateTimeKind.Utc), response.Month);
         Assert.Empty(response.Tours);
-        Assert.Empty(response.RecentActivity);
+        Assert.Empty(response.RecentEvents);
     }
 
     [Fact]
     public Task GetProductTourUsageAsync_AsOrganizationUser_ReturnsForbidden()
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .AsTestOrganizationUser()
             .AppendPaths("admin", "product-tour-usage")
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 4b579de86a..87096a9149 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -1,4 +1,3 @@
-using System.Text.Json;
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories;
@@ -28,79 +27,75 @@ protected override async Task ResetDataAsync()
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_NewProgress_PersistsAndReturnsProgress()
     {
+        // Arrange
         var currentUser = await GetTestOrganizationUserAsync();
 
+        // Act
         var progress = await SendRequestAsAsync<ProductTourProgress>(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .AppendPaths("users", "me", "product-tours", "app-overview")
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Dismissed, Version = 1 })
             .StatusCodeShouldBeOk());
 
+        // Assert
         Assert.NotNull(progress);
         Assert.Equal(ProductTourStatus.Dismissed, progress.Status);
         Assert.Equal(1, progress.Version);
 
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
-        Assert.Equal(progress, persistedUser.ProductTours["ui-overview"]);
-    }
-
-    [Fact]
-    public async Task GetCurrentUserAsync_ReturnsAuthoritativeProductTourVersions()
-    {
-        var currentUser = await SendRequestAsAsync<JsonElement>(request => request
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me")
-            .StatusCodeShouldBeOk());
-
-        var versions = currentUser.GetProperty("product_tour_versions")
-            .Deserialize<Dictionary<string, int>>();
-
-        Assert.Equal(ProductTours.Versions, versions);
+        Assert.Equal(progress, persistedUser.ProductTours["app-overview"]);
     }
 
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStoredValue()
     {
+        // Arrange
         var currentUser = await GetTestOrganizationUserAsync();
-        currentUser.ProductTours[ProductTours.MeetExie] = new ProductTourProgress
+        currentUser.ProductTours[ProductTours.ExieOverview] = new ProductTourProgress
         {
             Status = ProductTourStatus.Completed,
-            UpdatedUtc = TimeProvider.GetUtcNow().UtcDateTime,
             Version = 3
         };
         await _userRepository.SaveAsync(currentUser, options => options.Cache().ImmediateConsistency());
 
-        var replacement = await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Dismissed, 1);
+        // Act
+        var replacement = await UpdateProgressAsync(ProductTours.ExieOverview, ProductTourStatus.Dismissed, 1);
 
+        // Assert
         Assert.Equal(ProductTourStatus.Completed, replacement.Status);
         Assert.Equal(3, replacement.Version);
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
-        Assert.Equal(replacement, persistedUser.ProductTours["meet-exie"]);
+        Assert.Equal(replacement, persistedUser.ProductTours["exie-overview"]);
     }
 
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_CompletedProgress_ReplacesDismissedProgressForSameVersion()
     {
+        // Arrange
         var currentUser = await GetTestOrganizationUserAsync();
-        await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Dismissed, 1);
+        await UpdateProgressAsync(ProductTours.ExieOverview, ProductTourStatus.Dismissed, 1);
 
-        var replacement = await UpdateProgressAsync(ProductTours.MeetExie, ProductTourStatus.Completed, 1);
+        // Act
+        var replacement = await UpdateProgressAsync(ProductTours.ExieOverview, ProductTourStatus.Completed, 1);
 
+        // Assert
         Assert.Equal(ProductTourStatus.Completed, replacement.Status);
         Assert.Equal(1, replacement.Version);
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
-        Assert.Equal(replacement, persistedUser.ProductTours["meet-exie"]);
+        Assert.Equal(replacement, persistedUser.ProductTours["exie-overview"]);
     }
 
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_UnknownTourName_ReturnsUnprocessableEntity()
     {
+        // Arrange
         var currentUser = await GetTestOrganizationUserAsync();
 
+        // Act
         await SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
@@ -108,6 +103,7 @@ await SendRequestAsync(request => request
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
             .StatusCodeShouldBeUnprocessableEntity());
 
+        // Assert
         var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
         Assert.NotNull(persistedUser);
         Assert.DoesNotContain("unknown-tour", persistedUser.ProductTours);
@@ -116,6 +112,7 @@ await SendRequestAsync(request => request
     [Fact]
     public Task UpdateCurrentUserProductTourAsync_InvalidTourName_DoesNotMatchRoute()
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
@@ -127,9 +124,10 @@ public Task UpdateCurrentUserProductTourAsync_InvalidTourName_DoesNotMatchRoute(
     [Fact]
     public Task UpdateCurrentUserProductTourAsync_AnonymousUser_ReturnsUnauthorized()
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .Put()
-            .AppendPaths("users", "me", "product-tours", "welcome")
+            .AppendPaths("users", "me", "product-tours", ProductTours.AppWelcome)
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Dismissed, Version = 1 })
             .StatusCodeShouldBeUnauthorized());
     }
@@ -137,10 +135,11 @@ public Task UpdateCurrentUserProductTourAsync_AnonymousUser_ReturnsUnauthorized(
     [Fact]
     public Task UpdateCurrentUserProductTourAsync_MissingBody_ReturnsBadRequest()
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .AppendPaths("users", "me", "product-tours", "app-overview")
             .StatusCodeShouldBeBadRequest());
     }
 
@@ -150,10 +149,11 @@ public Task UpdateCurrentUserProductTourAsync_MissingBody_ReturnsBadRequest()
     [InlineData(2)]
     public Task UpdateCurrentUserProductTourAsync_UnsupportedVersion_ReturnsUnprocessableEntity(int version)
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .AppendPaths("users", "me", "product-tours", "app-overview")
             .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = version })
             .StatusCodeShouldBeUnprocessableEntity());
     }
@@ -161,10 +161,11 @@ public Task UpdateCurrentUserProductTourAsync_UnsupportedVersion_ReturnsUnproces
     [Fact]
     public Task UpdateCurrentUserProductTourAsync_UndefinedStatus_ReturnsUnprocessableEntity()
     {
+        // Act & Assert
         return SendRequestAsync(request => request
             .Put()
             .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", "ui-overview")
+            .AppendPaths("users", "me", "product-tours", "app-overview")
             .Content(new { Status = 999, Version = 1 })
             .StatusCodeShouldBeUnprocessableEntity());
     }
diff --git a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
index f0e22b33ad..7e95223a9a 100644
--- a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
+++ b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
@@ -70,7 +70,7 @@ public async Task GetOpenApiJson_Default_ContainsExpectedRoutesOperationsAndResp
         Assert.True(paths.TryGetProperty("/api/v2/admin/product-tour-usage", out var productTourUsagePath));
         Assert.True(productTourUsagePath.TryGetProperty("get", out var productTourUsageGet));
         AssertResponseCodes(productTourUsageGet, "200", "400", "401", "403");
-        AssertResponseSchema(productTourUsageGet, "200", "AdminProductTourUsageResponse");
+        AssertResponseSchema(productTourUsageGet, "200", "ProductTourUsageResponse");
 
         Assert.True(paths.TryGetProperty("/api/v2/assistant/chat", out var assistantChatPath));
         Assert.True(assistantChatPath.TryGetProperty("post", out var assistantChatPost));
@@ -113,9 +113,9 @@ public async Task GetOpenApiJson_Default_ContainsExpectedSchemasAndSecuritySchem
         Assert.True(schemas.TryGetProperty("TokenResult", out _));
         Assert.True(schemas.TryGetProperty("ProductTourProgress", out _));
         Assert.True(schemas.TryGetProperty("UpdateProductTourProgress", out _));
-        Assert.True(schemas.TryGetProperty("AdminProductTourActivity", out _));
-        Assert.True(schemas.TryGetProperty("AdminProductTourSummary", out _));
-        Assert.True(schemas.TryGetProperty("AdminProductTourUsageResponse", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourEvent", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourSummary", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourUsageResponse", out _));
         Assert.True(schemas.TryGetProperty("ViewOrganization", out _));
 
         var savedViewColumnProperties = savedViewColumnSettings.GetProperty("properties");
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 196877c9d5..d6df13ff06 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -39,44 +39,45 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
     [Fact]
     public async Task GetProductTourUsageAsync_KnownSources_ReturnsPerTourAggregations()
     {
+        // Arrange
         var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
         await CreateDataAsync(builder =>
         {
-            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddDays(1), "user-1", 2);
-            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.help-menu", month.AddDays(2), "user-1");
-            AddProductTourUsage(builder, "product-tour.completed.ui-overview.v1.catalog", month.AddDays(3), "user-2");
-            AddProductTourUsage(builder, "product-tour.shown.welcome.v1.automatic", month.AddDays(4), "user-3");
-            AddProductTourUsage(builder, "product-tour.started.ui-overview.v2.catalog", month.AddDays(5), "user-4");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(1), "user-1", 2);
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.HelpMenu), month.AddDays(2), "user-1");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(3), "user-2");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(4), "user-3");
+            AddProductTourUsage(builder, "product-tour.started.app-overview.v2.catalog", month.AddDays(5), "user-4");
             AddProductTourUsage(builder, "product-tour.started.unknown-tour.v1.catalog", month.AddDays(6), "user-5");
-            AddProductTourUsage(builder, "product-tour.started.ui-overview.v1.catalog", month.AddMonths(-1), "user-6");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddMonths(-1), "user-6");
             builder.Event()
                 .Organization(TestConstants.OrganizationId)
                 .Project(_appOptions.InternalProjectId)
                 .Type(Event.KnownTypes.FeatureUsage)
-                .Source("product-tour.started.ui-overview.v1.catalog")
+                .Source(ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog))
                 .Date(month.AddDays(8))
                 .UserIdentity("user-8");
             builder.Event()
                 .TestProject()
                 .Type(Event.KnownTypes.FeatureUsage)
-                .Source("product-tour.started.ui-overview.v1.catalog")
+                .Source(ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog))
                 .Date(month.AddDays(7))
                 .UserIdentity("user-7");
         });
 
+        // Act
         var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1), recentLimit: 3);
 
+        // Assert
         Assert.Equal(3, result.RecentEvents.Count);
-        Assert.Equal(2, result.Tours.Count);
-        var overview = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.UiOverview, StringComparison.Ordinal));
-        Assert.Equal(3, overview.UniqueUsers);
-        Assert.Equal(4, overview.Buckets.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started).Sum(bucket => bucket.Count));
-        Assert.Equal(1, overview.Buckets.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Completed).Sum(bucket => bucket.Count));
-        Assert.Equal(month.AddDays(8), overview.Buckets.Max(bucket => bucket.LastUtc));
-
-        var welcome = Assert.Single(result.Tours, tour => String.Equals(tour.Name, ProductTours.Welcome, StringComparison.Ordinal));
-        Assert.Equal(1, welcome.UniqueUsers);
-        Assert.Equal(1, Assert.Single(welcome.Buckets).Count);
+        Assert.Equal(2, result.Buckets.Select(bucket => bucket.Source.TourName).Distinct(StringComparer.Ordinal).Count());
+        var overview = result.Buckets.Where(bucket => String.Equals(bucket.Source.TourName, ProductTours.AppOverview, StringComparison.Ordinal)).ToArray();
+        Assert.Equal(4, overview.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started).Sum(bucket => bucket.Count));
+        Assert.Equal(1, overview.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Completed).Sum(bucket => bucket.Count));
+        Assert.Equal(month.AddDays(8), overview.Max(bucket => bucket.LastUtc));
+
+        var welcome = Assert.Single(result.Buckets, bucket => String.Equals(bucket.Source.TourName, ProductTours.AppWelcome, StringComparison.Ordinal));
+        Assert.Equal(1, welcome.Count);
 
         Assert.Equal(month.AddDays(8), result.RecentEvents.First().Event.Date);
         Assert.All(result.RecentEvents, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
diff --git a/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs b/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
index fdb4f5b9bf..dc1f1ccaae 100644
--- a/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
+++ b/tests/Exceptionless.Tests/Serializer/Models/UserSerializerTests.cs
@@ -242,6 +242,7 @@ public void Deserialize_SnakeCaseJson_PreservesOrganizationIds()
     [Fact]
     public void Deserialize_User_PreservesProductTourProgress()
     {
+        // Arrange
         var original = new User
         {
             Id = "tour-user",
@@ -250,29 +251,30 @@ public void Deserialize_User_PreservesProductTourProgress()
             IsEmailAddressVerified = true,
             ProductTours = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal)
             {
-                ["welcome"] = new()
+                ["app-welcome"] = new()
                 {
                     Version = 1,
-                    Status = ProductTourStatus.Dismissed,
-                    UpdatedUtc = FixedDateTime
+                    Status = ProductTourStatus.Dismissed
                 },
-                ["ui-overview"] = new()
+                ["app-overview"] = new()
                 {
                     Version = 2,
-                    Status = ProductTourStatus.Completed,
-                    UpdatedUtc = FixedDateTime.AddMinutes(1)
+                    Status = ProductTourStatus.Completed
                 }
             }
         };
 
+        // Act
         string? json = _serializer.SerializeToString(original);
         var deserialized = _serializer.Deserialize<User>(json);
 
+        // Assert
+        Assert.Contains("\"status\":2", json);
         Assert.NotNull(deserialized);
         Assert.Equal(2, deserialized.ProductTours.Count);
-        Assert.Equal(ProductTourStatus.Dismissed, deserialized.ProductTours["welcome"].Status);
-        Assert.Equal(2, deserialized.ProductTours["ui-overview"].Version);
-        Assert.Equal(ProductTourStatus.Completed, deserialized.ProductTours["ui-overview"].Status);
+        Assert.Equal(ProductTourStatus.Dismissed, deserialized.ProductTours["app-welcome"].Status);
+        Assert.Equal(2, deserialized.ProductTours["app-overview"].Version);
+        Assert.Equal(ProductTourStatus.Completed, deserialized.ProductTours["app-overview"].Status);
     }
 
     [Fact]
diff --git a/tests/http/users.http b/tests/http/users.http
index 2fc983c203..74801b5b3b 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -27,13 +27,13 @@ Authorization: Bearer {{token}}
 @oauthGrantId = replace-with-oauth-grant-id
 
 ### Record Product Tour Progress
-PUT {{apiUrl}}/users/me/product-tours/ui-overview
+PUT {{apiUrl}}/users/me/product-tours/app-overview
 Authorization: Bearer {{token}}
 Content-Type: application/json
 
 {
     "version": 1,
-    "status": "completed"
+    "status": 1
 }
 
 ### Get OAuth Grants

From 1a0f39ce163caf5d3e4ec3ca8c564dc75ba5ddaa Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 29 Aug 2026 13:34:15 -0500
Subject: [PATCH 08/43] Clarify guided tour usage reporting

---
 .../Models/Data/ProductTours.cs               |  2 +
 .../Repositories/EventRepository.cs           | 23 +++++---
 .../Interfaces/IEventRepository.cs            |  2 +-
 .../Api/Endpoints/AdminEndpoints.cs           |  4 +-
 .../Api/Handlers/AdminHandler.cs              | 16 ++++--
 .../Api/Messages/AdminMessages.cs             |  2 +-
 .../src/lib/features/admin/api.svelte.ts      | 19 +++++--
 .../components/product-tour-host.svelte       |  4 +-
 .../ClientApp/src/lib/generated/api.ts        |  8 ++-
 .../ClientApp/src/lib/generated/schemas.ts    |  5 +-
 .../(app)/system/product-tours/+page.svelte   | 44 ++++++++++++---
 .../Models/Admin/ProductTourUsageResponse.cs  |  5 +-
 .../Exceptionless.Tests/Api/Data/openapi.json | 46 +++++++++++++++-
 .../AdminProductTourUsageEndpointTests.cs     | 55 ++++++++++++++++++-
 .../Api/OpenApiSnapshotTests.cs               |  2 +-
 .../Repositories/EventRepositoryTests.cs      | 19 +++++++
 tests/http/admin.http                         |  5 ++
 17 files changed, 222 insertions(+), 39 deletions(-)

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index bf54ebe9d1..ba8521375a 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -28,6 +28,8 @@ public static class ProductTours
 
     public static bool IsKnown(string name) => Versions.ContainsKey(name);
 
+    public static bool IsPrompt(string name) => name is AppWelcome or ExieAnnouncement;
+
     public static bool IsValid(string name, int version)
     {
         return Versions.TryGetValue(name, out int currentVersion) && version > 0 && version <= currentVersion;
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index ce1f494bdf..08f78664b3 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -84,11 +84,11 @@ public Task<FindResults<PersistentEvent>> GetByReferenceIdAsync(string projectId
         return FindAsync(q => q.Project(projectId).FieldEquals(e => e.ReferenceId, referenceId).SortDescending(e => e.Date), o => o.PageLimit(10));
     }
 
-    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime utcStart, DateTime utcEnd, int recentLimit = 500)
+    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart = null, DateTime? utcEnd = null, int recentLimit = 500)
     {
         ArgumentException.ThrowIfNullOrEmpty(projectId);
         ArgumentOutOfRangeException.ThrowIfLessThan(recentLimit, 1);
-        if (utcEnd <= utcStart)
+        if (utcStart.HasValue && utcEnd.HasValue && utcEnd <= utcStart)
             throw new ArgumentOutOfRangeException(nameof(utcEnd), "The end date must be later than the start date.");
 
         var sourcesByName = ProductTours.Versions
@@ -125,16 +125,23 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
         IRepositoryQuery<PersistentEvent> query,
         string projectId,
-        DateTime utcStart,
-        DateTime utcEnd,
+        DateTime? utcStart,
+        DateTime? utcEnd,
         string[] sources)
     {
-        return query
+        query = query
             .Project(projectId)
             .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
-            .FieldEquals(ev => ev.Source, sources)
-            .DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date)
-            .Index(utcStart, utcEnd);
+            .FieldEquals(ev => ev.Source, sources);
+
+        if (utcStart.HasValue && utcEnd.HasValue)
+            return query.DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date).Index(utcStart, utcEnd);
+        if (utcStart.HasValue)
+            return query.DateRange(utcStart, null, (PersistentEvent ev) => ev.Date);
+        if (utcEnd.HasValue)
+            return query.DateRange(null, utcEnd, (PersistentEvent ev) => ev.Date);
+
+        return query;
     }
 
     private static ProductTourUsageSource[] CreateProductTourSources(string tourName, int currentVersion)
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
index 9545942087..1519d7bef5 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
@@ -13,7 +13,7 @@ public interface IEventRepository : IRepositoryOwnedByOrganizationAndProject<Per
     Task<bool> UpdateSessionStartLastActivityAsync(string id, DateTime lastActivityUtc, bool isSessionEnd = false, bool hasError = false, bool sendNotifications = true);
     Task<long> RemoveAllAsync(string organizationId, string? clientIpAddress, DateTime? utcStart, DateTime? utcEnd, CommandOptionsDescriptor<PersistentEvent>? options = null);
     Task<long> RemoveAllByStackIdsAsync(string[] stackIds);
-    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime utcStart, DateTime utcEnd, int recentLimit = 500);
+    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart = null, DateTime? utcEnd = null, int recentLimit = 500);
 }
 
 public static class EventRepositoryExtensions
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index e67422c46b..279fcbd8df 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -92,6 +92,7 @@ public static IEndpointRouteBuilder MapAdminEndpoints(this IEndpointRouteBuilder
             .AddEndpointFilter<AutoValidationEndpointFilter>()
             .Produces<ProductTourUsageResponse>(StatusCodes.Status200OK)
             .ProducesProblem(StatusCodes.Status400BadRequest)
+            .ProducesValidationProblem(StatusCodes.Status422UnprocessableEntity)
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status403Forbidden);
 
@@ -143,6 +144,7 @@ private static async Task<HttpIResult> GetProductTourUsageAsync(
         IMediator mediator,
         IMediatorResultMapper<HttpIResult> resultMapper,
         DateTime? month = null,
+        bool all = false,
         int limit = 100)
-        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, limit))).ToHttpResult(resultMapper);
+        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, all, limit))).ToHttpResult(resultMapper);
 }
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 8847922634..5dea5a23db 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -140,9 +140,11 @@ public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
 
     public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
     {
-        var requestedMonth = message.Month ?? timeProvider.GetUtcNow().UtcDateTime;
-        var month = requestedMonth.ToUniversalTime().StartOfMonth();
-        var nextMonth = month.AddMonths(1);
+        if (message.All && message.Month.HasValue)
+            return Result.Invalid(ValidationError.Create("month", "Month cannot be specified when requesting all-time usage."));
+
+        DateTime? month = message.All ? null : (message.Month ?? timeProvider.GetUtcNow().UtcDateTime).ToUniversalTime().StartOfMonth();
+        DateTime? nextMonth = month?.AddMonths(1);
         int limit = Math.Clamp(message.Limit, 1, 500);
 
         var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth, limit);
@@ -152,18 +154,24 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             {
                 long shown = SumEvent(buckets, ProductTourTelemetryEvent.Shown);
                 long started = SumEvent(buckets, ProductTourTelemetryEvent.Started);
+                long manualStarted = buckets
+                    .Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started && bucket.Source.LaunchSource != ProductTourLaunchSource.Automatic)
+                    .Sum(bucket => bucket.Count);
                 long completed = SumEvent(buckets, ProductTourTelemetryEvent.Completed);
                 long dismissed = SumEvent(buckets, ProductTourTelemetryEvent.Dismissed);
-                long decisionDenominator = started > 0 ? started : shown;
+                long decisionDenominator = ProductTours.IsPrompt(buckets.Key) ? shown : started;
                 DateTime? lastRunUtc = buckets.Select(bucket => bucket.LastUtc).Max();
 
                 return new ProductTourSummary(
                     buckets.Key,
                     shown,
                     started,
+                    manualStarted,
                     completed,
                     dismissed,
                     lastRunUtc,
+                    CalculateRate(started, shown),
+                    CalculateRate(manualStarted, started),
                     CalculateRate(completed, decisionDenominator),
                     CalculateRate(dismissed, decisionDenominator));
             })
diff --git a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
index 43f3144691..e1aea90bd6 100644
--- a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
@@ -3,7 +3,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetAdminSettings;
 public record GetAdminStats;
 public record GetAdminAssistantUsage(DateTime? Month, int Limit, HttpContext Context);
-public record GetAdminProductTourUsage(DateTime? Month, int Limit);
+public record GetAdminProductTourUsage(DateTime? Month, bool All, int Limit);
 public record GetAdminMigrations;
 public record GetAdminEcho(HttpContext Context);
 public record GetAdminAssemblies;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
index 8c5fe6d06e..9d368712f0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
@@ -45,7 +45,7 @@ export const queryKeys = {
     migrations: ['admin', 'migrations'] as const,
     oauthApplication: (id: string | undefined) => [...queryKeys.oauthApplications, id] as const,
     oauthApplications: ['admin', 'oauth-applications'] as const,
-    productTourUsage: (month: string) => ['admin', 'product-tour-usage', month] as const,
+    productTourUsage: (month?: string) => ['admin', 'product-tour-usage', month ?? 'all'] as const,
     snapshots: ['admin', 'elasticsearch', 'snapshots'] as const,
     stats: ['admin', 'stats'] as const
 };
@@ -112,15 +112,22 @@ export function getAdminAssistantUsageQuery(month: () => string) {
     }));
 }
 
-export function getAdminProductTourUsageQuery(month: () => string) {
+export function getAdminProductTourUsageQuery(month: () => string | undefined) {
     return createQuery<ProductTourUsageResponse, ProblemDetails>(() => ({
         queryFn: async ({ signal }: { signal: AbortSignal }) => {
             const client = useFetchClient();
+            const selectedMonth = month();
+            const params = selectedMonth
+                ? {
+                      limit: 100,
+                      month: `${selectedMonth}-01`
+                  }
+                : {
+                      all: true,
+                      limit: 100
+                  };
             const response = await client.getJSON<ProductTourUsageResponse>('admin/product-tour-usage', {
-                params: {
-                    limit: 100,
-                    month: `${month()}-01`
-                },
+                params,
                 signal
             });
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index dc64f73a1f..7038df9819 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -174,7 +174,7 @@
         closeOverlays();
         catalogOpen = false;
         const next = productTourCheckpoint.start(name, item.initialCheckpoint, source, currentUser.id, item.version, organizationId);
-        await Promise.all([track('shown', name, item.version, source), track('started', name, item.version, source)]);
+        await track('started', name, item.version, source);
 
         const destination = item.startingRoute(context);
         if (`${pathname}${window.location.search}` !== destination) {
@@ -207,6 +207,7 @@
             return;
         }
         welcomeHandled = true;
+        await track('started', 'app-welcome', WELCOME_VERSION, 'automatic');
         await track('completed', 'app-welcome', WELCOME_VERSION, 'automatic');
         await startTour(recommended.name, 'automatic');
     }
@@ -232,6 +233,7 @@
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
             return;
         }
+        await track('started', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         await track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         await startTour('exie-overview', 'feature-announcement');
     }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index b4fab356dc..841759d02a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -541,12 +541,18 @@ export interface ProductTourSummary {
   /** @format int64 */
   started: number;
   /** @format int64 */
+  manual_started: number;
+  /** @format int64 */
   completed: number;
   /** @format int64 */
   dismissed: number;
   /** @format date-time */
   last_run_utc?: null | string;
   /** @format double */
+  started_rate?: null | number;
+  /** @format double */
+  manual_started_rate?: null | number;
+  /** @format double */
   completion_rate?: null | number;
   /** @format double */
   dismissal_rate?: null | number;
@@ -554,7 +560,7 @@ export interface ProductTourSummary {
 
 export interface ProductTourUsageResponse {
   /** @format date-time */
-  month: string;
+  month?: null | string;
   tours: ProductTourSummary[];
   recent_events: ProductTourEvent[];
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index d963cd56a6..959fecd2f0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -664,16 +664,19 @@ export const ProductTourSummarySchema = object({
   name: string().min(1, "Name is required"),
   shown: int(),
   started: int(),
+  manual_started: int(),
   completed: int(),
   dismissed: int(),
   last_run_utc: iso.datetime().nullable(),
+  started_rate: number().nullable(),
+  manual_started_rate: number().nullable(),
   completion_rate: number().nullable(),
   dismissal_rate: number().nullable(),
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
 export const ProductTourUsageResponseSchema = object({
-  month: iso.datetime(),
+  month: iso.datetime().nullable(),
   tours: array(lazy(() => ProductTourSummarySchema)),
   recent_events: array(lazy(() => ProductTourEventSchema)),
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index e83280dc99..6d24664346 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -4,6 +4,8 @@
     import TimeAgo from '$comp/formatters/time-ago.svelte';
     import { Muted } from '$comp/typography';
     import { Badge } from '$comp/ui/badge';
+    import { Button } from '$comp/ui/button';
+    import * as ButtonGroup from '$comp/ui/button-group';
     import * as Card from '$comp/ui/card';
     import { Input } from '$comp/ui/input';
     import { Skeleton } from '$comp/ui/skeleton';
@@ -12,8 +14,9 @@
     import { getUtcMonthKey } from '$features/admin/assistant-usage';
 
     const currentMonth = getUtcMonthKey();
+    let range = $state<'all' | 'month'>('month');
     let selectedMonth = $state(currentMonth);
-    const usageQuery = getAdminProductTourUsageQuery(() => selectedMonth);
+    const usageQuery = getAdminProductTourUsageQuery(() => (range === 'month' ? selectedMonth : undefined));
     const usage = $derived(usageQuery.data);
 
     function title(value: string): string {
@@ -27,10 +30,18 @@
 <div class="space-y-6">
     <div class="flex flex-wrap items-end justify-between gap-4">
         <Muted>Tour starts, outcomes, and recent user activity recorded by Exceptionless Feature Usage events</Muted>
-        <label class="flex flex-col gap-1 text-sm font-medium">
-            Month
-            <Input class="w-40" type="month" max={currentMonth} bind:value={selectedMonth} />
-        </label>
+        <div class="flex items-end gap-2">
+            <ButtonGroup.Root aria-label="Usage period">
+                <Button variant={range === 'all' ? 'secondary' : 'outline'} aria-pressed={range === 'all'} onclick={() => (range = 'all')}>All time</Button>
+                <Button variant={range === 'month' ? 'secondary' : 'outline'} aria-pressed={range === 'month'} onclick={() => (range = 'month')}>Month</Button>
+            </ButtonGroup.Root>
+            {#if range === 'month'}
+                <label class="flex flex-col gap-1 text-sm font-medium">
+                    Month
+                    <Input class="w-40" type="month" max={currentMonth} bind:value={selectedMonth} />
+                </label>
+            {/if}
+        </div>
     </div>
 
     {#if usageQuery.isError}
@@ -44,8 +55,8 @@
             <Card.Header>
                 <Card.Title>Tour Outcomes</Card.Title>
                 <Card.Description>
-                    Tour rates use starts as the denominator. Welcome and announcement decision rates use shown prompts because they do not have a separate
-                    start event.
+                    Start rate uses real prompt impressions when available. Outcome rates use starts, or shown prompts for prompt-only experiences. Manual
+                    starts come from the catalog, command palette, feature announcements, and help menu.
                 </Card.Description>
             </Card.Header>
             <Card.Content class="px-0">
@@ -56,7 +67,9 @@
                         {/each}
                     </div>
                 {:else if usage?.tours.length === 0}
-                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">No guided-tour activity was recorded for this month.</p>
+                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">
+                        No guided-tour activity was recorded {range === 'month' ? 'for this month' : 'yet'}.
+                    </p>
                 {:else}
                     <Table.Root aria-label="Tour outcomes" class="min-w-4xl">
                         <Table.Header>
@@ -74,7 +87,20 @@
                                 <Table.Row>
                                     <Table.Cell class="pl-4 font-medium">{title(tour.name)}</Table.Cell>
                                     <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
-                                    <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
+                                    <Table.Cell class="text-right">
+                                        <Number value={tour.started} />
+                                        <span class="text-muted-foreground ml-1 text-xs">
+                                            ({#if tour.started_rate == null}—{:else}<Percentage percent={tour.started_rate * 100} />{/if})
+                                        </span>
+                                        {#if tour.manual_started > 0}
+                                            <div class="text-muted-foreground text-xs">
+                                                <Number value={tour.manual_started} /> manual
+                                                {#if tour.manual_started_rate != null}
+                                                    (<Percentage percent={tour.manual_started_rate * 100} />)
+                                                {/if}
+                                            </div>
+                                        {/if}
+                                    </Table.Cell>
                                     <Table.Cell class="text-right">
                                         <Number value={tour.completed} />
                                         <span class="text-muted-foreground ml-1 text-xs">
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index 066201a888..162fe5b144 100644
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -3,7 +3,7 @@
 namespace Exceptionless.Web.Models.Admin;
 
 public sealed record ProductTourUsageResponse(
-    DateTime Month,
+    DateTime? Month,
     IReadOnlyCollection<ProductTourSummary> Tours,
     IReadOnlyCollection<ProductTourEvent> RecentEvents);
 
@@ -11,9 +11,12 @@ public sealed record ProductTourSummary(
     string Name,
     long Shown,
     long Started,
+    long ManualStarted,
     long Completed,
     long Dismissed,
     DateTime? LastRunUtc,
+    decimal? StartedRate,
+    decimal? ManualStartedRate,
     decimal? CompletionRate,
     decimal? DismissalRate);
 
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index afd36a8459..4f4a9178a2 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -442,6 +442,14 @@
               "format": "date-time"
             }
           },
+          {
+            "name": "all",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          },
           {
             "name": "limit",
             "in": "query",
@@ -473,6 +481,16 @@
               }
             }
           },
+          "422": {
+            "description": "Unprocessable Entity",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/HttpValidationProblemDetails"
+                }
+              }
+            }
+          },
           "401": {
             "description": "Unauthorized"
           },
@@ -13453,9 +13471,12 @@
           "name",
           "shown",
           "started",
+          "manual_started",
           "completed",
           "dismissed",
           "last_run_utc",
+          "started_rate",
+          "manual_started_rate",
           "completion_rate",
           "dismissal_rate"
         ],
@@ -13472,6 +13493,10 @@
             "type": "integer",
             "format": "int64"
           },
+          "manual_started": {
+            "type": "integer",
+            "format": "int64"
+          },
           "completed": {
             "type": "integer",
             "format": "int64"
@@ -13487,6 +13512,20 @@
             ],
             "format": "date-time"
           },
+          "started_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          },
+          "manual_started_rate": {
+            "type": [
+              "null",
+              "number"
+            ],
+            "format": "double"
+          },
           "completion_rate": {
             "type": [
               "null",
@@ -13526,7 +13565,10 @@
         "type": "object",
         "properties": {
           "month": {
-            "type": "string",
+            "type": [
+              "null",
+              "string"
+            ],
             "format": "date-time"
           },
           "tours": {
@@ -15300,4 +15342,4 @@
       "name": "Source Map"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index b1c73bf755..5ba287faf3 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -33,7 +33,6 @@ public async Task GetProductTourUsageAsync_AsGlobalAdmin_ReturnsInternalMonthlyU
 
         await CreateDataAsync(builder =>
         {
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-1", 2);
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(2), "user-1");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.HelpMenu), month.AddDays(3), "user-1");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(4), "user-2");
@@ -41,6 +40,8 @@ await CreateDataAsync(builder =>
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(6), "user-2");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.ExieOverview, 1, ProductTourLaunchSource.CommandPalette), month.AddDays(7), "user-3");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-1", 2);
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1).AddHours(1), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1).AddHours(2), "user-1");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(2), "user-1");
             AddUsage(builder, "product-tour.started.unknown.v1.unknown-source", month.AddDays(8), "user-4");
 
@@ -67,24 +68,35 @@ await CreateDataAsync(builder =>
         Assert.Equal(3, response.Tours.Count);
 
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
-        Assert.Equal(2, overview.Shown);
+        Assert.Equal(0, overview.Shown);
         Assert.Equal(3, overview.Started);
+        Assert.Equal(3, overview.ManualStarted);
         Assert.Equal(1, overview.Completed);
         Assert.Equal(1, overview.Dismissed);
         Assert.Equal(month.AddDays(6), overview.LastRunUtc);
+        Assert.Null(overview.StartedRate);
+        Assert.Equal(1m, overview.ManualStartedRate);
         Assert.Equal(0.3333m, overview.CompletionRate);
         Assert.Equal(0.3333m, overview.DismissalRate);
 
         var exie = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.ExieOverview, StringComparison.Ordinal));
         Assert.Equal(1, exie.Started);
+        Assert.Equal(1, exie.ManualStarted);
+        Assert.Null(exie.StartedRate);
+        Assert.Equal(1m, exie.ManualStartedRate);
         Assert.Equal(month.AddDays(7), exie.LastRunUtc);
         Assert.Equal(0m, exie.CompletionRate);
         Assert.Equal(0m, exie.DismissalRate);
 
         var welcome = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppWelcome, StringComparison.Ordinal));
         Assert.Equal(2, welcome.Shown);
+        Assert.Equal(1, welcome.Started);
+        Assert.Equal(0.5m, welcome.StartedRate);
+        Assert.Equal(0m, welcome.ManualStartedRate);
+        Assert.Equal(1, welcome.Completed);
         Assert.Equal(1, welcome.Dismissed);
         Assert.Equal(month.AddDays(2), welcome.LastRunUtc);
+        Assert.Equal(0.5m, welcome.CompletionRate);
         Assert.Equal(0.5m, welcome.DismissalRate);
 
         Assert.Equal(3, response.RecentEvents.Count);
@@ -92,6 +104,45 @@ await CreateDataAsync(builder =>
         Assert.All(response.RecentEvents, productTourEvent => Assert.StartsWith("user-", productTourEvent.UserIdentity));
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_ForAllTime_ReturnsUsageAcrossMonths()
+    {
+        // Arrange
+        var currentMonth = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
+        await CreateDataAsync(builder =>
+        {
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), currentMonth.AddMonths(-1), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), currentMonth.AddDays(1), "user-2");
+        });
+
+        // Act
+        var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
+            .AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .QueryString("all", "true")
+            .StatusCodeShouldBeOk());
+
+        // Assert
+        Assert.NotNull(response);
+        Assert.Null(response.Month);
+        var overview = Assert.Single(response.Tours);
+        Assert.Equal(2, overview.Started);
+        Assert.Equal(1, overview.ManualStarted);
+        Assert.Equal(0.5m, overview.ManualStartedRate);
+    }
+
+    [Fact]
+    public Task GetProductTourUsageAsync_WithMonthAndAllTime_ReturnsValidationProblem()
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request
+            .AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .QueryString("month", "2026-08-01")
+            .QueryString("all", "true")
+            .StatusCodeShouldBeUnprocessableEntity());
+    }
+
     [Fact]
     public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonth()
     {
diff --git a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
index 7e95223a9a..8d800774db 100644
--- a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
+++ b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
@@ -69,7 +69,7 @@ public async Task GetOpenApiJson_Default_ContainsExpectedRoutesOperationsAndResp
 
         Assert.True(paths.TryGetProperty("/api/v2/admin/product-tour-usage", out var productTourUsagePath));
         Assert.True(productTourUsagePath.TryGetProperty("get", out var productTourUsageGet));
-        AssertResponseCodes(productTourUsageGet, "200", "400", "401", "403");
+        AssertResponseCodes(productTourUsageGet, "200", "400", "401", "403", "422");
         AssertResponseSchema(productTourUsageGet, "200", "ProductTourUsageResponse");
 
         Assert.True(paths.TryGetProperty("/api/v2/assistant/chat", out var assistantChatPath));
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index d6df13ff06..c0aecf2eb2 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -83,6 +83,25 @@ await CreateDataAsync(builder =>
         Assert.All(result.RecentEvents, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage()
+    {
+        // Arrange
+        var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
+        await CreateDataAsync(builder =>
+        {
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddMonths(-1), "user-1");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-2");
+        });
+
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId);
+
+        // Assert
+        Assert.Equal(2, result.RecentEvents.Count);
+        Assert.Equal(2, result.Buckets.Sum(bucket => bucket.Count));
+    }
+
     [Fact]
     public async Task GetAsync()
     {
diff --git a/tests/http/admin.http b/tests/http/admin.http
index e887ce5045..85e13d94d2 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -120,6 +120,11 @@ Content-Type: application/json
 GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01&limit=100
 Authorization: Bearer {{token}}
 
+###
+
+GET {{apiUrl}}/admin/product-tour-usage?all=true&limit=100
+Authorization: Bearer {{token}}
+
 ### Suspend
 POST {{apiUrl}}/organizations/{{organizationId}}/suspend?code=1
 Authorization: Bearer {{token}}

From f792d3ac59487181618d40ec9cdded2e612d6e77 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 30 Aug 2026 08:58:07 -0500
Subject: [PATCH 09/43] Simplify product tour usage reporting

---
 .../Models/Data/ProductTours.cs               |  65 +++++--
 .../Repositories/EventRepository.cs           |  32 ++--
 .../Interfaces/IEventRepository.cs            |   2 +-
 .../Repositories/ProductTourUsageResult.cs    |   6 +-
 .../Api/Endpoints/AdminEndpoints.cs           |   5 +-
 .../Api/Handlers/AdminHandler.cs              | 105 +++++------
 .../Api/Handlers/UserHandler.cs               |  46 +++--
 .../Api/Messages/AdminMessages.cs             |   2 +-
 .../Models/Admin/ProductTourUsageResponse.cs  |  24 +--
 .../Exceptionless.Tests/Api/Data/openapi.json | 170 ++++++------------
 .../AdminProductTourUsageEndpointTests.cs     | 101 +++++------
 .../Api/Endpoints/ProductTourEndpointTests.cs |  51 ++++++
 .../Api/OpenApiSnapshotTests.cs               |   3 +-
 .../Repositories/EventRepositoryTests.cs      |  13 +-
 tests/http/admin.http                         |  12 +-
 15 files changed, 305 insertions(+), 332 deletions(-)

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index ba8521375a..dfcff97942 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -1,7 +1,6 @@
 using System.Collections.Frozen;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Exceptionless.Core.Extensions;
 
 namespace Exceptionless.Core.Models.Data;
 
@@ -15,26 +14,28 @@ public static class ProductTours
     public const string ProjectConfigure = "project-configure";
     public const string SavedViewCreate = "saved-view-create";
 
-    public static IReadOnlyDictionary<string, int> Versions { get; } = new Dictionary<string, int>(StringComparer.Ordinal)
+    public static FrozenDictionary<string, ProductTourDefinition> Definitions { get; } = new[]
     {
-        [AppOverview] = 1,
-        [AppWelcome] = 1,
-        [ExieAnnouncement] = 1,
-        [ExieOverview] = 1,
-        [EventInvestigate] = 1,
-        [ProjectConfigure] = 1,
-        [SavedViewCreate] = 1
-    }.ToFrozenDictionary(StringComparer.Ordinal);
+        new ProductTourDefinition(AppOverview, 1, ProductTourKind.Guide),
+        new ProductTourDefinition(AppWelcome, 1, ProductTourKind.Prompt),
+        new ProductTourDefinition(ExieAnnouncement, 1, ProductTourKind.Prompt),
+        new ProductTourDefinition(ExieOverview, 1, ProductTourKind.Guide),
+        new ProductTourDefinition(EventInvestigate, 1, ProductTourKind.Guide),
+        new ProductTourDefinition(ProjectConfigure, 1, ProductTourKind.Guide),
+        new ProductTourDefinition(SavedViewCreate, 1, ProductTourKind.Guide)
+    }.ToFrozenDictionary(definition => definition.Name, StringComparer.Ordinal);
 
-    public static bool IsKnown(string name) => Versions.ContainsKey(name);
+    public static bool IsKnown(string name) => Definitions.ContainsKey(name);
 
-    public static bool IsPrompt(string name) => name is AppWelcome or ExieAnnouncement;
+    public static bool IsPrompt(string name) => Find(name)?.Kind is ProductTourKind.Prompt;
 
     public static bool IsValid(string name, int version)
     {
-        return Versions.TryGetValue(name, out int currentVersion) && version > 0 && version <= currentVersion;
+        return Find(name) is { } definition && version > 0 && version <= definition.CurrentVersion;
     }
 
+    public static ProductTourDefinition? Find(string name) => Definitions.GetValueOrDefault(name);
+
     public static string CreateTelemetrySource(
         ProductTourTelemetryEvent telemetryEvent,
         string tourName,
@@ -44,9 +45,37 @@ public static string CreateTelemetrySource(
         return $"product-tour.{GetTelemetryName(telemetryEvent)}.{tourName}.v{version}.{GetLaunchSourceName(launchSource)}";
     }
 
-    private static string GetTelemetryName(ProductTourTelemetryEvent telemetryEvent) => telemetryEvent.ToString().ToLowerUnderscoredWords('-');
+    private static string GetTelemetryName(ProductTourTelemetryEvent telemetryEvent) => telemetryEvent switch
+    {
+        ProductTourTelemetryEvent.Completed => "completed",
+        ProductTourTelemetryEvent.Dismissed => "dismissed",
+        ProductTourTelemetryEvent.Shown => "shown",
+        ProductTourTelemetryEvent.Started => "started",
+        _ => throw new ArgumentOutOfRangeException(nameof(telemetryEvent), telemetryEvent, "Unknown product tour telemetry event.")
+    };
+
+    private static string GetLaunchSourceName(ProductTourLaunchSource launchSource) => launchSource switch
+    {
+        ProductTourLaunchSource.Welcome => "welcome",
+        ProductTourLaunchSource.Catalog => "catalog",
+        ProductTourLaunchSource.CommandPalette => "command-palette",
+        ProductTourLaunchSource.FeatureAnnouncement => "feature-announcement",
+        ProductTourLaunchSource.HelpMenu => "help-menu",
+        _ => throw new ArgumentOutOfRangeException(nameof(launchSource), launchSource, "Unknown product tour launch source.")
+    };
+}
+
+public sealed record ProductTourDefinition(string Name, int CurrentVersion, ProductTourKind Kind);
 
-    private static string GetLaunchSourceName(ProductTourLaunchSource launchSource) => launchSource.ToString().ToLowerUnderscoredWords('-');
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum ProductTourKind
+{
+    [JsonStringEnumMemberName("guide")]
+    [EnumMember(Value = "guide")]
+    Guide,
+    [JsonStringEnumMemberName("prompt")]
+    [EnumMember(Value = "prompt")]
+    Prompt
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -69,9 +98,9 @@ public enum ProductTourTelemetryEvent
 [JsonConverter(typeof(JsonStringEnumConverter))]
 public enum ProductTourLaunchSource
 {
-    [JsonStringEnumMemberName("automatic")]
-    [EnumMember(Value = "automatic")]
-    Automatic,
+    [JsonStringEnumMemberName("welcome")]
+    [EnumMember(Value = "welcome")]
+    Welcome,
     [JsonStringEnumMemberName("catalog")]
     [EnumMember(Value = "catalog")]
     Catalog,
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 08f78664b3..161cb9db22 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -84,28 +84,24 @@ public Task<FindResults<PersistentEvent>> GetByReferenceIdAsync(string projectId
         return FindAsync(q => q.Project(projectId).FieldEquals(e => e.ReferenceId, referenceId).SortDescending(e => e.Date), o => o.PageLimit(10));
     }
 
-    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart = null, DateTime? utcEnd = null, int recentLimit = 500)
+    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd)
     {
         ArgumentException.ThrowIfNullOrEmpty(projectId);
-        ArgumentOutOfRangeException.ThrowIfLessThan(recentLimit, 1);
-        if (utcStart.HasValue && utcEnd.HasValue && utcEnd <= utcStart)
+        if (utcStart.HasValue && utcEnd <= utcStart)
             throw new ArgumentOutOfRangeException(nameof(utcEnd), "The end date must be later than the start date.");
 
-        var sourcesByName = ProductTours.Versions
-            .SelectMany(pair => CreateProductTourSources(pair.Key, pair.Value))
+        var sourcesByName = ProductTours.Definitions.Values
+            .SelectMany(definition => CreateProductTourSources(definition.Name, definition.CurrentVersion))
             .ToDictionary(source => source.Raw, StringComparer.Ordinal);
         string[] allSources = sourcesByName.Keys.ToArray();
         string sourceField = InferField(ev => ev.Source);
         string countField = InferField(ev => ev.Count);
         string dateField = InferField(ev => ev.Date);
 
-        var aggregationTask = CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
+        var aggregation = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
             .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField})"));
-        var recentTask = FindAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
-            .SortDescending(ev => ev.Date), options => options.PageLimit(recentLimit));
 
-        await Task.WhenAll(aggregationTask, recentTask);
-        var sourceBuckets = (await aggregationTask).Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
+        var sourceBuckets = aggregation.Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
         var usage = sourceBuckets
             .Select(bucket => sourcesByName.TryGetValue(bucket.Key, out var source)
                 ? new ProductTourUsageBucket(
@@ -115,18 +111,14 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                 : null)
             .OfType<ProductTourUsageBucket>()
             .ToArray();
-        var recentEvents = (await recentTask).Documents
-            .Select(ev => ev.Source is not null && sourcesByName.TryGetValue(ev.Source, out var source) ? new ProductTourUsageEvent(ev, source) : null)
-            .OfType<ProductTourUsageEvent>()
-            .ToArray();
-        return new ProductTourUsageResult(usage, recentEvents);
+        return new ProductTourUsageResult(usage);
     }
 
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
         IRepositoryQuery<PersistentEvent> query,
         string projectId,
         DateTime? utcStart,
-        DateTime? utcEnd,
+        DateTime utcEnd,
         string[] sources)
     {
         query = query
@@ -134,14 +126,10 @@ private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
             .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
             .FieldEquals(ev => ev.Source, sources);
 
-        if (utcStart.HasValue && utcEnd.HasValue)
-            return query.DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date).Index(utcStart, utcEnd);
         if (utcStart.HasValue)
-            return query.DateRange(utcStart, null, (PersistentEvent ev) => ev.Date);
-        if (utcEnd.HasValue)
-            return query.DateRange(null, utcEnd, (PersistentEvent ev) => ev.Date);
+            return query.DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date).Index(utcStart, utcEnd);
 
-        return query;
+        return query.DateRange(null, utcEnd, (PersistentEvent ev) => ev.Date);
     }
 
     private static ProductTourUsageSource[] CreateProductTourSources(string tourName, int currentVersion)
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
index 1519d7bef5..03731764c5 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
@@ -13,7 +13,7 @@ public interface IEventRepository : IRepositoryOwnedByOrganizationAndProject<Per
     Task<bool> UpdateSessionStartLastActivityAsync(string id, DateTime lastActivityUtc, bool isSessionEnd = false, bool hasError = false, bool sendNotifications = true);
     Task<long> RemoveAllAsync(string organizationId, string? clientIpAddress, DateTime? utcStart, DateTime? utcEnd, CommandOptionsDescriptor<PersistentEvent>? options = null);
     Task<long> RemoveAllByStackIdsAsync(string[] stackIds);
-    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart = null, DateTime? utcEnd = null, int recentLimit = 500);
+    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd);
 }
 
 public static class EventRepositoryExtensions
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index 5db431cf37..7ce0e080e5 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -1,16 +1,12 @@
-using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 
 namespace Exceptionless.Core.Repositories;
 
 public sealed record ProductTourUsageResult(
-    IReadOnlyCollection<ProductTourUsageBucket> Buckets,
-    IReadOnlyCollection<ProductTourUsageEvent> RecentEvents);
+    IReadOnlyCollection<ProductTourUsageBucket> Buckets);
 
 public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
 
-public sealed record ProductTourUsageEvent(PersistentEvent Event, ProductTourUsageSource Source);
-
 public sealed record ProductTourUsageSource(
     string Raw,
     ProductTourTelemetryEvent Event,
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index 279fcbd8df..5477ea05b6 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -144,7 +144,6 @@ private static async Task<HttpIResult> GetProductTourUsageAsync(
         IMediator mediator,
         IMediatorResultMapper<HttpIResult> resultMapper,
         DateTime? month = null,
-        bool all = false,
-        int limit = 100)
-        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, all, limit))).ToHttpResult(resultMapper);
+        bool history = false)
+        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, history))).ToHttpResult(resultMapper);
 }
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 5dea5a23db..4b19ffc7f9 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -19,7 +19,6 @@
 using Foundatio.Repositories;
 using Foundatio.Repositories.Migrations;
 using Foundatio.Repositories.Models;
-using Foundatio.Serializer;
 using Foundatio.Storage;
 using Foundatio.Mediator;
 
@@ -41,7 +40,6 @@ public class AdminHandler(
     BillingPlans plans,
     IMigrationStateRepository migrationStateRepository,
     SampleDataService sampleDataService,
-    ITextSerializer serializer,
     TimeProvider timeProvider,
     ILoggerFactory loggerFactory)
 {
@@ -140,54 +138,54 @@ public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
 
     public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
     {
-        if (message.All && message.Month.HasValue)
-            return Result.Invalid(ValidationError.Create("month", "Month cannot be specified when requesting all-time usage."));
-
-        DateTime? month = message.All ? null : (message.Month ?? timeProvider.GetUtcNow().UtcDateTime).ToUniversalTime().StartOfMonth();
-        DateTime? nextMonth = month?.AddMonths(1);
-        int limit = Math.Clamp(message.Limit, 1, 500);
-
-        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, month, nextMonth, limit);
-        var tours = usage.Buckets
-            .GroupBy(bucket => bucket.Source.TourName, StringComparer.Ordinal)
-            .Select(buckets =>
+        if (message.History && message.Month.HasValue)
+            return Result.Invalid(ValidationError.Create("month", "Month cannot be specified when requesting available history."));
+
+        DateTime utcEnd = timeProvider.GetUtcNow().UtcDateTime;
+        DateTime monthStart = (message.Month ?? utcEnd).ToUniversalTime().StartOfMonth();
+        DateTime? utcStart = message.History
+            ? appOptions.MaximumRetentionDays > 0
+                ? utcEnd.SubtractDays(appOptions.MaximumRetentionDays)
+                : null
+            : monthStart;
+        if (!message.History)
+            utcEnd = monthStart.AddMonths(1);
+
+        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd);
+        var bucketsByTour = usage.Buckets
+            .GroupBy(bucket => (bucket.Source.TourName, bucket.Source.Version))
+            .ToDictionary(group => group.Key);
+        var tours = ProductTours.Definitions.Values
+            .SelectMany(definition => Enumerable.Range(1, definition.CurrentVersion).Select(version =>
             {
-                long shown = SumEvent(buckets, ProductTourTelemetryEvent.Shown);
-                long started = SumEvent(buckets, ProductTourTelemetryEvent.Started);
-                long manualStarted = buckets
-                    .Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started && bucket.Source.LaunchSource != ProductTourLaunchSource.Automatic)
-                    .Sum(bucket => bucket.Count);
-                long completed = SumEvent(buckets, ProductTourTelemetryEvent.Completed);
-                long dismissed = SumEvent(buckets, ProductTourTelemetryEvent.Dismissed);
-                long decisionDenominator = ProductTours.IsPrompt(buckets.Key) ? shown : started;
-                DateTime? lastRunUtc = buckets.Select(bucket => bucket.LastUtc).Max();
+                IEnumerable<ProductTourUsageBucket> buckets = bucketsByTour.TryGetValue((definition.Name, version), out var matchingBuckets)
+                    ? matchingBuckets
+                    : [];
 
                 return new ProductTourSummary(
-                    buckets.Key,
-                    shown,
-                    started,
-                    manualStarted,
-                    completed,
-                    dismissed,
-                    lastRunUtc,
-                    CalculateRate(started, shown),
-                    CalculateRate(manualStarted, started),
-                    CalculateRate(completed, decisionDenominator),
-                    CalculateRate(dismissed, decisionDenominator));
-            })
-            .OrderByDescending(tour => tour.Started)
-            .ThenBy(tour => tour.Name, StringComparer.Ordinal)
-            .ToArray();
-
-        var recentEvents = usage.RecentEvents
-            .Select(item => CreateRecentEvent(item.Event, item.Source))
-            .Take(limit)
+                    definition.Name,
+                    version,
+                    definition.Kind,
+                    SumEvent(buckets, ProductTourTelemetryEvent.Shown),
+                    SumEvent(buckets, ProductTourTelemetryEvent.Started),
+                    SumEvent(buckets, ProductTourTelemetryEvent.Completed),
+                    SumEvent(buckets, ProductTourTelemetryEvent.Dismissed),
+                    buckets.Select(bucket => bucket.LastUtc).Max(),
+                    buckets
+                        .Where(bucket => bucket.Source.Event is ProductTourTelemetryEvent.Started)
+                        .GroupBy(bucket => bucket.Source.LaunchSource)
+                        .Select(group => new ProductTourStartSource(group.Key, group.Sum(bucket => bucket.Count)))
+                        .OrderBy(source => source.Source)
+                        .ToArray());
+            }))
+            .OrderBy(tour => tour.Name, StringComparer.Ordinal)
+            .ThenBy(tour => tour.Version)
             .ToArray();
 
         return new ProductTourUsageResponse(
-            month,
-            tours,
-            recentEvents);
+            utcStart,
+            utcEnd,
+            tours);
     }
 
     [HandlerEndpoint(HandlerMethod.Get, "migrations", Group = "Admin")]
@@ -228,25 +226,6 @@ public Task<Result<object>> Handle(GetAdminEcho message)
         });
     }
 
-    private ProductTourEvent CreateRecentEvent(PersistentEvent ev, ProductTourUsageSource source)
-    {
-        var user = ev.GetUserIdentity(serializer, _logger);
-        return new ProductTourEvent(
-            ev.Date.UtcDateTime,
-            source.Event,
-            source.LaunchSource,
-            source.TourName,
-            user?.Identity,
-            user?.Name,
-            source.Version,
-            ev.Count ?? 1);
-    }
-
-    private static decimal? CalculateRate(long value, long denominator)
-    {
-        return denominator > 0 ? Decimal.Round(value / (decimal)denominator, 4) : null;
-    }
-
     private static long SumEvent(IEnumerable<ProductTourUsageBucket> buckets, ProductTourTelemetryEvent telemetryEvent)
     {
         return buckets.Where(bucket => bucket.Source.Event == telemetryEvent).Sum(bucket => bucket.Count);
diff --git a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
index 68e3933dfd..3766cf716b 100644
--- a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
@@ -17,6 +17,7 @@
 using Foundatio.Caching;
 using Foundatio.Mediator;
 using Foundatio.Repositories;
+using Foundatio.Repositories.Exceptions;
 using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Web.Api.Handlers;
@@ -60,26 +61,33 @@ public async Task<Result<ProductTourProgress>> Handle(UpdateCurrentUserProductTo
             return Result.Invalid(ValidationError.Create("version", "The product tour version is not supported."));
 
         ProductTourProgress? progress = null;
-        await repository.PatchAsync(
-            GetCurrentUserId(),
-            new ActionPatch<User>(user =>
-            {
-                user.ProductTours.TryGetValue(message.TourName, out var currentProgress);
-                if (!ShouldUpdateProductTourProgress(currentProgress, message.Progress))
-                {
-                    progress = currentProgress;
-                    return false;
-                }
-
-                progress = new ProductTourProgress
+        try
+        {
+            await repository.PatchAsync(
+                GetCurrentUserId(),
+                new ActionPatch<User>(user =>
                 {
-                    Status = message.Progress.Status!.Value,
-                    Version = message.Progress.Version
-                };
-                user.ProductTours[message.TourName] = progress;
-                return true;
-            }),
-            options => options.Cache());
+                    user.ProductTours.TryGetValue(message.TourName, out var currentProgress);
+                    if (!ShouldUpdateProductTourProgress(currentProgress, message.Progress))
+                    {
+                        progress = currentProgress;
+                        return false;
+                    }
+
+                    progress = new ProductTourProgress
+                    {
+                        Status = message.Progress.Status!.Value,
+                        Version = message.Progress.Version
+                    };
+                    user.ProductTours[message.TourName] = progress;
+                    return true;
+                }),
+                options => options.Cache());
+        }
+        catch (DocumentNotFoundException)
+        {
+            return Result.NotFound("User not found.");
+        }
 
         return progress is null ? Result.NotFound("User not found.") : progress;
     }
diff --git a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
index e1aea90bd6..7183ab7392 100644
--- a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
@@ -3,7 +3,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetAdminSettings;
 public record GetAdminStats;
 public record GetAdminAssistantUsage(DateTime? Month, int Limit, HttpContext Context);
-public record GetAdminProductTourUsage(DateTime? Month, bool All, int Limit);
+public record GetAdminProductTourUsage(DateTime? Month, bool History);
 public record GetAdminMigrations;
 public record GetAdminEcho(HttpContext Context);
 public record GetAdminAssemblies;
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index 162fe5b144..11e3ae40d9 100644
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -3,29 +3,19 @@
 namespace Exceptionless.Web.Models.Admin;
 
 public sealed record ProductTourUsageResponse(
-    DateTime? Month,
-    IReadOnlyCollection<ProductTourSummary> Tours,
-    IReadOnlyCollection<ProductTourEvent> RecentEvents);
+    DateTime? UtcStart,
+    DateTime UtcEnd,
+    IReadOnlyCollection<ProductTourSummary> Tours);
 
 public sealed record ProductTourSummary(
     string Name,
+    int Version,
+    ProductTourKind Kind,
     long Shown,
     long Started,
-    long ManualStarted,
     long Completed,
     long Dismissed,
     DateTime? LastRunUtc,
-    decimal? StartedRate,
-    decimal? ManualStartedRate,
-    decimal? CompletionRate,
-    decimal? DismissalRate);
+    IReadOnlyCollection<ProductTourStartSource> StartSources);
 
-public sealed record ProductTourEvent(
-    DateTime DateUtc,
-    ProductTourTelemetryEvent Event,
-    ProductTourLaunchSource LaunchSource,
-    string TourName,
-    string? UserIdentity,
-    string? UserName,
-    int Version,
-    long Count);
+public sealed record ProductTourStartSource(ProductTourLaunchSource Source, long Count);
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 4f4a9178a2..e2faa7182f 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -443,21 +443,12 @@
             }
           },
           {
-            "name": "all",
+            "name": "history",
             "in": "query",
             "schema": {
               "type": "boolean",
               "default": false
             }
-          },
-          {
-            "name": "limit",
-            "in": "query",
-            "schema": {
-              "type": "integer",
-              "format": "int32",
-              "default": 100
-            }
           }
         ],
         "responses": {
@@ -13375,70 +13366,32 @@
           }
         }
       },
-      "ProductTourEvent": {
-        "required": [
-          "date_utc",
-          "event",
-          "launch_source",
-          "tour_name",
-          "user_identity",
-          "user_name",
-          "version",
-          "count"
-        ],
-        "type": "object",
-        "properties": {
-          "date_utc": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "event": {
-            "$ref": "#/components/schemas/ProductTourTelemetryEvent"
-          },
-          "launch_source": {
-            "$ref": "#/components/schemas/ProductTourLaunchSource"
-          },
-          "tour_name": {
-            "type": "string"
-          },
-          "user_identity": {
-            "type": [
-              "null",
-              "string"
-            ]
-          },
-          "user_name": {
-            "type": [
-              "null",
-              "string"
-            ]
-          },
-          "version": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "count": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
       "ProductTourLaunchSource": {
         "enum": [
-          "automatic",
+          "welcome",
           "catalog",
           "command-palette",
           "feature-announcement",
           "help-menu"
         ],
         "x-enumNames": [
-          "Automatic",
+          "Welcome",
           "Catalog",
           "CommandPalette",
           "FeatureAnnouncement",
           "HelpMenu"
         ]
       },
+      "ProductTourKind": {
+        "enum": [
+          "guide",
+          "prompt"
+        ],
+        "x-enumNames": [
+          "Guide",
+          "Prompt"
+        ]
+      },
       "ProductTourProgress": {
         "required": [
           "status",
@@ -13469,31 +13422,32 @@
       "ProductTourSummary": {
         "required": [
           "name",
+          "version",
+          "kind",
           "shown",
           "started",
-          "manual_started",
           "completed",
           "dismissed",
           "last_run_utc",
-          "started_rate",
-          "manual_started_rate",
-          "completion_rate",
-          "dismissal_rate"
+          "start_sources"
         ],
         "type": "object",
         "properties": {
           "name": {
             "type": "string"
           },
-          "shown": {
+          "version": {
             "type": "integer",
-            "format": "int64"
+            "format": "int32"
           },
-          "started": {
+          "kind": {
+            "$ref": "#/components/schemas/ProductTourKind"
+          },
+          "shown": {
             "type": "integer",
             "format": "int64"
           },
-          "manual_started": {
+          "started": {
             "type": "integer",
             "format": "int64"
           },
@@ -13512,76 +13466,54 @@
             ],
             "format": "date-time"
           },
-          "started_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
-          },
-          "manual_started_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
-          },
-          "completion_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
-          },
-          "dismissal_rate": {
-            "type": [
-              "null",
-              "number"
-            ],
-            "format": "double"
+          "start_sources": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProductTourStartSource"
+            }
           }
         }
       },
-      "ProductTourTelemetryEvent": {
-        "enum": [
-          "completed",
-          "dismissed",
-          "shown",
-          "started"
+      "ProductTourStartSource": {
+        "required": [
+          "source",
+          "count"
         ],
-        "x-enumNames": [
-          "Completed",
-          "Dismissed",
-          "Shown",
-          "Started"
-        ]
+        "type": "object",
+        "properties": {
+          "source": {
+            "$ref": "#/components/schemas/ProductTourLaunchSource"
+          },
+          "count": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
       },
       "ProductTourUsageResponse": {
         "required": [
-          "month",
-          "tours",
-          "recent_events"
+          "utc_start",
+          "utc_end",
+          "tours"
         ],
         "type": "object",
         "properties": {
-          "month": {
+          "utc_start": {
             "type": [
               "null",
               "string"
             ],
             "format": "date-time"
           },
+          "utc_end": {
+            "type": "string",
+            "format": "date-time"
+          },
           "tours": {
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/ProductTourSummary"
             }
-          },
-          "recent_events": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ProductTourEvent"
-            }
           }
         }
       },
@@ -15342,4 +15274,4 @@
       "name": "Source Map"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 5ba287faf3..6de3cd1eb3 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -2,6 +2,7 @@
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Utility;
+using Exceptionless.DateTimeExtensions;
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Tests.Utility;
 using Exceptionless.Web.Models.Admin;
@@ -25,7 +26,7 @@ protected override async Task ResetDataAsync()
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_AsGlobalAdmin_ReturnsInternalMonthlyUsage()
+    public async Task GetProductTourUsageAsync_AsGlobalAdmin_ReturnsMonthlyCountsAndKnownRows()
     {
         // Arrange
         var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
@@ -38,11 +39,10 @@ await CreateDataAsync(builder =>
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(4), "user-2");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(5), "user-1");
             AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(6), "user-2");
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.ExieOverview, 1, ProductTourLaunchSource.CommandPalette), month.AddDays(7), "user-3");
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-1", 2);
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1).AddHours(1), "user-1");
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(1).AddHours(2), "user-1");
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(2), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Welcome), month.AddDays(1), "user-1", 2);
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Welcome), month.AddDays(1).AddHours(1), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Welcome), month.AddDays(1).AddHours(2), "user-1");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Dismissed, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Welcome), month.AddDays(2), "user-1");
             AddUsage(builder, "product-tour.started.unknown.v1.unknown-source", month.AddDays(8), "user-4");
 
             builder.Event()
@@ -51,7 +51,7 @@ await CreateDataAsync(builder =>
                 .Source("product-tour.started.ignored-tour.v1.catalog")
                 .Date(month.AddDays(9))
                 .UserIdentity("user-5");
-            AddUsage(builder, "product-tour.started.old-tour.v1.catalog", month.AddMonths(-1), "user-6");
+            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddMonths(-1), "user-6");
         });
 
         // Act
@@ -59,95 +59,81 @@ await CreateDataAsync(builder =>
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
             .QueryString("month", "2026-08-01")
-            .QueryString("limit", "3")
             .StatusCodeShouldBeOk());
 
         // Assert
         Assert.NotNull(response);
-        Assert.Equal(month, response.Month);
-        Assert.Equal(3, response.Tours.Count);
+        Assert.Equal(month, response.UtcStart);
+        Assert.Equal(month.AddMonths(1), response.UtcEnd);
+        Assert.Equal(ProductTours.Definitions.Values.Sum(definition => definition.CurrentVersion), response.Tours.Count);
 
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
+        Assert.Equal(1, overview.Version);
+        Assert.Equal(ProductTourKind.Guide, overview.Kind);
         Assert.Equal(0, overview.Shown);
         Assert.Equal(3, overview.Started);
-        Assert.Equal(3, overview.ManualStarted);
         Assert.Equal(1, overview.Completed);
         Assert.Equal(1, overview.Dismissed);
         Assert.Equal(month.AddDays(6), overview.LastRunUtc);
-        Assert.Null(overview.StartedRate);
-        Assert.Equal(1m, overview.ManualStartedRate);
-        Assert.Equal(0.3333m, overview.CompletionRate);
-        Assert.Equal(0.3333m, overview.DismissalRate);
-
-        var exie = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.ExieOverview, StringComparison.Ordinal));
-        Assert.Equal(1, exie.Started);
-        Assert.Equal(1, exie.ManualStarted);
-        Assert.Null(exie.StartedRate);
-        Assert.Equal(1m, exie.ManualStartedRate);
-        Assert.Equal(month.AddDays(7), exie.LastRunUtc);
-        Assert.Equal(0m, exie.CompletionRate);
-        Assert.Equal(0m, exie.DismissalRate);
+        Assert.Equal(2, Assert.Single(overview.StartSources, source => source.Source == ProductTourLaunchSource.Catalog).Count);
+        Assert.Equal(1, Assert.Single(overview.StartSources, source => source.Source == ProductTourLaunchSource.HelpMenu).Count);
 
         var welcome = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppWelcome, StringComparison.Ordinal));
+        Assert.Equal(ProductTourKind.Prompt, welcome.Kind);
         Assert.Equal(2, welcome.Shown);
         Assert.Equal(1, welcome.Started);
-        Assert.Equal(0.5m, welcome.StartedRate);
-        Assert.Equal(0m, welcome.ManualStartedRate);
         Assert.Equal(1, welcome.Completed);
         Assert.Equal(1, welcome.Dismissed);
-        Assert.Equal(month.AddDays(2), welcome.LastRunUtc);
-        Assert.Equal(0.5m, welcome.CompletionRate);
-        Assert.Equal(0.5m, welcome.DismissalRate);
-
-        Assert.Equal(3, response.RecentEvents.Count);
-        Assert.Equal(month.AddDays(7), response.RecentEvents.First().DateUtc);
-        Assert.All(response.RecentEvents, productTourEvent => Assert.StartsWith("user-", productTourEvent.UserIdentity));
+        Assert.Equal(1, Assert.Single(welcome.StartSources).Count);
+        Assert.Equal(ProductTourLaunchSource.Welcome, welcome.StartSources.Single().Source);
+        Assert.DoesNotContain(response.Tours, tour => tour.Started > 0 && (tour.Name is "unknown" or "ignored-tour"));
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_ForAllTime_ReturnsUsageAcrossMonths()
+    public async Task GetProductTourUsageAsync_History_ReturnsConfiguredAvailableRange()
     {
         // Arrange
-        var currentMonth = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
-        await CreateDataAsync(builder =>
-        {
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), currentMonth.AddMonths(-1), "user-1");
-            AddUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), currentMonth.AddDays(1), "user-2");
-        });
+        var now = new DateTime(2026, 8, 21, 12, 30, 0, DateTimeKind.Utc);
+        TimeProvider.SetUtcNow(now);
+        var retainedEvent = now.SubtractDays(_appOptions.MaximumRetentionDays - 1);
+        await CreateDataAsync(builder => AddUsage(builder,
+            ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog),
+            retainedEvent,
+            "user-1"));
 
         // Act
         var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
-            .QueryString("all", "true")
+            .QueryString("history", "true")
             .StatusCodeShouldBeOk());
 
         // Assert
         Assert.NotNull(response);
-        Assert.Null(response.Month);
-        var overview = Assert.Single(response.Tours);
-        Assert.Equal(2, overview.Started);
-        Assert.Equal(1, overview.ManualStarted);
-        Assert.Equal(0.5m, overview.ManualStartedRate);
+        Assert.Equal(now.SubtractDays(_appOptions.MaximumRetentionDays), response.UtcStart);
+        Assert.Equal(now, response.UtcEnd);
+        var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
+        Assert.Equal(1, overview.Started);
     }
 
     [Fact]
-    public Task GetProductTourUsageAsync_WithMonthAndAllTime_ReturnsValidationProblem()
+    public Task GetProductTourUsageAsync_WithMonthAndHistory_ReturnsValidationProblem()
     {
         // Act & Assert
         return SendRequestAsync(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
             .QueryString("month", "2026-08-01")
-            .QueryString("all", "true")
+            .QueryString("history", "true")
             .StatusCodeShouldBeUnprocessableEntity());
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonth()
+    public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndReturnsZeroRows()
     {
         // Arrange
-        TimeProvider.SetUtcNow(new DateTime(2026, 9, 17, 12, 0, 0, DateTimeKind.Utc));
+        var now = new DateTime(2026, 9, 17, 12, 0, 0, DateTimeKind.Utc);
+        TimeProvider.SetUtcNow(now);
 
         // Act
         var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
@@ -157,9 +143,18 @@ public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonth()
 
         // Assert
         Assert.NotNull(response);
-        Assert.Equal(new DateTime(2026, 9, 1, 0, 0, 0, DateTimeKind.Utc), response.Month);
-        Assert.Empty(response.Tours);
-        Assert.Empty(response.RecentEvents);
+        Assert.Equal(now.StartOfMonth(), response.UtcStart);
+        Assert.Equal(now.StartOfMonth().AddMonths(1), response.UtcEnd);
+        Assert.Equal(ProductTours.Definitions.Values.Sum(definition => definition.CurrentVersion), response.Tours.Count);
+        Assert.All(response.Tours, tour =>
+        {
+            Assert.Equal(0, tour.Shown);
+            Assert.Equal(0, tour.Started);
+            Assert.Equal(0, tour.Completed);
+            Assert.Equal(0, tour.Dismissed);
+            Assert.Empty(tour.StartSources);
+            Assert.Null(tour.LastRunUtc);
+        });
     }
 
     [Fact]
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 87096a9149..95cfc7334a 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -89,6 +89,57 @@ public async Task UpdateCurrentUserProductTourAsync_CompletedProgress_ReplacesDi
         Assert.Equal(replacement, persistedUser.ProductTours["exie-overview"]);
     }
 
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_ConcurrentUpdatesPreserveBothTourKeys()
+    {
+        // Arrange
+        var currentUser = await GetTestOrganizationUserAsync();
+
+        // Act
+        await Task.WhenAll(
+            UpdateProgressAsync(ProductTours.AppOverview, ProductTourStatus.Completed, 1),
+            UpdateProgressAsync(ProductTours.SavedViewCreate, ProductTourStatus.Dismissed, 1));
+
+        // Assert
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(ProductTourStatus.Completed, persistedUser.ProductTours[ProductTours.AppOverview].Status);
+        Assert.Equal(ProductTourStatus.Dismissed, persistedUser.ProductTours[ProductTours.SavedViewCreate].Status);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_ConcurrentDismissAndCompleteLeavesCompletedProgress()
+    {
+        // Arrange
+        var currentUser = await GetTestOrganizationUserAsync();
+
+        // Act
+        await Task.WhenAll(
+            UpdateProgressAsync(ProductTours.ExieOverview, ProductTourStatus.Dismissed, 1),
+            UpdateProgressAsync(ProductTours.ExieOverview, ProductTourStatus.Completed, 1));
+
+        // Assert
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(ProductTourStatus.Completed, persistedUser.ProductTours[ProductTours.ExieOverview].Status);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_MissingUser_ReturnsNotFound()
+    {
+        // Arrange
+        var currentUser = await GetTestOrganizationUserAsync();
+        await _userRepository.RemoveAsync(currentUser.Id, options => options.ImmediateConsistency());
+
+        // Act & Assert
+        await SendRequestAsync(request => request
+            .Put()
+            .AsTestOrganizationUser()
+            .AppendPaths("users", "me", "product-tours", ProductTours.AppOverview)
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
+            .StatusCodeShouldBeNotFound());
+    }
+
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_UnknownTourName_ReturnsUnprocessableEntity()
     {
diff --git a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
index 8d800774db..417777c325 100644
--- a/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
+++ b/tests/Exceptionless.Tests/Api/OpenApiSnapshotTests.cs
@@ -113,7 +113,8 @@ public async Task GetOpenApiJson_Default_ContainsExpectedSchemasAndSecuritySchem
         Assert.True(schemas.TryGetProperty("TokenResult", out _));
         Assert.True(schemas.TryGetProperty("ProductTourProgress", out _));
         Assert.True(schemas.TryGetProperty("UpdateProductTourProgress", out _));
-        Assert.True(schemas.TryGetProperty("ProductTourEvent", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourKind", out _));
+        Assert.True(schemas.TryGetProperty("ProductTourStartSource", out _));
         Assert.True(schemas.TryGetProperty("ProductTourSummary", out _));
         Assert.True(schemas.TryGetProperty("ProductTourUsageResponse", out _));
         Assert.True(schemas.TryGetProperty("ViewOrganization", out _));
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index c0aecf2eb2..4e878370ee 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -46,7 +46,7 @@ await CreateDataAsync(builder =>
             AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(1), "user-1", 2);
             AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.HelpMenu), month.AddDays(2), "user-1");
             AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Completed, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddDays(3), "user-2");
-            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Automatic), month.AddDays(4), "user-3");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Shown, ProductTours.AppWelcome, 1, ProductTourLaunchSource.Welcome), month.AddDays(4), "user-3");
             AddProductTourUsage(builder, "product-tour.started.app-overview.v2.catalog", month.AddDays(5), "user-4");
             AddProductTourUsage(builder, "product-tour.started.unknown-tour.v1.catalog", month.AddDays(6), "user-5");
             AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddMonths(-1), "user-6");
@@ -66,10 +66,9 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1), recentLimit: 3);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, month, month.AddMonths(1));
 
         // Assert
-        Assert.Equal(3, result.RecentEvents.Count);
         Assert.Equal(2, result.Buckets.Select(bucket => bucket.Source.TourName).Distinct(StringComparer.Ordinal).Count());
         var overview = result.Buckets.Where(bucket => String.Equals(bucket.Source.TourName, ProductTours.AppOverview, StringComparison.Ordinal)).ToArray();
         Assert.Equal(4, overview.Where(bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started).Sum(bucket => bucket.Count));
@@ -79,8 +78,7 @@ await CreateDataAsync(builder =>
         var welcome = Assert.Single(result.Buckets, bucket => String.Equals(bucket.Source.TourName, ProductTours.AppWelcome, StringComparison.Ordinal));
         Assert.Equal(1, welcome.Count);
 
-        Assert.Equal(month.AddDays(8), result.RecentEvents.First().Event.Date);
-        Assert.All(result.RecentEvents, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
+        Assert.All(result.Buckets, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
     }
 
     [Fact]
@@ -91,14 +89,13 @@ public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage()
         await CreateDataAsync(builder =>
         {
             AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog), month.AddMonths(-1), "user-1");
-            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Automatic), month.AddDays(1), "user-2");
+            AddProductTourUsage(builder, ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Welcome), month.AddDays(1), "user-2");
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, month.AddMonths(1));
 
         // Assert
-        Assert.Equal(2, result.RecentEvents.Count);
         Assert.Equal(2, result.Buckets.Sum(bucket => bucket.Count));
     }
 
diff --git a/tests/http/admin.http b/tests/http/admin.http
index 85e13d94d2..fe3a895a49 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -54,6 +54,14 @@ Authorization: Bearer {{token}}
 GET {{apiUrl}}/admin/assistant-usage
 Authorization: Bearer {{token}}
 
+### Product Tour Usage (current retained month)
+GET {{apiUrl}}/admin/product-tour-usage
+Authorization: Bearer {{token}}
+
+### Product Tour Usage (available retained history)
+GET {{apiUrl}}/admin/product-tour-usage?history=true
+Authorization: Bearer {{token}}
+
 ### Get Exie Settings
 GET {{apiUrl}}/admin/assistant-settings
 Authorization: Bearer {{token}}
@@ -117,12 +125,12 @@ Content-Type: application/json
 }
 
 ### Product Tour Usage
-GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01&limit=100
+GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01
 Authorization: Bearer {{token}}
 
 ###
 
-GET {{apiUrl}}/admin/product-tour-usage?all=true&limit=100
+GET {{apiUrl}}/admin/product-tour-usage?history=true
 Authorization: Bearer {{token}}
 
 ### Suspend

From ee7f1ecba4e51fcb28fa1e51ae23cb8b3bb02e09 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 30 Aug 2026 09:42:38 -0500
Subject: [PATCH 10/43] Harden guided tour workflows and reporting

---
 .../Models/Data/ProductTours.cs               |   6 +-
 .../Interfaces/IUserRepository.cs             |   2 +
 .../Repositories/UserRepository.cs            |  36 ++
 .../Api/Handlers/UserHandler.cs               |  38 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  48 ++-
 .../src/lib/features/admin/api.svelte.ts      |  50 ++-
 .../features/admin/product-tour-usage.test.ts |  23 ++
 .../lib/features/admin/product-tour-usage.ts  |  28 ++
 .../events/components/events-overview.svelte  |   6 +-
 .../investigation-detail-tour.svelte          |   2 +-
 .../features/product-tours/actions.svelte.ts  |  48 ++-
 .../features/product-tours/catalog.test.ts    |  23 +-
 .../src/lib/features/product-tours/catalog.ts |  44 ++-
 .../product-tour-catalog-dialog.svelte        |  15 +-
 .../product-tour-welcome-dialog.svelte        |  11 +-
 ...product-tour-welcome-dialog.svelte.test.ts |   3 +-
 .../product-tour-feature-announcement.svelte  |   9 +-
 .../components/product-tour-host.svelte       | 227 +++++++++--
 .../product-tour-inline-callout.svelte        |  13 +-
 .../product-tour-shell-spotlight.svelte       |  24 +-
 .../components/product-tour-spotlight.svelte  | 124 +++++-
 .../components/saved-view-create-tour.svelte  |  68 +---
 .../product-tours/session.svelte.test.ts      |   9 +-
 .../src/lib/features/product-tours/session.ts |  25 +-
 .../product-tours/state.svelte.test.ts        |   1 -
 .../features/product-tours/state.svelte.ts    |  11 +-
 .../lib/features/product-tours/telemetry.ts   |   4 +-
 .../src/lib/features/product-tours/types.ts   |  15 +-
 .../components/save-view-dialog.svelte        |   2 +-
 .../components/saved-view-picker.svelte       |   8 +-
 .../saved-views/use-saved-views.svelte.ts     |   6 +-
 .../stacks/components/stack-card.svelte       |   3 +-
 .../ClientApp/src/lib/generated/api.ts        |  53 +--
 .../ClientApp/src/lib/generated/schemas.ts    |  41 +-
 .../(app)/(components)/layouts/navbar.svelte  |   2 +-
 .../(components)/navigation-command.svelte    |  20 +-
 .../navigation-command.svelte.test.ts         |  34 +-
 .../ClientApp/src/routes/(app)/+layout.svelte |  72 +---
 .../src/routes/(app)/event/+page.svelte       |   6 -
 .../(app)/organization/add/+page.svelte       |  11 +-
 .../[projectId]/configure/+page.svelte        |   6 +-
 .../src/routes/(app)/project/add/+page.svelte |   2 +-
 .../(app)/system/product-tours/+page.svelte   | 365 ++++++++++++------
 .../Api/Endpoints/ProductTourEndpointTests.cs |  13 +-
 44 files changed, 975 insertions(+), 582 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index dfcff97942..65ef2328f7 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -27,15 +27,11 @@ public static class ProductTours
 
     public static bool IsKnown(string name) => Definitions.ContainsKey(name);
 
-    public static bool IsPrompt(string name) => Find(name)?.Kind is ProductTourKind.Prompt;
-
     public static bool IsValid(string name, int version)
     {
-        return Find(name) is { } definition && version > 0 && version <= definition.CurrentVersion;
+        return Definitions.TryGetValue(name, out var definition) && version > 0 && version <= definition.CurrentVersion;
     }
 
-    public static ProductTourDefinition? Find(string name) => Definitions.GetValueOrDefault(name);
-
     public static string CreateTelemetrySource(
         ProductTourTelemetryEvent telemetryEvent,
         string tourName,
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IUserRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IUserRepository.cs
index 4835daa616..6c5f355915 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IUserRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IUserRepository.cs
@@ -1,4 +1,5 @@
 using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Models;
 
@@ -12,4 +13,5 @@ public interface IUserRepository : ISearchableRepository<User>
     Task<User?> GetUserByOAuthProviderAsync(string provider, string providerUserId);
     Task<User?> GetByVerifyEmailAddressTokenAsync(string token);
     Task<FindResults<User>> GetByOrganizationIdAsync(string organizationId, CommandOptionsDescriptor<User>? options = null);
+    Task<ProductTourProgress> UpdateProductTourProgressAsync(string userId, string tourName, ProductTourProgress progress);
 }
diff --git a/src/Exceptionless.Core/Repositories/UserRepository.cs b/src/Exceptionless.Core/Repositories/UserRepository.cs
index 91919a6beb..f5cafa976a 100644
--- a/src/Exceptionless.Core/Repositories/UserRepository.cs
+++ b/src/Exceptionless.Core/Repositories/UserRepository.cs
@@ -1,7 +1,9 @@
 using Exceptionless.Core.Extensions;
+using Exceptionless.Core.Models.Data;
 using Exceptionless.Core.Repositories.Configuration;
 using Exceptionless.Core.Validation;
 using Foundatio.Repositories;
+using Foundatio.Repositories.Exceptions;
 using Foundatio.Repositories.Models;
 using Foundatio.Repositories.Options;
 using User = Exceptionless.Core.Models.User;
@@ -78,6 +80,40 @@ public Task<FindResults<User>> GetByOrganizationIdAsync(string organizationId, C
         return FindAsync(q => q.FieldEquals(u => u.OrganizationIds, organizationId).SortAscending(u => u.EmailAddress), o => commandOptions);
     }
 
+    public async Task<ProductTourProgress> UpdateProductTourProgressAsync(string userId, string tourName, ProductTourProgress progress)
+    {
+        const string script = """
+            if (ctx._source.product_tours == null) {
+              ctx._source.product_tours = [:];
+            }
+
+            def current = ctx._source.product_tours[params.tourName];
+            if (current != null && (current.version > params.version ||
+                (current.version == params.version && current.status <= params.status))) {
+              ctx.op = 'none';
+            } else {
+              ctx._source.product_tours[params.tourName] = ['status': params.status, 'version': params.version];
+            }
+            """;
+        var patch = new ScriptPatch(script.TrimScript())
+        {
+            Params = new Dictionary<string, object>
+            {
+                ["status"] = (int)progress.Status,
+                ["tourName"] = tourName,
+                ["version"] = progress.Version
+            }
+        };
+
+        await PatchAsync(userId, patch, options => options.Cache());
+
+        var user = await GetByIdAsync(userId, options => options.Cache(false));
+        if (user is null || !user.ProductTours.TryGetValue(tourName, out var storedProgress))
+            throw new DocumentNotFoundException(userId);
+
+        return storedProgress;
+    }
+
     protected override async Task AddDocumentsToCacheAsync(ICollection<FindHit<User>> findHits, ICommandOptions options, bool isDirtyRead)
     {
         await base.AddDocumentsToCacheAsync(findHits, options, isDirtyRead);
diff --git a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
index 3766cf716b..18656626b6 100644
--- a/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/UserHandler.cs
@@ -18,7 +18,6 @@
 using Foundatio.Mediator;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Exceptions;
-using Foundatio.Repositories.Models;
 
 namespace Exceptionless.Web.Api.Handlers;
 
@@ -60,45 +59,22 @@ public async Task<Result<ProductTourProgress>> Handle(UpdateCurrentUserProductTo
         if (!ProductTours.IsValid(message.TourName, message.Progress.Version))
             return Result.Invalid(ValidationError.Create("version", "The product tour version is not supported."));
 
-        ProductTourProgress? progress = null;
         try
         {
-            await repository.PatchAsync(
+            var progress = await repository.UpdateProductTourProgressAsync(
                 GetCurrentUserId(),
-                new ActionPatch<User>(user =>
+                message.TourName,
+                new ProductTourProgress
                 {
-                    user.ProductTours.TryGetValue(message.TourName, out var currentProgress);
-                    if (!ShouldUpdateProductTourProgress(currentProgress, message.Progress))
-                    {
-                        progress = currentProgress;
-                        return false;
-                    }
-
-                    progress = new ProductTourProgress
-                    {
-                        Status = message.Progress.Status!.Value,
-                        Version = message.Progress.Version
-                    };
-                    user.ProductTours[message.TourName] = progress;
-                    return true;
-                }),
-                options => options.Cache());
+                    Status = message.Progress.Status!.Value,
+                    Version = message.Progress.Version
+                });
+            return progress;
         }
         catch (DocumentNotFoundException)
         {
             return Result.NotFound("User not found.");
         }
-
-        return progress is null ? Result.NotFound("User not found.") : progress;
-    }
-
-    private static bool ShouldUpdateProductTourProgress(ProductTourProgress? current, UpdateProductTourProgress requested)
-    {
-        return current is null
-            || requested.Version > current.Version
-            || (requested.Version == current.Version
-                && current.Status is ProductTourStatus.Dismissed
-                && requested.Status is ProductTourStatus.Completed);
     }
 
     public async Task<Result<IReadOnlyCollection<ViewOAuthGrant>>> Handle(GetCurrentUserOAuthGrants message)
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index d9021fd3e0..c49d86224a 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -63,11 +63,38 @@ test.describe('shell and identity checkpoints', () => {
             await expect(tour.getByText('Find anything quickly')).toBeVisible();
 
             const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
-            await tour.getByRole('button', { name: 'Close' }).click();
+            await tour.getByRole('button', { name: 'End guide' }).click();
             await dismissed;
             await expectProductTourSession(page, false);
         });
 
+        await test.step('every shell target remains visible on mobile', async () => {
+            await mockAssistantAccess(page);
+            await page.reload();
+            await page.setViewportSize({ height: 844, width: 390 });
+            await startTourFromCommand(page, 'Explore Exceptionless');
+            const tour = page.locator('.driver-popover');
+
+            for (const [title, target] of [
+                ['Your workspace navigation', '[data-tour="app-navigation"]'],
+                ['Find anything quickly', '[data-tour="command-search"]'],
+                ['Reuse configured views', '[data-tour="saved-view-navigation"]'],
+                ['Ask Exie with context', '[data-tour="exie-trigger"]'],
+                ['Help is always nearby', '[data-tour="help-menu"]']
+            ] as const) {
+                await expect(tour.getByText(title)).toBeVisible();
+                await expect(page.locator(target)).toBeVisible();
+                if (title !== 'Help is always nearby') {
+                    await tour.getByRole('button', { name: 'Continue' }).click();
+                }
+            }
+
+            const completed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
+            await tour.getByRole('button', { name: 'Continue' }).click();
+            await completed;
+            await expectProductTourSession(page, false);
+        });
+
         await test.step('an organization change clears an active checkpoint without recording progress', async () => {
             await mockAssistantAccess(page);
             await page.reload();
@@ -121,6 +148,12 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         await page.locator('[data-product-tour-inline="project-configure"]').getByRole('button', { name: 'Continue' }).click();
         await expect(page.getByText('Waiting for your first event')).toBeVisible();
 
+        let projectProgressRequests = 0;
+        const projectProgressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/project-configure';
+        await page.route(projectProgressRoute, async (route) => {
+            projectProgressRequests += 1;
+            await route.fulfill({ json: { title: 'Injected progress failure' }, status: 500 });
+        });
         try {
             const token = await e2eApi.getProjectDefaultToken(e2eScenario.userToken, projectId!);
             await e2eApi.submitEvent(
@@ -134,8 +167,16 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
                 })
             );
             await expect(page).toHaveURL(/\/next\/event/);
+            await expectProductTourSession(page, true);
+            await expect.poll(() => projectProgressRequests).toBe(1);
+
+            await page.unroute(projectProgressRoute);
+            const completed = page.waitForResponse(isSuccessfulTourProgress('project-configure'));
+            await page.goto(`/next/project/${projectId}/configure`);
+            await completed;
             await expectProductTourSession(page, false);
         } finally {
+            await page.unroute(projectProgressRoute);
             await e2eApi.deleteProject(e2eScenario.userToken, projectId!);
             await e2eApi.waitForProjectDeleted(e2eScenario.userToken, projectId!);
         }
@@ -267,5 +308,8 @@ async function startTourFromCommand(page: Page, title: string): Promise<void> {
     }
 
     await page.getByRole('button', { name: 'Search Exceptionless' }).click();
-    await page.getByRole('dialog').getByText(title, { exact: true }).click();
+    await page.getByRole('dialog').getByText('Guided Tours…', { exact: true }).click();
+    const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
+    const tour = catalog.locator('section').filter({ has: catalog.getByRole('heading', { name: title }) });
+    await tour.getByRole('button', { name: /^(Continue|Restart|Start)$/ }).click();
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
index 9d368712f0..1526ee6510 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/api.svelte.ts
@@ -19,6 +19,8 @@ import type {
     UpdateEventSubmissionSettingsRequest
 } from './models';
 
+import { getProductTourUsageParams, type ProductTourUsageRange } from './product-tour-usage';
+
 export type GetOAuthApplicationsParams = {
     criteria?: string;
     limit?: number;
@@ -45,7 +47,7 @@ export const queryKeys = {
     migrations: ['admin', 'migrations'] as const,
     oauthApplication: (id: string | undefined) => [...queryKeys.oauthApplications, id] as const,
     oauthApplications: ['admin', 'oauth-applications'] as const,
-    productTourUsage: (month?: string) => ['admin', 'product-tour-usage', month ?? 'all'] as const,
+    productTourUsage: (range: ProductTourUsageRange) => ['admin', 'product-tour-usage', range] as const,
     snapshots: ['admin', 'elasticsearch', 'snapshots'] as const,
     stats: ['admin', 'stats'] as const
 };
@@ -112,34 +114,28 @@ export function getAdminAssistantUsageQuery(month: () => string) {
     }));
 }
 
-export function getAdminProductTourUsageQuery(month: () => string | undefined) {
-    return createQuery<ProductTourUsageResponse, ProblemDetails>(() => ({
-        queryFn: async ({ signal }: { signal: AbortSignal }) => {
-            const client = useFetchClient();
-            const selectedMonth = month();
-            const params = selectedMonth
-                ? {
-                      limit: 100,
-                      month: `${selectedMonth}-01`
-                  }
-                : {
-                      all: true,
-                      limit: 100
-                  };
-            const response = await client.getJSON<ProductTourUsageResponse>('admin/product-tour-usage', {
-                params,
-                signal
-            });
+export function getAdminProductTourUsageQuery(range: () => ProductTourUsageRange) {
+    return createQuery<ProductTourUsageResponse, ProblemDetails>(() => {
+        const selectedRange = range();
 
-            if (!response.ok) {
-                throw response.problem;
-            }
+        return {
+            queryFn: async ({ signal }: { signal: AbortSignal }) => {
+                const client = useFetchClient();
+                const response = await client.getJSON<ProductTourUsageResponse>('admin/product-tour-usage', {
+                    params: getProductTourUsageParams(selectedRange),
+                    signal
+                });
 
-            return response.data!;
-        },
-        queryKey: queryKeys.productTourUsage(month()),
-        staleTime: 60 * 1000
-    }));
+                if (!response.ok) {
+                    throw response.problem;
+                }
+
+                return response.data!;
+            },
+            queryKey: queryKeys.productTourUsage(selectedRange),
+            staleTime: 60 * 1000
+        };
+    });
 }
 
 export function getAdminStatsQuery() {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
new file mode 100644
index 0000000000..c37e68175e
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest';
+
+import { getOutcomeShare, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
+
+describe('product tour usage helpers', () => {
+    it('maps each immutable range to the API query parameters', () => {
+        expect(getProductTourUsageParams({ kind: 'month', month: '2026-08' })).toEqual({ month: '2026-08-01' });
+        expect(getProductTourUsageParams({ kind: 'history' })).toEqual({ history: true });
+    });
+
+    it('returns null when a percentage has no denominator', () => {
+        expect(getRate(1, 0)).toBeNull();
+        expect(getOutcomeShare({ completed: 0, dismissed: 0 }, 'completed')).toBeNull();
+        expect(getStartSourceShare({ count: 1 }, 0)).toBeNull();
+    });
+
+    it('calculates prompt and guide rates from their declared denominators', () => {
+        expect(getRate(3, 4)).toBe(0.75);
+        expect(getOutcomeShare({ completed: 3, dismissed: 1 }, 'completed')).toBe(0.75);
+        expect(getOutcomeShare({ completed: 3, dismissed: 1 }, 'dismissed')).toBe(0.25);
+        expect(getStartSourceShare({ count: 2 }, 5)).toBe(0.4);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
new file mode 100644
index 0000000000..98297d2b95
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -0,0 +1,28 @@
+export type ProductTourUsageRange =
+    | {
+          kind: 'history';
+      }
+    | {
+          kind: 'month';
+          month: string;
+      };
+
+export function getOutcomeShare(value: { completed: number; dismissed: number }, outcome: 'completed' | 'dismissed'): null | number {
+    return getRate(value[outcome], value.completed + value.dismissed);
+}
+
+export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | string> {
+    if (range.kind === 'history') {
+        return { history: true };
+    }
+
+    return { month: `${range.month}-01` };
+}
+
+export function getRate(numerator: number, denominator: number): null | number {
+    return denominator > 0 ? numerator / denominator : null;
+}
+
+export function getStartSourceShare(source: { count: number }, started: number): null | number {
+    return getRate(source.count, started);
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index 493cd91988..ecdfb6514b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -334,7 +334,7 @@
 
 <InvestigationDetailTour {event} placement="stack" />
 
-<section data-event-type={event ? (hasErrorOrSimpleError(event) ? 'error' : event.type) : undefined} data-tour={event ? 'event-details' : undefined}>
+<section>
     <h4 class="text-muted-foreground mb-3 text-sm font-semibold tracking-wide uppercase">Stack</h4>
     {#if event?.stack_id}
         <StackCard
@@ -348,7 +348,7 @@
 
 <InvestigationDetailTour {event} placement="occurrence" />
 
-<section class="mt-2" data-tour={event ? 'event-occurrence' : undefined}>
+<section class="mt-2">
     <div class="mb-2 flex items-center justify-between">
         <h4 class="text-muted-foreground text-sm font-semibold tracking-wide uppercase">Event</h4>
         <div class="flex items-center gap-1">
@@ -360,7 +360,6 @@
             {#if event?.stack_id}
                 <Button
                     aria-label="Show all events"
-                    data-tour="event-stack-filter"
                     onclick={() => filterChanged(new EventsFacetedFilter.StringFilter('stack', event!.stack_id))}
                     size="icon-sm"
                     title="Show all events"
@@ -431,7 +430,6 @@
                                 draggedPromotedTab === tab && 'bg-accent/70'
                             ]}
                             draggable={isPromotedTab(tab)}
-                            data-tour={tab === 'Overview' ? 'event-tab-overview' : undefined}
                             ondragstart={(event) => handlePromotedTabDragStart(event, tab)}
                             ondragover={(event) => handlePromotedTabDragOver(event, tab)}
                             ondrop={(event) => handlePromotedTabDrop(event, tab)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
index 1802508462..6499f9069c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
@@ -104,11 +104,11 @@
 
 {#if event && checkpoint && copy}
     <ProductTourInlineCallout
+        {checkpoint}
         continueLabel={checkpoint.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
         description={copy.description}
         onContinue={continueTour}
         onDismiss={dismiss}
         title={copy.title}
-        tourName="event-investigate"
     />
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index e2e2951648..e3b18de31e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -8,6 +8,16 @@ import type { ProductTourCheckpoint, ProductTourKey, ProductTourLaunchSource } f
 import { productTourCheckpoint } from './state.svelte';
 import { buildProductTourTelemetryEvent, type ProductTourTelemetryEvent } from './telemetry';
 
+const COMPLETION_NEXT_STEPS: Record<ProductTourCheckpoint['tourName'], string> = {
+    'app-overview': 'Next: open Guided Tours from Help whenever you want a focused workflow.',
+    'event-investigate': 'Next: save a useful Events view for the investigation you repeat most.',
+    'exie-overview': 'Next: open Exie from a real event when you want help investigating it.',
+    'project-configure': 'Next: open the received event and investigate its stack.',
+    'saved-view-create': 'Next: reuse the saved view from the application navigation.'
+};
+
+const domainCompletionRequests = new WeakSet<ProductTourCheckpoint>();
+
 export function createProductTourActions() {
     const progressMutation = putCurrentUserProductTour();
 
@@ -19,6 +29,33 @@ export function createProductTourActions() {
         return finish(checkpoint, ProductTourStatus.Dismissed);
     }
 
+    function completeAfterDomainSuccess(checkpoint: ProductTourCheckpoint): void {
+        if (productTourCheckpoint.current !== checkpoint || domainCompletionRequests.has(checkpoint)) {
+            return;
+        }
+
+        domainCompletionRequests.add(checkpoint);
+        void progressMutation
+            .mutateAsync({
+                progress: {
+                    status: ProductTourStatus.Completed,
+                    version: checkpoint.version
+                },
+                tourName: checkpoint.tourName
+            })
+            .then(() => {
+                if (productTourCheckpoint.clear(checkpoint)) {
+                    void track('completed', checkpoint.tourName, checkpoint.version, checkpoint.source);
+                }
+            })
+            .catch(() => {
+                toast.error('Setup succeeded, but guided-tour progress could not be saved.');
+            })
+            .finally(() => {
+                domainCompletionRequests.delete(checkpoint);
+            });
+    }
+
     async function finish(checkpoint: ProductTourCheckpoint, status: ProductTourStatus): Promise<boolean> {
         try {
             await progressMutation.mutateAsync({
@@ -36,14 +73,19 @@ export function createProductTourActions() {
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        await track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, checkpoint.version, checkpoint.source);
+        void track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, checkpoint.version, checkpoint.source);
+        if (status === ProductTourStatus.Completed) {
+            toast.success('Guide complete', {
+                description: COMPLETION_NEXT_STEPS[checkpoint.tourName]
+            });
+        }
         return true;
     }
 
     return {
         complete,
-        dismiss,
-        progressMutation
+        completeAfterDomainSuccess,
+        dismiss
     };
 }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index 227a8fbfdb..0b96727eb2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -30,8 +30,9 @@ describe('product tour catalog', () => {
 
     it('recommends setup until an organization has configured projects', () => {
         expect(getRecommendedProductTourName(context({ organizationId: undefined }))).toBe('project-configure');
-        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: false }] }))).toBe('project-configure');
-        expect(getRecommendedProductTourName(context({ projects: [{ is_configured: true }] }))).toBe('app-overview');
+        expect(getRecommendedProductTourName(context({ projects: [] }))).toBe('project-configure');
+        expect(getRecommendedProductTourName(context({ projects: [{ id: 'project-id', is_configured: false }] }))).toBe('project-configure');
+        expect(getRecommendedProductTourName(context({ projects: [{ id: 'project-id', is_configured: true }] }))).toBe('app-overview');
     });
 
     it('reports availability separately from catalog metadata', () => {
@@ -48,4 +49,22 @@ describe('product tour catalog', () => {
     it('defines a positive version for every tour', () => {
         expect(getProductTourItems(context()).every((item) => item.version > 0)).toBe(true);
     });
+
+    it('starts project setup from domain state', () => {
+        const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
+
+        expect(definition.start(context({ organizationId: undefined }))).toEqual({ checkpointName: 'organization-name', route: '/next/organization/add' });
+        expect(definition.start(context({ projects: [] }))).toEqual({ checkpointName: 'project-name', route: '/next/project/add' });
+        expect(definition.start(context({ projects: [{ id: 'project-id', is_configured: false }] }))).toEqual({
+            checkpointName: 'choose-platform',
+            route: '/next/project/project-id/configure?redirect=true'
+        });
+    });
+
+    it('requires actual Exie access', () => {
+        const item = getProductTourItems(context({ assistantAccess: { enabled: true, has_access: false, upgrade_required: true } })).find(
+            (tour) => tour.name === 'exie-overview'
+        );
+        expect(item?.currentAvailability.available).toBe(false);
+    });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 025e60e68f..94c8f8fa04 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -26,51 +26,67 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     {
         availability: requireApplicationShell,
         description: 'Learn navigation, command search, saved views, Exie, and where to get help.',
-        initialCheckpoint: 'navigation',
         keywords: ['navigation', 'ui', 'search', 'command', 'help', 'saved views'],
         name: 'app-overview',
-        startingRoute: () => resolve('/'),
+        start: () => ({ checkpointName: 'navigation', route: resolve('/') }),
         title: 'Explore Exceptionless',
         version: 1
     },
     {
         availability: () => ({ available: true }),
         description: 'Create or resume a project, connect an SDK, and wait for its first real event.',
-        initialCheckpoint: 'project-name',
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'project-configure',
-        startingRoute: (context) => (context.organizationId ? resolve('/(app)/project/add') : resolve('/(app)/organization/add')),
+        start: (context) => {
+            if (!context.organizationId) {
+                return { checkpointName: 'organization-name', route: resolve('/(app)/organization/add') };
+            }
+
+            const unconfiguredProject = context.projects.find((project) => !project.is_configured);
+            if (unconfiguredProject?.id) {
+                return {
+                    checkpointName: 'choose-platform',
+                    route: `${resolve('/(app)/project/[projectId]/configure', { projectId: unconfiguredProject.id })}?redirect=true`
+                };
+            }
+
+            return { checkpointName: 'project-name', route: resolve('/(app)/project/add') };
+        },
         title: 'Configure a project',
         version: 1
     },
     {
         availability: requireOrganization,
         description: 'Save the current Events configuration as a private view that only you can see.',
-        initialCheckpoint: 'open-view-menu',
         keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
         name: 'saved-view-create',
-        startingRoute: () => resolve('/(app)/event'),
+        start: () => ({ checkpointName: 'open-view-menu', route: resolve('/(app)/event') }),
         title: 'Create a saved view',
         version: 1
     },
     {
         availability: requireError,
         description: 'Open a real error, assess its stack and status, then inspect the occurrence.',
-        initialCheckpoint: 'filter-errors',
         keywords: ['error report', 'event details', 'exception', 'filter', 'stack', 'triage'],
         name: 'event-investigate',
-        startingRoute: () => `${resolve('/(app)/event')}?time=all&type=error`,
+        start: () => ({ checkpointName: 'filter-errors', route: `${resolve('/(app)/event')}?time=all&type=error` }),
         title: 'Investigate an error',
         version: 1
     },
     {
-        availability: (context) =>
-            context.assistantAccess?.enabled ? { available: true } : { available: false, reason: 'Exie is not enabled by this Exceptionless installation.' },
+        availability: (context) => {
+            if (!context.assistantAccess?.enabled) {
+                return { available: false, reason: 'Exie is not enabled by this Exceptionless installation.' };
+            }
+
+            return context.assistantAccess.has_access
+                ? { available: true }
+                : { available: false, reason: context.assistantAccess.message ?? 'Exie requires access.' };
+        },
         description: 'See how Exie uses the current page as context without sending a prompt.',
-        initialCheckpoint: 'open-exie',
         keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
         name: 'exie-overview',
-        startingRoute: () => resolve('/'),
+        start: () => ({ checkpointName: 'open-exie', route: resolve('/') }),
         title: 'Meet Exie',
         version: 1
     }
@@ -87,5 +103,7 @@ export function getProductTourItems(context: ProductTourContext, progress: Recor
 }
 
 export function getRecommendedProductTourName(context: ProductTourContext): ProductTourName {
-    return !context.organizationId || context.projects.some((project) => !project.is_configured) ? 'project-configure' : 'app-overview';
+    return !context.organizationId || context.projects.length === 0 || context.projects.some((project) => !project.is_configured)
+        ? 'project-configure'
+        : 'app-overview';
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 097ae08e3a..3e41311269 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -7,13 +7,17 @@
 
     import type { ProductTourListItem, ProductTourName } from '../../types';
 
+    import { PRODUCT_TOUR_CHECKPOINTS } from '../../types';
+
     interface Props {
+        activeTourName?: ProductTourName;
         items: ProductTourListItem[];
         onStart: (name: ProductTourName) => Promise<void>;
         open?: boolean;
+        resumableTourName?: ProductTourName;
     }
 
-    let { items, onStart, open = $bindable(false) }: Props = $props();
+    let { activeTourName, items, onStart, open = $bindable(false), resumableTourName }: Props = $props();
 </script>
 
 <Dialog.Root bind:open>
@@ -37,12 +41,19 @@
                     <div class="flex-1">
                         <h3 class="font-semibold">{item.title}</h3>
                         <p class="text-muted-foreground mt-1 text-sm">{item.description}</p>
+                        <p class="text-muted-foreground mt-2 text-xs">
+                            {item.name === 'app-overview' ? 'Up to ' : ''}{PRODUCT_TOUR_CHECKPOINTS[item.name].length} steps
+                        </p>
                         {#if !item.currentAvailability.available}
                             <p class="text-muted-foreground mt-2 text-xs">{item.currentAvailability.reason}</p>
                         {/if}
                     </div>
                     <Button disabled={!item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
-                        {item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version ? 'Restart' : 'Start'}
+                        {resumableTourName === item.name
+                            ? 'Continue'
+                            : activeTourName === item.name || (item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version)
+                              ? 'Restart'
+                              : 'Start'}
                     </Button>
                 </section>
             {/each}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
index 5c7b70c523..90e4998c0b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
@@ -6,6 +6,7 @@
     import type { ProductTourListItem } from '../../types';
 
     interface Props {
+        busy?: boolean;
         onBrowse: () => Promise<void>;
         onDismiss: () => Promise<void>;
         onStart: () => Promise<void>;
@@ -13,10 +14,10 @@
         recommended: ProductTourListItem;
     }
 
-    let { onBrowse, onDismiss, onStart, open = $bindable(false), recommended }: Props = $props();
+    let { busy = false, onBrowse, onDismiss, onStart, open = $bindable(false), recommended }: Props = $props();
 
     async function onOpenChange(nextOpen: boolean): Promise<void> {
-        if (!nextOpen && open) {
+        if (!nextOpen && open && !busy) {
             await onDismiss();
         }
     }
@@ -38,10 +39,10 @@
         </section>
 
         <Dialog.Footer class="gap-2 sm:justify-between">
-            <Button onclick={onDismiss} variant="ghost">Skip</Button>
+            <Button disabled={busy} onclick={onDismiss} variant="ghost">Skip</Button>
             <div class="flex flex-col-reverse gap-2 sm:flex-row">
-                <Button onclick={onBrowse} variant="outline">Browse Guides</Button>
-                <Button onclick={onStart}>{recommended.name === 'project-configure' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
+                <Button disabled={busy} onclick={onBrowse} variant="outline">Browse Guides</Button>
+                <Button disabled={busy} onclick={onStart}>{recommended.name === 'project-configure' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
             </div>
         </Dialog.Footer>
     </Dialog.Content>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
index 08f6bbe948..ffb99d649f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
@@ -7,10 +7,9 @@ const recommended = {
     availability: vi.fn(() => ({ available: true })),
     currentAvailability: { available: true },
     description: 'Learn navigation and search.',
-    initialCheckpoint: 'navigation' as const,
     keywords: ['navigation'],
     name: 'app-overview' as const,
-    startingRoute: vi.fn(() => '/next'),
+    start: vi.fn(() => ({ checkpointName: 'navigation' as const, route: '/next' })),
     title: 'Explore Exceptionless',
     version: 1
 };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
index 910b93917d..732482c2f1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
@@ -5,6 +5,7 @@
     import X from '@lucide/svelte/icons/x';
 
     interface Props {
+        busy?: boolean;
         hasAccess: boolean;
         message?: string;
         onDismiss: () => void;
@@ -12,7 +13,7 @@
         open?: boolean;
     }
 
-    let { hasAccess, message, onDismiss, onStart, open = true }: Props = $props();
+    let { busy = false, hasAccess, message, onDismiss, onStart, open = true }: Props = $props();
 </script>
 
 {#if open}
@@ -31,13 +32,13 @@
                             : (message ?? 'Exie is available with an eligible organization plan.')}
                     </p>
                 </div>
-                <Button aria-label="Dismiss Exie announcement" class="-mt-1 -mr-1 size-7" onclick={onDismiss} size="icon" variant="ghost">
+                <Button aria-label="Dismiss Exie announcement" class="-mt-1 -mr-1 size-11" disabled={busy} onclick={onDismiss} size="icon" variant="ghost">
                     <X aria-hidden="true" class="size-4" />
                 </Button>
             </div>
             <div class="mt-3 flex flex-wrap gap-2">
-                <Button onclick={onStart} size="sm">See how it works</Button>
-                <Button onclick={onDismiss} size="sm" variant="outline">Dismiss</Button>
+                <Button disabled={busy} onclick={onStart} size="sm">{hasAccess ? 'See how it works' : 'View access options'}</Button>
+                <Button disabled={busy} onclick={onDismiss} size="sm" variant="outline">Dismiss</Button>
             </div>
         </div>
     </Alert.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 7038df9819..92fb88e1a2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
     import type { AssistantAccess } from '$features/assistant/models';
-    import type { ViewProject } from '$features/projects/models';
     import type { ViewCurrentUser } from '$features/users/models';
 
     import { goto } from '$app/navigation';
     import { resolve } from '$app/paths';
+    import { getOrganizationEventsQuery } from '$features/events/api.svelte';
+    import { getOrganizationProjectsQuery } from '$features/projects/api.svelte';
     import { putCurrentUserProductTour } from '$features/users/api.svelte';
     import { ProductTourStatus } from '$features/users/models';
+    import { onMount } from 'svelte';
     import { toast } from 'svelte-sonner';
 
-    import type { ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../types';
+    import type { ProductTourCheckpoint, ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../types';
 
     import { createProductTourActions, track } from '../actions.svelte';
     import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
@@ -24,21 +26,21 @@
         assistantAccess?: AssistantAccess;
         closeOverlays: () => void;
         currentUser?: ViewCurrentUser;
-        errorEventAvailability: ProductTourContext['errorEventAvailability'];
         isAnyOverlayOpen: boolean;
         isImpersonating: boolean;
+        isMobile: boolean;
         isSetupPage: boolean;
         openAssistant: () => Promise<void>;
         organizationId?: string;
         pathname: string;
-        projects: ViewProject[];
-        requestErrorAvailability: () => void;
         setMobileNavigationOpen: (open: boolean) => void;
         stateSettled: boolean;
     }
 
     const EVENT_PATH = resolve('/(app)/event');
     const EXIE_ANNOUNCEMENT_VERSION = 1;
+    const ORGANIZATION_ADD_PATH = resolve('/(app)/organization/add');
+    const PROJECT_ADD_PATH = resolve('/(app)/project/add');
     const STACK_PATH = resolve('/(app)/stack');
     const SYSTEM_PATH = resolve('/(app)/system');
     const WELCOME_VERSION = 1;
@@ -47,27 +49,74 @@
         assistantAccess,
         closeOverlays,
         currentUser,
-        errorEventAvailability,
         isAnyOverlayOpen,
         isImpersonating,
+        isMobile,
         isSetupPage,
         openAssistant,
         organizationId,
         pathname,
-        projects,
-        requestErrorAvailability,
         setMobileNavigationOpen,
         stateSettled
     }: Props = $props();
 
     let catalogOpen = $state(false);
     let catalogSource = $state<ProductTourLaunchSource>('catalog');
+    let checkErrorAvailability = $state(false);
+    let automaticSurface = $state<'exie-announcement' | 'welcome'>();
+    let automaticSurfaceReady = $state(false);
+    let automaticSurfaceClaimed = $state(false);
+    let automaticSurfaceUserId = $state<string>();
     let lastTrackedAnnouncementImpression = $state('');
     let lastTrackedWelcomeImpression = $state('');
     let welcomeHandled = $state(false);
+    let attemptedProjectCompletion: ProductTourCheckpoint | undefined;
 
     const actions = createProductTourActions();
     const progressMutation = putCurrentUserProductTour();
+    const projectsQuery = getOrganizationProjectsQuery({
+        route: {
+            get organizationId() {
+                return organizationId;
+            }
+        }
+    });
+    const projects = $derived(projectsQuery.data?.data ?? []);
+    const configuredProjectOnPage = $derived(
+        projects.some(
+            (project) =>
+                project.is_configured &&
+                project.id &&
+                pathname ===
+                    resolve('/(app)/project/[projectId]/configure', {
+                        projectId: project.id
+                    })
+        )
+    );
+    const errorEventsQuery = getOrganizationEventsQuery({
+        enabled: () => checkErrorAvailability,
+        params: {
+            filter: 'type:error',
+            limit: 1,
+            mode: 'summary',
+            time: 'all'
+        },
+        route: {
+            get organizationId() {
+                return organizationId;
+            }
+        }
+    });
+    const errorEventAvailability = $derived<ProductTourContext['errorEventAvailability']>(
+        !organizationId || !checkErrorAvailability || errorEventsQuery.isPending
+            ? 'loading'
+            : errorEventsQuery.isError
+              ? 'error'
+              : (errorEventsQuery.data?.data?.length ?? 0) > 0
+                ? 'available'
+                : 'empty'
+    );
+    const hostStateSettled = $derived(stateSettled && (!organizationId || projectsQuery.isSuccess));
     const context = $derived<ProductTourContext>({
         assistantAccess,
         errorEventAvailability,
@@ -81,7 +130,8 @@
     const checkpoint = $derived(productTourCheckpoint.current);
     const welcomeOpen = $derived(
         !!(
-            stateSettled &&
+            hostStateSettled &&
+            automaticSurface === 'welcome' &&
             currentUser &&
             !welcomeHandled &&
             !catalogOpen &&
@@ -94,14 +144,14 @@
     );
     const exieAnnouncementOpen = $derived(
         !!(
-            stateSettled &&
+            hostStateSettled &&
+            automaticSurface === 'exie-announcement' &&
             currentUser &&
             assistantAccess?.enabled &&
             (pathname.startsWith(EVENT_PATH) || pathname.startsWith(STACK_PATH)) &&
             !isSetupPage &&
             !isImpersonating &&
             !checkpoint &&
-            !welcomeOpen &&
             !catalogOpen &&
             !isAnyOverlayOpen &&
             !shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) &&
@@ -109,8 +159,46 @@
         )
     );
 
+    onMount(() => {
+        automaticSurfaceReady = true;
+    });
+
+    $effect(() => {
+        if (!automaticSurfaceReady || !currentUser) {
+            automaticSurface = undefined;
+            automaticSurfaceUserId = undefined;
+            automaticSurfaceClaimed = false;
+            return;
+        }
+
+        if (automaticSurfaceUserId !== currentUser.id) {
+            automaticSurface = undefined;
+            automaticSurfaceUserId = currentUser.id;
+            automaticSurfaceClaimed = sessionStorage.getItem(getAutomaticSurfaceKey(currentUser.id)) === 'shown';
+            welcomeHandled = false;
+            return;
+        }
+
+        if (automaticSurfaceClaimed || !hostStateSettled || isImpersonating || isSetupPage) {
+            return;
+        }
+
+        if (shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) && !pathname.startsWith(SYSTEM_PATH)) {
+            claimAutomaticSurface('welcome');
+            return;
+        }
+
+        if (
+            assistantAccess?.enabled &&
+            (pathname.startsWith(EVENT_PATH) || pathname.startsWith(STACK_PATH)) &&
+            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
+        ) {
+            claimAutomaticSurface('exie-announcement');
+        }
+    });
+
     $effect(() => {
-        if (!stateSettled) {
+        if (!hostStateSettled) {
             return;
         }
 
@@ -125,6 +213,18 @@
         }
     });
 
+    $effect(() => {
+        const active = checkpoint;
+        if (active?.tourName === 'project-configure' && active.checkpointName === 'wait-for-event' && configuredProjectOnPage) {
+            if (attemptedProjectCompletion !== active) {
+                attemptedProjectCompletion = active;
+                actions.completeAfterDomainSuccess(active);
+            }
+        } else {
+            attemptedProjectCompletion = undefined;
+        }
+    });
+
     $effect(() => {
         if (!currentUser) {
             return;
@@ -133,7 +233,7 @@
         const impression = `${currentUser.id}:${WELCOME_VERSION}`;
         if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
             lastTrackedWelcomeImpression = impression;
-            void track('shown', 'app-welcome', WELCOME_VERSION, 'automatic');
+            void track('shown', 'app-welcome', WELCOME_VERSION, 'welcome');
         }
     });
 
@@ -151,7 +251,7 @@
 
     export function openCatalog(source: ProductTourLaunchSource = 'catalog'): void {
         closeOverlays();
-        requestErrorAvailability();
+        checkErrorAvailability = true;
         catalogSource = source;
         catalogOpen = true;
     }
@@ -167,16 +267,23 @@
         }
 
         const active = productTourCheckpoint.current;
+        if (active?.tourName === name && isActiveTourRenderable(active)) {
+            closeOverlays();
+            catalogOpen = false;
+            return;
+        }
+
         if (active && !(await actions.dismiss(active))) {
             return;
         }
 
         closeOverlays();
         catalogOpen = false;
-        const next = productTourCheckpoint.start(name, item.initialCheckpoint, source, currentUser.id, item.version, organizationId);
-        await track('started', name, item.version, source);
+        const start = item.start(context);
+        const next = productTourCheckpoint.start(name, start.checkpointName, source, currentUser.id, item.version, organizationId);
+        void track('started', name, item.version, source);
 
-        const destination = item.startingRoute(context);
+        const destination = start.route;
         if (`${pathname}${window.location.search}` !== destination) {
             await goto(destination);
         }
@@ -187,6 +294,9 @@
     }
 
     async function recordPreference(name: 'app-welcome' | 'exie-announcement', version: number, status: ProductTourStatus): Promise<boolean> {
+        if (progressMutation.isPending) {
+            return false;
+        }
         try {
             await progressMutation.mutateAsync({
                 progress: {
@@ -207,9 +317,10 @@
             return;
         }
         welcomeHandled = true;
-        await track('started', 'app-welcome', WELCOME_VERSION, 'automatic');
-        await track('completed', 'app-welcome', WELCOME_VERSION, 'automatic');
-        await startTour(recommended.name, 'automatic');
+        automaticSurface = undefined;
+        void track('started', 'app-welcome', WELCOME_VERSION, 'welcome');
+        void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        await startTour(recommended.name, 'welcome');
     }
 
     async function onWelcomeBrowse(): Promise<void> {
@@ -217,7 +328,8 @@
             return;
         }
         welcomeHandled = true;
-        await track('completed', 'app-welcome', WELCOME_VERSION, 'automatic');
+        automaticSurface = undefined;
+        void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         openCatalog('catalog');
     }
 
@@ -226,45 +338,102 @@
             return;
         }
         welcomeHandled = true;
-        await track('dismissed', 'app-welcome', WELCOME_VERSION, 'automatic');
+        automaticSurface = undefined;
+        void track('dismissed', 'app-welcome', WELCOME_VERSION, 'welcome');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        await track('started', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
-        await track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
-        await startTour('exie-overview', 'feature-announcement');
+        automaticSurface = undefined;
+        void track('started', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        void track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        if (assistantAccess?.has_access) {
+            await startTour('exie-overview', 'feature-announcement');
+        } else {
+            await openAssistant();
+        }
     }
 
     async function onExieAnnouncementDismiss(): Promise<void> {
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
-        await track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        automaticSurface = undefined;
+        void track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
     }
 
     function getItem<Name extends ProductTourName>(name: Name): ProductTourListItem<Name> {
         return items.find((item) => item.name === name)! as ProductTourListItem<Name>;
     }
+
+    function claimAutomaticSurface(surface: 'exie-announcement' | 'welcome'): void {
+        if (!currentUser) {
+            return;
+        }
+
+        automaticSurface = surface;
+        automaticSurfaceClaimed = true;
+        sessionStorage.setItem(getAutomaticSurfaceKey(currentUser.id), 'shown');
+    }
+
+    function getAutomaticSurfaceKey(userId: string): string {
+        return `exceptionless.product-tour.automatic-surface.${userId}.welcome-v${WELCOME_VERSION}.announcement-v${EXIE_ANNOUNCEMENT_VERSION}`;
+    }
+
+    function isActiveTourRenderable(active: NonNullable<typeof checkpoint>): boolean {
+        switch (active.tourName) {
+            case 'app-overview':
+                return true;
+            case 'event-investigate':
+                return pathname.startsWith(EVENT_PATH) && (active.checkpointName === 'filter-errors' || active.checkpointName === 'choose-error');
+            case 'exie-overview':
+                return active.checkpointName === 'open-exie';
+            case 'project-configure':
+                if (active.checkpointName === 'organization-name') {
+                    return pathname === ORGANIZATION_ADD_PATH;
+                }
+
+                if (active.checkpointName === 'project-name') {
+                    return pathname === ORGANIZATION_ADD_PATH || pathname === PROJECT_ADD_PATH;
+                }
+                return pathname.startsWith(PROJECT_ADD_PATH.slice(0, -3)) && pathname.endsWith('/configure');
+            case 'saved-view-create':
+                return pathname.startsWith(EVENT_PATH) && (active.checkpointName === 'open-view-menu' || active.checkpointName === 'view-created');
+        }
+    }
 </script>
 
-<ProductTourWelcomeDialog open={welcomeOpen} onBrowse={onWelcomeBrowse} onDismiss={onWelcomeSkip} onStart={onWelcomeStart} {recommended} />
+<ProductTourWelcomeDialog
+    busy={progressMutation.isPending}
+    open={welcomeOpen}
+    onBrowse={onWelcomeBrowse}
+    onDismiss={onWelcomeSkip}
+    onStart={onWelcomeStart}
+    {recommended}
+/>
 
 {#if exieAnnouncementOpen && assistantAccess}
     <ProductTourFeatureAnnouncement
         hasAccess={assistantAccess.has_access}
         message={assistantAccess.message}
+        busy={progressMutation.isPending}
         onDismiss={onExieAnnouncementDismiss}
         onStart={onExieAnnouncementStart}
     />
 {/if}
 
-<ProductTourCatalogDialog bind:open={catalogOpen} {items} onStart={(name) => startTour(name, catalogSource)} />
+<ProductTourCatalogDialog
+    activeTourName={checkpoint?.tourName}
+    bind:open={catalogOpen}
+    {items}
+    onStart={(name) => startTour(name, catalogSource)}
+    resumableTourName={checkpoint && isActiveTourRenderable(checkpoint) ? checkpoint.tourName : undefined}
+/>
 
 {#if checkpoint && (checkpoint.tourName === 'exie-overview' || checkpoint.tourName === 'app-overview')}
     {#key checkpoint}
-        <ProductTourShellSpotlight {assistantAccess} {checkpoint} {isAnyOverlayOpen} {openAssistant} {setMobileNavigationOpen} />
+        <ProductTourShellSpotlight {assistantAccess} {checkpoint} {isAnyOverlayOpen} {isMobile} {openAssistant} {setMobileNavigationOpen} />
     {/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
index 325b931d75..408aa47e3d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
@@ -3,22 +3,29 @@
     import { Button } from '$comp/ui/button';
     import Info from '@lucide/svelte/icons/info';
 
+    import type { ProductTourCheckpoint } from '../types';
+
+    import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
+
     interface Props {
+        checkpoint: ProductTourCheckpoint;
         continueLabel?: string;
         description: string;
         onContinue?: () => Promise<void> | void;
         onDismiss: () => Promise<void> | void;
         title: string;
-        tourName: string;
     }
 
-    let { continueLabel = 'Continue', description, onContinue, onDismiss, title, tourName }: Props = $props();
+    let { checkpoint, continueLabel = 'Continue', description, onContinue, onDismiss, title }: Props = $props();
+    const checkpoints = $derived<readonly string[]>(PRODUCT_TOUR_CHECKPOINTS[checkpoint.tourName]);
+    const stepNumber = $derived(checkpoints.indexOf(checkpoint.checkpointName) + 1);
 </script>
 
-<Alert.Root data-product-tour-inline={tourName}>
+<Alert.Root data-product-tour-inline={checkpoint.tourName}>
     <Info aria-hidden="true" />
     <Alert.Title>{title}</Alert.Title>
     <Alert.Description>
+        <span class="text-muted-foreground mb-1 block text-xs">Step {stepNumber} of {checkpoints.length}</span>
         {description}
         <div class="mt-2 flex flex-wrap gap-2">
             {#if onContinue}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
index e41e8616d2..802234c706 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import type { AssistantAccess } from '$features/assistant/models';
 
-    import { onDestroy, onMount, untrack } from 'svelte';
+    import { onDestroy, onMount, tick, untrack } from 'svelte';
 
     import type { ProductTourCheckpoint, ProductTourCheckpointName } from '../types';
 
@@ -13,6 +13,7 @@
         assistantAccess?: AssistantAccess;
         checkpoint: ProductTourCheckpoint;
         isAnyOverlayOpen: boolean;
+        isMobile: boolean;
         openAssistant: () => Promise<void>;
         setMobileNavigationOpen: (open: boolean) => void;
     }
@@ -20,11 +21,12 @@
     interface ShellStep {
         checkpointName: ProductTourCheckpointName;
         description: string;
+        mobileNavigation?: boolean;
         target: string;
         title: string;
     }
 
-    let { assistantAccess, checkpoint, isAnyOverlayOpen, openAssistant, setMobileNavigationOpen }: Props = $props();
+    let { assistantAccess, checkpoint, isAnyOverlayOpen, isMobile, openAssistant, setMobileNavigationOpen }: Props = $props();
     const currentAssistantAccess = untrack(() => assistantAccess);
     const currentCheckpoint = untrack(() => checkpoint);
     const actions = createProductTourActions();
@@ -46,6 +48,7 @@
         {
             checkpointName: 'navigation',
             description: 'Move between dashboards, saved views, and settings from the application navigation.',
+            mobileNavigation: true,
             target: '[data-tour="app-navigation"]',
             title: 'Your workspace navigation'
         },
@@ -58,10 +61,11 @@
         {
             checkpointName: 'saved-views',
             description: 'Saved views preserve filters, time, sorting, charts, stats, and columns for quick reuse.',
+            mobileNavigation: true,
             target: '[data-tour="saved-view-navigation"]',
             title: 'Reuse configured views'
         },
-        ...(currentAssistantAccess?.enabled
+        ...(currentAssistantAccess?.has_access
             ? [
                   {
                       checkpointName: 'exie' as const,
@@ -74,15 +78,21 @@
         {
             checkpointName: 'help',
             description: 'Open Help for documentation, support, keyboard shortcuts, and guided tours.',
+            mobileNavigation: true,
             target: '[data-tour="help-menu"]',
             title: 'Help is always nearby'
         }
     ];
     const steps = currentCheckpoint.tourName === 'app-overview' ? appOverviewSteps : exieOverviewSteps;
     const spotlight = steps.find((step) => step.checkpointName === currentCheckpoint.checkpointName);
+    let targetReady = $state(false);
 
-    onMount(() => {
-        setMobileNavigationOpen(currentCheckpoint.checkpointName === 'navigation');
+    onMount(async () => {
+        setMobileNavigationOpen(spotlight?.mobileNavigation ?? false);
+        if (isMobile && spotlight?.mobileNavigation) {
+            await tick();
+        }
+        targetReady = true;
     });
 
     onDestroy(() => {
@@ -107,12 +117,14 @@
     }
 </script>
 
-{#if spotlight && (!isAnyOverlayOpen || checkpoint.tourName === 'exie-overview')}
+{#if spotlight && targetReady && (!isAnyOverlayOpen || checkpoint.tourName === 'exie-overview')}
     <ProductTourSpotlight
         checkpoint={currentCheckpoint}
         description={spotlight.description}
         onDismiss={actions.dismiss}
         onNext={advance}
+        stepCount={steps.length}
+        stepNumber={steps.indexOf(spotlight) + 1}
         target={spotlight.target}
         title={spotlight.title}
     />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index a00e3de4e7..fefcbc1755 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -1,9 +1,12 @@
 <script lang="ts">
     import { driver, type Driver } from 'driver.js';
     import { onMount } from 'svelte';
+    import { toast } from 'svelte-sonner';
 
     import type { ProductTourCheckpoint } from '../types';
 
+    import { productTourCheckpoint } from '../state.svelte';
+    import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
     import 'driver.js/dist/driver.css';
 
     interface Props {
@@ -13,30 +16,52 @@
         onDismiss: (checkpoint: ProductTourCheckpoint) => Promise<boolean>;
         onNext?: (checkpoint: ProductTourCheckpoint) => Promise<void> | void;
         side?: 'bottom' | 'left' | 'right' | 'top';
+        stepCount?: number;
+        stepNumber?: number;
         target: Element | string;
         title: string;
     }
 
-    let { checkpoint, continueLabel = 'Continue', description, onDismiss, onNext, side, target, title }: Props = $props();
+    let { checkpoint, continueLabel = 'Continue', description, onDismiss, onNext, side, stepCount, stepNumber, target, title }: Props = $props();
     let activeDriver: Driver | undefined;
+    let dismissing = false;
+    let returnFocus: HTMLElement | null = null;
 
     onMount(() => {
+        const element = typeof target === 'string' ? document.querySelector(target) : target;
+        if (!element) {
+            productTourCheckpoint.clear(checkpoint);
+            toast.warning('This guide step is unavailable on this page. Start the guide again from Guided Tours.');
+            return;
+        }
+
+        returnFocus = document.activeElement instanceof HTMLElement ? document.activeElement : null;
+        const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[checkpoint.tourName];
+        const currentStepNumber = stepNumber ?? checkpoints.indexOf(checkpoint.checkpointName) + 1;
+        const totalSteps = stepCount ?? checkpoints.length;
         const instance = driver({
             allowClose: true,
             animate: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
             disableActiveInteraction: false,
-            onDestroyStarted: async () => {
-                if (activeDriver === instance && (await onDismiss(checkpoint))) {
-                    destroy();
-                }
+            onCloseClick: () => {
+                void dismiss();
+            },
+            onDestroyStarted: () => {
+                void dismiss();
+            },
+            onPopoverRender: (popover) => {
+                popover.closeButton.textContent = 'End guide';
+                popover.closeButton.setAttribute('aria-label', 'End guide');
+                popover.closeButton.setAttribute('title', 'End guide');
+                popover.progress.textContent = `Step ${currentStepNumber} of ${totalSteps}`;
             },
-            popoverClass:
-                'max-w-sm rounded-lg border border-border bg-popover text-popover-foreground shadow-lg [&_.driver-popover-title]:text-base [&_.driver-popover-title]:font-semibold',
-            showProgress: false,
+            overlayClickBehavior: () => {},
+            popoverClass: 'product-tour-popover',
+            showProgress: true,
             smoothScroll: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
             steps: [
                 {
-                    element: target,
+                    element,
                     popover: {
                         description,
                         doneBtnText: continueLabel,
@@ -48,8 +73,7 @@
                         showButtons: onNext ? ['close', 'next'] : ['close'],
                         side,
                         title
-                    },
-                    waitForElement: 5000
+                    }
                 }
             ]
         });
@@ -59,6 +83,19 @@
         return destroyImmediately;
     });
 
+    async function dismiss(): Promise<void> {
+        if (dismissing || !activeDriver) {
+            return;
+        }
+
+        dismissing = true;
+        if (await onDismiss(checkpoint)) {
+            destroy();
+        } else {
+            dismissing = false;
+        }
+    }
+
     function destroy(): void {
         const instance = activeDriver;
         activeDriver = undefined;
@@ -67,9 +104,74 @@
             onDestroyStarted: undefined
         });
         instance?.destroy();
+        queueMicrotask(() => returnFocus?.focus());
     }
 
     function destroyImmediately(): void {
         destroy();
     }
 </script>
+
+<style>
+    :global(.product-tour-popover.driver-popover) {
+        max-width: min(24rem, calc(100vw - 2rem));
+        border: 1px solid var(--border);
+        border-radius: var(--radius-lg);
+        background: var(--popover);
+        color: var(--popover-foreground);
+        box-shadow: 0 10px 15px -3px color-mix(in oklab, var(--foreground) 12%, transparent);
+    }
+
+    :global(.product-tour-popover .driver-popover-title) {
+        color: var(--popover-foreground);
+        font-size: 1rem;
+        font-weight: 600;
+        padding-right: 5.5rem;
+    }
+
+    :global(.product-tour-popover .driver-popover-description),
+    :global(.product-tour-popover .driver-popover-progress-text) {
+        color: var(--muted-foreground);
+    }
+
+    :global(.product-tour-popover .driver-popover-close-btn),
+    :global(.product-tour-popover .driver-popover-next-btn) {
+        min-width: 2.75rem;
+        min-height: 2.75rem;
+        border-color: var(--border);
+        border-radius: var(--radius-md);
+        background: var(--background);
+        color: var(--foreground);
+        font-size: 0.875rem;
+        text-shadow: none;
+    }
+
+    :global(.product-tour-popover .driver-popover-close-btn) {
+        top: 0.25rem;
+        right: 0.25rem;
+        width: auto;
+        padding: 0.5rem;
+        font-size: 0.75rem;
+    }
+
+    :global(.product-tour-popover button:focus-visible) {
+        outline: 2px solid var(--ring);
+        outline-offset: 2px;
+    }
+
+    :global(.product-tour-popover .driver-popover-arrow-side-top) {
+        border-bottom-color: var(--popover);
+    }
+
+    :global(.product-tour-popover .driver-popover-arrow-side-right) {
+        border-left-color: var(--popover);
+    }
+
+    :global(.product-tour-popover .driver-popover-arrow-side-bottom) {
+        border-top-color: var(--popover);
+    }
+
+    :global(.product-tour-popover .driver-popover-arrow-side-left) {
+        border-right-color: var(--popover);
+    }
+</style>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
index 69e05695ff..d3dfd36e30 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
@@ -1,31 +1,20 @@
 <script lang="ts">
-    import type { SavedView } from '$features/saved-views/models';
-
     import { toast } from 'svelte-sonner';
 
-    import type { ProductTourCheckpoint } from '../types';
-
     import { createProductTourActions } from '../actions.svelte';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourSpotlight from './product-tour-spotlight.svelte';
 
     interface Props {
         closeMenu: () => void;
-        onLoadView: (view: SavedView) => Promise<void> | void;
         openMenu: () => void;
         openSaveDialog: () => void;
-        savedViews: SavedView[];
     }
 
-    let { closeMenu, onLoadView, openMenu, openSaveDialog, savedViews }: Props = $props();
+    let { closeMenu, openMenu, openSaveDialog }: Props = $props();
+    let completionPending = $state(false);
     const actions = createProductTourActions();
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'saved-view-create' ? productTourCheckpoint.current : undefined);
-    const pendingView = $derived.by(() => {
-        const phase = checkpoint?.phase;
-        return phase?.type === 'saved-view-created' || phase?.type === 'saved-view-loaded'
-            ? savedViews.find((savedView) => savedView.id === phase.viewId)
-            : undefined;
-    });
 
     export function validateSave(isPrivate: boolean): boolean {
         if (!checkpoint) {
@@ -49,63 +38,34 @@
         return Boolean(checkpoint);
     }
 
-    export async function created(view: SavedView): Promise<void> {
+    export async function created(): Promise<void> {
         const active = checkpoint;
-        if (!active) {
-            await onLoadView(view);
+        if (!active || active.checkpointName !== 'save-view') {
             return;
         }
 
-        const createdCheckpoint = productTourCheckpoint.advance(active, 'view-created', {
-            type: 'saved-view-created',
-            viewId: view.id
-        });
+        const createdCheckpoint = productTourCheckpoint.advance(active, 'view-created');
         if (createdCheckpoint) {
-            await loadAndComplete(createdCheckpoint, view);
+            completionPending = true;
+            await actions.complete(createdCheckpoint);
+            completionPending = false;
         }
     }
 
     export async function closed(): Promise<void> {
         const active = checkpoint;
-        if (active?.phase.type === 'active' && ['name-view', 'private-view', 'save-view'].includes(active.checkpointName)) {
+        if (active && ['name-view', 'private-view', 'save-view'].includes(active.checkpointName)) {
             await actions.dismiss(active);
         }
     }
 
     async function retry(): Promise<void> {
         const active = checkpoint;
-        if (!active) {
-            return;
-        }
-
-        if (active.phase.type === 'saved-view-loaded') {
-            await actions.complete(active);
+        if (active?.checkpointName !== 'view-created') {
             return;
         }
 
-        if (active.phase.type === 'saved-view-created') {
-            if (!pendingView) {
-                toast.error('The created view could not be loaded. Refresh and try again.');
-                return;
-            }
-
-            await loadAndComplete(active, pendingView);
-        }
-    }
-
-    async function loadAndComplete(active: ProductTourCheckpoint<'saved-view-create'>, view: SavedView): Promise<void> {
-        try {
-            await onLoadView(view);
-            const loadedCheckpoint = productTourCheckpoint.advance(active, 'view-created', {
-                type: 'saved-view-loaded',
-                viewId: view.id
-            });
-            if (loadedCheckpoint) {
-                await actions.complete(loadedCheckpoint);
-            }
-        } catch {
-            toast.error('Failed to load the created view. Please try again.');
-        }
+        await actions.complete(active);
     }
 </script>
 
@@ -164,13 +124,11 @@
         target="[data-tour='saved-view-submit']"
         title="Create the saved view"
     />
-{:else if checkpoint?.phase.type === 'saved-view-created' || checkpoint?.phase.type === 'saved-view-loaded'}
+{:else if checkpoint?.checkpointName === 'view-created' && !completionPending}
     <ProductTourSpotlight
         {checkpoint}
         continueLabel="Retry guide completion"
-        description={checkpoint.phase.type === 'saved-view-created'
-            ? 'The view was created, but it could not be loaded. Continue to try loading it again.'
-            : 'The view was created and loaded, but guide progress could not be saved. Continue to retry.'}
+        description="The view was created and loaded, but guide progress could not be saved. Continue to retry."
         onDismiss={actions.dismiss}
         onNext={retry}
         target="[data-tour='saved-view-trigger']"
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
index b548dc623c..ceb6cba570 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
@@ -7,7 +7,6 @@ import { clearProductTourSession, readProductTourSession, writeProductTourSessio
 const checkpoint: ProductTourCheckpoint = {
     checkpointName: 'choose-error',
     organizationId: 'organization-id',
-    phase: { type: 'active' },
     source: 'command-palette',
     tourName: 'event-investigate',
     userId: 'user-id',
@@ -32,13 +31,15 @@ describe('product tour session', () => {
         JSON.stringify({ ...checkpoint, checkpointName: 'unknown-step' }),
         JSON.stringify({ ...checkpoint, source: 'unknown-source' }),
         JSON.stringify({ ...checkpoint, version: 0 }),
-        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created' } }),
-        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created', viewId: 'view-id' } }),
-        JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-loaded', viewId: 'view-id' } }),
         JSON.stringify({ ...checkpoint, userId: 42 })
     ])('clears malformed or unknown stored state: %s', (value) => {
         sessionStorage.setItem('exceptionless.product-tour', value);
         expect(readProductTourSession()).toBeUndefined();
         expect(sessionStorage).toHaveLength(0);
     });
+
+    it('drops obsolete workflow state from an existing browser session', () => {
+        sessionStorage.setItem('exceptionless.product-tour', JSON.stringify({ ...checkpoint, phase: { type: 'saved-view-created', viewId: 'view-id' } }));
+        expect(readProductTourSession()).toEqual(checkpoint);
+    });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index 822de6d2f3..a68574eb3a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -1,4 +1,4 @@
-import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
+import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName } from './types';
 
 import { PRODUCT_TOUR_CHECKPOINTS, PRODUCT_TOUR_LAUNCH_SOURCES } from './types';
 
@@ -20,7 +20,14 @@ export function readProductTourSession(storage: Pick<Storage, 'getItem' | 'remov
             return undefined;
         }
 
-        return candidate;
+        return {
+            checkpointName: candidate.checkpointName,
+            organizationId: candidate.organizationId,
+            source: candidate.source,
+            tourName: candidate.tourName,
+            userId: candidate.userId,
+            version: candidate.version
+        } as ProductTourCheckpoint;
     } catch {
         clearProductTourSession(storage);
         return undefined;
@@ -31,18 +38,6 @@ export function writeProductTourSession(checkpoint: ProductTourCheckpoint, stora
     storage.setItem(SESSION_KEY, JSON.stringify(checkpoint));
 }
 
-function isPhase(value: unknown, tourName: string, checkpointName: unknown): value is ProductTourPhase {
-    if (!isRecord(value) || typeof value.type !== 'string') return false;
-    if (value.type === 'active') return true;
-    return (
-        tourName === 'saved-view-create' &&
-        checkpointName === 'view-created' &&
-        (value.type === 'saved-view-created' || value.type === 'saved-view-loaded') &&
-        typeof value.viewId === 'string' &&
-        !!value.viewId
-    );
-}
-
 function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint {
     if (
         !isRecord(value) ||
@@ -59,7 +54,7 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
 
     const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[value.tourName];
     if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) return false;
-    return isPhase(value.phase, value.tourName, value.checkpointName);
+    return true;
 }
 
 function isProductTourLaunchSource(value: unknown): value is ProductTourLaunchSource {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index fcb3e1a479..e5be7a69a0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -7,7 +7,6 @@ import { productTourCheckpoint } from './state.svelte';
 const checkpoint: ProductTourCheckpoint = {
     checkpointName: 'navigation',
     organizationId: 'organization-id',
-    phase: { type: 'active' },
     source: 'catalog',
     tourName: 'app-overview',
     userId: 'user-id',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
index 7ba2fcb1d4..6bce990651 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -1,4 +1,4 @@
-import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourLaunchSource, ProductTourName, ProductTourPhase } from './types';
+import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourLaunchSource, ProductTourName } from './types';
 
 import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
 
@@ -8,9 +8,6 @@ class ProductTourCheckpointStore {
     advance<Name extends ProductTourCheckpoint['tourName']>(
         expected: ProductTourCheckpoint<Name>,
         checkpointName: ProductTourCheckpointName<Name>,
-        phase: ProductTourPhase<Name> = {
-            type: 'active'
-        },
         organizationId = expected.organizationId
     ): ProductTourCheckpoint<Name> | undefined {
         if (this.current !== expected) {
@@ -19,8 +16,7 @@ class ProductTourCheckpointStore {
         const next = {
             ...expected,
             checkpointName,
-            organizationId,
-            phase
+            organizationId
         } as ProductTourCheckpoint<Name>;
         return this.save(next);
     }
@@ -64,9 +60,6 @@ class ProductTourCheckpointStore {
         const checkpoint = {
             checkpointName,
             organizationId,
-            phase: {
-                type: 'active'
-            },
             source,
             tourName,
             userId,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
index 8eeb6df23d..0c8ecc8429 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
@@ -1,8 +1,6 @@
-import type { ProductTourTelemetryEvent as ProductTourTelemetryEventContract } from '$generated/api';
-
 import type { ProductTourKey, ProductTourLaunchSource } from './types';
 
-export type ProductTourTelemetryEvent = `${ProductTourTelemetryEventContract}`;
+export type ProductTourTelemetryEvent = 'completed' | 'dismissed' | 'shown' | 'started';
 
 export function buildProductTourTelemetryEvent(
     event: ProductTourTelemetryEvent,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index f13f8916c5..8be111572e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -9,7 +9,7 @@ export const PRODUCT_TOUR_CHECKPOINTS = {
     'saved-view-create': ['open-view-menu', 'review-settings', 'name-view', 'private-view', 'save-view', 'view-created']
 } as const;
 
-export const PRODUCT_TOUR_LAUNCH_SOURCES = ['automatic', 'catalog', 'command-palette', 'feature-announcement', 'help-menu'] as const;
+export const PRODUCT_TOUR_LAUNCH_SOURCES = ['welcome', 'catalog', 'command-palette', 'feature-announcement', 'help-menu'] as const;
 
 export interface ProductTourAvailability {
     available: boolean;
@@ -19,7 +19,6 @@ export type ProductTourCheckpoint<Name extends ProductTourName = ProductTourName
     ? {
           checkpointName: ProductTourCheckpointName<Name>;
           organizationId?: string;
-          phase: ProductTourPhase<Name>;
           source: ProductTourLaunchSource;
           tourName: Name;
           userId: string;
@@ -33,19 +32,17 @@ export interface ProductTourContext {
     isSetupPage: boolean;
     organizationId?: string;
     pathname: string;
-    projects: Pick<ViewProject, 'is_configured'>[];
+    projects: Pick<ViewProject, 'id' | 'is_configured'>[];
 }
 export interface ProductTourDefinition<Name extends ProductTourName = ProductTourName> {
     availability: (context: ProductTourContext) => ProductTourAvailability;
     description: string;
-    initialCheckpoint: ProductTourCheckpointName<Name>;
     keywords: readonly string[];
     name: Name;
-    startingRoute: (context: ProductTourContext) => string;
+    start: (context: ProductTourContext) => ProductTourStart<Name>;
     title: string;
     version: number;
 }
-
 export type ProductTourKey = 'app-welcome' | 'exie-announcement' | ProductTourName;
 
 export type ProductTourLaunchSource = (typeof PRODUCT_TOUR_LAUNCH_SOURCES)[number];
@@ -57,5 +54,7 @@ export interface ProductTourListItem<Name extends ProductTourName = ProductTourN
 
 export type ProductTourName = keyof typeof PRODUCT_TOUR_CHECKPOINTS;
 
-export type ProductTourPhase<Name extends ProductTourName = ProductTourName> =
-    (Name extends 'saved-view-create' ? { type: 'saved-view-created' | 'saved-view-loaded'; viewId: string } : never) | { type: 'active' };
+export interface ProductTourStart<Name extends ProductTourName = ProductTourName> {
+    checkpointName: ProductTourCheckpointName<Name>;
+    route: string;
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
index 4c5d0cb627..0452ec7930 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
@@ -124,7 +124,7 @@
         }
     }}
 >
-    <Dialog.Content class="sm:max-w-100" data-tour="saved-view-dialog">
+    <Dialog.Content class="sm:max-w-100">
         <Dialog.Header>
             <Dialog.Title>Save View</Dialog.Title>
             <Dialog.Description>Save the current view configuration for quick access.</Dialog.Description>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 11b6ffd02f..2040dd7fd5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -70,7 +70,7 @@
         filters: IFilter[];
         isModified: boolean;
         onClearSavedView: () => Promise<void>;
-        onLoadView: (view: SavedView) => Promise<void> | void;
+        onLoadView: (view: SavedView) => void;
         onResetToSaved: () => void;
         onSavedViewUpdated: (view: SavedView) => void;
         savedViews: SavedView[];
@@ -284,9 +284,9 @@
 
         try {
             const result = await createMutation.mutateAsync(body);
-            const tourCompletion = tour ? tour.created(result) : onLoadView(result);
             isSaveDialogOpen = false;
-            await tourCompletion;
+            onLoadView(result);
+            void tour?.created();
             toast.success(`Saved view "${result.name}" created.`);
         } catch (error) {
             toast.error(getErrorMessage(error, 'Failed to save view. Please try again.'));
@@ -517,8 +517,6 @@
     closeMenu={() => (isMenuOpen = false)}
     openMenu={() => (isMenuOpen = true)}
     openSaveDialog={() => (isSaveDialogOpen = true)}
-    {onLoadView}
-    {savedViews}
 />
 
 {#if isRenameDialogOpen && activeView}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
index 331a8884b9..7a9d2d4737 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/use-saved-views.svelte.ts
@@ -99,7 +99,7 @@ export interface UseSavedViewsReturn {
     autoFillColumnId: AutoFillColumnSelection;
     canModifySavedView: boolean;
     handleClearSavedView: () => Promise<void>;
-    handleLoadView: (view: SavedView) => Promise<void>;
+    handleLoadView: (view: SavedView) => void;
     handleResetToSaved: () => void;
     handleSavedViewUpdated: (view: SavedView) => void;
     hydratedSavedViewId: string | undefined;
@@ -1209,9 +1209,9 @@ export function useSavedViews(options: UseSavedViewsOptions): UseSavedViewsRetur
         })
     );
 
-    async function handleLoadView(view: SavedView): Promise<void> {
+    function handleLoadView(view: SavedView) {
         if (options.baseHref) {
-            await goto(savedViewHref(view));
+            goto(savedViewHref(view));
             return;
         }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
index c4e17c0212..d28effe22b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
@@ -173,7 +173,6 @@
 {#if stack}
     <Card.Root
         class="bg-background relative overflow-hidden ring-[color-mix(in_oklab,var(--chart-1)_42%,transparent)] before:absolute before:inset-x-0 before:top-0 before:h-1 before:bg-[linear-gradient(90deg,var(--chart-1),var(--chart-2))] before:content-['']"
-        data-tour="event-stack"
     >
         <Card.Header>
             <Card.Title class="flex flex-row items-center justify-between text-lg font-semibold">
@@ -185,7 +184,7 @@
                 <div class="ml-2 flex shrink-0 items-center gap-2">
                     <StackLogLevel {stack} />
                     <AssistantFixButton {prepareContext} resource={assistantResource} />
-                    <ButtonGroup.Root data-tour="event-stack-triage">
+                    <ButtonGroup.Root>
                         <StackStatusDropdownMenu {stack} />
                         <StackOptionsDropdownMenu {onDeleted} {stack} />
                     </ButtonGroup.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 841759d02a..d762ce9ff9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -7,20 +7,18 @@ export enum StackStatus {
   Discarded = "discarded",
 }
 
-export enum ProductTourTelemetryEvent {
-  Completed = "completed",
-  Dismissed = "dismissed",
-  Shown = "shown",
-  Started = "started",
-}
-
 export enum ProductTourStatus {
   Completed = 1,
   Dismissed = 2,
 }
 
+export enum ProductTourKind {
+  Guide = "guide",
+  Prompt = "prompt",
+}
+
 export enum ProductTourLaunchSource {
-  Automatic = "automatic",
+  Welcome = "welcome",
   Catalog = "catalog",
   CommandPalette = "command-palette",
   FeatureAnnouncement = "feature-announcement",
@@ -514,20 +512,6 @@ export interface ProblemDetails {
   instance?: null | string;
 }
 
-export interface ProductTourEvent {
-  /** @format date-time */
-  date_utc: string;
-  event: ProductTourTelemetryEvent;
-  launch_source: ProductTourLaunchSource;
-  tour_name: string;
-  user_identity?: null | string;
-  user_name?: null | string;
-  /** @format int32 */
-  version: number;
-  /** @format int64 */
-  count: number;
-}
-
 export interface ProductTourProgress {
   status: ProductTourStatus;
   /** @format int32 */
@@ -536,33 +520,34 @@ export interface ProductTourProgress {
 
 export interface ProductTourSummary {
   name: string;
+  /** @format int32 */
+  version: number;
+  kind: ProductTourKind;
   /** @format int64 */
   shown: number;
   /** @format int64 */
   started: number;
   /** @format int64 */
-  manual_started: number;
-  /** @format int64 */
   completed: number;
   /** @format int64 */
   dismissed: number;
   /** @format date-time */
   last_run_utc?: null | string;
-  /** @format double */
-  started_rate?: null | number;
-  /** @format double */
-  manual_started_rate?: null | number;
-  /** @format double */
-  completion_rate?: null | number;
-  /** @format double */
-  dismissal_rate?: null | number;
+  start_sources: ProductTourStartSource[];
+}
+
+export interface ProductTourStartSource {
+  source: ProductTourLaunchSource;
+  /** @format int64 */
+  count: number;
 }
 
 export interface ProductTourUsageResponse {
   /** @format date-time */
-  month?: null | string;
+  utc_start?: null | string;
+  /** @format date-time */
+  utc_end: string;
   tours: ProductTourSummary[];
-  recent_events: ProductTourEvent[];
 }
 
 export interface ResetPasswordModel {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index 959fecd2f0..dc7f6f66b4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,15 +27,10 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
-export const ProductTourTelemetryEventSchema = zodEnum([
-  "completed",
-  "dismissed",
-  "shown",
-  "started",
-]);
 export const ProductTourStatusSchema = union([literal(1), literal(2)]);
+export const ProductTourKindSchema = zodEnum(["guide", "prompt"]);
 export const ProductTourLaunchSourceSchema = zodEnum([
-  "automatic",
+  "welcome",
   "catalog",
   "command-palette",
   "feature-announcement",
@@ -640,18 +635,6 @@ export const ProblemDetailsSchema = object({
 });
 export type ProblemDetailsFormData = Infer<typeof ProblemDetailsSchema>;
 
-export const ProductTourEventSchema = object({
-  date_utc: iso.datetime(),
-  event: ProductTourTelemetryEventSchema,
-  launch_source: ProductTourLaunchSourceSchema,
-  tour_name: string().min(1, "Tour name is required"),
-  user_identity: string().min(1, "User identity is required").nullable(),
-  user_name: string().min(1, "User name is required").nullable(),
-  version: int32(),
-  count: int(),
-});
-export type ProductTourEventFormData = Infer<typeof ProductTourEventSchema>;
-
 export const ProductTourProgressSchema = object({
   status: ProductTourStatusSchema,
   version: int32(),
@@ -662,23 +645,29 @@ export type ProductTourProgressFormData = Infer<
 
 export const ProductTourSummarySchema = object({
   name: string().min(1, "Name is required"),
+  version: int32(),
+  kind: ProductTourKindSchema,
   shown: int(),
   started: int(),
-  manual_started: int(),
   completed: int(),
   dismissed: int(),
   last_run_utc: iso.datetime().nullable(),
-  started_rate: number().nullable(),
-  manual_started_rate: number().nullable(),
-  completion_rate: number().nullable(),
-  dismissal_rate: number().nullable(),
+  start_sources: array(lazy(() => ProductTourStartSourceSchema)),
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
+export const ProductTourStartSourceSchema = object({
+  source: ProductTourLaunchSourceSchema,
+  count: int(),
+});
+export type ProductTourStartSourceFormData = Infer<
+  typeof ProductTourStartSourceSchema
+>;
+
 export const ProductTourUsageResponseSchema = object({
-  month: iso.datetime().nullable(),
+  utc_start: iso.datetime().nullable(),
+  utc_end: iso.datetime(),
   tours: array(lazy(() => ProductTourSummarySchema)),
-  recent_events: array(lazy(() => ProductTourEventSchema)),
 });
 export type ProductTourUsageResponseFormData = Infer<
   typeof ProductTourUsageResponseSchema
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
index 5998ebf0fb..f5f87f094c 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/navbar.svelte
@@ -27,7 +27,7 @@
     <div class="px-4 py-3">
         <div class="flex items-center justify-between">
             <div class="flex items-center justify-start">
-                <Sidebar.Trigger data-tour="mobile-navigation-trigger" variant="outline" class="size-9" />
+                <Sidebar.Trigger variant="outline" class="size-9" />
 
                 <A variant="ghost" class="mr-14 ml-2 flex md:min-w-62.5 lg:ml-3 dark:text-white" href={resolve('/')}>
                     {#if isMediumScreenQuery.current}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
index 2a19d607a3..bd17bea309 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import type { ViewOrganization } from '$features/organizations/models';
-    import type { ProductTourListItem, ProductTourName } from '$features/product-tours/types';
     import type { ViewProject } from '$features/projects/models';
     import type { FetchClientResponse } from '@foundatiofx/fetchclient';
 
@@ -58,7 +57,6 @@
 
     type Props = {
         askExie: (prompt: string) => Promise<void> | void;
-        guidedTours: ProductTourListItem[];
         isChatEnabled: boolean;
         isExieEnabled: boolean;
         isGlobalAdmin: boolean;
@@ -74,7 +72,6 @@
         organizations: ViewOrganization[];
         resetKey: number;
         routes: NavigationItem[];
-        startGuidedTour: (name: ProductTourName) => Promise<void>;
         stopImpersonating: () => Promise<void> | void;
     };
 
@@ -91,7 +88,6 @@
 
     let {
         askExie,
-        guidedTours,
         isChatEnabled,
         isExieEnabled,
         isGlobalAdmin,
@@ -107,7 +103,6 @@
         organizations,
         resetKey,
         routes,
-        startGuidedTour,
         stopImpersonating
     }: Props = $props();
     let searchText = $state('');
@@ -428,11 +423,6 @@
         openGuidedTours();
     }
 
-    async function launchGuidedTour(name: ProductTourName): Promise<void> {
-        closeCommandWindow();
-        await startGuidedTour(name);
-    }
-
     function toggleTheme(): void {
         closeCommandWindow();
         toggleMode();
@@ -575,15 +565,9 @@
             />
             {#if !selectingProject}
                 <Command.Group heading="Guided Tours">
-                    {#each guidedTours.filter((tour) => tour.currentAvailability.available) as tour (tour.name)}
-                        <Command.Item keywords={[...tour.keywords]} value={`Guided Tour ${tour.title}`} onSelect={() => launchGuidedTour(tour.name)}>
-                            <Compass />
-                            <span>{tour.title}</span>
-                        </Command.Item>
-                    {/each}
                     <Command.Item value="Browse Guided Tours help onboarding guides" onSelect={openGuidedTourCatalog}>
-                        <CircleHelp />
-                        <span>Browse Guided Tours…</span>
+                        <Compass />
+                        <span>Guided Tours…</span>
                     </Command.Item>
                 </Command.Group>
                 <Command.Separator />
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
index 093b8c446d..d54d118edc 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/navigation-command.svelte.test.ts
@@ -1,5 +1,3 @@
-import type { ProductTourListItem } from '$features/product-tours/types';
-
 import { fireEvent, render, screen, waitFor } from '@testing-library/svelte';
 import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
@@ -55,7 +53,6 @@ import NavigationCommand from './navigation-command.svelte';
 
 type RenderOptions = {
     askExie?: (prompt: string) => Promise<void> | void;
-    guidedTours?: ProductTourListItem[];
     isChatEnabled?: boolean;
     isExieEnabled?: boolean;
     isGlobalAdmin?: boolean;
@@ -65,7 +62,6 @@ type RenderOptions = {
     openGuidedTours?: () => void;
     openImpersonateOrganization?: () => Promise<void> | void;
     organizations?: Array<{ id: string; name: string }>;
-    startGuidedTour?: (name: ProductTourListItem['name']) => Promise<void>;
     stopImpersonating?: () => Promise<void> | void;
 };
 
@@ -79,7 +75,6 @@ const sessionsRoute: NavigationItem = {
 function renderCommandPalette(routes: NavigationItem[] = [], options: RenderOptions = {}) {
     return render(NavigationCommand, {
         askExie: options.askExie ?? vi.fn(),
-        guidedTours: options.guidedTours ?? [],
         isChatEnabled: options.isChatEnabled ?? false,
         isExieEnabled: options.isExieEnabled ?? true,
         isGlobalAdmin: options.isGlobalAdmin ?? false,
@@ -95,7 +90,6 @@ function renderCommandPalette(routes: NavigationItem[] = [], options: RenderOpti
         organizations: (options.organizations ?? []) as never,
         resetKey: 0,
         routes: [sessionsRoute, ...routes],
-        startGuidedTour: options.startGuidedTour ?? vi.fn(),
         stopImpersonating: options.stopImpersonating ?? vi.fn()
     });
 }
@@ -329,36 +323,12 @@ describe('NavigationCommand project actions', () => {
 });
 
 describe('NavigationCommand guided tours', () => {
-    it('launches available tours directly and opens the full catalog', async () => {
+    it('opens the guided-tour catalog from one command', async () => {
         vi.useFakeTimers();
         const openGuidedTours = vi.fn();
-        const startGuidedTour = vi.fn();
         try {
-            const tourPalette = renderCommandPalette([], {
-                guidedTours: [
-                    {
-                        availability: vi.fn(() => ({ available: true })),
-                        currentAvailability: { available: true },
-                        description: 'Learn the UI.',
-                        initialCheckpoint: 'navigation',
-                        keywords: ['tour'],
-                        name: 'app-overview',
-                        startingRoute: vi.fn(() => '/next'),
-                        title: 'Explore Exceptionless',
-                        version: 1
-                    }
-                ],
-                openGuidedTours,
-                startGuidedTour
-            });
-
-            await fireEvent.click(screen.getByText('Explore Exceptionless'));
-            expect(startGuidedTour).toHaveBeenCalledWith('app-overview');
-            tourPalette.unmount();
-            await vi.runAllTimersAsync();
-
             const catalogPalette = renderCommandPalette([], { openGuidedTours });
-            await fireEvent.click(screen.getByText('Browse Guided Tours…'));
+            await fireEvent.click(screen.getByText('Guided Tours…'));
             expect(openGuidedTours).toHaveBeenCalled();
             catalogPalette.unmount();
             await vi.runAllTimersAsync();
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index df33ceb996..0ec4af43be 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import type { AssistantPromptRequest } from '$features/assistant/models';
-    import type { ProductTourLaunchSource, ProductTourName } from '$features/product-tours/types';
+    import type { ProductTourLaunchSource } from '$features/product-tours/types';
     import type { SavedView } from '$features/saved-views/models';
     import type { Snippet } from 'svelte';
 
@@ -18,7 +18,6 @@
     import { ChangePlanDialogHost, UpgradeRequiredDialog } from '$features/billing';
     import {
         createOrganizationEventNotificationRefresher,
-        getOrganizationEventsQuery,
         invalidatePersistentEventQueries,
         type OrganizationEventNotificationRefresher
     } from '$features/events/api.svelte';
@@ -38,11 +37,10 @@
     import { organization, showOrganizationNotifications } from '$features/organizations/context.svelte';
     import { premiumPage } from '$features/organizations/premium-page.svelte';
     import { getUtcMonthKey, ORGANIZATION_USAGE_ROLLOVER_CHECK_INTERVAL_MS } from '$features/organizations/utils';
-    import { getProductTourItems } from '$features/product-tours/catalog';
     import ProductTourHost from '$features/product-tours/components/product-tour-host.svelte';
     import { isProductTourSetupRoute } from '$features/product-tours/eligibility';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
-    import { getOrganizationProjectsQuery, invalidateProjectQueries } from '$features/projects/api.svelte';
+    import { invalidateProjectQueries } from '$features/projects/api.svelte';
     import { getSavedViewsQuery, invalidateSavedViewQueries, isSavedViewDeleted, putUserSavedViewOrder } from '$features/saved-views/api.svelte';
     import { getPersonalSavedViewOrder, resolvePersonalSavedViewOrder } from '$features/saved-views/ordering';
     import { savedViewHref } from '$features/saved-views/slugs';
@@ -100,7 +98,6 @@
     let isImpersonateOrganizationOpen = $state(false);
     let isUserMenuOpen = $state(false);
     let productToursComponent = $state<ProductTourHost>();
-    let productTourErrorCheckEnabled = $state(false);
 
     // Auto-reset premium page state on navigation so pages don't need cleanup
     beforeNavigate(() => {
@@ -109,7 +106,6 @@
 
     function openCommandPalette(): void {
         commandResetKey += 1;
-        productTourErrorCheckEnabled = true;
         isCommandOpen = true;
     }
 
@@ -248,14 +244,9 @@
     }
 
     function openGuidedTours(source: ProductTourLaunchSource): void {
-        productTourErrorCheckEnabled = true;
         productToursComponent?.openCatalog(source);
     }
 
-    async function startGuidedTour(name: ProductTourName, source: ProductTourLaunchSource): Promise<void> {
-        await productToursComponent?.startTour(name, source);
-    }
-
     async function stopImpersonating(): Promise<void> {
         isCommandOpen = false;
         organization.current = organizations[0]?.id;
@@ -513,43 +504,6 @@
 
     const organizationsQuery = getOrganizationsQuery({});
     const organizations = $derived(organizationsQuery.data?.data ?? []);
-    const projectsQuery = getOrganizationProjectsQuery({
-        params: {
-            limit: 1000
-        },
-        route: {
-            get organizationId() {
-                return organization.current;
-            }
-        }
-    });
-    const projects = $derived(projectsQuery.data?.data ?? []);
-    const productTourErrorEventsQuery = getOrganizationEventsQuery({
-        enabled: () => productTourErrorCheckEnabled,
-        params: {
-            filter: 'type:error',
-            limit: 1,
-            mode: 'summary',
-            time: 'all'
-        },
-        route: {
-            get organizationId() {
-                return organization.current;
-            }
-        }
-    });
-    const productTourErrorEventAvailability = $derived.by(() => {
-        if (!organization.current || !productTourErrorCheckEnabled || productTourErrorEventsQuery.isPending) {
-            return 'loading' as const;
-        }
-
-        if (productTourErrorEventsQuery.isError) {
-            return 'error' as const;
-        }
-
-        return (productTourErrorEventsQuery.data?.data?.length ?? 0) > 0 ? ('available' as const) : ('empty' as const);
-    });
-
     const impersonatingOrganizationId = $derived.by(() => {
         // Only consider impersonation if user data is loaded and user has organizations
         const userOrganizationIds = meQuery.data?.organization_ids;
@@ -729,21 +683,6 @@
     const setupPath = resolve('/(app)/organization/add');
     const isSetupPage = $derived(page.url.pathname === setupPath);
     const suppressAutomaticProductTours = $derived(isProductTourSetupRoute(page.route.id));
-    const productTourItems = $derived(
-        meQuery.isSuccess
-            ? getProductTourItems(
-                  {
-                      assistantAccess,
-                      errorEventAvailability: productTourErrorEventAvailability,
-                      isSetupPage: suppressAutomaticProductTours,
-                      organizationId: organization.current,
-                      pathname: page.url.pathname,
-                      projects
-                  },
-                  meQuery.data?.product_tours
-              )
-            : []
-    );
     const isAnyProductTourOverlayOpen = $derived(
         isAssistantOpen || isCommandOpen || isImpersonateOrganizationOpen || isKeyboardShortcutsOpen || isOrganizationSwitcherOpen || isUserMenuOpen
     );
@@ -829,7 +768,6 @@
                     isExieEnabled={isAssistantEnabled}
                     {isGlobalAdmin}
                     {isImpersonating}
-                    guidedTours={productTourItems}
                     {openChat}
                     openExie={openAssistantPanel}
                     {openImpersonateOrganization}
@@ -841,7 +779,6 @@
                     resetKey={commandResetKey}
                     routes={filteredRoutes}
                     {stopImpersonating}
-                    startGuidedTour={(id) => startGuidedTour(id, 'command-palette')}
                 />
                 <KeyboardShortcutsDialog bind:open={isKeyboardShortcutsOpen} />
 
@@ -900,19 +837,16 @@
         bind:this={productToursComponent}
         closeOverlays={closeProductTourOverlays}
         currentUser={meQuery.data}
-        errorEventAvailability={productTourErrorEventAvailability}
         isAnyOverlayOpen={isAnyProductTourOverlayOpen}
         {isImpersonating}
+        isMobile={sidebar.isMobile}
         isSetupPage={suppressAutomaticProductTours}
         openAssistant={openAssistantPanel}
         organizationId={organization.current}
         pathname={page.url.pathname}
-        {projects}
-        requestErrorAvailability={() => (productTourErrorCheckEnabled = true)}
         setMobileNavigationOpen={(open) => (sidebar.isMobile ? sidebar.setOpenMobile(open) : sidebar.setOpen(open))}
         stateSettled={meQuery.isSuccess &&
             organizationsQuery.isSuccess &&
-            (!organization.current || projectsQuery.isSuccess) &&
             (!organization.current || assistantAccessQuery.isSuccess || assistantAccessQuery.isError)}
     />
     <IntercomShell
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index 323e8896fe..e8ad4389bf 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -50,7 +50,6 @@
     import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { organization } from '$features/organizations/context.svelte';
     import { premiumPage } from '$features/organizations/premium-page.svelte';
-    import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import SavedViewPicker from '$features/saved-views/components/saved-view-picker.svelte';
     import { isSavedViewHydrationPending, isSavedViewUnavailable, useSavedViews } from '$features/saved-views/use-saved-views.svelte';
     import * as agg from '$features/shared/api/aggregations';
@@ -80,7 +79,6 @@
         serializeTimeQueryParam
     } from '../redirect-to-events.svelte';
     let selectedEventId: null | string = $state(null);
-    const investigationCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
 
     function handleEventError(problem: ProblemDetails) {
         showBillingDialogOnUpgradeProblem(problem, organization.current);
@@ -89,10 +87,6 @@
 
     function rowClick(row: EventSummaryModel<SummaryTemplateKeys>) {
         selectedEventId = row.id;
-        const checkpoint = investigationCheckpoint;
-        if (checkpoint?.checkpointName === 'choose-error') {
-            productTourCheckpoint.advance(checkpoint, 'stack-summary');
-        }
     }
 
     function rowHref(row: EventSummaryModel<SummaryTemplateKeys>): string {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
index 87e39c6e2f..180acdfecf 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
@@ -64,14 +64,7 @@
 
                     const checkpoint = projectConfigureCheckpoint;
                     if (checkpoint) {
-                        productTourCheckpoint.advance(
-                            checkpoint,
-                            'choose-platform',
-                            {
-                                type: 'active'
-                            },
-                            createdOrganization.id
-                        );
+                        productTourCheckpoint.advance(checkpoint, 'choose-platform', createdOrganization.id);
                     }
 
                     toastId = toast.success('Project added successfully');
@@ -159,7 +152,7 @@
             </form.Field>
             <form.Subscribe selector={(state) => state.isSubmitting}>
                 {#snippet children(isSubmitting)}
-                    <Button data-tour="project-setup-submit" type="submit" class="mt-4 w-full" disabled={isSubmitting}>
+                    <Button type="submit" class="mt-4 w-full" disabled={isSubmitting}>
                         {#if isSubmitting}
                             <Spinner /> Creating Setup...
                         {:else}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index ab15681aa2..17f4a5eaaf 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -426,7 +426,7 @@ public partial class App : Application {
 
         if (queryParams.redirect && message.project_id === projectId && message.change_type !== ChangeType.Removed) {
             if (projectConfigureCheckpoint) {
-                await tourActions.complete(projectConfigureCheckpoint);
+                tourActions.completeAfterDomainSuccess(projectConfigureCheckpoint);
             }
 
             toast.success('First event received. Opening Events...');
@@ -472,7 +472,7 @@ public partial class App : Application {
     {/if}
 
     {#if queryParams.redirect}
-        <Notification data-tour="project-configure-waiting">
+        <Notification>
             <NotificationTitle>Waiting for your first event</NotificationTitle>
             <NotificationDescription>
                 <P>Send an event from your app. When it arrives, we'll open the project Events page automatically.</P>
@@ -795,6 +795,7 @@ public partial class App : Application {
 
     {#if projectConfigureCheckpoint?.checkpointName === 'sdk-instructions'}
         <ProductTourInlineCallout
+            checkpoint={projectConfigureCheckpoint}
             description="Follow these SDK instructions in your own application. When it is connected, return here and continue to wait for the first event."
             onContinue={() => {
                 productTourCheckpoint.advance(projectConfigureCheckpoint, 'wait-for-event');
@@ -803,7 +804,6 @@ public partial class App : Application {
                 await tourActions.dismiss(projectConfigureCheckpoint);
             }}
             title="Connect your application"
-            tourName="project-configure"
         />
     {/if}
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
index 1e4ce35e85..ffef0e0d40 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
@@ -116,7 +116,7 @@
         </form.Field>
         <form.Subscribe selector={(state) => state.isSubmitting}>
             {#snippet children(isSubmitting)}
-                <Button data-tour="project-setup-submit" type="submit" class="mt-4" disabled={isSubmitting}>
+                <Button type="submit" class="mt-4" disabled={isSubmitting}>
                     {#if isSubmitting}
                         <Spinner /> Adding Project...
                     {:else}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 6d24664346..966a3494de 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import type { ProductTourSummary } from '$generated/api';
+
+    import DateTime from '$comp/formatters/date-time.svelte';
     import Number from '$comp/formatters/number.svelte';
     import Percentage from '$comp/formatters/percentage.svelte';
     import TimeAgo from '$comp/formatters/time-ago.svelte';
@@ -12,11 +15,15 @@
     import * as Table from '$comp/ui/table';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
     import { getUtcMonthKey } from '$features/admin/assistant-usage';
+    import { getOutcomeShare, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
 
     const currentMonth = getUtcMonthKey();
-    let range = $state<'all' | 'month'>('month');
     let selectedMonth = $state(currentMonth);
-    const usageQuery = getAdminProductTourUsageQuery(() => (range === 'month' ? selectedMonth : undefined));
+    let range = $state<ProductTourUsageRange>({
+        kind: 'month',
+        month: currentMonth
+    });
+    const usageQuery = getAdminProductTourUsageQuery(() => range);
     const usage = $derived(usageQuery.data);
 
     function title(value: string): string {
@@ -25,20 +32,61 @@
             .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
             .join(' ');
     }
+
+    function setMonth(month: string): void {
+        selectedMonth = month;
+        range = {
+            kind: 'month',
+            month
+        };
+    }
+
+    function setHistory(): void {
+        range = {
+            kind: 'history'
+        };
+    }
+
+    function formatSource(source: string): string {
+        return source === 'welcome' ? 'Welcome' : title(source);
+    }
+
+    function promptEngagement(tour: ProductTourSummary): null | number {
+        return getRate(tour.completed, tour.shown);
+    }
+
+    function promptDismissal(tour: ProductTourSummary): null | number {
+        return getRate(tour.dismissed, tour.shown);
+    }
+
+    function promptStart(tour: ProductTourSummary): null | number {
+        return getRate(tour.started, tour.shown);
+    }
 </script>
 
 <div class="space-y-6">
     <div class="flex flex-wrap items-end justify-between gap-4">
-        <Muted>Tour starts, outcomes, and recent user activity recorded by Exceptionless Feature Usage events</Muted>
+        <div>
+            <Muted>Feature Usage events for guided-tour prompts and guides. Counts are events, not unique users.</Muted>
+            {#if usage}
+                <p class="text-muted-foreground mt-1 text-xs">
+                    Bounds: {#if usage.utc_start}<DateTime value={usage.utc_start} />{:else}available history{/if} – <DateTime value={usage.utc_end} />
+                </p>
+            {/if}
+        </div>
         <div class="flex items-end gap-2">
             <ButtonGroup.Root aria-label="Usage period">
-                <Button variant={range === 'all' ? 'secondary' : 'outline'} aria-pressed={range === 'all'} onclick={() => (range = 'all')}>All time</Button>
-                <Button variant={range === 'month' ? 'secondary' : 'outline'} aria-pressed={range === 'month'} onclick={() => (range = 'month')}>Month</Button>
+                <Button variant={range.kind === 'history' ? 'secondary' : 'outline'} aria-pressed={range.kind === 'history'} onclick={setHistory}
+                    >Available history</Button
+                >
+                <Button variant={range.kind === 'month' ? 'secondary' : 'outline'} aria-pressed={range.kind === 'month'} onclick={() => setMonth(selectedMonth)}
+                    >Month</Button
+                >
             </ButtonGroup.Root>
-            {#if range === 'month'}
+            {#if range.kind === 'month'}
                 <label class="flex flex-col gap-1 text-sm font-medium">
                     Month
-                    <Input class="w-40" type="month" max={currentMonth} bind:value={selectedMonth} />
+                    <Input class="w-40" type="month" max={currentMonth} value={selectedMonth} onchange={(event) => setMonth(event.currentTarget.value)} />
                 </label>
             {/if}
         </div>
@@ -51,121 +99,198 @@
             </Card.Content>
         </Card.Root>
     {:else}
-        <Card.Root>
-            <Card.Header>
-                <Card.Title>Tour Outcomes</Card.Title>
-                <Card.Description>
-                    Start rate uses real prompt impressions when available. Outcome rates use starts, or shown prompts for prompt-only experiences. Manual
-                    starts come from the catalog, command palette, feature announcements, and help menu.
-                </Card.Description>
-            </Card.Header>
-            <Card.Content class="px-0">
-                {#if usageQuery.isPending}
-                    <div class="space-y-3 px-4 pb-2">
-                        {#each [0, 1, 2, 3, 4] as row (row)}
-                            <Skeleton class="h-12 w-full rounded" aria-label={`Loading tour ${row + 1}`} />
-                        {/each}
-                    </div>
-                {:else if usage?.tours.length === 0}
-                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">
-                        No guided-tour activity was recorded {range === 'month' ? 'for this month' : 'yet'}.
-                    </p>
-                {:else}
-                    <Table.Root aria-label="Tour outcomes" class="min-w-4xl">
-                        <Table.Header>
-                            <Table.Row>
-                                <Table.Head class="pl-4">Tour</Table.Head>
-                                <Table.Head class="text-right">Shown</Table.Head>
-                                <Table.Head class="text-right">Started</Table.Head>
-                                <Table.Head class="text-right">Completed</Table.Head>
-                                <Table.Head class="text-right">Dismissed</Table.Head>
-                                <Table.Head>Last Run</Table.Head>
-                            </Table.Row>
-                        </Table.Header>
-                        <Table.Body>
-                            {#each usage?.tours ?? [] as tour (tour.name)}
-                                <Table.Row>
-                                    <Table.Cell class="pl-4 font-medium">{title(tour.name)}</Table.Cell>
-                                    <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
-                                    <Table.Cell class="text-right">
-                                        <Number value={tour.started} />
-                                        <span class="text-muted-foreground ml-1 text-xs">
-                                            ({#if tour.started_rate == null}—{:else}<Percentage percent={tour.started_rate * 100} />{/if})
-                                        </span>
-                                        {#if tour.manual_started > 0}
-                                            <div class="text-muted-foreground text-xs">
-                                                <Number value={tour.manual_started} /> manual
-                                                {#if tour.manual_started_rate != null}
-                                                    (<Percentage percent={tour.manual_started_rate * 100} />)
-                                                {/if}
-                                            </div>
-                                        {/if}
-                                    </Table.Cell>
-                                    <Table.Cell class="text-right">
-                                        <Number value={tour.completed} />
-                                        <span class="text-muted-foreground ml-1 text-xs">
-                                            ({#if tour.completion_rate == null}—{:else}<Percentage percent={tour.completion_rate * 100} />{/if})
-                                        </span>
-                                    </Table.Cell>
-                                    <Table.Cell class="text-right">
-                                        <Number value={tour.dismissed} />
-                                        <span class="text-muted-foreground ml-1 text-xs">
-                                            ({#if tour.dismissal_rate == null}—{:else}<Percentage percent={tour.dismissal_rate * 100} />{/if})
-                                        </span>
-                                    </Table.Cell>
-                                    <Table.Cell>
-                                        {#if tour.last_run_utc}
-                                            <TimeAgo value={tour.last_run_utc} />
-                                        {:else}
-                                            <span class="text-muted-foreground">Never</span>
-                                        {/if}
-                                    </Table.Cell>
-                                </Table.Row>
+        {#if usageQuery.isPending}
+            <Card.Root>
+                <Card.Header>
+                    <Card.Title>Guided-tour usage</Card.Title>
+                </Card.Header>
+                <Card.Content class="space-y-3">
+                    {#each [0, 1, 2, 3] as row (row)}
+                        <Skeleton class="h-16 w-full rounded" aria-label={`Loading tour ${row + 1}`} />
+                    {/each}
+                </Card.Content>
+            </Card.Root>
+        {:else if usage?.tours.length === 0}
+            <Card.Root>
+                <Card.Content class="text-muted-foreground py-10 text-center text-sm">No guided-tour usage events were recorded for this range.</Card.Content>
+            </Card.Root>
+        {:else}
+            {@const prompts = usage?.tours.filter((tour) => tour.kind === 'prompt') ?? []}
+            {@const guides = usage?.tours.filter((tour) => tour.kind === 'guide') ?? []}
+
+            {#if prompts.length > 0}
+                <Card.Root>
+                    <Card.Header>
+                        <Card.Title>Prompts</Card.Title>
+                        <Card.Description>Prompt impressions and responses. Percentages use shown impressions as the denominator.</Card.Description>
+                    </Card.Header>
+                    <Card.Content class="px-0">
+                        <div class="hidden overflow-x-auto md:block">
+                            <Table.Root aria-label="Prompt usage" class="min-w-3xl">
+                                <Table.Header>
+                                    <Table.Row>
+                                        <Table.Head class="pl-4">Prompt</Table.Head>
+                                        <Table.Head class="text-right">Shown</Table.Head>
+                                        <Table.Head class="text-right">Started</Table.Head>
+                                        <Table.Head class="text-right">Engaged</Table.Head>
+                                        <Table.Head class="text-right">Dismissed</Table.Head>
+                                        <Table.Head>Last event</Table.Head>
+                                    </Table.Row>
+                                </Table.Header>
+                                <Table.Body>
+                                    {#each prompts as tour (`${tour.name}:${tour.version}`)}
+                                        <Table.Row>
+                                            <Table.Cell class="pl-4 font-medium"
+                                                >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
+                                            >
+                                            <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
+                                            {@render RateCell(tour.started, promptStart(tour))}
+                                            {@render RateCell(tour.completed, promptEngagement(tour))}
+                                            {@render RateCell(tour.dismissed, promptDismissal(tour))}
+                                            {@render LastRun(tour.last_run_utc)}
+                                        </Table.Row>
+                                    {/each}
+                                </Table.Body>
+                            </Table.Root>
+                        </div>
+                        <div class="grid gap-3 px-4 md:hidden">
+                            {#each prompts as tour (`${tour.name}:${tour.version}`)}
+                                {@render PromptCard(tour)}
                             {/each}
-                        </Table.Body>
-                    </Table.Root>
-                {/if}
-            </Card.Content>
-        </Card.Root>
+                        </div>
+                    </Card.Content>
+                </Card.Root>
+            {/if}
 
-        <Card.Root>
-            <Card.Header>
-                <Card.Title>Recent Activity</Card.Title>
-                <Card.Description>Latest identified-user tour events for investigating support and onboarding patterns.</Card.Description>
-            </Card.Header>
-            <Card.Content class="px-0">
-                {#if usage?.recent_events.length === 0}
-                    <p class="text-muted-foreground px-4 py-10 text-center text-sm">No recent tour activity was recorded.</p>
-                {:else}
-                    <Table.Root aria-label="Recent guided-tour activity" class="min-w-3xl">
-                        <Table.Header>
-                            <Table.Row>
-                                <Table.Head class="pl-4">User</Table.Head>
-                                <Table.Head>Tour</Table.Head>
-                                <Table.Head>Event</Table.Head>
-                                <Table.Head>Source</Table.Head>
-                                <Table.Head>When</Table.Head>
-                            </Table.Row>
-                        </Table.Header>
-                        <Table.Body>
-                            {#each usage?.recent_events ?? [] as activity (activity)}
-                                <Table.Row>
-                                    <Table.Cell class="pl-4">
-                                        <div class="font-medium">{activity.user_name || activity.user_identity || 'Unknown user'}</div>
-                                        {#if activity.user_name && activity.user_identity}
-                                            <div class="text-muted-foreground font-mono text-xs">{activity.user_identity}</div>
-                                        {/if}
-                                    </Table.Cell>
-                                    <Table.Cell>{title(activity.tour_name)} <span class="text-muted-foreground">v{activity.version}</span></Table.Cell>
-                                    <Table.Cell><Badge variant="secondary">{title(activity.event)}</Badge></Table.Cell>
-                                    <Table.Cell>{title(activity.launch_source)}</Table.Cell>
-                                    <Table.Cell><TimeAgo value={activity.date_utc} /></Table.Cell>
-                                </Table.Row>
+            {#if guides.length > 0}
+                <Card.Root>
+                    <Card.Header>
+                        <Card.Title>Guides</Card.Title>
+                        <Card.Description>Guide outcomes use completed plus dismissed events. Entry-point percentages use starts.</Card.Description>
+                    </Card.Header>
+                    <Card.Content class="px-0">
+                        <div class="hidden overflow-x-auto md:block">
+                            <Table.Root aria-label="Guide usage" class="min-w-4xl">
+                                <Table.Header>
+                                    <Table.Row>
+                                        <Table.Head class="pl-4">Guide</Table.Head>
+                                        <Table.Head class="text-right">Started</Table.Head>
+                                        <Table.Head class="text-right">Completed</Table.Head>
+                                        <Table.Head class="text-right">Dismissed</Table.Head>
+                                        <Table.Head>Entry points</Table.Head>
+                                        <Table.Head>Last event</Table.Head>
+                                    </Table.Row>
+                                </Table.Header>
+                                <Table.Body>
+                                    {#each guides as tour (`${tour.name}:${tour.version}`)}
+                                        <Table.Row>
+                                            <Table.Cell class="pl-4 font-medium"
+                                                >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
+                                            >
+                                            <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
+                                            {@render RateCell(tour.completed, getOutcomeShare(tour, 'completed'))}
+                                            {@render RateCell(tour.dismissed, getOutcomeShare(tour, 'dismissed'))}
+                                            <Table.Cell>{@render SourceMix(tour)}</Table.Cell>
+                                            {@render LastRun(tour.last_run_utc)}
+                                        </Table.Row>
+                                    {/each}
+                                </Table.Body>
+                            </Table.Root>
+                        </div>
+                        <div class="grid gap-3 px-4 md:hidden">
+                            {#each guides as tour (`${tour.name}:${tour.version}`)}
+                                {@render GuideCard(tour)}
                             {/each}
-                        </Table.Body>
-                    </Table.Root>
-                {/if}
-            </Card.Content>
-        </Card.Root>
+                        </div>
+                    </Card.Content>
+                </Card.Root>
+            {/if}
+        {/if}
     {/if}
 </div>
+
+{#snippet RateCell(value: number, rate: null | number)}
+    <Table.Cell class="text-right">
+        <Number {value} />
+        <span class="text-muted-foreground ml-1 text-xs"
+            >({#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if})</span
+        >
+    </Table.Cell>
+{/snippet}
+
+{#snippet LastRun(value: null | string | undefined)}
+    <Table.Cell>
+        {#if value}
+            <TimeAgo {value} />
+        {:else}
+            <span class="text-muted-foreground">Never</span>
+        {/if}
+    </Table.Cell>
+{/snippet}
+
+{#snippet SourceMix(tour: ProductTourSummary)}
+    {#if tour.started === 0 || tour.start_sources.length === 0}
+        <span class="text-muted-foreground">—</span>
+    {:else}
+        <div class="flex flex-wrap gap-1">
+            {#each tour.start_sources as source (source.source)}
+                <Badge variant="outline">
+                    {formatSource(source.source)}
+                    <Number value={source.count} />
+                    (<Percentage percent={(getStartSourceShare(source, tour.started) ?? 0) * 100} />)
+                </Badge>
+            {/each}
+        </div>
+    {/if}
+{/snippet}
+
+{#snippet PromptCard(tour: ProductTourSummary)}
+    <div class="rounded-lg border p-4">
+        <div class="flex items-start justify-between gap-3">
+            <div class="font-medium">{title(tour.name)}</div>
+            <Badge variant="outline">v{tour.version}</Badge>
+        </div>
+        <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
+            {@render Metric('Shown', tour.shown)}
+            {@render Metric('Started', tour.started, promptStart(tour))}
+            {@render Metric('Engaged', tour.completed, promptEngagement(tour))}
+            {@render Metric('Dismissed', tour.dismissed, promptDismissal(tour))}
+        </div>
+        {#if tour.last_run_utc}
+            <p class="text-muted-foreground mt-4 text-xs">Last event <TimeAgo value={tour.last_run_utc} /></p>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet GuideCard(tour: ProductTourSummary)}
+    <div class="rounded-lg border p-4">
+        <div class="flex items-start justify-between gap-3">
+            <div class="font-medium">{title(tour.name)}</div>
+            <Badge variant="outline">v{tour.version}</Badge>
+        </div>
+        <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
+            {@render Metric('Started', tour.started)}
+            {@render Metric('Completed', tour.completed, getOutcomeShare(tour, 'completed'))}
+            {@render Metric('Dismissed', tour.dismissed, getOutcomeShare(tour, 'dismissed'))}
+        </div>
+        <div class="mt-4">
+            <p class="text-muted-foreground mb-2 text-xs font-medium">Entry points</p>
+            {@render SourceMix(tour)}
+        </div>
+        {#if tour.last_run_utc}
+            <p class="text-muted-foreground mt-4 text-xs">Last event <TimeAgo value={tour.last_run_utc} /></p>
+        {/if}
+    </div>
+{/snippet}
+
+{#snippet Metric(label: string, value: number, rate?: null | number)}
+    <div>
+        <div class="text-muted-foreground text-xs">{label}</div>
+        <div class="font-medium">
+            <Number {value} />
+            {#if rate !== undefined}<span class="text-muted-foreground text-xs"
+                    >({#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if})</span
+                >{/if}
+        </div>
+    </div>
+{/snippet}
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 95cfc7334a..8b0f2de3a5 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -5,6 +5,7 @@
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Web.Models;
 using Foundatio.Repositories;
+using Foundatio.Repositories.Exceptions;
 using Xunit;
 
 namespace Exceptionless.Tests.Api.Endpoints;
@@ -125,19 +126,17 @@ await Task.WhenAll(
     }
 
     [Fact]
-    public async Task UpdateCurrentUserProductTourAsync_MissingUser_ReturnsNotFound()
+    public async Task UpdateProductTourProgressAsync_MissingUser_ThrowsNotFound()
     {
         // Arrange
         var currentUser = await GetTestOrganizationUserAsync();
         await _userRepository.RemoveAsync(currentUser.Id, options => options.ImmediateConsistency());
 
         // Act & Assert
-        await SendRequestAsync(request => request
-            .Put()
-            .AsTestOrganizationUser()
-            .AppendPaths("users", "me", "product-tours", ProductTours.AppOverview)
-            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 })
-            .StatusCodeShouldBeNotFound());
+        await Assert.ThrowsAsync<DocumentNotFoundException>(() => _userRepository.UpdateProductTourProgressAsync(
+            currentUser.Id,
+            ProductTours.AppOverview,
+            new ProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 }));
     }
 
     [Fact]

From d38f77e1167cc077b1b706d824e514b3fca93b8d Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 30 Aug 2026 09:57:55 -0500
Subject: [PATCH 11/43] Regenerate guided tour API contracts

---
 .../ClientApp/src/lib/generated/api.ts        | 22 ++++----
 .../ClientApp/src/lib/generated/schemas.ts    | 18 +++----
 .../Exceptionless.Tests/Api/Data/openapi.json | 54 +++++++++----------
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index d762ce9ff9..9cc43a52a4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -12,11 +12,6 @@ export enum ProductTourStatus {
   Dismissed = 2,
 }
 
-export enum ProductTourKind {
-  Guide = "guide",
-  Prompt = "prompt",
-}
-
 export enum ProductTourLaunchSource {
   Welcome = "welcome",
   Catalog = "catalog",
@@ -25,6 +20,11 @@ export enum ProductTourLaunchSource {
   HelpMenu = "help-menu",
 }
 
+export enum ProductTourKind {
+  Guide = "guide",
+  Prompt = "prompt",
+}
+
 export enum BillingStatus {
   Trialing = 0,
   Active = 1,
@@ -518,6 +518,12 @@ export interface ProductTourProgress {
   version: number;
 }
 
+export interface ProductTourStartSource {
+  source: ProductTourLaunchSource;
+  /** @format int64 */
+  count: number;
+}
+
 export interface ProductTourSummary {
   name: string;
   /** @format int32 */
@@ -536,12 +542,6 @@ export interface ProductTourSummary {
   start_sources: ProductTourStartSource[];
 }
 
-export interface ProductTourStartSource {
-  source: ProductTourLaunchSource;
-  /** @format int64 */
-  count: number;
-}
-
 export interface ProductTourUsageResponse {
   /** @format date-time */
   utc_start?: null | string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index dc7f6f66b4..47f51b1dab 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -28,7 +28,6 @@ export const StackStatusSchema = zodEnum([
   "discarded",
 ]);
 export const ProductTourStatusSchema = union([literal(1), literal(2)]);
-export const ProductTourKindSchema = zodEnum(["guide", "prompt"]);
 export const ProductTourLaunchSourceSchema = zodEnum([
   "welcome",
   "catalog",
@@ -36,6 +35,7 @@ export const ProductTourLaunchSourceSchema = zodEnum([
   "feature-announcement",
   "help-menu",
 ]);
+export const ProductTourKindSchema = zodEnum(["guide", "prompt"]);
 export const BillingStatusSchema = union([
   literal(0),
   literal(1),
@@ -643,6 +643,14 @@ export type ProductTourProgressFormData = Infer<
   typeof ProductTourProgressSchema
 >;
 
+export const ProductTourStartSourceSchema = object({
+  source: ProductTourLaunchSourceSchema,
+  count: int(),
+});
+export type ProductTourStartSourceFormData = Infer<
+  typeof ProductTourStartSourceSchema
+>;
+
 export const ProductTourSummarySchema = object({
   name: string().min(1, "Name is required"),
   version: int32(),
@@ -656,14 +664,6 @@ export const ProductTourSummarySchema = object({
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
-export const ProductTourStartSourceSchema = object({
-  source: ProductTourLaunchSourceSchema,
-  count: int(),
-});
-export type ProductTourStartSourceFormData = Infer<
-  typeof ProductTourStartSourceSchema
->;
-
 export const ProductTourUsageResponseSchema = object({
   utc_start: iso.datetime().nullable(),
   utc_end: iso.datetime(),
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index e2faa7182f..2dfd0b2976 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -13366,6 +13366,16 @@
           }
         }
       },
+      "ProductTourKind": {
+        "enum": [
+          "guide",
+          "prompt"
+        ],
+        "x-enumNames": [
+          "Guide",
+          "Prompt"
+        ]
+      },
       "ProductTourLaunchSource": {
         "enum": [
           "welcome",
@@ -13382,16 +13392,6 @@
           "HelpMenu"
         ]
       },
-      "ProductTourKind": {
-        "enum": [
-          "guide",
-          "prompt"
-        ],
-        "x-enumNames": [
-          "Guide",
-          "Prompt"
-        ]
-      },
       "ProductTourProgress": {
         "required": [
           "status",
@@ -13408,6 +13408,22 @@
           }
         }
       },
+      "ProductTourStartSource": {
+        "required": [
+          "source",
+          "count"
+        ],
+        "type": "object",
+        "properties": {
+          "source": {
+            "$ref": "#/components/schemas/ProductTourLaunchSource"
+          },
+          "count": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
       "ProductTourStatus": {
         "enum": [
           1,
@@ -13474,22 +13490,6 @@
           }
         }
       },
-      "ProductTourStartSource": {
-        "required": [
-          "source",
-          "count"
-        ],
-        "type": "object",
-        "properties": {
-          "source": {
-            "$ref": "#/components/schemas/ProductTourLaunchSource"
-          },
-          "count": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
       "ProductTourUsageResponse": {
         "required": [
           "utc_start",
@@ -15274,4 +15274,4 @@
       "name": "Source Map"
     }
   ]
-}
+}
\ No newline at end of file

From abb75e08d493559481ebb0c3502e88eb7bdd90c2 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 30 Aug 2026 10:22:16 -0500
Subject: [PATCH 12/43] Stabilize guided tour end-to-end coverage

---
 .../ClientApp/e2e/fixtures/api-client.ts      |  2 ++
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 32 +++++++++++++------
 .../product-tour-catalog-dialog.svelte        |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
index 4092bedede..a2cd26d404 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
@@ -22,6 +22,7 @@ export interface E2EOrganization {
 
 export interface E2EProject {
     id: string;
+    is_configured?: boolean;
     name: string;
     organization_id?: string;
 }
@@ -469,6 +470,7 @@ function toProject(value: unknown): E2EProject {
 
     return {
         id: getRequiredString(record, 'id', 'project response'),
+        is_configured: typeof record.is_configured === 'boolean' ? record.is_configured : undefined,
         name: getRequiredString(record, 'name', 'project response'),
         organization_id: getOptionalString(record, 'organization_id')
     };
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index c49d86224a..8bb7238e85 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -113,6 +113,7 @@ test.describe('shell and identity checkpoints', () => {
         });
 
         await test.step('logout clears an active checkpoint without recording progress', async () => {
+            await page.setViewportSize({ height: 900, width: 1440 });
             await startTourFromCommand(page, 'Meet Exie');
             await expectProductTourSession(page, true);
             const writesBeforeLogout = progressWrites.length;
@@ -131,16 +132,24 @@ test.describe('shell and identity checkpoints', () => {
 test('domain workflows advance only on real success', async ({ e2eApi, e2eScenario, page }) => {
     test.setTimeout(300_000);
 
-    await test.step('project configuration advances after creation and the first event', async () => {
+    await test.step('project configuration advances after setup and the first event', async () => {
         await page.goto('/next/stack');
         await startTourFromCommand(page, 'Configure a project');
-        await expect(page.getByRole('heading', { name: 'Add Project' })).toBeVisible();
+        await page.waitForURL(/\/next\/project\/(?:add|[^/]+\/configure)/);
+
+        let createdProject = false;
+        let projectId = page.url().match(/\/project\/([^/]+)\/configure/)?.[1];
+        if (!projectId) {
+            createdProject = true;
+            await expect(page.getByRole('heading', { name: 'Add Project' })).toBeVisible();
+            await page.getByLabel('Project Name', { exact: true }).fill(`Tour Project ${e2eScenario.run}`);
+            await page.getByRole('button', { name: 'Continue to Client Setup' }).click();
+            await page.waitForURL(/\/next\/project\/[^/]+\/configure\?redirect=true/);
+            projectId = page.url().match(/\/project\/([^/]+)\/configure/)?.[1];
+        } else {
+            expect(projectId).toBe(e2eScenario.projectId);
+        }
 
-        const projectName = `Tour Project ${e2eScenario.run}`;
-        await page.getByLabel('Project Name', { exact: true }).fill(projectName);
-        await page.getByRole('button', { name: 'Continue to Client Setup' }).click();
-        await page.waitForURL(/\/next\/project\/[^/]+\/configure\?redirect=true/);
-        const projectId = page.url().match(/\/project\/([^/]+)\/configure/)?.[1];
         expect(projectId).toBeTruthy();
 
         await page.locator('[data-tour="project-configure-platform"]').click();
@@ -169,6 +178,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
             await expect(page).toHaveURL(/\/next\/event/);
             await expectProductTourSession(page, true);
             await expect.poll(() => projectProgressRequests).toBe(1);
+            await expect.poll(async () => (await e2eApi.getProject(e2eScenario.userToken, projectId!))?.is_configured).toBe(true);
 
             await page.unroute(projectProgressRoute);
             const completed = page.waitForResponse(isSuccessfulTourProgress('project-configure'));
@@ -177,8 +187,10 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
             await expectProductTourSession(page, false);
         } finally {
             await page.unroute(projectProgressRoute);
-            await e2eApi.deleteProject(e2eScenario.userToken, projectId!);
-            await e2eApi.waitForProjectDeleted(e2eScenario.userToken, projectId!);
+            if (createdProject) {
+                await e2eApi.deleteProject(e2eScenario.userToken, projectId!);
+                await e2eApi.waitForProjectDeleted(e2eScenario.userToken, projectId!);
+            }
         }
     });
 
@@ -310,6 +322,6 @@ async function startTourFromCommand(page: Page, title: string): Promise<void> {
     await page.getByRole('button', { name: 'Search Exceptionless' }).click();
     await page.getByRole('dialog').getByText('Guided Tours…', { exact: true }).click();
     const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
-    const tour = catalog.locator('section').filter({ has: catalog.getByRole('heading', { name: title }) });
+    const tour = catalog.getByRole('region', { name: title });
     await tour.getByRole('button', { name: /^(Continue|Restart|Start)$/ }).click();
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 3e41311269..1c81852ba4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -29,7 +29,7 @@
 
         <div class="grid gap-3 py-2 sm:grid-cols-2">
             {#each items as item (item.name)}
-                <section class="border-border bg-card flex min-h-44 flex-col gap-3 rounded-lg border p-4">
+                <section aria-label={item.title} class="border-border bg-card flex min-h-44 flex-col gap-3 rounded-lg border p-4">
                     <div class="flex items-start justify-between gap-3">
                         <div class="bg-primary/10 text-primary flex size-9 shrink-0 items-center justify-center rounded-lg">
                             <Compass aria-hidden="true" class="size-5" />

From 87e40fc12aba56551a24fb135fe48bf00026cdb2 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Tue, 1 Sep 2026 17:38:28 -0500
Subject: [PATCH 13/43] Harden guided tour recovery and metrics

---
 .../lib/features/admin/product-tour-usage.test.ts    |  8 ++++----
 .../src/lib/features/admin/product-tour-usage.ts     |  4 ++--
 .../dialogs/product-tour-catalog-dialog.svelte       |  5 +++--
 .../components/product-tour-host.svelte              |  6 +++---
 .../src/lib/features/product-tours/types.ts          |  2 +-
 .../(app)/project/[projectId]/configure/+page.svelte |  7 +++++--
 .../routes/(app)/system/product-tours/+page.svelte   | 12 ++++++------
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index c37e68175e..ef2df8033c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { getOutcomeShare, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
+import { getGuideOutcomeRate, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
 
 describe('product tour usage helpers', () => {
     it('maps each immutable range to the API query parameters', () => {
@@ -10,14 +10,14 @@ describe('product tour usage helpers', () => {
 
     it('returns null when a percentage has no denominator', () => {
         expect(getRate(1, 0)).toBeNull();
-        expect(getOutcomeShare({ completed: 0, dismissed: 0 }, 'completed')).toBeNull();
+        expect(getGuideOutcomeRate({ completed: 0, dismissed: 0, started: 0 }, 'completed')).toBeNull();
         expect(getStartSourceShare({ count: 1 }, 0)).toBeNull();
     });
 
     it('calculates prompt and guide rates from their declared denominators', () => {
         expect(getRate(3, 4)).toBe(0.75);
-        expect(getOutcomeShare({ completed: 3, dismissed: 1 }, 'completed')).toBe(0.75);
-        expect(getOutcomeShare({ completed: 3, dismissed: 1 }, 'dismissed')).toBe(0.25);
+        expect(getGuideOutcomeRate({ completed: 3, dismissed: 1, started: 5 }, 'completed')).toBe(0.6);
+        expect(getGuideOutcomeRate({ completed: 3, dismissed: 1, started: 5 }, 'dismissed')).toBe(0.2);
         expect(getStartSourceShare({ count: 2 }, 5)).toBe(0.4);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index 98297d2b95..bed55ed8a5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -7,8 +7,8 @@ export type ProductTourUsageRange =
           month: string;
       };
 
-export function getOutcomeShare(value: { completed: number; dismissed: number }, outcome: 'completed' | 'dismissed'): null | number {
-    return getRate(value[outcome], value.completed + value.dismissed);
+export function getGuideOutcomeRate(value: { completed: number; dismissed: number; started: number }, outcome: 'completed' | 'dismissed'): null | number {
+    return getRate(value[outcome], value.started);
 }
 
 export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | string> {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 1c81852ba4..7f4603495b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -14,10 +14,11 @@
         items: ProductTourListItem[];
         onStart: (name: ProductTourName) => Promise<void>;
         open?: boolean;
+        ready: boolean;
         resumableTourName?: ProductTourName;
     }
 
-    let { activeTourName, items, onStart, open = $bindable(false), resumableTourName }: Props = $props();
+    let { activeTourName, items, onStart, open = $bindable(false), ready, resumableTourName }: Props = $props();
 </script>
 
 <Dialog.Root bind:open>
@@ -48,7 +49,7 @@
                             <p class="text-muted-foreground mt-2 text-xs">{item.currentAvailability.reason}</p>
                         {/if}
                     </div>
-                    <Button disabled={!item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
+                    <Button disabled={!ready || !item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
                         {resumableTourName === item.name
                             ? 'Continue'
                             : activeTourName === item.name || (item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version)
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 92fb88e1a2..86477f0dd8 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -82,10 +82,9 @@
         }
     });
     const projects = $derived(projectsQuery.data?.data ?? []);
-    const configuredProjectOnPage = $derived(
+    const projectConfigurePage = $derived(
         projects.some(
             (project) =>
-                project.is_configured &&
                 project.id &&
                 pathname ===
                     resolve('/(app)/project/[projectId]/configure', {
@@ -215,7 +214,7 @@
 
     $effect(() => {
         const active = checkpoint;
-        if (active?.tourName === 'project-configure' && active.checkpointName === 'wait-for-event' && configuredProjectOnPage) {
+        if (active?.tourName === 'project-configure' && active.checkpointName === 'event-received' && projectConfigurePage) {
             if (attemptedProjectCompletion !== active) {
                 attemptedProjectCompletion = active;
                 actions.completeAfterDomainSuccess(active);
@@ -429,6 +428,7 @@
     bind:open={catalogOpen}
     {items}
     onStart={(name) => startTour(name, catalogSource)}
+    ready={hostStateSettled && !!currentUser}
     resumableTourName={checkpoint && isActiveTourRenderable(checkpoint) ? checkpoint.tourName : undefined}
 />
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 8be111572e..135b89e1c7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -5,7 +5,7 @@ export const PRODUCT_TOUR_CHECKPOINTS = {
     'app-overview': ['navigation', 'command-search', 'saved-views', 'exie', 'help'],
     'event-investigate': ['filter-errors', 'choose-error', 'stack-summary', 'stack-triage', 'event-occurrence', 'tab-overview', 'filter-stack-events'],
     'exie-overview': ['open-exie', 'exie-context'],
-    'project-configure': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event'],
+    'project-configure': ['organization-name', 'project-name', 'choose-platform', 'sdk-instructions', 'wait-for-event', 'event-received'],
     'saved-view-create': ['open-view-menu', 'review-settings', 'name-view', 'private-view', 'save-view', 'view-created']
 } as const;
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index 17f4a5eaaf..e0339842de 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -425,8 +425,11 @@ public partial class App : Application {
         const message = (event as CustomEvent<WebSocketMessageValue<'PersistentEventChanged'>>).detail;
 
         if (queryParams.redirect && message.project_id === projectId && message.change_type !== ChangeType.Removed) {
-            if (projectConfigureCheckpoint) {
-                tourActions.completeAfterDomainSuccess(projectConfigureCheckpoint);
+            if (projectConfigureCheckpoint?.checkpointName === 'wait-for-event') {
+                const eventReceivedCheckpoint = productTourCheckpoint.advance(projectConfigureCheckpoint, 'event-received');
+                if (eventReceivedCheckpoint) {
+                    tourActions.completeAfterDomainSuccess(eventReceivedCheckpoint);
+                }
             }
 
             toast.success('First event received. Opening Events...');
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 966a3494de..2c56bf3bd0 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -15,7 +15,7 @@
     import * as Table from '$comp/ui/table';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
     import { getUtcMonthKey } from '$features/admin/assistant-usage';
-    import { getOutcomeShare, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
+    import { getGuideOutcomeRate, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
 
     const currentMonth = getUtcMonthKey();
     let selectedMonth = $state(currentMonth);
@@ -166,7 +166,7 @@
                 <Card.Root>
                     <Card.Header>
                         <Card.Title>Guides</Card.Title>
-                        <Card.Description>Guide outcomes use completed plus dismissed events. Entry-point percentages use starts.</Card.Description>
+                        <Card.Description>Guide outcome and entry-point percentages use starts as the denominator.</Card.Description>
                     </Card.Header>
                     <Card.Content class="px-0">
                         <div class="hidden overflow-x-auto md:block">
@@ -188,8 +188,8 @@
                                                 >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
                                             >
                                             <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
-                                            {@render RateCell(tour.completed, getOutcomeShare(tour, 'completed'))}
-                                            {@render RateCell(tour.dismissed, getOutcomeShare(tour, 'dismissed'))}
+                                            {@render RateCell(tour.completed, getGuideOutcomeRate(tour, 'completed'))}
+                                            {@render RateCell(tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
                                             <Table.Cell>{@render SourceMix(tour)}</Table.Cell>
                                             {@render LastRun(tour.last_run_utc)}
                                         </Table.Row>
@@ -270,8 +270,8 @@
         </div>
         <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
             {@render Metric('Started', tour.started)}
-            {@render Metric('Completed', tour.completed, getOutcomeShare(tour, 'completed'))}
-            {@render Metric('Dismissed', tour.dismissed, getOutcomeShare(tour, 'dismissed'))}
+            {@render Metric('Completed', tour.completed, getGuideOutcomeRate(tour, 'completed'))}
+            {@render Metric('Dismissed', tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
         </div>
         <div class="mt-4">
             <p class="text-muted-foreground mb-2 text-xs font-medium">Entry points</p>

From d89eadebd7ab54e18170e229bb22655836a86e25 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 14:46:12 -0500
Subject: [PATCH 14/43] Refine guided tour accessibility and usage insights

---
 .../Repositories/EventRepository.cs           |  11 +-
 .../Repositories/ProductTourUsageResult.cs    |  20 +-
 .../Api/Handlers/AdminHandler.cs              |  14 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 158 +++++++++--
 .../components/product-tour-activity.svelte   | 126 +++++++++
 .../components/product-tour-period.svelte     |  70 +++++
 .../product-tour-period.svelte.test.ts        |  33 +++
 .../features/admin/product-tour-usage.test.ts |  48 +++-
 .../lib/features/admin/product-tour-usage.ts  |  34 +++
 .../events/components/events-overview.svelte  |  12 +-
 .../investigation-detail-tour.svelte          | 112 ++++----
 .../investigation-detail-tour.svelte.test.ts  | 116 ++++++++
 .../components/investigation-list-tour.svelte |  38 ++-
 .../investigation-list-tour.svelte.test.ts    |  65 +++++
 .../product-tours/actions.svelte.test.ts      | 121 ++++++++
 .../features/product-tours/actions.svelte.ts  |  33 ++-
 .../features/product-tours/catalog.test.ts    |  30 ++
 .../src/lib/features/product-tours/catalog.ts |  23 +-
 .../product-tour-catalog-dialog.svelte        |  78 +++---
 ...product-tour-catalog-dialog.svelte.test.ts |  55 ++++
 .../product-tour-welcome-dialog.svelte        |  49 ----
 ...product-tour-welcome-dialog.svelte.test.ts |  40 ---
 .../product-tour-description.svelte           |  35 +++
 .../product-tour-feature-announcement.svelte  |   2 +-
 .../components/product-tour-host.svelte       |  19 +-
 .../product-tour-inline-callout.svelte        |  37 ---
 .../product-tour-shell-spotlight.svelte       | 134 +++++++--
 .../components/product-tour-spotlight.svelte  | 168 ++++++++++--
 .../product-tour-spotlight.svelte.test.ts     |  98 +++++++
 .../components/product-tour-welcome.svelte    |  48 ++++
 .../product-tour-welcome.svelte.test.ts       |  90 ++++++
 .../components/saved-view-create-tour.svelte  |  69 +++--
 .../features/product-tours/controls.svelte.ts |  18 ++
 .../src/lib/features/product-tours/types.ts   |   1 +
 .../components/saved-view-picker.svelte       |   6 +-
 .../stacks/components/stack-card.svelte       |   4 +-
 .../ClientApp/src/lib/generated/api.ts        |  20 ++
 .../ClientApp/src/lib/generated/schemas.ts    |  14 +
 .../(components)/layouts/sidebar-user.svelte  |  42 ++-
 .../ClientApp/src/routes/(app)/+layout.svelte |  16 +-
 .../src/routes/(app)/event/+page.svelte       |   9 +-
 .../(app)/organization/add/+page.svelte       |  42 +--
 .../[projectId]/configure/+page.svelte        |  66 +++--
 .../src/routes/(app)/project/add/+page.svelte |   9 +-
 .../(app)/system/product-tours/+page.svelte   | 258 ++++++++++--------
 .../Models/Admin/ProductTourUsageResponse.cs  |   9 +-
 .../Exceptionless.Tests/Api/Data/openapi.json |  57 +++-
 .../AdminProductTourUsageEndpointTests.cs     |   9 +
 .../Repositories/EventRepositoryTests.cs      |   6 +
 tests/http/admin.http                         |   3 +-
 50 files changed, 2032 insertions(+), 543 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/controls.svelte.ts

diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 161cb9db22..d01f1a020e 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -97,9 +97,11 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
         string sourceField = InferField(ev => ev.Source);
         string countField = InferField(ev => ev.Count);
         string dateField = InferField(ev => ev.Date);
+        bool daily = utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1);
+        string interval = daily ? "1d" : "1M";
 
         var aggregation = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
-            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField})"));
+            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}~{interval} sum:{countField}~1))"));
 
         var sourceBuckets = aggregation.Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
         var usage = sourceBuckets
@@ -107,11 +109,14 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                 ? new ProductTourUsageBucket(
                     source,
                     Convert.ToInt64(bucket.Aggregations.Sum($"sum_{countField}")?.Value ?? bucket.Total.GetValueOrDefault()),
-                    bucket.Aggregations.Max<DateTime>($"max_{dateField}")?.Value)
+                    bucket.Aggregations.Max<DateTime>($"max_{dateField}")?.Value,
+                    (bucket.Aggregations.DateHistogram($"date_{dateField}")?.Buckets ?? [])
+                        .Select(period => new ProductTourUsagePeriod(period.Date, Convert.ToInt64(period.Aggregations.Sum($"sum_{countField}")?.Value ?? period.Total.GetValueOrDefault())))
+                        .ToArray())
                 : null)
             .OfType<ProductTourUsageBucket>()
             .ToArray();
-        return new ProductTourUsageResult(usage);
+        return new ProductTourUsageResult(usage, daily ? ProductTourUsageInterval.Day : ProductTourUsageInterval.Month);
     }
 
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index 7ce0e080e5..1b8603bd88 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -1,11 +1,27 @@
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using Exceptionless.Core.Models.Data;
 
 namespace Exceptionless.Core.Repositories;
 
 public sealed record ProductTourUsageResult(
-    IReadOnlyCollection<ProductTourUsageBucket> Buckets);
+    IReadOnlyCollection<ProductTourUsageBucket> Buckets,
+    ProductTourUsageInterval Interval);
 
-public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc);
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum ProductTourUsageInterval
+{
+    [JsonStringEnumMemberName("day")]
+    [EnumMember(Value = "day")]
+    Day,
+    [JsonStringEnumMemberName("month")]
+    [EnumMember(Value = "month")]
+    Month
+}
+
+public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity);
+
+public sealed record ProductTourUsagePeriod(DateTime DateUtc, long Count);
 
 public sealed record ProductTourUsageSource(
     string Raw,
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 4b19ffc7f9..c590aa3aba 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -176,6 +176,17 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
                         .GroupBy(bucket => bucket.Source.LaunchSource)
                         .Select(group => new ProductTourStartSource(group.Key, group.Sum(bucket => bucket.Count)))
                         .OrderBy(source => source.Source)
+                        .ToArray(),
+                    buckets
+                        .SelectMany(bucket => bucket.Activity.Select(period => (period.DateUtc, period.Count, bucket.Source.Event)))
+                        .GroupBy(period => period.DateUtc)
+                        .OrderBy(group => group.Key)
+                        .Select(group => new ProductTourActivity(
+                            group.Key,
+                            group.Where(period => period.Event == ProductTourTelemetryEvent.Shown).Sum(period => period.Count),
+                            group.Where(period => period.Event == ProductTourTelemetryEvent.Started).Sum(period => period.Count),
+                            group.Where(period => period.Event == ProductTourTelemetryEvent.Completed).Sum(period => period.Count),
+                            group.Where(period => period.Event == ProductTourTelemetryEvent.Dismissed).Sum(period => period.Count)))
                         .ToArray());
             }))
             .OrderBy(tour => tour.Name, StringComparer.Ordinal)
@@ -185,7 +196,8 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
         return new ProductTourUsageResponse(
             utcStart,
             utcEnd,
-            tours);
+            tours,
+            usage.Interval);
     }
 
     [HandlerEndpoint(HandlerMethod.Get, "migrations", Group = "Admin")]
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 8bb7238e85..1104066797 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -9,21 +9,80 @@ test.use({ actionTimeout: 15_000, e2eUseGeneratedUser: true });
 test.describe('first-run welcome', () => {
     test.use({ e2eDismissProductTourWelcome: false });
 
-    test('Browse Guides persists before the catalog opens', async ({ e2eScenario, page }) => {
+    test('Browse Guides persists before the catalog opens', async ({ e2eScenario, page }, testInfo) => {
         await test.step(`show the first-run prompt for ${e2eScenario.email}`, async () => {
             await page.goto('/next/stack');
-            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
+            await expect(page.getByRole('region', { name: 'Welcome to Exceptionless' })).toBeVisible();
+            await expect(page.getByRole('dialog')).toBeHidden();
+            await page.screenshot({ path: testInfo.outputPath('welcome-desktop.png') });
+            await page.getByRole('button', { name: 'Search Exceptionless' }).click();
+            await expect(page.getByRole('dialog')).toBeVisible();
+            await page.keyboard.press('Escape');
+            await expect(page.getByRole('region', { name: 'Welcome to Exceptionless' })).toBeVisible();
         });
 
         const persisted = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
-        await page.getByRole('dialog', { name: 'Welcome to Exceptionless' }).getByRole('button', { name: 'Browse Guides' }).click();
+        await page.getByRole('region', { name: 'Welcome to Exceptionless' }).getByRole('button', { name: 'Browse guides' }).click();
         await persisted;
 
         const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
         await expect(catalog).toBeVisible();
         await catalog.getByRole('button', { name: 'Close' }).click();
         await page.reload();
-        await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeHidden();
+        await expect(page.getByRole('region', { name: 'Welcome to Exceptionless' })).toBeHidden();
+    });
+
+    test('the compact mobile welcome respects reduced motion and starts the recommended setup', async ({ e2eScenario, page }, testInfo) => {
+        // Arrange
+        await page.setViewportSize({ height: 844, width: 390 });
+        await page.emulateMedia({ reducedMotion: 'reduce' });
+        await page.goto('/next/stack');
+        const welcome = page.getByRole('region', { name: 'Welcome to Exceptionless' });
+        await expect(welcome).toBeVisible();
+
+        // Act
+        const presentation = await welcome.evaluate((element) => {
+            const bounds = element.getBoundingClientRect();
+            return { animation: getComputedStyle(element).animationName, bottom: bounds.bottom, height: bounds.height, left: bounds.left, right: bounds.right };
+        });
+
+        // Assert
+        expect(presentation.animation).toBe('none');
+        expect(presentation.left).toBeGreaterThanOrEqual(16);
+        expect(presentation.right).toBeLessThanOrEqual(374);
+        expect(presentation.bottom).toBeLessThanOrEqual(828);
+        expect(presentation.height).toBeLessThan(220);
+        await expect(page.getByRole('dialog')).toBeHidden();
+        await page.screenshot({ path: testInfo.outputPath('welcome-mobile.png') });
+        const persisted = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
+        await welcome.getByRole('button', { name: 'Continue setup' }).click();
+        await persisted;
+        await expect(page).toHaveURL(new RegExp(`/next/project/(?:add|${e2eScenario.projectId}/configure)`));
+        await expect(welcome).toBeHidden();
+    });
+
+    test('a failed close remains retryable and successful dismissal survives reload', async ({ e2eScenario, page }) => {
+        // Arrange
+        const welcome = page.getByRole('region', { name: 'Welcome to Exceptionless' });
+        await test.step(`show the welcome for ${e2eScenario.email}`, async () => {
+            await page.goto('/next/stack');
+            await expect(welcome).toBeVisible();
+        });
+        const progressRoute = '**/api/v2/users/me/product-tours/app-welcome';
+        await page.route(progressRoute, (route) => route.fulfill({ json: { title: 'Injected progress failure' }, status: 500 }));
+
+        // Act
+        await welcome.getByRole('button', { name: 'Close welcome' }).click();
+
+        // Assert
+        await expect(page.getByText('We could not save your guided-tour preference. Please try again.')).toBeVisible();
+        await expect(welcome).toBeVisible();
+        await page.unroute(progressRoute);
+        const persisted = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
+        await welcome.getByRole('button', { name: 'Close welcome' }).click();
+        await persisted;
+        await page.reload();
+        await expect(welcome).toBeHidden();
     });
 });
 
@@ -41,11 +100,13 @@ test.describe('shell and identity checkpoints', () => {
 
         await test.step('closing the welcome persists dismissal', async () => {
             await page.goto('/next/stack');
-            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeVisible();
+            const welcome = page.getByRole('region', { name: 'Welcome to Exceptionless' });
+            await expect(welcome).toBeVisible();
             const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-welcome'));
+            await welcome.getByRole('button', { name: 'Close welcome' }).focus();
             await page.keyboard.press('Escape');
             await dismissed;
-            await expect(page.getByRole('dialog', { name: 'Welcome to Exceptionless' })).toBeHidden();
+            await expect(welcome).toBeHidden();
         });
 
         await test.step('the shell tour renders on mobile and resumes on desktop with reduced motion', async () => {
@@ -57,10 +118,23 @@ test.describe('shell and identity checkpoints', () => {
 
             await page.emulateMedia({ reducedMotion: 'reduce' });
             await page.setViewportSize({ height: 900, width: 1440 });
+            const closeButton = tour.getByRole('button', { name: 'End guide' });
+            await expect(closeButton).toHaveText('×');
+            const closeBounds = await closeButton.boundingBox();
+            const titleBounds = await tour.locator('.driver-popover-title').boundingBox();
+            const descriptionBounds = await tour.locator('.driver-popover-description').boundingBox();
+            const continueBounds = await tour.getByRole('button', { name: 'Continue' }).boundingBox();
+            expect(closeBounds).not.toBeNull();
+            expect(titleBounds).not.toBeNull();
+            expect(descriptionBounds).not.toBeNull();
+            expect(continueBounds?.height).toBe(32);
+            expect(closeBounds?.height).toBe(32);
+            expect(titleBounds!.x + titleBounds!.width).toBeLessThanOrEqual(closeBounds!.x);
+            expect(closeBounds!.y + closeBounds!.height).toBeLessThanOrEqual(descriptionBounds!.y);
             await tour.getByRole('button', { name: 'Continue' }).click();
-            await expect(tour.getByText('Find anything quickly')).toBeVisible();
+            await expect(tour.getByText('Use the command palette')).toBeVisible();
             await page.reload();
-            await expect(tour.getByText('Find anything quickly')).toBeVisible();
+            await expect(tour.getByText('Use the command palette')).toBeVisible();
 
             const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
             await tour.getByRole('button', { name: 'End guide' }).click();
@@ -77,22 +151,29 @@ test.describe('shell and identity checkpoints', () => {
 
             for (const [title, target] of [
                 ['Your workspace navigation', '[data-tour="app-navigation"]'],
-                ['Find anything quickly', '[data-tour="command-search"]'],
-                ['Reuse configured views', '[data-tour="saved-view-navigation"]'],
+                ['Use the command palette', '[data-tour="command-search"]'],
+                ['Find your saved views', '[data-tour="saved-view-navigation"]'],
                 ['Ask Exie with context', '[data-tour="exie-trigger"]'],
-                ['Help is always nearby', '[data-tour="help-menu"]']
+                ['Find your next guide', '[data-tour="guided-tours-menu-item"]']
             ] as const) {
                 await expect(tour.getByText(title)).toBeVisible();
                 await expect(page.locator(target)).toBeVisible();
-                if (title !== 'Help is always nearby') {
+                if (title !== 'Find your next guide') {
                     await tour.getByRole('button', { name: 'Continue' }).click();
                 }
             }
 
+            const guidedTours = page.getByRole('menuitem', { exact: true, name: 'Guided Tours…' });
+            await expect(guidedTours).toBeVisible();
+            await expect(guidedTours).toHaveClass(/driver-active-element/);
+            await expect(page.getByRole('menuitem', { exact: true, name: 'Help' })).toHaveAttribute('data-state', 'open');
+            await expect(guidedTours).toBeInViewport();
             const completed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
-            await tour.getByRole('button', { name: 'Continue' }).click();
+            await tour.getByRole('button', { name: 'Browse guides' }).click();
             await completed;
             await expectProductTourSession(page, false);
+            await expect(page.getByRole('dialog', { exact: true, name: 'Guided Tours' })).toBeVisible();
+            await page.keyboard.press('Escape');
         });
 
         await test.step('an organization change clears an active checkpoint without recording progress', async () => {
@@ -129,6 +210,23 @@ test.describe('shell and identity checkpoints', () => {
     });
 });
 
+test('project guide preserves the current SDK selection', async ({ e2eScenario, page }) => {
+    // Arrange
+    await page.goto(`/next/project/${e2eScenario.projectId}/configure?type=dotnet-legacy-mvc`);
+    await expect(page.locator('[data-tour="project-configure-platform"]')).toContainText('ASP.NET MVC');
+
+    // Act
+    await startTourFromCommand(page, 'Configure a project');
+
+    // Assert
+    await expect(page.getByRole('button', { exact: true, name: 'End guide' })).toBeVisible();
+    await expect(page.locator('.driver-popover')).toHaveCount(0);
+    await expect(page.locator('[data-tour="project-configure-platform"]')).toContainText('ASP.NET MVC');
+    expect(new URL(page.url()).searchParams.get('type')).toBe('dotnet-legacy-mvc');
+    expect(new URL(page.url()).searchParams.get('redirect')).toBe('true');
+    expect(new URL(page.url()).pathname).toBe(`/next/project/${e2eScenario.projectId}/configure`);
+});
+
 test('domain workflows advance only on real success', async ({ e2eApi, e2eScenario, page }) => {
     test.setTimeout(300_000);
 
@@ -154,8 +252,23 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
 
         await page.locator('[data-tour="project-configure-platform"]').click();
         await page.getByRole('option', { name: 'Browser applications' }).click();
-        await page.locator('[data-product-tour-inline="project-configure"]').getByRole('button', { name: 'Continue' }).click();
         await expect(page.getByText('Waiting for your first event')).toBeVisible();
+        await expect(page.locator('.driver-popover')).toHaveCount(0);
+        await expect(page.locator('.driver-overlay')).toHaveCount(0);
+        await expect(page.locator('[data-tour="project-sdk-instructions"]')).toBeVisible();
+        await expect(page.getByRole('button', { exact: true, name: 'End guide' })).toBeVisible();
+
+        const instructionButtons = page.locator('[data-tour="project-sdk-instructions"]').getByRole('button');
+        const reachedButtons = new Set<number>();
+        await page.locator('[data-tour="project-configure-platform"]').focus();
+        for (let tab = 0; tab < 40 && reachedButtons.size < (await instructionButtons.count()); tab++) {
+            await page.keyboard.press('Tab');
+            const focusedIndex = await instructionButtons.evaluateAll((buttons) => buttons.indexOf(document.activeElement as HTMLButtonElement));
+            if (focusedIndex >= 0) {
+                reachedButtons.add(focusedIndex);
+            }
+        }
+        expect(reachedButtons.size).toBe(await instructionButtons.count());
 
         let projectProgressRequests = 0;
         const projectProgressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/project-configure';
@@ -218,8 +331,9 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
             await startTourFromCommand(page, 'Create a saved view');
             await expectProductTourSession(page, true);
             const tour = page.locator('.driver-popover');
-            await tour.getByRole('button', { name: 'Continue' }).click();
-            await tour.getByRole('button', { name: 'Continue' }).click();
+            await tour.getByRole('button', { name: 'Open View' }).click();
+            await expect(page.locator('[data-tour="saved-view-save-as"]')).toHaveClass(/driver-active-element/);
+            await tour.getByRole('button', { name: 'Save As…' }).click();
 
             await page.getByLabel('Name', { exact: true }).fill(`Tour View ${e2eScenario.run}`);
             await page.getByRole('button', { name: 'Continue' }).click();
@@ -252,10 +366,10 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         await expect(page.getByText(e2eScenario.message).first()).toBeVisible({ timeout: 30_000 });
         await startTourFromCommand(page, 'Investigate an error');
         await page.locator('.driver-popover').getByRole('button', { name: 'Continue' }).click();
-        await page.locator('tr').filter({ hasText: e2eScenario.message }).first().click();
-        const callout = page.locator('[data-product-tour-inline="event-investigate"]');
+        await page.locator('.driver-popover').getByRole('button', { name: 'Open first error' }).click();
+        const callout = page.locator('.driver-popover');
         await expect(callout.getByText('Understand the grouped issue')).toBeVisible();
-        for (const title of ['Triage deliberately', 'Inspect the occurrence', 'Begin with the overview', 'Compare every occurrence']) {
+        for (const title of ['Review the issue status', 'Inspect the occurrence', 'Begin with the overview', 'Compare every occurrence']) {
             await callout.getByRole('button', { name: 'Continue' }).click();
             await expect(callout.getByText(title)).toBeVisible();
         }
@@ -265,7 +379,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         await completed;
         await expectProductTourSession(page, false);
         await page.reload();
-        await expect(page.locator('[data-product-tour-inline="event-investigate"]')).toBeHidden();
+        await expect(page.locator('.driver-popover')).toBeHidden();
     });
 
     await test.step('Exie opens context without provider submission', async () => {
@@ -280,7 +394,7 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
             await page.goto('/next/stack');
             await startTourFromCommand(page, 'Meet Exie');
             const tour = page.locator('.driver-popover');
-            await tour.getByRole('button', { name: 'Continue' }).click();
+            await tour.getByRole('button', { name: 'Open Exie' }).click();
             await expect(tour.getByText('You control every request')).toBeVisible();
             expect(chatRequests).toBe(0);
         } finally {
@@ -323,5 +437,5 @@ async function startTourFromCommand(page: Page, title: string): Promise<void> {
     await page.getByRole('dialog').getByText('Guided Tours…', { exact: true }).click();
     const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
     const tour = catalog.getByRole('region', { name: title });
-    await tour.getByRole('button', { name: /^(Continue|Restart|Start)$/ }).click();
+    await tour.getByRole('button', { name: /^(Continue|Restart|Start) / }).click();
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
new file mode 100644
index 0000000000..6fb5daaf8c
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -0,0 +1,126 @@
+<script lang="ts">
+    import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
+
+    import Number from '$comp/formatters/number.svelte';
+    import Percentage from '$comp/formatters/percentage.svelte';
+    import * as Chart from '$comp/ui/chart';
+    import * as Table from '$comp/ui/table';
+    import { scaleUtc } from 'd3-scale';
+    import { curveLinear } from 'd3-shape';
+    import { LineChart } from 'layerchart';
+
+    import { getProductTourActivity, getRate } from '../product-tour-usage';
+
+    let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
+    const prompt = $derived(tour.kind === 'prompt');
+    const data = $derived(getProductTourActivity(tour.activity ?? [], interval, start, end));
+    const config = $derived({
+        completed: {
+            color: 'var(--chart-1)',
+            label: prompt ? 'Engaged' : 'Completed'
+        },
+        dismissed: {
+            color: 'var(--chart-5)',
+            label: 'Dismissed'
+        },
+        shown: {
+            color: 'var(--chart-4)',
+            label: 'Shown'
+        },
+        started: {
+            color: 'var(--chart-2)',
+            label: 'Started'
+        }
+    } satisfies Chart.ChartConfig);
+    const keys = $derived(prompt ? (['shown', 'started', 'completed', 'dismissed'] as const) : (['started', 'completed', 'dismissed'] as const));
+    const series = $derived(
+        keys.map((key) => ({
+            key,
+            ...config[key]
+        }))
+    );
+    const total = $derived(tour.shown + tour.started + tour.completed + tour.dismissed);
+
+    function dateLabel(value: unknown): string {
+        if (!(value instanceof Date)) {
+            return '';
+        }
+        return value.toLocaleDateString(undefined, {
+            day: interval === 'day' ? 'numeric' : undefined,
+            month: 'short',
+            timeZone: 'UTC',
+            year: interval === 'month' ? 'numeric' : undefined
+        });
+    }
+</script>
+
+<div class="flex flex-col gap-4">
+    <dl class="grid grid-cols-2 gap-3 sm:grid-cols-4" aria-label="Selected guide totals">
+        {#if !prompt}
+            <div>
+                <dt class="text-muted-foreground text-xs">Recorded events</dt>
+                <dd class="text-xl font-semibold"><Number value={total} /></dd>
+            </div>
+        {/if}
+        {#each keys as key (key)}
+            {@const rate = key === 'shown' || (!prompt && key === 'started') ? undefined : getRate(tour[key], prompt ? tour.shown : tour.started)}
+            <div>
+                <dt class="text-muted-foreground text-xs">{config[key].label}</dt>
+                <dd class="text-xl font-semibold"><Number value={tour[key]} /></dd>
+                {#if rate !== undefined}<dd class="text-muted-foreground text-xs">
+                        {#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if} of {prompt ? 'shown' : 'starts'}
+                    </dd>{/if}
+            </div>
+        {/each}
+    </dl>
+    <p class="text-muted-foreground text-xs">{interval === 'day' ? 'Daily' : 'Monthly'} activity · UTC · Counts are events, not unique users.</p>
+    {#if total === 0}
+        <p class="text-muted-foreground flex h-40 items-center justify-center text-sm">No activity recorded for this guide in this period.</p>
+    {:else}
+        <Chart.Container
+            {config}
+            class="h-40 w-full"
+            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} guide activity. Exact values are in the activity table below.`}
+        >
+            <LineChart
+                {data}
+                x="date"
+                xScale={scaleUtc()}
+                {series}
+                yDomain={[0, null]}
+                axis
+                legend
+                props={{
+                    spline: {
+                        curve: curveLinear,
+                        strokeWidth: 2
+                    },
+                    xAxis: {
+                        format: dateLabel,
+                        ticks: 4
+                    }
+                }}
+            >
+                {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}
+            </LineChart>
+        </Chart.Container>
+        <details>
+            <summary class="text-muted-foreground cursor-pointer text-xs">View activity table</summary>
+            <Table.Root aria-label="Guide activity by date">
+                <Table.Header
+                    ><Table.Row
+                        ><Table.Head>Date (UTC)</Table.Head>{#each keys as key (key)}<Table.Head class="text-right">{config[key].label}</Table.Head
+                            >{/each}</Table.Row
+                    ></Table.Header
+                >
+                <Table.Body
+                    >{#each data as period (period.date_utc)}<Table.Row
+                            ><Table.Cell>{dateLabel(period.date)}</Table.Cell>{#each keys as key (key)}<Table.Cell class="text-right"
+                                    ><Number value={period[key]} /></Table.Cell
+                                >{/each}</Table.Row
+                        >{/each}</Table.Body
+                >
+            </Table.Root>
+        </details>
+    {/if}
+</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
new file mode 100644
index 0000000000..06a2c4704b
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
@@ -0,0 +1,70 @@
+<script lang="ts">
+    import { Button } from '$comp/ui/button';
+    import * as Field from '$comp/ui/field';
+    import { Input } from '$comp/ui/input';
+    import * as Popover from '$comp/ui/popover';
+    import Calendar from '@lucide/svelte/icons/calendar';
+    import { untrack } from 'svelte';
+
+    import type { ProductTourUsageRange } from '../product-tour-usage';
+
+    import { getUtcMonthKey } from '../assistant-usage';
+
+    let { range = $bindable() }: { range: ProductTourUsageRange } = $props();
+    let open = $state(false);
+    const currentMonth = getUtcMonthKey();
+    let month = $state(untrack(() => (range.kind === 'month' ? range.month : currentMonth)));
+    const label = $derived(
+        range.kind === 'history'
+            ? 'Available history'
+            : new Date(`${range.month}-01T00:00:00Z`).toLocaleDateString(undefined, {
+                  month: 'long',
+                  timeZone: 'UTC',
+                  year: 'numeric'
+              })
+    );
+
+    function selectMonth(): void {
+        range = {
+            kind: 'month',
+            month
+        };
+        open = false;
+    }
+</script>
+
+<Popover.Root bind:open>
+    <Popover.Trigger>
+        {#snippet child({ props })}
+            <Button {...props} variant="outline" class="w-44 justify-start" aria-label={`Usage period: ${label}`}>
+                <Calendar data-icon="inline-start" />{label}
+            </Button>
+        {/snippet}
+    </Popover.Trigger>
+    <Popover.Content align="end" class="w-64">
+        <form
+            class="flex flex-col gap-3"
+            onsubmit={(event) => {
+                event.preventDefault();
+                selectMonth();
+            }}
+        >
+            <Field.FieldGroup>
+                <Field.Field>
+                    <Field.Label for="tour-usage-month">Month (UTC)</Field.Label>
+                    <Input id="tour-usage-month" type="month" required max={currentMonth} bind:value={month} />
+                </Field.Field>
+            </Field.FieldGroup>
+            <Button type="submit" variant="secondary">Show month</Button>
+            <Button
+                variant="ghost"
+                onclick={() => {
+                    range = {
+                        kind: 'history'
+                    };
+                    open = false;
+                }}>Available history</Button
+            >
+        </form>
+    </Popover.Content>
+</Popover.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte.test.ts
new file mode 100644
index 0000000000..45f5a49b26
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte.test.ts
@@ -0,0 +1,33 @@
+import { fireEvent, render, screen } from '@testing-library/svelte';
+import { describe, expect, it } from 'vitest';
+
+import ProductTourPeriod from './product-tour-period.svelte';
+
+describe('ProductTourPeriod', () => {
+    it('edits the selected month inside the popover rather than adding a toolbar input', async () => {
+        // Arrange
+        render(ProductTourPeriod, { range: { kind: 'month', month: '2020-08' } });
+        expect(screen.queryByLabelText('Month (UTC)')).toBeNull();
+
+        // Act
+        await fireEvent.click(screen.getByRole('button', { name: 'Usage period: August 2020' }));
+
+        // Assert
+        expect((screen.getByLabelText('Month (UTC)') as HTMLInputElement).value).toBe('2020-08');
+    });
+
+    it('switches history back to the remembered month using the same trigger', async () => {
+        // Arrange
+        render(ProductTourPeriod, { range: { kind: 'month', month: '2020-08' } });
+        await fireEvent.click(screen.getByRole('button', { name: 'Usage period: August 2020' }));
+
+        // Act
+        await fireEvent.click(screen.getByRole('button', { name: 'Available history' }));
+        await fireEvent.click(screen.getByRole('button', { name: 'Usage period: Available history' }));
+        await fireEvent.click(screen.getByRole('button', { name: 'Show month' }));
+
+        // Assert
+        expect(screen.getByRole('button', { name: 'Usage period: August 2020' })).toBeTruthy();
+        expect(screen.queryByLabelText('Month (UTC)')).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index ef2df8033c..f01d13eafa 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -1,6 +1,7 @@
+import { ProductTourUsageInterval } from '$generated/api';
 import { describe, expect, it } from 'vitest';
 
-import { getGuideOutcomeRate, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
+import { getGuideOutcomeRate, getProductTourActivity, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
 
 describe('product tour usage helpers', () => {
     it('maps each immutable range to the API query parameters', () => {
@@ -20,4 +21,49 @@ describe('product tour usage helpers', () => {
         expect(getGuideOutcomeRate({ completed: 3, dismissed: 1, started: 5 }, 'dismissed')).toBe(0.2);
         expect(getStartSourceShare({ count: 2 }, 5)).toBe(0.4);
     });
+
+    it('fills missing UTC days without inventing future activity', () => {
+        // Arrange
+        const activity = [{ completed: 0, date_utc: '2026-08-02T00:00:00Z', dismissed: 0, shown: 2, started: 1 }];
+
+        // Act
+        const data = getProductTourActivity(
+            activity,
+            ProductTourUsageInterval.Day,
+            '2026-08-01T00:00:00Z',
+            '2026-09-01T00:00:00Z',
+            new Date('2026-08-03T12:00:00Z')
+        );
+
+        // Assert
+        expect(data).toHaveLength(3);
+        expect(data.map((period) => period.shown)).toEqual([0, 2, 0]);
+        expect(data[0]?.date.toISOString()).toBe('2026-08-01T00:00:00.000Z');
+    });
+
+    it('keeps monthly history buckets at UTC month starts', () => {
+        // Arrange
+        const activity = [{ completed: 3, date_utc: '2026-02-01T00:00:00Z', dismissed: 1, shown: 0, started: 5 }];
+
+        // Act
+        const data = getProductTourActivity(
+            activity,
+            ProductTourUsageInterval.Month,
+            '2026-01-31T15:00:00Z',
+            '2026-04-01T00:00:00Z',
+            new Date('2026-05-01T00:00:00Z')
+        );
+
+        // Assert
+        expect(data.map((period) => period.date.getUTCMonth())).toEqual([0, 1, 2]);
+        expect(data.map((period) => period.started)).toEqual([0, 5, 0]);
+    });
+
+    it('does not invent a start date for empty unlimited history', () => {
+        // Act
+        const data = getProductTourActivity([], ProductTourUsageInterval.Month, null, '2026-04-01T00:00:00Z');
+
+        // Assert
+        expect(data).toEqual([]);
+    });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index bed55ed8a5..12d166e917 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -1,3 +1,5 @@
+import type { ProductTourActivity, ProductTourUsageInterval } from '$generated/api';
+
 export type ProductTourUsageRange =
     | {
           kind: 'history';
@@ -11,6 +13,38 @@ export function getGuideOutcomeRate(value: { completed: number; dismissed: numbe
     return getRate(value[outcome], value.started);
 }
 
+export function getProductTourActivity(
+    activity: ProductTourActivity[],
+    interval: ProductTourUsageInterval,
+    start: null | string | undefined,
+    end: string,
+    now = new Date()
+): (ProductTourActivity & { date: Date })[] {
+    const endDate = new Date(Math.min(new Date(end).getTime(), now.getTime()));
+    const firstDate = start ?? activity[0]?.date_utc;
+    if (!firstDate) {
+        return [];
+    }
+
+    const cursor = new Date(firstDate);
+    cursor.setUTCHours(0, 0, 0, 0);
+    if (interval === 'month') {
+        cursor.setUTCDate(1);
+    }
+    const byDate = new Map(activity.map((period) => [period.date_utc.slice(0, 10), period]));
+    const result: (ProductTourActivity & { date: Date })[] = [];
+    while (cursor < endDate) {
+        const key = cursor.toISOString().slice(0, 10);
+        result.push({ completed: 0, dismissed: 0, shown: 0, started: 0, ...byDate.get(key), date: new Date(cursor), date_utc: cursor.toISOString() });
+        if (interval === 'month') {
+            cursor.setUTCMonth(cursor.getUTCMonth() + 1);
+        } else {
+            cursor.setUTCDate(cursor.getUTCDate() + 1);
+        }
+    }
+    return result;
+}
+
 export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | string> {
     if (range.kind === 'history') {
         return { history: true };
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index ecdfb6514b..da1a008902 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -62,6 +62,7 @@
         onNavigate,
         prepareStackAssistantContext
     }: Props = $props();
+    let tourStackId = $state<string>();
 
     function getTabs(event?: null | PersistentEvent, project?: ViewProject): TabType[] {
         if (!event) {
@@ -332,22 +333,20 @@
     });
 </script>
 
-<InvestigationDetailTour {event} placement="stack" />
-
 <section>
     <h4 class="text-muted-foreground mb-3 text-sm font-semibold tracking-wide uppercase">Stack</h4>
+    <InvestigationDetailTour event={tourStackId === event?.stack_id ? event : undefined} />
     {#if event?.stack_id}
         <StackCard
             {assistantResource}
             {filterChanged}
             id={event.stack_id}
+            onLoaded={(stack) => (tourStackId = stack.id)}
             prepareAssistantContext={assistantResource === 'event' ? prepareEventAssistantContext : prepareStackAssistantContext}
         ></StackCard>
     {/if}
 </section>
 
-<InvestigationDetailTour {event} placement="occurrence" />
-
 <section class="mt-2">
     <div class="mb-2 flex items-center justify-between">
         <h4 class="text-muted-foreground text-sm font-semibold tracking-wide uppercase">Event</h4>
@@ -360,6 +359,7 @@
             {#if event?.stack_id}
                 <Button
                     aria-label="Show all events"
+                    data-tour="stack-events"
                     onclick={() => filterChanged(new EventsFacetedFilter.StringFilter('stack', event!.stack_id))}
                     size="icon-sm"
                     title="Show all events"
@@ -386,7 +386,7 @@
         </div>
     </div>
 
-    <Table.Root>
+    <Table.Root data-tour="event-occurrence">
         <Table.Body>
             <Table.Row class="group">
                 {#if event}
@@ -402,7 +402,6 @@
     </Table.Root>
 
     {#if event}
-        <InvestigationDetailTour {event} placement="overview" />
         <Tabs.Root class="mt-4 mb-4" bind:value={activeTab}>
             <div class="relative">
                 {#if canScrollTabsLeft}
@@ -423,6 +422,7 @@
                 >
                     {#each tabs as tab (tab)}
                         <Tabs.Trigger
+                            data-tour={tab === 'Overview' ? 'event-overview' : undefined}
                             aria-label={isPromotedTab(tab) ? `${tab}. Drag to reorder custom tab.` : undefined}
                             class={[
                                 'dark:data-[state=active]:bg-background flex-none shrink-0 px-3 py-1.5 data-[state=active]:shadow-xs dark:data-[state=active]:border-transparent',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
index 6499f9069c..e497ef58e2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
-    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
+    import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+    import { PRODUCT_TOUR_CHECKPOINTS } from '$features/product-tours/types';
 
     import type { PersistentEvent } from '../models';
 
@@ -9,58 +10,54 @@
 
     interface Props {
         event?: PersistentEvent;
-        placement: 'occurrence' | 'overview' | 'stack';
     }
 
-    let { event, placement }: Props = $props();
+    let { event }: Props = $props();
     let advancedEventId = $state('');
 
     const actions = createProductTourActions();
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
+    const steps = PRODUCT_TOUR_CHECKPOINTS['event-investigate'];
+    const stepIndex = $derived(checkpoint ? steps.indexOf(checkpoint.checkpointName) : -1);
     const copy = $derived.by(() => {
         switch (checkpoint?.checkpointName) {
             case 'event-occurrence':
-                return placement === 'occurrence'
-                    ? {
-                          description: 'This occurrence contains its timestamp, raw JSON, and navigation to nearby events.',
-                          title: 'Inspect the occurrence'
-                      }
-                    : undefined;
+                return {
+                    description: 'An occurrence is one event. This is when it happened. Use the buttons beside Event to view JSON or browse older occurrences.',
+                    target: '[data-tour="event-occurrence"]',
+                    title: 'Inspect the occurrence'
+                };
             case 'filter-stack-events':
-                return placement === 'occurrence'
-                    ? {
-                          description: 'Show all events filters the list to this stack when you are ready to compare occurrences.',
-                          title: 'Compare every occurrence'
-                      }
-                    : undefined;
+                return {
+                    description: 'Select “Show all events” to compare occurrences of this stack. You can also finish this guide and keep exploring this event.',
+                    target: '[data-tour="stack-events"]',
+                    title: 'Compare every occurrence'
+                };
             case 'stack-summary':
-                return placement === 'stack'
-                    ? {
-                          description: 'Use the grouped stack title, affected users, occurrence count, and trend to judge scope and impact.',
-                          title: 'Understand the grouped issue'
-                      }
-                    : undefined;
+                return {
+                    description: 'A stack groups similar events. Check its event count and users affected.',
+                    target: '[data-tour="stack-metrics"]',
+                    title: 'Understand the grouped issue'
+                };
             case 'stack-triage':
-                return placement === 'stack'
-                    ? {
-                          description: 'Status and options change shared issue state. Review them here; this guide will not invoke them.',
-                          title: 'Triage deliberately'
-                      }
-                    : undefined;
+                return {
+                    description: 'Status changes affect everyone in the project. This guide does not change the status.',
+                    target: '[data-tour="stack-status"]',
+                    title: 'Review the issue status'
+                };
             case 'tab-overview':
-                return placement === 'overview'
-                    ? {
-                          description: 'Overview summarizes the message and useful event fields. Choose other tabs when the evidence calls for them.',
-                          title: 'Begin with the overview'
-                      }
-                    : undefined;
+                return {
+                    description: 'Select “Overview” to read the message and event details. Other tabs show more context.',
+                    target: '[data-tour="event-overview"]',
+                    title: 'Begin with the overview'
+                };
             default:
                 return undefined;
         }
     });
 
     $effect(() => {
-        if (placement !== 'stack' || !event || event.id === advancedEventId) {
+        if (!event || event.id === advancedEventId) {
             return;
         }
 
@@ -77,38 +74,33 @@
             return;
         }
 
-        switch (active.checkpointName) {
-            case 'event-occurrence':
-                productTourCheckpoint.advance(active, 'tab-overview');
-                break;
-            case 'stack-summary':
-                productTourCheckpoint.advance(active, 'stack-triage');
-                break;
-            case 'stack-triage':
-                productTourCheckpoint.advance(active, 'event-occurrence');
-                break;
-            case 'tab-overview':
-                productTourCheckpoint.advance(active, 'filter-stack-events');
-                break;
-            default:
-                await actions.complete(active);
+        const next = steps[stepIndex + 1];
+        if (next) {
+            productTourCheckpoint.advance(active, next);
+        } else {
+            await actions.complete(active);
         }
     }
 
-    async function dismiss(): Promise<void> {
-        if (checkpoint) {
-            await actions.dismiss(checkpoint);
+    function back(): void {
+        const previous = steps[stepIndex - 1];
+        if (checkpoint && previous && stepIndex > steps.indexOf('stack-summary')) {
+            productTourCheckpoint.advance(checkpoint, previous);
         }
     }
 </script>
 
 {#if event && checkpoint && copy}
-    <ProductTourInlineCallout
-        {checkpoint}
-        continueLabel={checkpoint.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
-        description={copy.description}
-        onContinue={continueTour}
-        onDismiss={dismiss}
-        title={copy.title}
-    />
+    {#key checkpoint}
+        <ProductTourSpotlight
+            {checkpoint}
+            continueLabel={checkpoint.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
+            description={copy.description}
+            onNext={continueTour}
+            onPrevious={stepIndex > steps.indexOf('stack-summary') ? back : undefined}
+            onDismiss={actions.dismiss}
+            target={copy.target}
+            title={copy.title}
+        />
+    {/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
new file mode 100644
index 0000000000..0ad94d562d
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
@@ -0,0 +1,116 @@
+import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { PersistentEvent } from '../models';
+
+import InvestigationDetailTour from './investigation-detail-tour.svelte';
+
+const actions = vi.hoisted(() => ({ complete: vi.fn(), dismiss: vi.fn() }));
+vi.mock('$features/product-tours/actions.svelte', () => ({ createProductTourActions: () => actions }));
+
+const event: PersistentEvent = {
+    created_utc: '2026-09-01T00:00:00Z',
+    data: { '@simple_error': { message: 'Example error', type: 'ExampleException' } },
+    date: '2026-09-01T00:00:00Z',
+    id: 'event',
+    is_first_occurrence: false,
+    organization_id: 'organization',
+    project_id: 'project',
+    stack_id: 'stack',
+    type: 'error'
+};
+
+describe('InvestigationDetailTour', () => {
+    let targets: HTMLElement[];
+    beforeEach(() => {
+        vi.stubGlobal(
+            'ResizeObserver',
+            class {
+                disconnect() {}
+                observe() {}
+            }
+        );
+        targets = ['stack-metrics', 'stack-status', 'event-occurrence', 'event-overview', 'stack-events'].map((name) => {
+            const element = document.createElement('button');
+            element.dataset.tour = name;
+            element.scrollIntoView = vi.fn();
+            document.body.append(element);
+            return element;
+        });
+    });
+
+    afterEach(() => {
+        cleanup();
+        targets.forEach((target) => target.remove());
+        vi.unstubAllGlobals();
+        productTourCheckpoint.clear();
+        vi.clearAllMocks();
+    });
+
+    it('uses a spotlight on the actual control at every detail step', async () => {
+        // Arrange
+        productTourCheckpoint.start('event-investigate', 'choose-error', 'catalog', 'user', 1);
+        render(InvestigationDetailTour, { event });
+        await screen.findByText('Understand the grouped issue');
+
+        // Act and assert
+        for (const [index, title] of [
+            'Understand the grouped issue',
+            'Review the issue status',
+            'Inspect the occurrence',
+            'Begin with the overview',
+            'Compare every occurrence'
+        ].entries()) {
+            await screen.findByText(title);
+            expect(targets[index]?.classList.contains('driver-active-element')).toBe(true);
+            if (index < targets.length - 1) {
+                await fireEvent.click(screen.getByRole('button', { name: 'Continue' }));
+            }
+        }
+        await fireEvent.click(screen.getByRole('button', { name: 'Finish guide' }));
+        expect(actions.complete).toHaveBeenCalledExactlyOnceWith(productTourCheckpoint.current);
+        expect(actions.dismiss).not.toHaveBeenCalled();
+    });
+
+    it('does not advance for a non-error event', () => {
+        // Arrange
+        productTourCheckpoint.start('event-investigate', 'choose-error', 'catalog', 'user', 1);
+
+        // Act
+        render(InvestigationDetailTour, { event: { ...event, data: {}, type: 'log' } });
+
+        // Assert
+        expect(productTourCheckpoint.current?.checkpointName).toBe('choose-error');
+        expect(screen.queryByRole('region', { name: 'Guide' })).toBeNull();
+    });
+
+    it('goes back through detail steps without reopening events or saving progress', async () => {
+        // Arrange
+        productTourCheckpoint.start('event-investigate', 'stack-triage', 'catalog', 'user', 1);
+        render(InvestigationDetailTour, { event });
+
+        // Act
+        await fireEvent.click(await screen.findByRole('button', { name: 'Back' }));
+        await screen.findByText('Understand the grouped issue');
+
+        // Assert
+        expect(productTourCheckpoint.current?.checkpointName).toBe('stack-summary');
+        expect(screen.queryByRole('button', { name: 'Back' })).toBeNull();
+        expect(actions.complete).not.toHaveBeenCalled();
+        expect(actions.dismiss).not.toHaveBeenCalled();
+    });
+
+    it('retains an accessible end-guide action', async () => {
+        // Arrange
+        productTourCheckpoint.start('event-investigate', 'stack-summary', 'catalog', 'user', 1);
+        render(InvestigationDetailTour, { event });
+
+        // Act
+        await fireEvent.click(await screen.findByRole('button', { name: 'End guide' }));
+
+        // Assert
+        expect(actions.dismiss).toHaveBeenCalledExactlyOnceWith(productTourCheckpoint.current);
+        expect(actions.complete).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
index 07d9315c05..6b2aec2ec0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
@@ -3,6 +3,13 @@
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
 
+    interface Props {
+        firstErrorId?: string;
+        onOpenError: (eventId: string) => void;
+    }
+
+    let { firstErrorId, onOpenError }: Props = $props();
+
     const actions = createProductTourActions();
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
 </script>
@@ -10,7 +17,7 @@
 {#if checkpoint?.checkpointName === 'filter-errors'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Errors are selected. Narrow the list by project, status, date, version, tags, or search terms when you need a specific incident."
+        description="This list shows errors. Use the filters or search to find the one you want to investigate."
         onDismiss={actions.dismiss}
         onNext={(current) => {
             productTourCheckpoint.advance(current, 'choose-error');
@@ -19,11 +26,26 @@
         title="Start with the right errors"
     />
 {:else if checkpoint?.checkpointName === 'choose-error'}
-    <ProductTourSpotlight
-        {checkpoint}
-        description="Choose a real error row. The guide continues only after its detail sheet loads."
-        onDismiss={actions.dismiss}
-        target="[data-tour='event-list']"
-        title="Open a real error"
-    />
+    {#key firstErrorId}
+        <ProductTourSpotlight
+            {checkpoint}
+            continueLabel="Open first error"
+            description={firstErrorId
+                ? 'Open the first error below, or select another row. The guide continues in the details panel.'
+                : 'No errors are ready to open in this list. Adjust the filters or wait for the results to load.'}
+            onDismiss={actions.dismiss}
+            onPrevious={(current) => {
+                productTourCheckpoint.advance(current, 'filter-errors');
+            }}
+            onNext={firstErrorId
+                ? () => {
+                      if (firstErrorId) {
+                          onOpenError(firstErrorId);
+                      }
+                  }
+                : undefined}
+            target="[data-tour='event-list']"
+            title="Open an error"
+        />
+    {/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
new file mode 100644
index 0000000000..9106517cbf
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
@@ -0,0 +1,65 @@
+import { productTourCheckpoint } from '$features/product-tours/state.svelte';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import InvestigationListTour from './investigation-list-tour.svelte';
+
+vi.mock('$features/product-tours/actions.svelte', () => ({
+    createProductTourActions: () => ({ dismiss: vi.fn() })
+}));
+
+describe('InvestigationListTour', () => {
+    let target: HTMLDivElement;
+
+    beforeEach(() => {
+        vi.stubGlobal(
+            'ResizeObserver',
+            class {
+                disconnect() {}
+                observe() {}
+            }
+        );
+        target = document.createElement('div');
+        target.dataset.tour = 'event-list';
+        document.body.append(target);
+        target.scrollIntoView = vi.fn();
+        productTourCheckpoint.start('event-investigate', 'choose-error', 'catalog', 'user', 1);
+    });
+
+    afterEach(() => {
+        cleanup();
+        target.remove();
+        vi.unstubAllGlobals();
+        productTourCheckpoint.clear();
+    });
+
+    it('opens the supplied first error only after the user chooses the action', async () => {
+        // Arrange
+        const onOpenError = vi.fn();
+        render(InvestigationListTour, { firstErrorId: 'first-error', onOpenError });
+        const open = await screen.findByRole('button', { name: 'Open first error' });
+        expect(onOpenError).not.toHaveBeenCalled();
+
+        // Act
+        await fireEvent.click(open);
+
+        // Assert
+        expect(onOpenError).toHaveBeenCalledExactlyOnceWith('first-error');
+        expect(productTourCheckpoint.current?.checkpointName).toBe('choose-error');
+    });
+
+    it('offers no open action until an error is available', async () => {
+        // Arrange
+        const onOpenError = vi.fn();
+        const component = render(InvestigationListTour, { onOpenError });
+        await screen.findByText('No errors are ready to open in this list. Adjust the filters or wait for the results to load.');
+        expect(screen.queryByRole('button', { name: 'Open first error' })).toBeNull();
+
+        // Act
+        await component.rerender({ firstErrorId: 'loaded-error', onOpenError });
+        await fireEvent.click(await screen.findByRole('button', { name: 'Open first error' }));
+
+        // Assert
+        expect(onOpenError).toHaveBeenCalledExactlyOnceWith('loaded-error');
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
new file mode 100644
index 0000000000..4586f9af22
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
@@ -0,0 +1,121 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { createProductTourActions } from './actions.svelte';
+import { productTourCheckpoint } from './state.svelte';
+
+const mocks = vi.hoisted(() => ({
+    error: vi.fn(),
+    mutateAsync: vi.fn<() => Promise<void>>(),
+    openCatalog: vi.fn(),
+    submitFeatureUsage: vi.fn(),
+    success: vi.fn()
+}));
+vi.mock('$features/auth/exceptionless-session', () => ({ submitFeatureUsage: mocks.submitFeatureUsage }));
+vi.mock('$features/users/api.svelte', () => ({ putCurrentUserProductTour: () => ({ mutateAsync: mocks.mutateAsync }) }));
+vi.mock('./controls.svelte', () => ({ tryUseProductTourControls: () => ({ openCatalog: mocks.openCatalog }) }));
+vi.mock('svelte-sonner', () => ({ toast: { error: mocks.error, success: mocks.success } }));
+
+describe('product tour completion', () => {
+    afterEach(() => {
+        productTourCheckpoint.clear();
+        vi.resetAllMocks();
+    });
+
+    it('offers an actionable next step only after progress is saved', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('event-investigate', 'filter-stack-events', 'catalog', 'user', 1);
+        const actions = createProductTourActions();
+
+        // Act
+        const completed = await actions.complete(checkpoint);
+
+        // Assert
+        expect(completed).toBe(true);
+        expect(productTourCheckpoint.current).toBeUndefined();
+        expect(mocks.success).toHaveBeenCalledExactlyOnceWith('You’ve explored an error and its occurrences', {
+            action: { label: 'Browse guides', onClick: mocks.openCatalog },
+            description: 'For more guides, select your name in the sidebar → Help → Guided Tours.'
+        });
+        const options = mocks.success.mock.calls[0]![1];
+        options.action.onClick();
+        expect(mocks.openCatalog).toHaveBeenCalledOnce();
+    });
+
+    it('leaves the overview menu handoff unobstructed by a completion toast', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
+
+        // Act
+        const completed = await createProductTourActions().complete(checkpoint);
+
+        // Assert
+        expect(completed).toBe(true);
+        expect(mocks.success).not.toHaveBeenCalled();
+    });
+
+    it('keeps the last step available when progress cannot be saved', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
+        mocks.mutateAsync.mockRejectedValueOnce(new Error('Unavailable'));
+
+        // Act
+        const completed = await createProductTourActions().complete(checkpoint);
+
+        // Assert
+        expect(completed).toBe(false);
+        expect(productTourCheckpoint.current).toBe(checkpoint);
+        expect(mocks.error).toHaveBeenCalledOnce();
+        expect(mocks.success).not.toHaveBeenCalled();
+        expect(mocks.openCatalog).not.toHaveBeenCalled();
+    });
+
+    it('does not show a completion action for dismissal or a stale checkpoint', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
+        const actions = createProductTourActions();
+
+        // Act
+        await actions.dismiss(checkpoint);
+        const completed = await actions.complete(checkpoint);
+
+        // Assert
+        expect(completed).toBe(false);
+        expect(mocks.success).not.toHaveBeenCalled();
+        expect(mocks.openCatalog).not.toHaveBeenCalled();
+    });
+
+    it('offers the next guide once after a first event succeeds', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('project-configure', 'event-received', 'catalog', 'user', 1);
+        mocks.mutateAsync.mockResolvedValueOnce(undefined);
+        const actions = createProductTourActions();
+
+        // Act
+        actions.completeAfterDomainSuccess(checkpoint);
+        actions.completeAfterDomainSuccess(checkpoint);
+        await vi.waitFor(() => expect(productTourCheckpoint.current).toBeUndefined());
+
+        // Assert
+        expect(mocks.mutateAsync).toHaveBeenCalledOnce();
+        expect(mocks.success).toHaveBeenCalledExactlyOnceWith(
+            'Your project received its first event',
+            expect.objectContaining({
+                action: { label: 'Browse guides', onClick: mocks.openCatalog }
+            })
+        );
+    });
+
+    it('preserves a domain-success checkpoint for retry when progress saving fails', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('project-configure', 'event-received', 'catalog', 'user', 1);
+        mocks.mutateAsync.mockRejectedValueOnce(new Error('Unavailable'));
+
+        // Act
+        createProductTourActions().completeAfterDomainSuccess(checkpoint);
+        await vi.waitFor(() => expect(mocks.error).toHaveBeenCalledOnce());
+
+        // Assert
+        expect(productTourCheckpoint.current).toBe(checkpoint);
+        expect(mocks.success).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index e3b18de31e..45e89d8de2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -5,20 +5,21 @@ import { toast } from 'svelte-sonner';
 
 import type { ProductTourCheckpoint, ProductTourKey, ProductTourLaunchSource } from './types';
 
+import { tryUseProductTourControls } from './controls.svelte';
 import { productTourCheckpoint } from './state.svelte';
 import { buildProductTourTelemetryEvent, type ProductTourTelemetryEvent } from './telemetry';
 
-const COMPLETION_NEXT_STEPS: Record<ProductTourCheckpoint['tourName'], string> = {
-    'app-overview': 'Next: open Guided Tours from Help whenever you want a focused workflow.',
-    'event-investigate': 'Next: save a useful Events view for the investigation you repeat most.',
-    'exie-overview': 'Next: open Exie from a real event when you want help investigating it.',
-    'project-configure': 'Next: open the received event and investigate its stack.',
-    'saved-view-create': 'Next: reuse the saved view from the application navigation.'
+const COMPLETION_MESSAGES: Record<Exclude<ProductTourCheckpoint['tourName'], 'app-overview'>, string> = {
+    'event-investigate': 'You’ve explored an error and its occurrences',
+    'exie-overview': 'You’re ready to ask Exie a question',
+    'project-configure': 'Your project received its first event',
+    'saved-view-create': 'Your saved view is ready'
 };
 
 const domainCompletionRequests = new WeakSet<ProductTourCheckpoint>();
 
 export function createProductTourActions() {
+    const controls = tryUseProductTourControls();
     const progressMutation = putCurrentUserProductTour();
 
     async function complete(checkpoint: ProductTourCheckpoint): Promise<boolean> {
@@ -46,6 +47,7 @@ export function createProductTourActions() {
             .then(() => {
                 if (productTourCheckpoint.clear(checkpoint)) {
                     void track('completed', checkpoint.tourName, checkpoint.version, checkpoint.source);
+                    showCompletion(checkpoint);
                 }
             })
             .catch(() => {
@@ -75,13 +77,26 @@ export function createProductTourActions() {
         }
         void track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, checkpoint.version, checkpoint.source);
         if (status === ProductTourStatus.Completed) {
-            toast.success('Guide complete', {
-                description: COMPLETION_NEXT_STEPS[checkpoint.tourName]
-            });
+            showCompletion(checkpoint);
         }
         return true;
     }
 
+    function showCompletion(checkpoint: ProductTourCheckpoint): void {
+        // The overview hands off to the Help menu; a toast would cover that menu.
+        if (checkpoint.tourName !== 'app-overview') {
+            toast.success(COMPLETION_MESSAGES[checkpoint.tourName], {
+                action: controls
+                    ? {
+                          label: 'Browse guides',
+                          onClick: controls.openCatalog
+                      }
+                    : undefined,
+                description: 'For more guides, select your name in the sidebar → Help → Guided Tours.'
+            });
+        }
+    }
+
     return {
         complete,
         completeAfterDomainSuccess,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index 0b96727eb2..d1a5549dbb 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -61,6 +61,36 @@ describe('product tour catalog', () => {
         });
     });
 
+    it('keeps the current project and SDK when starting from Client Setup', () => {
+        // Arrange
+        const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
+        const currentContext = context({
+            pathname: '/next/project/current-project/configure',
+            projects: [
+                { id: 'other-project', is_configured: false },
+                { id: 'current-project', is_configured: true }
+            ],
+            search: '?type=dotnet-legacy-mvc'
+        });
+
+        // Act
+        const start = definition.start(currentContext);
+
+        // Assert
+        expect(start).toEqual({ checkpointName: 'choose-platform', route: '/next/project/current-project/configure?type=dotnet-legacy-mvc&redirect=true' });
+    });
+
+    it('does not carry another page SDK selection into project setup', () => {
+        // Arrange
+        const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
+
+        // Act
+        const start = definition.start(context({ projects: [{ id: 'project-id', is_configured: false }], search: '?type=error' }));
+
+        // Assert
+        expect(start).toEqual({ checkpointName: 'choose-platform', route: '/next/project/project-id/configure?redirect=true' });
+    });
+
     it('requires actual Exie access', () => {
         const item = getProductTourItems(context({ assistantAccess: { enabled: true, has_access: false, upgrade_required: true } })).find(
             (tour) => tour.name === 'exie-overview'
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 94c8f8fa04..1d3eba3cdc 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -25,8 +25,8 @@ function requireOrganization(context: ProductTourContext) {
 export const productTourCatalog: readonly ProductTourDefinition[] = [
     {
         availability: requireApplicationShell,
-        description: 'Learn navigation, command search, saved views, Exie, and where to get help.',
-        keywords: ['navigation', 'ui', 'search', 'command', 'help', 'saved views'],
+        description: 'Navigate stacks and events, use the command palette, and reopen saved views.',
+        keywords: ['navigation', 'ui', 'search', 'command palette', 'help', 'saved views', 'stacks', 'occurrences'],
         name: 'app-overview',
         start: () => ({ checkpointName: 'navigation', route: resolve('/') }),
         title: 'Explore Exceptionless',
@@ -34,7 +34,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     },
     {
         availability: () => ({ available: true }),
-        description: 'Create or resume a project, connect an SDK, and wait for its first real event.',
+        description: 'Continue an unfinished project, or create one and send its first event.',
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'project-configure',
         start: (context) => {
@@ -42,6 +42,15 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
                 return { checkpointName: 'organization-name', route: resolve('/(app)/organization/add') };
             }
 
+            const currentProject = context.projects.find(
+                (project) => project.id && context.pathname === resolve('/(app)/project/[projectId]/configure', { projectId: project.id })
+            );
+            if (currentProject) {
+                const search = new URLSearchParams(context.search);
+                search.set('redirect', 'true');
+                return { checkpointName: 'choose-platform', route: `${context.pathname}?${search}` };
+            }
+
             const unconfiguredProject = context.projects.find((project) => !project.is_configured);
             if (unconfiguredProject?.id) {
                 return {
@@ -57,7 +66,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     },
     {
         availability: requireOrganization,
-        description: 'Save the current Events configuration as a private view that only you can see.',
+        description: 'Save your event filters and layout in a view only you can see.',
         keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
         name: 'saved-view-create',
         start: () => ({ checkpointName: 'open-view-menu', route: resolve('/(app)/event') }),
@@ -66,8 +75,8 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     },
     {
         availability: requireError,
-        description: 'Open a real error, assess its stack and status, then inspect the occurrence.',
-        keywords: ['error report', 'event details', 'exception', 'filter', 'stack', 'triage'],
+        description: 'Understand stacks, review status, and inspect individual event occurrences.',
+        keywords: ['error report', 'event details', 'occurrences', 'exception', 'filter', 'stack', 'triage'],
         name: 'event-investigate',
         start: () => ({ checkpointName: 'filter-errors', route: `${resolve('/(app)/event')}?time=all&type=error` }),
         title: 'Investigate an error',
@@ -83,7 +92,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
                 ? { available: true }
                 : { available: false, reason: context.assistantAccess.message ?? 'Exie requires access.' };
         },
-        description: 'See how Exie uses the current page as context without sending a prompt.',
+        description: 'Explore the AI assistant. This guide does not send an AI request.',
         keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
         name: 'exie-overview',
         start: () => ({ checkpointName: 'open-exie', route: resolve('/') }),
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 7f4603495b..a365c65fd2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -3,12 +3,14 @@
     import { Button } from '$comp/ui/button';
     import * as Dialog from '$comp/ui/dialog';
     import { ProductTourStatus } from '$features/users/models';
-    import Compass from '@lucide/svelte/icons/compass';
+    import Bookmark from '@lucide/svelte/icons/bookmark';
+    import Bot from '@lucide/svelte/icons/bot';
+    import Folder from '@lucide/svelte/icons/folder';
+    import Layers from '@lucide/svelte/icons/layers';
+    import PanelLeft from '@lucide/svelte/icons/panel-left';
 
     import type { ProductTourListItem, ProductTourName } from '../../types';
 
-    import { PRODUCT_TOUR_CHECKPOINTS } from '../../types';
-
     interface Props {
         activeTourName?: ProductTourName;
         items: ProductTourListItem[];
@@ -19,45 +21,57 @@
     }
 
     let { activeTourName, items, onStart, open = $bindable(false), ready, resumableTourName }: Props = $props();
+    const id = $props.id();
+    const icons = {
+        'app-overview': PanelLeft,
+        'event-investigate': Layers,
+        'exie-overview': Bot,
+        'project-configure': Folder,
+        'saved-view-create': Bookmark
+    };
 </script>
 
 <Dialog.Root bind:open>
     <Dialog.Content class="max-h-[85vh] overflow-y-auto sm:max-w-2xl" data-product-tour-overlay>
         <Dialog.Header>
             <Dialog.Title>Guided Tours</Dialog.Title>
-            <Dialog.Description>Learn Exceptionless with short guides that use your real data.</Dialog.Description>
+            <Dialog.Description>Choose a short, step-by-step guide. Guides use your workspace, not sample data.</Dialog.Description>
         </Dialog.Header>
 
-        <div class="grid gap-3 py-2 sm:grid-cols-2">
+        <ul aria-label="Available guides" class="divide-border divide-y">
             {#each items as item (item.name)}
-                <section aria-label={item.title} class="border-border bg-card flex min-h-44 flex-col gap-3 rounded-lg border p-4">
-                    <div class="flex items-start justify-between gap-3">
-                        <div class="bg-primary/10 text-primary flex size-9 shrink-0 items-center justify-center rounded-lg">
-                            <Compass aria-hidden="true" class="size-5" />
+                {@const Icon = icons[item.name]}
+                {@const completed = item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version}
+                {@const actionLabel = resumableTourName === item.name ? 'Continue' : activeTourName === item.name || completed ? 'Restart' : 'Start'}
+                <li>
+                    <section aria-label={item.title} class="grid grid-cols-[auto_minmax(0,1fr)] gap-x-3 gap-y-2 py-3 sm:grid-cols-[auto_minmax(0,1fr)_auto]">
+                        <Icon aria-hidden="true" class="text-muted-foreground mt-0.5 size-5" />
+                        <div class="min-w-0">
+                            <div class="flex flex-wrap items-center gap-x-2 gap-y-1">
+                                <h3 class="text-sm font-semibold">{item.title}</h3>
+                                {#if completed}
+                                    <Badge variant="secondary">Completed</Badge>
+                                {/if}
+                            </div>
+                            <p class="text-muted-foreground mt-1 text-sm">{item.description}</p>
+                            {#if !item.currentAvailability.available}
+                                <p class="text-muted-foreground mt-1 text-xs" id={`${id}-${item.name}-reason`}>{item.currentAvailability.reason}</p>
+                            {/if}
                         </div>
-                        {#if item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version}
-                            <Badge variant="secondary">Completed</Badge>
-                        {/if}
-                    </div>
-                    <div class="flex-1">
-                        <h3 class="font-semibold">{item.title}</h3>
-                        <p class="text-muted-foreground mt-1 text-sm">{item.description}</p>
-                        <p class="text-muted-foreground mt-2 text-xs">
-                            {item.name === 'app-overview' ? 'Up to ' : ''}{PRODUCT_TOUR_CHECKPOINTS[item.name].length} steps
-                        </p>
-                        {#if !item.currentAvailability.available}
-                            <p class="text-muted-foreground mt-2 text-xs">{item.currentAvailability.reason}</p>
-                        {/if}
-                    </div>
-                    <Button disabled={!ready || !item.currentAvailability.available} onclick={() => onStart(item.name)} variant="outline">
-                        {resumableTourName === item.name
-                            ? 'Continue'
-                            : activeTourName === item.name || (item.progress?.status === ProductTourStatus.Completed && item.progress.version >= item.version)
-                              ? 'Restart'
-                              : 'Start'}
-                    </Button>
-                </section>
+                        <Button
+                            aria-describedby={!item.currentAvailability.available ? `${id}-${item.name}-reason` : undefined}
+                            aria-label={`${actionLabel} ${item.title}`}
+                            class="col-start-2 min-w-20 justify-self-start sm:col-start-3 sm:row-start-1 sm:self-center pointer-coarse:min-h-11"
+                            disabled={!ready || !item.currentAvailability.available}
+                            onclick={() => onStart(item.name)}
+                            size="sm"
+                            variant="outline"
+                        >
+                            {actionLabel}
+                        </Button>
+                    </section>
+                </li>
             {/each}
-        </div>
+        </ul>
     </Dialog.Content>
 </Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
new file mode 100644
index 0000000000..ae9feeb08f
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
@@ -0,0 +1,55 @@
+import { ProductTourStatus } from '$features/users/models';
+import { fireEvent, render, screen } from '@testing-library/svelte';
+import { describe, expect, it, vi } from 'vitest';
+
+import { getProductTourItems } from '../../catalog';
+import ProductTourCatalogDialog from './product-tour-catalog-dialog.svelte';
+
+describe('ProductTourCatalogDialog', () => {
+    it('distinguishes guides and preserves restart, continue, and unavailable actions', async () => {
+        // Arrange
+        const items = getProductTourItems(
+            { errorEventAvailability: 'empty', isSetupPage: false, organizationId: 'organization', pathname: '/next', projects: [] },
+            { 'app-overview': { status: ProductTourStatus.Completed, version: 1 } }
+        );
+        const onStart = vi.fn(async () => {});
+        render(ProductTourCatalogDialog, { items, onStart, open: true, ready: true, resumableTourName: 'saved-view-create' });
+
+        // Act
+        await fireEvent.click(screen.getByRole('button', { name: 'Restart Explore Exceptionless' }));
+        await fireEvent.click(screen.getByRole('button', { name: 'Continue Create a saved view' }));
+        screen.getByRole('button', { name: 'Start Investigate an error' }).click();
+
+        // Assert
+        expect(onStart.mock.calls).toEqual([['app-overview'], ['saved-view-create']]);
+        expect(screen.getByText('Completed')).toBeTruthy();
+        const unavailable = screen.getByRole('button', { name: 'Start Investigate an error' });
+        expect(unavailable.hasAttribute('disabled')).toBe(true);
+        expect(document.getElementById(unavailable.getAttribute('aria-describedby')!)?.textContent).toContain('Send an error report');
+        expect(screen.getByRole('list', { name: 'Available guides' })).toBeTruthy();
+        expect(screen.getAllByRole('listitem')).toHaveLength(5);
+        const icons = items.map((item) => {
+            const icon = screen.getByRole('region', { name: item.title }).querySelector('svg');
+            expect(icon?.getAttribute('aria-hidden')).toBe('true');
+            return icon?.innerHTML;
+        });
+        expect(new Set(icons).size).toBe(5);
+    });
+
+    it('keeps the picker focused on outcomes without step counts or documentation detours', () => {
+        // Arrange
+        const items = getProductTourItems({ errorEventAvailability: 'empty', isSetupPage: false, pathname: '/next', projects: [] });
+        const onStart = vi.fn();
+
+        // Act
+        render(ProductTourCatalogDialog, { items, onStart, open: true, ready: false });
+
+        // Assert
+        for (const item of items) {
+            expect(screen.getByText(item.description)).toBeTruthy();
+        }
+        expect(screen.queryAllByRole('link')).toHaveLength(0);
+        expect(screen.queryByText(/\d+ steps/)).toBeNull();
+        expect(onStart).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
deleted file mode 100644
index 90e4998c0b..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte
+++ /dev/null
@@ -1,49 +0,0 @@
-<script lang="ts">
-    import { Button } from '$comp/ui/button';
-    import * as Dialog from '$comp/ui/dialog';
-    import Compass from '@lucide/svelte/icons/compass';
-
-    import type { ProductTourListItem } from '../../types';
-
-    interface Props {
-        busy?: boolean;
-        onBrowse: () => Promise<void>;
-        onDismiss: () => Promise<void>;
-        onStart: () => Promise<void>;
-        open?: boolean;
-        recommended: ProductTourListItem;
-    }
-
-    let { busy = false, onBrowse, onDismiss, onStart, open = $bindable(false), recommended }: Props = $props();
-
-    async function onOpenChange(nextOpen: boolean): Promise<void> {
-        if (!nextOpen && open && !busy) {
-            await onDismiss();
-        }
-    }
-</script>
-
-<Dialog.Root {open} {onOpenChange}>
-    <Dialog.Content class="sm:max-w-lg" data-product-tour-overlay>
-        <Dialog.Header>
-            <div class="bg-primary/10 text-primary mb-2 flex size-11 items-center justify-center rounded-xl">
-                <Compass aria-hidden="true" />
-            </div>
-            <Dialog.Title>Welcome to Exceptionless</Dialog.Title>
-            <Dialog.Description>Take a short guided tour now, or browse the guides whenever you need them.</Dialog.Description>
-        </Dialog.Header>
-
-        <section class="border-border bg-muted/30 rounded-lg border p-4">
-            <p class="text-sm font-semibold">Recommended: {recommended.title}</p>
-            <p class="text-muted-foreground mt-1 text-sm">{recommended.description}</p>
-        </section>
-
-        <Dialog.Footer class="gap-2 sm:justify-between">
-            <Button disabled={busy} onclick={onDismiss} variant="ghost">Skip</Button>
-            <div class="flex flex-col-reverse gap-2 sm:flex-row">
-                <Button disabled={busy} onclick={onBrowse} variant="outline">Browse Guides</Button>
-                <Button disabled={busy} onclick={onStart}>{recommended.name === 'project-configure' ? 'Continue setup' : 'Explore Exceptionless'}</Button>
-            </div>
-        </Dialog.Footer>
-    </Dialog.Content>
-</Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
deleted file mode 100644
index ffb99d649f..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-welcome-dialog.svelte.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/svelte';
-import { describe, expect, it, vi } from 'vitest';
-
-import ProductTourWelcomeDialog from './product-tour-welcome-dialog.svelte';
-
-const recommended = {
-    availability: vi.fn(() => ({ available: true })),
-    currentAvailability: { available: true },
-    description: 'Learn navigation and search.',
-    keywords: ['navigation'],
-    name: 'app-overview' as const,
-    start: vi.fn(() => ({ checkpointName: 'navigation' as const, route: '/next' })),
-    title: 'Explore Exceptionless',
-    version: 1
-};
-
-describe('ProductTourWelcomeDialog', () => {
-    it('records dismissal from Escape', async () => {
-        const onBrowse = vi.fn();
-        const onDismiss = vi.fn();
-        const onStart = vi.fn();
-        render(ProductTourWelcomeDialog, { onBrowse, onDismiss, onStart, open: true, recommended });
-
-        await fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' });
-        expect(onBrowse).not.toHaveBeenCalled();
-        expect(onDismiss).toHaveBeenCalledOnce();
-        expect(onStart).not.toHaveBeenCalled();
-    });
-
-    it('provides Browse Guides and Skip choices', async () => {
-        const onBrowse = vi.fn();
-        const onDismiss = vi.fn();
-        render(ProductTourWelcomeDialog, { onBrowse, onDismiss, onStart: vi.fn(), open: true, recommended });
-
-        await fireEvent.click(screen.getByRole('button', { name: 'Browse Guides' }));
-        expect(onBrowse).toHaveBeenCalledOnce();
-        await fireEvent.click(screen.getByRole('button', { name: 'Skip' }));
-        expect(onDismiss).toHaveBeenCalledOnce();
-    });
-});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
new file mode 100644
index 0000000000..e832696fcf
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
@@ -0,0 +1,35 @@
+<script lang="ts" module>
+    import type { KeyboardShortcut } from '$features/shared/keyboard-shortcuts';
+
+    export interface ProductTourShortcut {
+        label: string;
+        shortcut: KeyboardShortcut;
+    }
+</script>
+
+<script lang="ts">
+    import type { Snippet } from 'svelte';
+
+    import * as Kbd from '$comp/ui/kbd';
+    import { formatKeyboardShortcut } from '$features/shared/keyboard-shortcuts';
+
+    let { description, shortcuts = [] }: { description: Snippet | string; shortcuts?: ProductTourShortcut[] } = $props();
+</script>
+
+<p>
+    {#if typeof description === 'string'}
+        {description}
+    {:else}
+        {@render description()}
+    {/if}
+</p>
+{#if shortcuts.length}
+    <div class="mt-2 flex flex-wrap items-center gap-x-3 gap-y-2">
+        {#each shortcuts as { label, shortcut } (label)}
+            <span class="inline-flex items-center gap-1.5 text-xs">
+                {label}
+                <Kbd.Root>{formatKeyboardShortcut(shortcut.keys)}</Kbd.Root>
+            </span>
+        {/each}
+    </div>
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
index 732482c2f1..16af7af542 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
@@ -28,7 +28,7 @@
                     <Alert.Title>New: Meet Exie</Alert.Title>
                     <p class="text-muted-foreground mt-1 text-sm">
                         {hasAccess
-                            ? 'See how Exie uses the page you are viewing as context for investigations.'
+                            ? 'Take a short guide to Exie, your AI assistant for investigating errors.'
                             : (message ?? 'Exie is available with an eligible organization plan.')}
                     </p>
                 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 86477f0dd8..afe7296b94 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -18,9 +18,9 @@
     import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from '../eligibility';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourCatalogDialog from './dialogs/product-tour-catalog-dialog.svelte';
-    import ProductTourWelcomeDialog from './dialogs/product-tour-welcome-dialog.svelte';
     import ProductTourFeatureAnnouncement from './product-tour-feature-announcement.svelte';
     import ProductTourShellSpotlight from './product-tour-shell-spotlight.svelte';
+    import ProductTourWelcome from './product-tour-welcome.svelte';
 
     interface Props {
         assistantAccess?: AssistantAccess;
@@ -248,7 +248,11 @@
         }
     });
 
-    export function openCatalog(source: ProductTourLaunchSource = 'catalog'): void {
+    export async function openCatalog(source: ProductTourLaunchSource = 'catalog'): Promise<void> {
+        const active = checkpoint;
+        if (active?.tourName === 'app-overview' && active.checkpointName === 'help' && !(await actions.complete(active))) {
+            return;
+        }
         closeOverlays();
         checkErrorAvailability = true;
         catalogSource = source;
@@ -261,7 +265,7 @@
         }
         const item = getItem(name);
         if (!item.currentAvailability.available) {
-            openCatalog(source);
+            await openCatalog(source);
             return;
         }
 
@@ -278,7 +282,10 @@
 
         closeOverlays();
         catalogOpen = false;
-        const start = item.start(context);
+        const start = item.start({
+            ...context,
+            search: window.location.search
+        });
         const next = productTourCheckpoint.start(name, start.checkpointName, source, currentUser.id, item.version, organizationId);
         void track('started', name, item.version, source);
 
@@ -329,7 +336,7 @@
         welcomeHandled = true;
         automaticSurface = undefined;
         void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
-        openCatalog('catalog');
+        await openCatalog('catalog');
     }
 
     async function onWelcomeSkip(): Promise<void> {
@@ -404,7 +411,7 @@
     }
 </script>
 
-<ProductTourWelcomeDialog
+<ProductTourWelcome
     busy={progressMutation.isPending}
     open={welcomeOpen}
     onBrowse={onWelcomeBrowse}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
deleted file mode 100644
index 408aa47e3d..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-inline-callout.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts">
-    import * as Alert from '$comp/ui/alert';
-    import { Button } from '$comp/ui/button';
-    import Info from '@lucide/svelte/icons/info';
-
-    import type { ProductTourCheckpoint } from '../types';
-
-    import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
-
-    interface Props {
-        checkpoint: ProductTourCheckpoint;
-        continueLabel?: string;
-        description: string;
-        onContinue?: () => Promise<void> | void;
-        onDismiss: () => Promise<void> | void;
-        title: string;
-    }
-
-    let { checkpoint, continueLabel = 'Continue', description, onContinue, onDismiss, title }: Props = $props();
-    const checkpoints = $derived<readonly string[]>(PRODUCT_TOUR_CHECKPOINTS[checkpoint.tourName]);
-    const stepNumber = $derived(checkpoints.indexOf(checkpoint.checkpointName) + 1);
-</script>
-
-<Alert.Root data-product-tour-inline={checkpoint.tourName}>
-    <Info aria-hidden="true" />
-    <Alert.Title>{title}</Alert.Title>
-    <Alert.Description>
-        <span class="text-muted-foreground mb-1 block text-xs">Step {stepNumber} of {checkpoints.length}</span>
-        {description}
-        <div class="mt-2 flex flex-wrap gap-2">
-            {#if onContinue}
-                <Button onclick={onContinue} size="sm" type="button">{continueLabel}</Button>
-            {/if}
-            <Button onclick={onDismiss} size="sm" type="button" variant="outline">End guide</Button>
-        </div>
-    </Alert.Description>
-</Alert.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
index 802234c706..f45b3d017a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
     import type { AssistantAccess } from '$features/assistant/models';
 
+    import { appKeyboardShortcuts } from '$features/shared/keyboard-shortcuts';
     import { onDestroy, onMount, tick, untrack } from 'svelte';
 
     import type { ProductTourCheckpoint, ProductTourCheckpointName } from '../types';
+    import type { ProductTourShortcut } from './product-tour-description.svelte';
 
     import { createProductTourActions } from '../actions.svelte';
+    import { tryUseProductTourControls } from '../controls.svelte';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourSpotlight from './product-tour-spotlight.svelte';
 
@@ -22,24 +25,26 @@
         checkpointName: ProductTourCheckpointName;
         description: string;
         mobileNavigation?: boolean;
+        shortcuts?: ProductTourShortcut[];
         target: string;
         title: string;
     }
 
     let { assistantAccess, checkpoint, isAnyOverlayOpen, isMobile, openAssistant, setMobileNavigationOpen }: Props = $props();
+    const controls = tryUseProductTourControls();
     const currentAssistantAccess = untrack(() => assistantAccess);
     const currentCheckpoint = untrack(() => checkpoint);
     const actions = createProductTourActions();
     const exieOverviewSteps: ShellStep[] = [
         {
             checkpointName: 'open-exie',
-            description: 'Open Exie to see the page context available for your next question.',
+            description: 'Open Exie to see which page details it can use to answer your question.',
             target: '[data-tour="exie-trigger"]',
             title: 'Open Exie'
         },
         {
             checkpointName: 'exie-context',
-            description: 'Nothing is sent until you choose a prompt. Submitted requests use metered provider usage.',
+            description: 'The guide does not send an AI request. Sending a message or choosing a suggested question counts as AI usage.',
             target: '[data-tour="exie-panel"]',
             title: 'You control every request'
         }
@@ -47,29 +52,45 @@
     const appOverviewSteps: ShellStep[] = [
         {
             checkpointName: 'navigation',
-            description: 'Move between dashboards, saved views, and settings from the application navigation.',
+            description: 'Use Stacks for grouped issues and Events for individual occurrences. Switch views in the sidebar.',
             mobileNavigation: true,
+            shortcuts: [
+                {
+                    label: 'Stacks',
+                    shortcut: appKeyboardShortcuts.stacks
+                },
+                {
+                    label: 'Events',
+                    shortcut: appKeyboardShortcuts.allEvents
+                }
+            ],
             target: '[data-tour="app-navigation"]',
             title: 'Your workspace navigation'
         },
         {
             checkpointName: 'command-search',
-            description: 'Open search or press / to jump to pages, projects, events, stacks, and actions.',
+            description: 'Select Search at the top of the page to find pages, projects, events, and actions. Close it to return to this guide.',
+            shortcuts: [
+                {
+                    label: 'Search',
+                    shortcut: appKeyboardShortcuts.commandPalette
+                }
+            ],
             target: '[data-tour="command-search"]',
-            title: 'Find anything quickly'
+            title: 'Use the command palette'
         },
         {
             checkpointName: 'saved-views',
-            description: 'Saved views preserve filters, time, sorting, charts, stats, and columns for quick reuse.',
+            description: 'Expand Stacks or Events to find views. Choose one to restore saved filters and layout, or Continue to keep exploring.',
             mobileNavigation: true,
             target: '[data-tour="saved-view-navigation"]',
-            title: 'Reuse configured views'
+            title: 'Find your saved views'
         },
         ...(currentAssistantAccess?.has_access
             ? [
                   {
                       checkpointName: 'exie' as const,
-                      description: 'Exie can investigate the page or error you are viewing. You decide whether to send a prompt.',
+                      description: 'Exie can help investigate this page or error. You choose whether to send an AI request.',
                       target: '[data-tour="exie-trigger"]',
                       title: 'Ask Exie with context'
                   }
@@ -77,26 +98,48 @@
             : []),
         {
             checkpointName: 'help',
-            description: 'Open Help for documentation, support, keyboard shortcuts, and guided tours.',
+            description: 'This is Guided Tours, under your name → Help. Open it whenever you want to try another guide or restart one.',
             mobileNavigation: true,
+            shortcuts: [
+                {
+                    label: 'User menu',
+                    shortcut: appKeyboardShortcuts.userMenu
+                },
+                {
+                    label: 'All shortcuts',
+                    shortcut: appKeyboardShortcuts.keyboardShortcuts
+                }
+            ],
             target: '[data-tour="help-menu"]',
-            title: 'Help is always nearby'
+            title: 'Find your next guide'
         }
     ];
     const steps = currentCheckpoint.tourName === 'app-overview' ? appOverviewSteps : exieOverviewSteps;
     const spotlight = steps.find((step) => step.checkpointName === currentCheckpoint.checkpointName);
+    const stepIndex = steps.findIndex((step) => step.checkpointName === currentCheckpoint.checkpointName);
     let targetReady = $state(false);
+    const isHelpStep = currentCheckpoint.tourName === 'app-overview' && currentCheckpoint.checkpointName === 'help';
+    const helpTarget = $derived(isHelpStep ? controls?.getGuidedToursTarget() : undefined);
 
     onMount(async () => {
-        setMobileNavigationOpen(spotlight?.mobileNavigation ?? false);
+        if (isMobile || spotlight?.mobileNavigation) {
+            setMobileNavigationOpen(spotlight?.mobileNavigation ?? false);
+        }
+
         if (isMobile && spotlight?.mobileNavigation) {
             await tick();
         }
+
+        if (isHelpStep) {
+            await controls?.showGuidedToursMenu();
+        }
         targetReady = true;
     });
 
     onDestroy(() => {
-        setMobileNavigationOpen(false);
+        if (isMobile) {
+            setMobileNavigationOpen(false);
+        }
     });
 
     async function advance(): Promise<void> {
@@ -106,26 +149,65 @@
             return;
         }
 
-        const index = steps.findIndex((step) => step.checkpointName === currentCheckpoint.checkpointName);
-        const next = steps[index + 1];
+        const next = steps[stepIndex + 1];
         if (next) {
             productTourCheckpoint.advance(currentCheckpoint, next.checkpointName);
             return;
         }
 
-        await actions.complete(currentCheckpoint);
+        if (isHelpStep) {
+            if (helpTarget) {
+                controls?.openCatalog();
+            } else {
+                await controls?.showGuidedToursMenu();
+            }
+        } else {
+            await actions.complete(currentCheckpoint);
+        }
+    }
+
+    function back(): void {
+        const previous = steps[stepIndex - 1];
+        if (previous) {
+            if (isHelpStep) {
+                controls?.closeOverlays();
+            }
+            productTourCheckpoint.advance(currentCheckpoint, previous.checkpointName);
+        }
+    }
+
+    async function dismiss(): Promise<boolean> {
+        const dismissed = await actions.dismiss(currentCheckpoint);
+        if (dismissed && isHelpStep) {
+            controls?.closeOverlays();
+        }
+        return dismissed;
     }
 </script>
 
-{#if spotlight && targetReady && (!isAnyOverlayOpen || checkpoint.tourName === 'exie-overview')}
-    <ProductTourSpotlight
-        checkpoint={currentCheckpoint}
-        description={spotlight.description}
-        onDismiss={actions.dismiss}
-        onNext={advance}
-        stepCount={steps.length}
-        stepNumber={steps.indexOf(spotlight) + 1}
-        target={spotlight.target}
-        title={spotlight.title}
-    />
+{#if spotlight && targetReady && (!isAnyOverlayOpen || helpTarget || checkpoint.tourName === 'exie-overview')}
+    {#key helpTarget}
+        <ProductTourSpotlight
+            checkpoint={currentCheckpoint}
+            continueLabel={stepIndex === steps.length - 1
+                ? checkpoint.tourName === 'app-overview'
+                    ? helpTarget
+                        ? 'Browse guides'
+                        : 'Show me where'
+                    : 'Finish guide'
+                : checkpoint.tourName === 'exie-overview'
+                  ? 'Open Exie'
+                  : 'Continue'}
+            description={spotlight.description}
+            onDismiss={dismiss}
+            onNext={advance}
+            onPrevious={checkpoint.tourName === 'app-overview' && stepIndex > 0 ? back : undefined}
+            shortcuts={spotlight.shortcuts}
+            side={isHelpStep ? 'top' : undefined}
+            stepCount={steps.length}
+            stepNumber={stepIndex + 1}
+            target={helpTarget ?? spotlight.target}
+            title={spotlight.title}
+        />
+    {/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index fefcbc1755..904101e603 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -1,20 +1,24 @@
 <script lang="ts">
     import { driver, type Driver } from 'driver.js';
-    import { onMount } from 'svelte';
+    import { mount, onMount, type Snippet, tick, unmount } from 'svelte';
     import { toast } from 'svelte-sonner';
 
     import type { ProductTourCheckpoint } from '../types';
 
     import { productTourCheckpoint } from '../state.svelte';
     import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
+    import ProductTourDescription, { type ProductTourShortcut } from './product-tour-description.svelte';
     import 'driver.js/dist/driver.css';
 
     interface Props {
         checkpoint: ProductTourCheckpoint;
         continueLabel?: string;
-        description: string;
+        description: Snippet | string;
         onDismiss: (checkpoint: ProductTourCheckpoint) => Promise<boolean>;
         onNext?: (checkpoint: ProductTourCheckpoint) => Promise<void> | void;
+        onPrevious?: (checkpoint: ProductTourCheckpoint) => void;
+        shortcuts?: ProductTourShortcut[];
+        showProgress?: boolean;
         side?: 'bottom' | 'left' | 'right' | 'top';
         stepCount?: number;
         stepNumber?: number;
@@ -22,12 +26,55 @@
         title: string;
     }
 
-    let { checkpoint, continueLabel = 'Continue', description, onDismiss, onNext, side, stepCount, stepNumber, target, title }: Props = $props();
+    let {
+        checkpoint,
+        continueLabel = 'Continue',
+        description,
+        onDismiss,
+        onNext,
+        onPrevious,
+        shortcuts,
+        showProgress = true,
+        side,
+        stepCount,
+        stepNumber,
+        target,
+        title
+    }: Props = $props();
     let activeDriver: Driver | undefined;
+    let descriptionContent: ReturnType<typeof mount> | undefined;
     let dismissing = false;
     let returnFocus: HTMLElement | null = null;
 
     onMount(() => {
+        let cancelled = false;
+        let resizeObserver: ResizeObserver | undefined;
+        let frame: number | undefined;
+        void tick().then(() => {
+            if (cancelled) {
+                return;
+            }
+            initialize();
+            const element = activeDriver?.getActiveElement();
+            if (element) {
+                resizeObserver = new ResizeObserver(() => activeDriver?.refresh());
+                resizeObserver.observe(element);
+            }
+            frame = requestAnimationFrame(() => activeDriver?.refresh());
+        });
+
+        return () => {
+            cancelled = true;
+            resizeObserver?.disconnect();
+            if (frame !== undefined) {
+                cancelAnimationFrame(frame);
+            }
+            window.removeEventListener('keydown', onKeyDown, true);
+            destroy();
+        };
+    });
+
+    function initialize(): void {
         const element = typeof target === 'string' ? document.querySelector(target) : target;
         if (!element) {
             productTourCheckpoint.clear(checkpoint);
@@ -41,6 +88,8 @@
         const totalSteps = stepCount ?? checkpoints.length;
         const instance = driver({
             allowClose: true,
+            // Handle keys on keydown so an Escape that closes another overlay cannot end the resumed guide on keyup.
+            allowKeyboardControl: false,
             animate: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
             disableActiveInteraction: false,
             onCloseClick: () => {
@@ -50,27 +99,38 @@
                 void dismiss();
             },
             onPopoverRender: (popover) => {
-                popover.closeButton.textContent = 'End guide';
+                popover.wrapper.style.display = 'grid';
                 popover.closeButton.setAttribute('aria-label', 'End guide');
                 popover.closeButton.setAttribute('title', 'End guide');
-                popover.progress.textContent = `Step ${currentStepNumber} of ${totalSteps}`;
+                popover.progress.textContent = showProgress ? `Step ${currentStepNumber} of ${totalSteps}` : '';
+                popover.description.replaceChildren();
+                popover.description.style.display = 'block';
+                descriptionContent = mount(ProductTourDescription, {
+                    props: {
+                        description,
+                        shortcuts
+                    },
+                    target: popover.description
+                });
             },
             overlayClickBehavior: () => {},
             popoverClass: 'product-tour-popover',
-            showProgress: true,
+            showProgress,
             smoothScroll: !window.matchMedia('(prefers-reduced-motion: reduce)').matches,
             steps: [
                 {
                     element,
                     popover: {
-                        description,
+                        disableButtons: [],
                         doneBtnText: continueLabel,
                         onNextClick: onNext
                             ? async () => {
                                   await onNext(checkpoint);
                               }
                             : undefined,
-                        showButtons: onNext ? ['close', 'next'] : ['close'],
+                        onPrevClick: onPrevious ? () => onPrevious(checkpoint) : undefined,
+                        prevBtnText: 'Back',
+                        showButtons: ['close', ...(onPrevious ? ['previous' as const] : []), ...(onNext ? ['next' as const] : [])],
                         side,
                         title
                     }
@@ -79,9 +139,27 @@
         });
         activeDriver = instance;
         instance.drive();
+        window.addEventListener('keydown', onKeyDown, true);
+    }
 
-        return destroyImmediately;
-    });
+    function onKeyDown(event: KeyboardEvent): void {
+        if (event.defaultPrevented || event.repeat || !activeDriver) {
+            return;
+        }
+
+        if (event.key === 'Escape') {
+            event.preventDefault();
+            void dismiss();
+        } else if (event.target instanceof HTMLButtonElement && event.target.closest('.product-tour-popover')) {
+            if (event.key === 'ArrowLeft' && onPrevious) {
+                event.preventDefault();
+                onPrevious(checkpoint);
+            } else if (event.key === 'ArrowRight' && onNext) {
+                event.preventDefault();
+                void onNext(checkpoint);
+            }
+        }
+    }
 
     async function dismiss(): Promise<void> {
         if (dismissing || !activeDriver) {
@@ -99,6 +177,10 @@
     function destroy(): void {
         const instance = activeDriver;
         activeDriver = undefined;
+        if (descriptionContent) {
+            void unmount(descriptionContent);
+            descriptionContent = undefined;
+        }
         instance?.setConfig({
             ...instance.getConfig(),
             onDestroyStarted: undefined
@@ -106,14 +188,13 @@
         instance?.destroy();
         queueMicrotask(() => returnFocus?.focus());
     }
-
-    function destroyImmediately(): void {
-        destroy();
-    }
 </script>
 
 <style>
     :global(.product-tour-popover.driver-popover) {
+        grid-template-columns: minmax(0, 1fr) auto;
+        column-gap: 0.5rem;
+        padding: 0.75rem;
         max-width: min(24rem, calc(100vw - 2rem));
         border: 1px solid var(--border);
         border-radius: var(--radius-lg);
@@ -123,10 +204,17 @@
     }
 
     :global(.product-tour-popover .driver-popover-title) {
+        grid-column: 1;
+        grid-row: 1;
+        align-self: center;
         color: var(--popover-foreground);
         font-size: 1rem;
         font-weight: 600;
-        padding-right: 5.5rem;
+    }
+
+    :global(.product-tour-popover .driver-popover-description),
+    :global(.product-tour-popover .driver-popover-footer) {
+        grid-column: 1 / -1;
     }
 
     :global(.product-tour-popover .driver-popover-description),
@@ -135,9 +223,10 @@
     }
 
     :global(.product-tour-popover .driver-popover-close-btn),
+    :global(.product-tour-popover .driver-popover-prev-btn),
     :global(.product-tour-popover .driver-popover-next-btn) {
-        min-width: 2.75rem;
-        min-height: 2.75rem;
+        min-width: 2rem;
+        min-height: 2rem;
         border-color: var(--border);
         border-radius: var(--radius-md);
         background: var(--background);
@@ -146,12 +235,47 @@
         text-shadow: none;
     }
 
+    :global(.product-tour-popover .driver-popover-prev-btn) {
+        border-color: transparent;
+        background: transparent;
+        color: var(--muted-foreground);
+        padding: 0.375rem 0.75rem;
+    }
+
+    :global(.product-tour-popover .driver-popover-prev-btn:hover) {
+        background: var(--accent);
+        color: var(--accent-foreground);
+    }
+
     :global(.product-tour-popover .driver-popover-close-btn) {
-        top: 0.25rem;
-        right: 0.25rem;
-        width: auto;
-        padding: 0.5rem;
-        font-size: 0.75rem;
+        position: static;
+        grid-column: 2;
+        grid-row: 1;
+        align-self: start;
+        width: 2rem;
+        height: 2rem;
+        background: transparent;
+        color: var(--muted-foreground);
+        font-size: 1.25rem;
+    }
+
+    :global(.product-tour-popover .driver-popover-next-btn) {
+        padding: 0.375rem 0.75rem;
+        font-size: 0.8125rem;
+    }
+
+    :global(.product-tour-popover .driver-popover-close-btn:hover) {
+        background: var(--accent);
+        color: var(--accent-foreground);
+    }
+
+    @media (pointer: coarse) {
+        :global(.product-tour-popover .driver-popover-close-btn),
+        :global(.product-tour-popover .driver-popover-prev-btn),
+        :global(.product-tour-popover .driver-popover-next-btn) {
+            min-width: 2.75rem;
+            min-height: 2.75rem;
+        }
     }
 
     :global(.product-tour-popover button:focus-visible) {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
new file mode 100644
index 0000000000..6699ecb1de
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
@@ -0,0 +1,98 @@
+import { appKeyboardShortcuts } from '$features/shared/keyboard-shortcuts';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { ProductTourCheckpoint } from '../types';
+
+import ProductTourSpotlight from './product-tour-spotlight.svelte';
+
+const checkpoint: ProductTourCheckpoint = { checkpointName: 'command-search', source: 'catalog', tourName: 'app-overview', userId: 'user', version: 1 };
+
+describe('ProductTourSpotlight', () => {
+    let target: HTMLButtonElement;
+
+    beforeEach(() => {
+        vi.stubGlobal(
+            'ResizeObserver',
+            class {
+                disconnect() {}
+                observe() {}
+            }
+        );
+        target = document.createElement('button');
+        target.scrollIntoView = vi.fn();
+        document.body.append(target);
+    });
+
+    afterEach(() => {
+        cleanup();
+        target.remove();
+        vi.unstubAllGlobals();
+    });
+
+    it('renders safe text and the shared Kbd component in the driver popover', async () => {
+        // Arrange / Act
+        render(ProductTourSpotlight, {
+            props: {
+                checkpoint,
+                description: 'Search <not markup>',
+                onDismiss: vi.fn(async () => true),
+                shortcuts: [{ label: 'Search', shortcut: appKeyboardShortcuts.commandPalette }],
+                target,
+                title: 'Search'
+            }
+        });
+
+        // Assert
+        expect(await screen.findByText('Search <not markup>')).toBeTruthy();
+        const key = screen.getByText('/');
+        expect(key.tagName).toBe('KBD');
+        expect(key.getAttribute('data-slot')).toBe('kbd');
+        expect(screen.queryByRole('button', { name: 'Back' })).toBeNull();
+        expect(screen.getByText('Step 2 of 5')).toBeTruthy();
+        cleanup();
+        expect(document.querySelector('.product-tour-popover')).toBeNull();
+    });
+
+    it('omits progress when checkpoints include work outside the guide', async () => {
+        // Arrange / Act
+        render(ProductTourSpotlight, {
+            props: { checkpoint, description: 'Choose a platform', onDismiss: vi.fn(async () => true), showProgress: false, target, title: 'Setup' }
+        });
+
+        // Assert
+        expect(await screen.findByText('Choose a platform')).toBeTruthy();
+        expect(screen.queryByText(/Step \d of \d/)).toBeNull();
+        expect(screen.getByRole('button', { name: 'End guide' })).toBeTruthy();
+    });
+
+    it('enables Back only when the caller provides a safe previous step', async () => {
+        // Arrange
+        const onPrevious = vi.fn();
+        const onNext = vi.fn();
+        render(ProductTourSpotlight, {
+            props: { checkpoint, description: 'Search', onDismiss: vi.fn(async () => true), onNext, onPrevious, target, title: 'Search' }
+        });
+        const back = await screen.findByRole('button', { name: 'Back' });
+
+        // Act
+        await fireEvent.click(back);
+
+        // Assert
+        expect(back.hasAttribute('disabled')).toBe(false);
+        expect(onPrevious).toHaveBeenCalledExactlyOnceWith(checkpoint);
+        expect(onNext).not.toHaveBeenCalled();
+    });
+
+    it('ignores Escape keyup from a closing overlay but handles a fresh Escape press', async () => {
+        // Arrange
+        const onDismiss = vi.fn(async () => true);
+        render(ProductTourSpotlight, { props: { checkpoint, description: 'Search', onDismiss, target, title: 'Search' } });
+
+        // Act / Assert
+        await fireEvent.keyUp(window, { key: 'Escape' });
+        expect(onDismiss).not.toHaveBeenCalled();
+        await fireEvent.keyDown(window, { key: 'Escape' });
+        expect(onDismiss).toHaveBeenCalledExactlyOnceWith(checkpoint);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
new file mode 100644
index 0000000000..61e091d8cf
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
@@ -0,0 +1,48 @@
+<script lang="ts">
+    import * as Alert from '$comp/ui/alert';
+    import { Button } from '$comp/ui/button';
+    import X from '@lucide/svelte/icons/x';
+
+    import type { ProductTourListItem } from '../types';
+
+    interface Props {
+        busy?: boolean;
+        onBrowse: () => Promise<void>;
+        onDismiss: () => Promise<void>;
+        onStart: () => Promise<void>;
+        open?: boolean;
+        recommended: ProductTourListItem;
+    }
+
+    let { busy = false, onBrowse, onDismiss, onStart, open = false, recommended }: Props = $props();
+
+    async function onKeydown(event: KeyboardEvent): Promise<void> {
+        if (event.key === 'Escape' && !busy) {
+            event.stopPropagation();
+            await onDismiss();
+        }
+    }
+</script>
+
+{#if open}
+    <Alert.Root
+        aria-label="Welcome to Exceptionless"
+        aria-live="polite"
+        class="motion-safe:animate-in motion-safe:fade-in-0 motion-safe:slide-in-from-bottom-2 fixed right-4 bottom-4 z-40 w-[min(24rem,calc(100vw-2rem))] p-4 shadow-lg motion-safe:duration-200"
+        data-product-tour-welcome
+        onkeydown={onKeydown}
+        role="region"
+    >
+        <div class="flex items-center justify-between gap-2">
+            <Alert.Title><h2>Welcome to Exceptionless</h2></Alert.Title>
+            <Button aria-label="Close welcome" class="-my-2 -mr-2 size-11 shrink-0" disabled={busy} onclick={onDismiss} size="icon" variant="ghost">
+                <X aria-hidden="true" />
+            </Button>
+        </div>
+        <Alert.Description class="mt-1">{recommended.description}</Alert.Description>
+        <div class="mt-3 flex flex-wrap items-center gap-2">
+            <Button disabled={busy} onclick={onStart} size="sm">{recommended.name === 'project-configure' ? 'Continue setup' : recommended.title}</Button>
+            <Button disabled={busy} onclick={onBrowse} size="sm" variant="ghost">Browse guides</Button>
+        </div>
+    </Alert.Root>
+{/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts
new file mode 100644
index 0000000000..c979c38ee0
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts
@@ -0,0 +1,90 @@
+import { fireEvent, render, screen } from '@testing-library/svelte';
+import { describe, expect, it, vi } from 'vitest';
+
+import ProductTourWelcome from './product-tour-welcome.svelte';
+
+const recommended = {
+    availability: vi.fn(() => ({ available: true })),
+    currentAvailability: { available: true },
+    description: 'Learn navigation and search.',
+    keywords: ['navigation'],
+    name: 'app-overview' as const,
+    start: vi.fn(() => ({ checkpointName: 'navigation' as const, route: '/next' })),
+    title: 'Explore Exceptionless',
+    version: 1
+};
+
+describe('ProductTourWelcome', () => {
+    it('records dismissal from Escape inside the welcome', async () => {
+        const onBrowse = vi.fn();
+        const onDismiss = vi.fn();
+        const onStart = vi.fn();
+        render(ProductTourWelcome, { onBrowse, onDismiss, onStart, open: true, recommended });
+
+        await fireEvent.keyDown(screen.getByRole('button', { name: 'Close welcome' }), { key: 'Escape' });
+        expect(onBrowse).not.toHaveBeenCalled();
+        expect(onDismiss).toHaveBeenCalledOnce();
+        expect(onStart).not.toHaveBeenCalled();
+    });
+
+    it('provides browse and close choices', async () => {
+        const onBrowse = vi.fn();
+        const onDismiss = vi.fn();
+        render(ProductTourWelcome, { onBrowse, onDismiss, onStart: vi.fn(), open: true, recommended });
+
+        await fireEvent.click(screen.getByRole('button', { name: 'Browse guides' }));
+        expect(onBrowse).toHaveBeenCalledOnce();
+        await fireEvent.click(screen.getByRole('button', { name: 'Close welcome' }));
+        expect(onDismiss).toHaveBeenCalledOnce();
+    });
+
+    it('offers only the recommended action without a modal or taking focus', async () => {
+        // Arrange
+        const onStart = vi.fn();
+        const focusedElement = document.activeElement;
+
+        // Act
+        render(ProductTourWelcome, { onBrowse: vi.fn(), onDismiss: vi.fn(), onStart, open: true, recommended });
+
+        // Assert
+        expect(screen.getByRole('region', { name: 'Welcome to Exceptionless' })).toBeTruthy();
+        expect(screen.queryByRole('dialog')).toBeNull();
+        expect(document.activeElement).toBe(focusedElement);
+        expect(screen.getAllByRole('button')).toHaveLength(3);
+        expect(screen.getByText(recommended.description)).toBeTruthy();
+        await fireEvent.click(screen.getByRole('button', { name: recommended.title }));
+        expect(onStart).toHaveBeenCalledOnce();
+    });
+
+    it('offers setup when that is the recommendation', () => {
+        render(ProductTourWelcome, {
+            onBrowse: vi.fn(),
+            onDismiss: vi.fn(),
+            onStart: vi.fn(),
+            open: true,
+            recommended: { ...recommended, name: 'project-configure', title: 'Configure a project' }
+        });
+
+        expect(screen.getByRole('button', { name: 'Continue setup' })).toBeTruthy();
+        expect(screen.queryByRole('button', { name: 'Explore Exceptionless' })).toBeNull();
+    });
+
+    it('does not dismiss unrelated Escape presses or allow actions while saving', async () => {
+        const onDismiss = vi.fn();
+        render(ProductTourWelcome, { busy: true, onBrowse: vi.fn(), onDismiss, onStart: vi.fn(), open: true, recommended });
+
+        await fireEvent.keyDown(document.body, { key: 'Escape' });
+        await fireEvent.keyDown(screen.getByRole('button', { name: 'Close welcome' }), { key: 'Escape' });
+
+        expect(onDismiss).not.toHaveBeenCalled();
+        for (const button of screen.getAllByRole('button')) {
+            expect(button.hasAttribute('disabled')).toBe(true);
+        }
+    });
+
+    it('does not render when closed', () => {
+        render(ProductTourWelcome, { onBrowse: vi.fn(), onDismiss: vi.fn(), onStart: vi.fn(), recommended });
+
+        expect(screen.queryByRole('region')).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
index d3dfd36e30..49a9100c1c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
@@ -7,22 +7,35 @@
 
     interface Props {
         closeMenu: () => void;
+        isMenuOpen: boolean;
         openMenu: () => void;
-        openSaveDialog: () => void;
+        openSaveDialog: () => Promise<void>;
     }
 
-    let { closeMenu, openMenu, openSaveDialog }: Props = $props();
+    let { closeMenu, isMenuOpen, openMenu, openSaveDialog }: Props = $props();
     let completionPending = $state(false);
     const actions = createProductTourActions();
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'saved-view-create' ? productTourCheckpoint.current : undefined);
 
+    $effect(() => {
+        if (isMenuOpen && checkpoint?.checkpointName === 'open-view-menu') {
+            productTourCheckpoint.advance(checkpoint, 'review-settings');
+        }
+    });
+
+    export function openingSaveDialog(): void {
+        if (checkpoint?.checkpointName === 'review-settings') {
+            productTourCheckpoint.advance(checkpoint, 'name-view');
+        }
+    }
+
     export function validateSave(isPrivate: boolean): boolean {
         if (!checkpoint) {
             return true;
         }
 
         if (checkpoint.checkpointName !== 'save-view') {
-            toast.error('Continue the guide before creating the practice view.');
+            toast.error('Complete the guide steps before saving your view.');
             return false;
         }
 
@@ -30,7 +43,7 @@
             return true;
         }
 
-        toast.error('Enable Private before creating the guided practice view.');
+        toast.error('Turn on Private so only you can see this view.');
         return false;
     }
 
@@ -72,32 +85,37 @@
 {#if checkpoint?.checkpointName === 'open-view-menu'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Open View settings to review what a reusable saved view can remember."
+        description="Open View to review the settings you can save."
+        continueLabel="Open View"
         onDismiss={actions.dismiss}
-        onNext={(active) => {
-            openMenu();
-            productTourCheckpoint.advance(active, 'review-settings');
-        }}
+        onNext={openMenu}
         target="[data-tour='saved-view-trigger']"
         title="Open View settings"
     />
 {:else if checkpoint?.checkpointName === 'review-settings'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Review the filters, date range, display choices, and columns. The guide will not change them for you."
+        continueLabel="Save As…"
         onDismiss={actions.dismiss}
-        onNext={(active) => {
+        onPrevious={(active) => {
             closeMenu();
-            openSaveDialog();
-            productTourCheckpoint.advance(active, 'name-view');
+            productTourCheckpoint.advance(active, 'open-view-menu');
         }}
-        target="[data-tour='saved-view-settings']"
-        title="Configure what the view remembers"
-    />
+        onNext={async () => {
+            closeMenu();
+            await openSaveDialog();
+        }}
+        target="[data-tour='saved-view-save-as']"
+        title="Save your current view"
+    >
+        {#snippet description()}
+            Select <strong>Save As…</strong> to name a copy of your current filters and layout. Your existing view stays unchanged.
+        {/snippet}
+    </ProductTourSpotlight>
 {:else if checkpoint?.checkpointName === 'name-view'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Choose a meaningful name for the current filters, time range, display options, and columns."
+        description="Choose a name that will help you recognize this view later."
         onDismiss={actions.dismiss}
         onNext={(active) => {
             productTourCheckpoint.advance(active, 'private-view');
@@ -108,8 +126,11 @@
 {:else if checkpoint?.checkpointName === 'private-view'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Enable Private so this guided practice view is visible only to you."
+        description="Keep Private turned on so only you can see this view."
         onDismiss={actions.dismiss}
+        onPrevious={(active) => {
+            productTourCheckpoint.advance(active, 'name-view');
+        }}
         onNext={(active) => {
             productTourCheckpoint.advance(active, 'save-view');
         }}
@@ -119,16 +140,22 @@
 {:else if checkpoint?.checkpointName === 'save-view'}
     <ProductTourSpotlight
         {checkpoint}
-        description="Create the saved view when you are ready. The guide finishes after the view is successfully created and loaded."
         onDismiss={actions.dismiss}
+        onPrevious={(active) => {
+            productTourCheckpoint.advance(active, 'private-view');
+        }}
         target="[data-tour='saved-view-submit']"
         title="Create the saved view"
-    />
+    >
+        {#snippet description()}
+            Select <strong>Save</strong> in the form to create your view and finish the guide.
+        {/snippet}
+    </ProductTourSpotlight>
 {:else if checkpoint?.checkpointName === 'view-created' && !completionPending}
     <ProductTourSpotlight
         {checkpoint}
         continueLabel="Retry guide completion"
-        description="The view was created and loaded, but guide progress could not be saved. Continue to retry."
+        description="Your view is saved. Retry saving your guide progress; this will not create another view."
         onDismiss={actions.dismiss}
         onNext={retry}
         target="[data-tour='saved-view-trigger']"
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/controls.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/controls.svelte.ts
new file mode 100644
index 0000000000..0857f6ecde
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/controls.svelte.ts
@@ -0,0 +1,18 @@
+import { getContext, setContext } from 'svelte';
+
+interface ProductTourControls {
+    closeOverlays: () => void;
+    getGuidedToursTarget: () => HTMLElement | undefined;
+    openCatalog: () => void;
+    showGuidedToursMenu: () => Promise<void>;
+}
+
+const PRODUCT_TOUR_CONTROLS_CONTEXT_KEY = Symbol.for('exceptionless-product-tour-controls');
+
+export function setProductTourControls(controls: ProductTourControls): void {
+    setContext(PRODUCT_TOUR_CONTROLS_CONTEXT_KEY, controls);
+}
+
+export function tryUseProductTourControls(): ProductTourControls | undefined {
+    return getContext<ProductTourControls | undefined>(PRODUCT_TOUR_CONTROLS_CONTEXT_KEY);
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 135b89e1c7..3c77501d6e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -33,6 +33,7 @@ export interface ProductTourContext {
     organizationId?: string;
     pathname: string;
     projects: Pick<ViewProject, 'id' | 'is_configured'>[];
+    search?: string;
 }
 export interface ProductTourDefinition<Name extends ProductTourName = ProductTourName> {
     availability: (context: ProductTourContext) => ProductTourAvailability;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 2040dd7fd5..78a8e7c9c1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -221,6 +221,7 @@
     async function openSaveDialog() {
         await tick();
         isSaveDialogOpen = true;
+        savedViewCreateTour?.openingSaveDialog();
     }
 
     async function openRenameDialog() {
@@ -419,7 +420,7 @@
                     Save
                 </DropdownMenu.Item>
             {/if}
-            <DropdownMenu.Item disabled={saving} onclick={openSaveDialog}>
+            <DropdownMenu.Item data-tour="saved-view-save-as" disabled={saving} onclick={openSaveDialog}>
                 <Plus class="mr-2 size-4" aria-hidden="true" />
                 Save As...
             </DropdownMenu.Item>
@@ -515,8 +516,9 @@
 <SavedViewCreateTour
     bind:this={savedViewCreateTour}
     closeMenu={() => (isMenuOpen = false)}
+    {isMenuOpen}
     openMenu={() => (isMenuOpen = true)}
-    openSaveDialog={() => (isSaveDialogOpen = true)}
+    {openSaveDialog}
 />
 
 {#if isRenameDialogOpen && activeView}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
index d28effe22b..b1680287e2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/stacks/components/stack-card.svelte
@@ -184,7 +184,7 @@
                 <div class="ml-2 flex shrink-0 items-center gap-2">
                     <StackLogLevel {stack} />
                     <AssistantFixButton {prepareContext} resource={assistantResource} />
-                    <ButtonGroup.Root>
+                    <ButtonGroup.Root data-tour="stack-status">
                         <StackStatusDropdownMenu {stack} />
                         <StackOptionsDropdownMenu {onDeleted} {stack} />
                     </ButtonGroup.Root>
@@ -192,7 +192,7 @@
             </Card.Title>
         </Card.Header>
         <Card.Content class="space-y-2">
-            <div class="grid grid-cols-2 gap-2 lg:grid-cols-4">
+            <div class="grid grid-cols-2 gap-2 lg:grid-cols-4" data-tour="stack-metrics">
                 <Card.Root size="sm" class={metricCardClass}>
                     <Card.Header class={metricHeaderClass}>
                         <div class="flex min-w-0 items-center gap-1.5">
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 9cc43a52a4..0da2a4ff3b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -7,6 +7,11 @@ export enum StackStatus {
   Discarded = "discarded",
 }
 
+export enum ProductTourUsageInterval {
+  Day = "day",
+  Month = "month",
+}
+
 export enum ProductTourStatus {
   Completed = 1,
   Dismissed = 2,
@@ -512,6 +517,19 @@ export interface ProblemDetails {
   instance?: null | string;
 }
 
+export interface ProductTourActivity {
+  /** @format date-time */
+  date_utc: string;
+  /** @format int64 */
+  shown: number;
+  /** @format int64 */
+  started: number;
+  /** @format int64 */
+  completed: number;
+  /** @format int64 */
+  dismissed: number;
+}
+
 export interface ProductTourProgress {
   status: ProductTourStatus;
   /** @format int32 */
@@ -540,6 +558,7 @@ export interface ProductTourSummary {
   /** @format date-time */
   last_run_utc?: null | string;
   start_sources: ProductTourStartSource[];
+  activity: ProductTourActivity[];
 }
 
 export interface ProductTourUsageResponse {
@@ -548,6 +567,7 @@ export interface ProductTourUsageResponse {
   /** @format date-time */
   utc_end: string;
   tours: ProductTourSummary[];
+  interval: ProductTourUsageInterval;
 }
 
 export interface ResetPasswordModel {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index 47f51b1dab..f1d88e8df3 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,6 +27,7 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
+export const ProductTourUsageIntervalSchema = zodEnum(["day", "month"]);
 export const ProductTourStatusSchema = union([literal(1), literal(2)]);
 export const ProductTourLaunchSourceSchema = zodEnum([
   "welcome",
@@ -635,6 +636,17 @@ export const ProblemDetailsSchema = object({
 });
 export type ProblemDetailsFormData = Infer<typeof ProblemDetailsSchema>;
 
+export const ProductTourActivitySchema = object({
+  date_utc: iso.datetime(),
+  shown: int(),
+  started: int(),
+  completed: int(),
+  dismissed: int(),
+});
+export type ProductTourActivityFormData = Infer<
+  typeof ProductTourActivitySchema
+>;
+
 export const ProductTourProgressSchema = object({
   status: ProductTourStatusSchema,
   version: int32(),
@@ -661,6 +673,7 @@ export const ProductTourSummarySchema = object({
   dismissed: int(),
   last_run_utc: iso.datetime().nullable(),
   start_sources: array(lazy(() => ProductTourStartSourceSchema)),
+  activity: array(lazy(() => ProductTourActivitySchema)),
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
@@ -668,6 +681,7 @@ export const ProductTourUsageResponseSchema = object({
   utc_start: iso.datetime().nullable(),
   utc_end: iso.datetime(),
   tours: array(lazy(() => ProductTourSummarySchema)),
+  interval: ProductTourUsageIntervalSchema,
 });
 export type ProductTourUsageResponseFormData = Infer<
   typeof ProductTourUsageResponseSchema
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
index e5536c4b63..9aaa866927 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar-user.svelte
@@ -59,6 +59,24 @@
     const client = useFetchClient();
     const queryClient = useQueryClient();
     const currentOrganizationId = $derived(organizations.find((organizationItem) => organizationItem.id === organization.current)?.id);
+    let helpOpen = $state(false);
+    let guidedToursItem = $state<HTMLElement | null>(null);
+    let focusGuidedTours = false;
+
+    $effect(() => {
+        if (!open) {
+            focusGuidedTours = false;
+        }
+    });
+
+    export function showGuidedTours(): void {
+        focusGuidedTours = true;
+        open = true;
+    }
+
+    export function getGuidedToursTarget(): HTMLElement | undefined {
+        return open && helpOpen ? (guidedToursItem ?? undefined) : undefined;
+    }
 
     function getUnreadCountLabel(unreadCount: number): string {
         return unreadCount > 99 ? '99+' : unreadCount.toString();
@@ -165,6 +183,13 @@
                     {/snippet}
                 </DropdownMenu.Trigger>
                 <DropdownMenu.Content
+                    onOpenAutoFocus={(event) => {
+                        if (focusGuidedTours) {
+                            event.preventDefault();
+                            helpOpen = true;
+                            guidedToursItem?.focus();
+                        }
+                    }}
                     class="w-(--bits-dropdown-menu-anchor-width) min-w-56 rounded-lg"
                     side={sidebar.isMobile ? 'bottom' : 'right'}
                     align="end"
@@ -233,13 +258,22 @@
                             </DropdownMenu.Item>
                         {/if}
                     </DropdownMenu.Group>
-                    <DropdownMenu.Sub>
-                        <DropdownMenu.SubTrigger>
+                    <DropdownMenu.Sub bind:open={helpOpen}>
+                        <DropdownMenu.SubTrigger class="data-[state=open]:bg-accent data-[state=open]:text-accent-foreground">
                             <BookOpen />
                             Help
                         </DropdownMenu.SubTrigger>
-                        <DropdownMenu.SubContent>
-                            <DropdownMenu.Item onSelect={onGuidedToursClick}>
+                        <DropdownMenu.SubContent
+                            side={sidebar.isMobile ? 'top' : 'right'}
+                            align={sidebar.isMobile ? 'end' : 'start'}
+                            onOpenAutoFocus={(event) => {
+                                if (focusGuidedTours) {
+                                    event.preventDefault();
+                                    guidedToursItem?.focus();
+                                }
+                            }}
+                        >
+                            <DropdownMenu.Item bind:ref={guidedToursItem} data-tour="guided-tours-menu-item" onSelect={onGuidedToursClick}>
                                 <Compass />
                                 <span class="w-full">Guided Tours…</span>
                             </DropdownMenu.Item>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index 0ec4af43be..c734fba47f 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -38,6 +38,7 @@
     import { premiumPage } from '$features/organizations/premium-page.svelte';
     import { getUtcMonthKey, ORGANIZATION_USAGE_ROLLOVER_CHECK_INTERVAL_MS } from '$features/organizations/utils';
     import ProductTourHost from '$features/product-tours/components/product-tour-host.svelte';
+    import { setProductTourControls } from '$features/product-tours/controls.svelte';
     import { isProductTourSetupRoute } from '$features/product-tours/eligibility';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { invalidateProjectQueries } from '$features/projects/api.svelte';
@@ -98,6 +99,18 @@
     let isImpersonateOrganizationOpen = $state(false);
     let isUserMenuOpen = $state(false);
     let productToursComponent = $state<ProductTourHost>();
+    let sidebarUserComponent = $state<SidebarUser>();
+
+    setProductTourControls({
+        closeOverlays: closeProductTourOverlays,
+        getGuidedToursTarget: () => sidebarUserComponent?.getGuidedToursTarget(),
+        openCatalog: () => openGuidedTours('catalog'),
+        showGuidedToursMenu: async () => {
+            closeProductTourOverlays();
+            await tick();
+            sidebarUserComponent?.showGuidedTours();
+        }
+    });
 
     // Auto-reset premium page state on navigation so pages don't need cleanup
     beforeNavigate(() => {
@@ -244,7 +257,7 @@
     }
 
     function openGuidedTours(source: ProductTourLaunchSource): void {
-        productToursComponent?.openCatalog(source);
+        void productToursComponent?.openCatalog(source);
     }
 
     async function stopImpersonating(): Promise<void> {
@@ -740,6 +753,7 @@
 
         {#snippet footer()}
             <SidebarUser
+                bind:this={sidebarUserComponent}
                 {isChatEnabled}
                 isLoading={meQuery.isLoading}
                 user={meQuery.data}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index e8ad4389bf..f8dfbdecde 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -1051,4 +1051,11 @@
     onError={handleEventError}
 />
 
-<InvestigationListTour />
+<InvestigationListTour
+    firstErrorId={eventsQuery.isFetching || isSavedViewRoutePending
+        ? undefined
+        : table.getRowModel().rows.find((row) => row.original.type === 'error')?.original.id}
+    onOpenError={(eventId) => {
+        selectedEventId = eventId;
+    }}
+/>
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
index 180acdfecf..28a05690a3 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/add/+page.svelte
@@ -166,21 +166,29 @@
 </Card.Root>
 
 {#if projectConfigureCheckpoint}
-    <ProductTourSpotlight
-        checkpoint={projectConfigureCheckpoint}
-        description={projectConfigureCheckpoint.checkpointName === 'organization-name'
-            ? 'Name the organization that will own your projects and error data.'
-            : 'Name the application or service that will send events. The guide advances only after setup succeeds.'}
-        onDismiss={tourActions.dismiss}
-        onNext={projectConfigureCheckpoint.checkpointName === 'organization-name'
-            ? (checkpoint) => {
-                  productTourCheckpoint.advance(checkpoint, 'project-name');
-              }
-            : undefined}
-        side="top"
-        target={projectConfigureCheckpoint.checkpointName === 'organization-name'
-            ? "[data-tour='setup-organization-name']"
-            : "[data-tour='project-setup-form']"}
-        title={projectConfigureCheckpoint.checkpointName === 'organization-name' ? 'Name your organization' : 'Name your first project'}
-    />
+    {#key projectConfigureCheckpoint.checkpointName}
+        <ProductTourSpotlight
+            checkpoint={projectConfigureCheckpoint}
+            showProgress={false}
+            description={projectConfigureCheckpoint.checkpointName === 'organization-name'
+                ? 'Give your workspace a name. Your projects and events belong to this organization.'
+                : 'Name your application or service, then submit the form to continue setup.'}
+            onDismiss={tourActions.dismiss}
+            onPrevious={projectConfigureCheckpoint.checkpointName === 'project-name'
+                ? (checkpoint) => {
+                      productTourCheckpoint.advance(checkpoint, 'organization-name');
+                  }
+                : undefined}
+            onNext={projectConfigureCheckpoint.checkpointName === 'organization-name'
+                ? (checkpoint) => {
+                      productTourCheckpoint.advance(checkpoint, 'project-name');
+                  }
+                : undefined}
+            side="top"
+            target={projectConfigureCheckpoint.checkpointName === 'organization-name'
+                ? "[data-tour='setup-organization-name']"
+                : "[data-tour='project-setup-form']"}
+            title={projectConfigureCheckpoint.checkpointName === 'organization-name' ? 'Name your organization' : 'Name your first project'}
+        />
+    {/key}
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index e0339842de..08bcb189db 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -6,6 +6,7 @@
     import { A, CodeBlock, Muted, P } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Select from '$comp/ui/select';
+    import { Spinner } from '$comp/ui/spinner';
     import { env } from '$env/dynamic/public';
     import { ProjectFilter } from '$features/events/components/filters';
     import { getIntercom } from '$features/intercom';
@@ -13,7 +14,6 @@
     import { organization } from '$features/organizations/context.svelte';
     import { useHideOrganizationNotifications } from '$features/organizations/hooks/use-hide-organization-notifications.svelte';
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
-    import ProductTourInlineCallout from '$features/product-tours/components/product-tour-inline-callout.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
@@ -238,6 +238,12 @@
         }
     });
 
+    $effect(() => {
+        if (projectConfigureCheckpoint?.checkpointName === 'choose-platform' && projectTypes.some((projectType) => projectType.id === queryParams.type)) {
+            productTourCheckpoint.advance(projectConfigureCheckpoint, 'sdk-instructions');
+        }
+    });
+
     const isCommandLine = $derived(selectedProjectType?.platform === 'Command Line');
     const isDotNet = $derived(selectedProjectType?.platform === '.NET');
     const isDotNetLegacy = $derived(selectedProjectType?.platform === '.NET Legacy');
@@ -425,14 +431,16 @@ public partial class App : Application {
         const message = (event as CustomEvent<WebSocketMessageValue<'PersistentEventChanged'>>).detail;
 
         if (queryParams.redirect && message.project_id === projectId && message.change_type !== ChangeType.Removed) {
-            if (projectConfigureCheckpoint?.checkpointName === 'wait-for-event') {
+            if (projectConfigureCheckpoint && projectConfigureCheckpoint.checkpointName !== 'event-received') {
                 const eventReceivedCheckpoint = productTourCheckpoint.advance(projectConfigureCheckpoint, 'event-received');
                 if (eventReceivedCheckpoint) {
                     tourActions.completeAfterDomainSuccess(eventReceivedCheckpoint);
                 }
             }
 
-            toast.success('First event received. Opening Events...');
+            if (!projectConfigureCheckpoint) {
+                toast.success('First event received. Opening Events...');
+            }
             await redirectToEventsWithFilter(organization.current, new ProjectFilter([projectId]));
         }
     });
@@ -475,26 +483,30 @@ public partial class App : Application {
     {/if}
 
     {#if queryParams.redirect}
-        <Notification>
-            <NotificationTitle>Waiting for your first event</NotificationTitle>
+        <Notification data-tour="project-first-event">
+            <NotificationTitle class="flex items-center gap-2">
+                <Spinner aria-hidden="true" class="shrink-0 motion-reduce:animate-none" />
+                Waiting for your first event
+            </NotificationTitle>
             <NotificationDescription>
-                <P>Send an event from your app. When it arrives, we'll open the project Events page automatically.</P>
                 {#if projectConfigureCheckpoint}
-                    <P class="mt-2">You can leave this tab while updating your application. The guide will resume here when you return.</P>
-                    <Button
-                        class="mt-2"
-                        onclick={async () => {
-                            await tourActions.dismiss(projectConfigureCheckpoint);
-                        }}
-                        size="sm"
-                        variant="outline">End guide</Button
-                    >
+                    <P>Follow the instructions below, then send an event from your application. When it arrives, this guide completes and Events opens.</P>
+                    {#if projectConfigureCheckpoint.checkpointName !== 'choose-platform'}
+                        <Button
+                            variant="ghost"
+                            size="sm"
+                            class="mt-2"
+                            onclick={() => projectConfigureCheckpoint && tourActions.dismiss(projectConfigureCheckpoint)}>End guide</Button
+                        >
+                    {/if}
+                {:else}
+                    <P>Send an event from your app. When it arrives, we'll open the project Events page automatically.</P>
                 {/if}
             </NotificationDescription>
         </Notification>
     {/if}
 
-    <ol class="my-6 ml-6 list-decimal [&>li]:mt-2">
+    <ol class="my-6 ml-6 list-decimal [&>li]:mt-2" data-tour="project-sdk-instructions">
         <li>
             <P>Choose your project type.</P>
             <Select.Root
@@ -504,9 +516,6 @@ public partial class App : Application {
                 onValueChange={(value) => {
                     selectedProjectType = projectTypes.find((P) => P.id === value) || null;
                     queryParams.type = value;
-                    if (projectConfigureCheckpoint?.checkpointName === 'choose-platform') {
-                        productTourCheckpoint.advance(projectConfigureCheckpoint, 'sdk-instructions');
-                    }
                 }}
             >
                 <Select.Trigger class="w-full" data-tour="project-configure-platform">
@@ -796,27 +805,14 @@ public partial class App : Application {
         {/if}
     </ol>
 
-    {#if projectConfigureCheckpoint?.checkpointName === 'sdk-instructions'}
-        <ProductTourInlineCallout
-            checkpoint={projectConfigureCheckpoint}
-            description="Follow these SDK instructions in your own application. When it is connected, return here and continue to wait for the first event."
-            onContinue={() => {
-                productTourCheckpoint.advance(projectConfigureCheckpoint, 'wait-for-event');
-            }}
-            onDismiss={async () => {
-                await tourActions.dismiss(projectConfigureCheckpoint);
-            }}
-            title="Connect your application"
-        />
-    {/if}
-
     {#if projectConfigureCheckpoint?.checkpointName === 'choose-platform' && !isProjectTypeOpen}
         <ProductTourSpotlight
             checkpoint={projectConfigureCheckpoint}
-            description="Choose the SDK platform that matches the application you are connecting."
+            description="Choose your application's language or platform to see the setup instructions."
+            showProgress={false}
             onDismiss={tourActions.dismiss}
             target="[data-tour='project-configure-platform']"
-            title="Choose your SDK"
+            title="Choose your language or platform"
         />
     {/if}
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
index ffef0e0d40..bd83b967d7 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/add/+page.svelte
@@ -131,10 +131,15 @@
 {#if projectConfigureCheckpoint?.checkpointName === 'project-name'}
     <ProductTourSpotlight
         checkpoint={projectConfigureCheckpoint}
-        description="Name the application or service that will send events. Continue by submitting this form; the guide advances only after creation succeeds."
+        showProgress={false}
         onDismiss={tourActions.dismiss}
         side="top"
         target="[data-tour='project-setup-form']"
         title="Name your project"
-    />
+    >
+        {#snippet description()}
+            This is <strong>Add Project</strong>, available under Settings → Projects. Name the application or service that will send events, then select
+            <strong>Continue to Client Setup</strong> in the form.
+        {/snippet}
+    </ProductTourSpotlight>
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 2c56bf3bd0..df9e20cb5a 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -8,23 +8,25 @@
     import { Muted } from '$comp/typography';
     import { Badge } from '$comp/ui/badge';
     import { Button } from '$comp/ui/button';
-    import * as ButtonGroup from '$comp/ui/button-group';
     import * as Card from '$comp/ui/card';
-    import { Input } from '$comp/ui/input';
+    import * as Select from '$comp/ui/select';
     import { Skeleton } from '$comp/ui/skeleton';
     import * as Table from '$comp/ui/table';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
     import { getUtcMonthKey } from '$features/admin/assistant-usage';
+    import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
+    import ProductTourPeriod from '$features/admin/components/product-tour-period.svelte';
     import { getGuideOutcomeRate, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
 
     const currentMonth = getUtcMonthKey();
-    let selectedMonth = $state(currentMonth);
     let range = $state<ProductTourUsageRange>({
         kind: 'month',
         month: currentMonth
     });
     const usageQuery = getAdminProductTourUsageQuery(() => range);
     const usage = $derived(usageQuery.data);
+    let selectedTour = $state('app-overview:1');
+    const activeTour = $derived(usage?.tours.find((tour) => `${tour.name}:${tour.version}` === selectedTour));
 
     function title(value: string): string {
         return value
@@ -33,20 +35,6 @@
             .join(' ');
     }
 
-    function setMonth(month: string): void {
-        selectedMonth = month;
-        range = {
-            kind: 'month',
-            month
-        };
-    }
-
-    function setHistory(): void {
-        range = {
-            kind: 'history'
-        };
-    }
-
     function formatSource(source: string): string {
         return source === 'welcome' ? 'Welcome' : title(source);
     }
@@ -64,38 +52,32 @@
     }
 </script>
 
-<div class="space-y-6">
-    <div class="flex flex-wrap items-end justify-between gap-4">
-        <div>
-            <Muted>Feature Usage events for guided-tour prompts and guides. Counts are events, not unique users.</Muted>
-            {#if usage}
-                <p class="text-muted-foreground mt-1 text-xs">
-                    Bounds: {#if usage.utc_start}<DateTime value={usage.utc_start} />{:else}available history{/if} – <DateTime value={usage.utc_end} />
-                </p>
-            {/if}
-        </div>
-        <div class="flex items-end gap-2">
-            <ButtonGroup.Root aria-label="Usage period">
-                <Button variant={range.kind === 'history' ? 'secondary' : 'outline'} aria-pressed={range.kind === 'history'} onclick={setHistory}
-                    >Available history</Button
-                >
-                <Button variant={range.kind === 'month' ? 'secondary' : 'outline'} aria-pressed={range.kind === 'month'} onclick={() => setMonth(selectedMonth)}
-                    >Month</Button
-                >
-            </ButtonGroup.Root>
-            {#if range.kind === 'month'}
-                <label class="flex flex-col gap-1 text-sm font-medium">
-                    Month
-                    <Input class="w-40" type="month" max={currentMonth} value={selectedMonth} onchange={(event) => setMonth(event.currentTarget.value)} />
-                </label>
-            {/if}
-        </div>
+<div class="flex flex-col gap-4">
+    <Muted>See which guides people start, finish, or dismiss.</Muted>
+    <div class="flex items-center justify-between gap-2" aria-label="Usage filters">
+        <Select.Root type="single" bind:value={selectedTour}>
+            <Select.Trigger aria-label="Guide or invitation" class="min-w-0 flex-1 sm:max-w-60">
+                <span class="truncate">{activeTour ? `${title(activeTour.name)} · v${activeTour.version}` : 'Choose a guide'}</span>
+            </Select.Trigger>
+            <Select.Content>
+                {#each ['guide', 'prompt'] as kind (kind)}
+                    <Select.Group>
+                        <Select.Label>{kind === 'guide' ? 'Guides' : 'Invitations'}</Select.Label>
+                        {#each usage?.tours.filter((tour) => tour.kind === kind) ?? [] as tour (`${tour.name}:${tour.version}`)}
+                            <Select.Item value={`${tour.name}:${tour.version}`}>{title(tour.name)} · v{tour.version}</Select.Item>
+                        {/each}
+                    </Select.Group>
+                {/each}
+            </Select.Content>
+        </Select.Root>
+        <ProductTourPeriod bind:range />
     </div>
 
     {#if usageQuery.isError}
         <Card.Root>
             <Card.Content class="pt-6">
                 <p class="text-destructive text-sm">Failed to load guided-tour usage. Please try again.</p>
+                <Button class="mt-3" variant="outline" onclick={() => usageQuery.refetch()}>Retry</Button>
             </Card.Content>
         </Card.Root>
     {:else}
@@ -104,7 +86,7 @@
                 <Card.Header>
                     <Card.Title>Guided-tour usage</Card.Title>
                 </Card.Header>
-                <Card.Content class="space-y-3">
+                <Card.Content class="flex flex-col gap-3">
                     {#each [0, 1, 2, 3] as row (row)}
                         <Skeleton class="h-16 w-full rounded" aria-label={`Loading tour ${row + 1}`} />
                     {/each}
@@ -118,92 +100,126 @@
             {@const prompts = usage?.tours.filter((tour) => tour.kind === 'prompt') ?? []}
             {@const guides = usage?.tours.filter((tour) => tour.kind === 'guide') ?? []}
 
-            {#if prompts.length > 0}
+            {#if activeTour && usage}
                 <Card.Root>
                     <Card.Header>
-                        <Card.Title>Prompts</Card.Title>
-                        <Card.Description>Prompt impressions and responses. Percentages use shown impressions as the denominator.</Card.Description>
+                        <Card.Title>{title(activeTour.name)}</Card.Title>
+                        <Card.Description
+                            >{activeTour.kind === 'prompt'
+                                ? 'Invitation outcomes as a share of times shown.'
+                                : 'Completion and dismissal rates use starts, not matched users.'}</Card.Description
+                        >
                     </Card.Header>
-                    <Card.Content class="px-0">
-                        <div class="hidden overflow-x-auto md:block">
-                            <Table.Root aria-label="Prompt usage" class="min-w-3xl">
-                                <Table.Header>
-                                    <Table.Row>
-                                        <Table.Head class="pl-4">Prompt</Table.Head>
-                                        <Table.Head class="text-right">Shown</Table.Head>
-                                        <Table.Head class="text-right">Started</Table.Head>
-                                        <Table.Head class="text-right">Engaged</Table.Head>
-                                        <Table.Head class="text-right">Dismissed</Table.Head>
-                                        <Table.Head>Last event</Table.Head>
-                                    </Table.Row>
-                                </Table.Header>
-                                <Table.Body>
-                                    {#each prompts as tour (`${tour.name}:${tour.version}`)}
-                                        <Table.Row>
-                                            <Table.Cell class="pl-4 font-medium"
-                                                >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
-                                            >
-                                            <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
-                                            {@render RateCell(tour.started, promptStart(tour))}
-                                            {@render RateCell(tour.completed, promptEngagement(tour))}
-                                            {@render RateCell(tour.dismissed, promptDismissal(tour))}
-                                            {@render LastRun(tour.last_run_utc)}
-                                        </Table.Row>
-                                    {/each}
-                                </Table.Body>
-                            </Table.Root>
-                        </div>
-                        <div class="grid gap-3 px-4 md:hidden">
-                            {#each prompts as tour (`${tour.name}:${tour.version}`)}
-                                {@render PromptCard(tour)}
-                            {/each}
-                        </div>
+                    <Card.Content>
+                        <ProductTourActivity tour={activeTour} interval={usage.interval} start={usage.utc_start} end={usage.utc_end} />
                     </Card.Content>
+                    <Card.Footer class="flex flex-wrap items-center justify-between gap-2">
+                        <div class="text-muted-foreground text-xs">Started from {@render SourceMix(activeTour)}</div>
+                        {#if activeTour.last_run_utc}<p class="text-muted-foreground text-xs">Last event <TimeAgo value={activeTour.last_run_utc} /></p>{/if}
+                    </Card.Footer>
                 </Card.Root>
             {/if}
 
-            {#if guides.length > 0}
-                <Card.Root>
-                    <Card.Header>
-                        <Card.Title>Guides</Card.Title>
-                        <Card.Description>Guide outcome and entry-point percentages use starts as the denominator.</Card.Description>
-                    </Card.Header>
-                    <Card.Content class="px-0">
-                        <div class="hidden overflow-x-auto md:block">
-                            <Table.Root aria-label="Guide usage" class="min-w-4xl">
-                                <Table.Header>
-                                    <Table.Row>
-                                        <Table.Head class="pl-4">Guide</Table.Head>
-                                        <Table.Head class="text-right">Started</Table.Head>
-                                        <Table.Head class="text-right">Completed</Table.Head>
-                                        <Table.Head class="text-right">Dismissed</Table.Head>
-                                        <Table.Head>Entry points</Table.Head>
-                                        <Table.Head>Last event</Table.Head>
-                                    </Table.Row>
-                                </Table.Header>
-                                <Table.Body>
+            <details class="group">
+                <summary class="cursor-pointer text-sm font-medium">Compare all guides and invitations</summary>
+                <div class="mt-4 flex flex-col gap-4">
+                    {#if prompts.length > 0}
+                        <Card.Root>
+                            <Card.Header>
+                                <Card.Title>Guide invitations</Card.Title>
+                                <Card.Description
+                                    >The welcome and feature invitations that offer a guide. Percentages are based on how often each invitation was shown.</Card.Description
+                                >
+                            </Card.Header>
+                            <Card.Content class="px-0">
+                                <div class="hidden overflow-x-auto md:block">
+                                    <Table.Root aria-label="Guide invitation usage" class="min-w-3xl">
+                                        <Table.Header>
+                                            <Table.Row>
+                                                <Table.Head class="pl-4">Invitation</Table.Head>
+                                                <Table.Head class="text-right">Shown</Table.Head>
+                                                <Table.Head class="text-right">Started</Table.Head>
+                                                <Table.Head class="text-right">Engaged</Table.Head>
+                                                <Table.Head class="text-right">Dismissed</Table.Head>
+                                                <Table.Head>Last event</Table.Head>
+                                            </Table.Row>
+                                        </Table.Header>
+                                        <Table.Body>
+                                            {#each prompts as tour (`${tour.name}:${tour.version}`)}
+                                                <Table.Row>
+                                                    <Table.Cell class="pl-4 font-medium"
+                                                        >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
+                                                    >
+                                                    <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
+                                                    {@render RateCell(tour.started, promptStart(tour))}
+                                                    {@render RateCell(tour.completed, promptEngagement(tour))}
+                                                    {@render RateCell(tour.dismissed, promptDismissal(tour))}
+                                                    {@render LastRun(tour.last_run_utc)}
+                                                </Table.Row>
+                                            {/each}
+                                        </Table.Body>
+                                    </Table.Root>
+                                </div>
+                                <div class="grid gap-3 px-4 md:hidden">
+                                    {#each prompts as tour (`${tour.name}:${tour.version}`)}
+                                        {@render PromptCard(tour)}
+                                    {/each}
+                                </div>
+                            </Card.Content>
+                        </Card.Root>
+                    {/if}
+
+                    {#if guides.length > 0}
+                        <Card.Root>
+                            <Card.Header>
+                                <Card.Title>Guides</Card.Title>
+                                <Card.Description>Guide outcome and entry-point percentages use starts as the denominator.</Card.Description>
+                            </Card.Header>
+                            <Card.Content class="px-0">
+                                <div class="hidden overflow-x-auto md:block">
+                                    <Table.Root aria-label="Guide usage" class="min-w-4xl">
+                                        <Table.Header>
+                                            <Table.Row>
+                                                <Table.Head class="pl-4">Guide</Table.Head>
+                                                <Table.Head class="text-right">Started</Table.Head>
+                                                <Table.Head class="text-right">Completed</Table.Head>
+                                                <Table.Head class="text-right">Dismissed</Table.Head>
+                                                <Table.Head>Entry points</Table.Head>
+                                                <Table.Head>Last event</Table.Head>
+                                            </Table.Row>
+                                        </Table.Header>
+                                        <Table.Body>
+                                            {#each guides as tour (`${tour.name}:${tour.version}`)}
+                                                <Table.Row>
+                                                    <Table.Cell class="pl-4 font-medium"
+                                                        >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
+                                                    >
+                                                    <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
+                                                    {@render RateCell(tour.completed, getGuideOutcomeRate(tour, 'completed'))}
+                                                    {@render RateCell(tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
+                                                    <Table.Cell>{@render SourceMix(tour)}</Table.Cell>
+                                                    {@render LastRun(tour.last_run_utc)}
+                                                </Table.Row>
+                                            {/each}
+                                        </Table.Body>
+                                    </Table.Root>
+                                </div>
+                                <div class="grid gap-3 px-4 md:hidden">
                                     {#each guides as tour (`${tour.name}:${tour.version}`)}
-                                        <Table.Row>
-                                            <Table.Cell class="pl-4 font-medium"
-                                                >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
-                                            >
-                                            <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
-                                            {@render RateCell(tour.completed, getGuideOutcomeRate(tour, 'completed'))}
-                                            {@render RateCell(tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
-                                            <Table.Cell>{@render SourceMix(tour)}</Table.Cell>
-                                            {@render LastRun(tour.last_run_utc)}
-                                        </Table.Row>
+                                        {@render GuideCard(tour)}
                                     {/each}
-                                </Table.Body>
-                            </Table.Root>
-                        </div>
-                        <div class="grid gap-3 px-4 md:hidden">
-                            {#each guides as tour (`${tour.name}:${tour.version}`)}
-                                {@render GuideCard(tour)}
-                            {/each}
-                        </div>
-                    </Card.Content>
-                </Card.Root>
+                                </div>
+                            </Card.Content>
+                        </Card.Root>
+                    {/if}
+                </div>
+            </details>
+            {#if usage}
+                <p class="text-muted-foreground text-xs">
+                    Retained data: {#if usage.utc_start}<DateTime value={usage.utc_start} />{:else}earliest available event{/if} – <DateTime
+                        value={usage.utc_end}
+                    />. Periods use UTC; these bounds use your local time.
+                </p>
             {/if}
         {/if}
     {/if}
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index 11e3ae40d9..e40031b1b8 100644
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -1,11 +1,13 @@
 using Exceptionless.Core.Models.Data;
+using Exceptionless.Core.Repositories;
 
 namespace Exceptionless.Web.Models.Admin;
 
 public sealed record ProductTourUsageResponse(
     DateTime? UtcStart,
     DateTime UtcEnd,
-    IReadOnlyCollection<ProductTourSummary> Tours);
+    IReadOnlyCollection<ProductTourSummary> Tours,
+    ProductTourUsageInterval Interval);
 
 public sealed record ProductTourSummary(
     string Name,
@@ -16,6 +18,9 @@ public sealed record ProductTourSummary(
     long Completed,
     long Dismissed,
     DateTime? LastRunUtc,
-    IReadOnlyCollection<ProductTourStartSource> StartSources);
+    IReadOnlyCollection<ProductTourStartSource> StartSources,
+    IReadOnlyCollection<ProductTourActivity> Activity);
 
 public sealed record ProductTourStartSource(ProductTourLaunchSource Source, long Count);
+
+public sealed record ProductTourActivity(DateTime DateUtc, long Shown, long Started, long Completed, long Dismissed);
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 2dfd0b2976..4c686e9889 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -13366,6 +13366,38 @@
           }
         }
       },
+      "ProductTourActivity": {
+        "required": [
+          "date_utc",
+          "shown",
+          "started",
+          "completed",
+          "dismissed"
+        ],
+        "type": "object",
+        "properties": {
+          "date_utc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "shown": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "started": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "completed": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "dismissed": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
       "ProductTourKind": {
         "enum": [
           "guide",
@@ -13445,7 +13477,8 @@
           "completed",
           "dismissed",
           "last_run_utc",
-          "start_sources"
+          "start_sources",
+          "activity"
         ],
         "type": "object",
         "properties": {
@@ -13487,14 +13520,31 @@
             "items": {
               "$ref": "#/components/schemas/ProductTourStartSource"
             }
+          },
+          "activity": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProductTourActivity"
+            }
           }
         }
       },
+      "ProductTourUsageInterval": {
+        "enum": [
+          "day",
+          "month"
+        ],
+        "x-enumNames": [
+          "Day",
+          "Month"
+        ]
+      },
       "ProductTourUsageResponse": {
         "required": [
           "utc_start",
           "utc_end",
-          "tours"
+          "tours",
+          "interval"
         ],
         "type": "object",
         "properties": {
@@ -13514,6 +13564,9 @@
             "items": {
               "$ref": "#/components/schemas/ProductTourSummary"
             }
+          },
+          "interval": {
+            "$ref": "#/components/schemas/ProductTourUsageInterval"
           }
         }
       },
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 6de3cd1eb3..f1b09da45f 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -1,6 +1,7 @@
 using Exceptionless.Core;
 using Exceptionless.Core.Models;
 using Exceptionless.Core.Models.Data;
+using Exceptionless.Core.Repositories;
 using Exceptionless.Core.Utility;
 using Exceptionless.DateTimeExtensions;
 using Exceptionless.Tests.Extensions;
@@ -65,6 +66,7 @@ await CreateDataAsync(builder =>
         Assert.NotNull(response);
         Assert.Equal(month, response.UtcStart);
         Assert.Equal(month.AddMonths(1), response.UtcEnd);
+        Assert.Equal(ProductTourUsageInterval.Day, response.Interval);
         Assert.Equal(ProductTours.Definitions.Values.Sum(definition => definition.CurrentVersion), response.Tours.Count);
 
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
@@ -86,6 +88,11 @@ await CreateDataAsync(builder =>
         Assert.Equal(1, welcome.Dismissed);
         Assert.Equal(1, Assert.Single(welcome.StartSources).Count);
         Assert.Equal(ProductTourLaunchSource.Welcome, welcome.StartSources.Single().Source);
+        var welcomeDay = Assert.Single(welcome.Activity, period => period.DateUtc == month.AddDays(1));
+        Assert.Equal(2, welcomeDay.Shown);
+        Assert.Equal(1, welcomeDay.Started);
+        Assert.Equal(1, welcomeDay.Completed);
+        Assert.Equal(overview.Started, overview.Activity.Sum(period => period.Started));
         Assert.DoesNotContain(response.Tours, tour => tour.Started > 0 && (tour.Name is "unknown" or "ignored-tour"));
     }
 
@@ -112,6 +119,7 @@ await CreateDataAsync(builder => AddUsage(builder,
         Assert.NotNull(response);
         Assert.Equal(now.SubtractDays(_appOptions.MaximumRetentionDays), response.UtcStart);
         Assert.Equal(now, response.UtcEnd);
+        Assert.Equal(ProductTourUsageInterval.Month, response.Interval);
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
         Assert.Equal(1, overview.Started);
     }
@@ -153,6 +161,7 @@ public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndRe
             Assert.Equal(0, tour.Completed);
             Assert.Equal(0, tour.Dismissed);
             Assert.Empty(tour.StartSources);
+            Assert.Empty(tour.Activity);
             Assert.Null(tour.LastRunUtc);
         });
     }
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 4e878370ee..83e690489d 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -79,6 +79,10 @@ await CreateDataAsync(builder =>
         Assert.Equal(1, welcome.Count);
 
         Assert.All(result.Buckets, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
+        Assert.Equal(ProductTourUsageInterval.Day, result.Interval);
+        Assert.All(result.Buckets, bucket => Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count)));
+        var catalogStarts = Assert.Single(overview, bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started && bucket.Source.LaunchSource == ProductTourLaunchSource.Catalog);
+        Assert.Equal(2, Assert.Single(catalogStarts.Activity, period => period.DateUtc == month.AddDays(1)).Count);
     }
 
     [Fact]
@@ -97,6 +101,8 @@ await CreateDataAsync(builder =>
 
         // Assert
         Assert.Equal(2, result.Buckets.Sum(bucket => bucket.Count));
+        Assert.Equal(ProductTourUsageInterval.Month, result.Interval);
+        Assert.Contains(result.Buckets.SelectMany(bucket => bucket.Activity), period => period.DateUtc == month.AddMonths(-1) && period.Count == 1);
     }
 
     [Fact]
diff --git a/tests/http/admin.http b/tests/http/admin.http
index fe3a895a49..7ce07dd9ec 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -58,7 +58,7 @@ Authorization: Bearer {{token}}
 GET {{apiUrl}}/admin/product-tour-usage
 Authorization: Bearer {{token}}
 
-### Product Tour Usage (available retained history)
+### Product Tour Usage (available retained history; monthly activity for ranges longer than one month)
 GET {{apiUrl}}/admin/product-tour-usage?history=true
 Authorization: Bearer {{token}}
 
@@ -125,6 +125,7 @@ Content-Type: application/json
 }
 
 ### Product Tour Usage
+# Includes weighted daily activity alongside unchanged per-guide totals.
 GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01
 Authorization: Bearer {{token}}
 

From e3b243e2668d84b5a953ad5acfb064baf17396bf Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 15:15:22 -0500
Subject: [PATCH 15/43] Simplify guided tour usage metrics and chart
 presentation

---
 .../components/product-tour-activity.svelte   | 47 ++++------
 .../components/product-tour-totals.svelte     | 47 ++++++++++
 .../product-tour-totals.svelte.test.ts        | 72 ++++++++++++++
 .../(app)/system/product-tours/+page.svelte   | 94 +++++++++++--------
 4 files changed, 193 insertions(+), 67 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 6fb5daaf8c..568d23a053 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,14 +2,14 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
-    import Percentage from '$comp/formatters/percentage.svelte';
     import * as Chart from '$comp/ui/chart';
     import * as Table from '$comp/ui/table';
     import { scaleUtc } from 'd3-scale';
     import { curveLinear } from 'd3-shape';
-    import { LineChart } from 'layerchart';
+    import { LineChart, Points, Spline } from 'layerchart';
 
-    import { getProductTourActivity, getRate } from '../product-tour-usage';
+    import { getProductTourActivity } from '../product-tour-usage';
+    import ProductTourTotals from './product-tour-totals.svelte';
 
     let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
     const prompt = $derived(tour.kind === 'prompt');
@@ -17,7 +17,7 @@
     const config = $derived({
         completed: {
             color: 'var(--chart-1)',
-            label: prompt ? 'Engaged' : 'Completed'
+            label: prompt ? 'Accepted' : 'Completed'
         },
         dismissed: {
             color: 'var(--chart-5)',
@@ -55,28 +55,11 @@
 </script>
 
 <div class="flex flex-col gap-4">
-    <dl class="grid grid-cols-2 gap-3 sm:grid-cols-4" aria-label="Selected guide totals">
-        {#if !prompt}
-            <div>
-                <dt class="text-muted-foreground text-xs">Recorded events</dt>
-                <dd class="text-xl font-semibold"><Number value={total} /></dd>
-            </div>
-        {/if}
-        {#each keys as key (key)}
-            {@const rate = key === 'shown' || (!prompt && key === 'started') ? undefined : getRate(tour[key], prompt ? tour.shown : tour.started)}
-            <div>
-                <dt class="text-muted-foreground text-xs">{config[key].label}</dt>
-                <dd class="text-xl font-semibold"><Number value={tour[key]} /></dd>
-                {#if rate !== undefined}<dd class="text-muted-foreground text-xs">
-                        {#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if} of {prompt ? 'shown' : 'starts'}
-                    </dd>{/if}
-            </div>
-        {/each}
-    </dl>
-    <p class="text-muted-foreground text-xs">{interval === 'day' ? 'Daily' : 'Monthly'} activity · UTC · Counts are events, not unique users.</p>
+    <ProductTourTotals {tour} />
     {#if total === 0}
-        <p class="text-muted-foreground flex h-40 items-center justify-center text-sm">No activity recorded for this guide in this period.</p>
+        <p class="text-muted-foreground text-sm">No activity recorded in this period. Try another period or check that browser telemetry is configured.</p>
     {:else}
+        <p class="text-muted-foreground text-xs">{interval === 'day' ? 'Daily' : 'Monthly'} activity · UTC</p>
         <Chart.Container
             {config}
             class="h-40 w-full"
@@ -91,16 +74,22 @@
                 axis
                 legend
                 props={{
-                    spline: {
-                        curve: curveLinear,
-                        strokeWidth: 2
-                    },
                     xAxis: {
                         format: dateLabel,
-                        ticks: 4
+                        ticks: data.filter((_, index) => index % Math.max(1, Math.ceil((data.length - 1) / 4)) === 0).map((period) => period.date)
+                    },
+                    yAxis: {
+                        format: (value) => String(value),
+                        ticks: (scale) => scale.ticks?.(3).filter((value: number) => globalThis.Number.isInteger(value))
                     }
                 }}
             >
+                {#snippet marks({ context })}
+                    {#each context.series.visibleSeries as item (item.key)}
+                        <Spline seriesKey={item.key} curve={curveLinear} strokeWidth={2} />
+                        <Points seriesKey={item.key} r={3} fill={item.color} />
+                    {/each}
+                {/snippet}
                 {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
new file mode 100644
index 0000000000..ce44735fbb
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
@@ -0,0 +1,47 @@
+<script lang="ts">
+    import type { ProductTourSummary } from '$generated/api';
+
+    import Number from '$comp/formatters/number.svelte';
+    import Percentage from '$comp/formatters/percentage.svelte';
+
+    import { getRate } from '../product-tour-usage';
+
+    let { tour }: { tour: ProductTourSummary } = $props();
+    const invitation = $derived(tour.kind === 'prompt');
+    const metrics = $derived([
+        ...(invitation
+            ? [
+                  {
+                      key: 'shown' as const,
+                      label: 'Shown'
+                  }
+              ]
+            : []),
+        {
+            key: 'started' as const,
+            label: 'Started'
+        },
+        {
+            key: 'completed' as const,
+            label: invitation ? 'Accepted' : 'Completed'
+        },
+        {
+            key: 'dismissed' as const,
+            label: 'Dismissed'
+        }
+    ]);
+</script>
+
+<dl class={['grid gap-3', invitation ? 'grid-cols-2 sm:grid-cols-4' : 'grid-cols-3']} aria-label="Selected guide totals">
+    {#each metrics as metric (metric.key)}
+        {@const rate =
+            metric.key === 'shown' || (!invitation && metric.key === 'started') ? null : getRate(tour[metric.key], invitation ? tour.shown : tour.started)}
+        <div>
+            <dt class="text-muted-foreground text-xs">{metric.label}</dt>
+            <dd class="font-semibold tabular-nums"><Number value={tour[metric.key]} /></dd>
+            {#if rate !== null}
+                <dd class="text-muted-foreground text-xs"><Percentage percent={rate * 100} /> of {invitation ? 'invitations shown' : 'starts'}</dd>
+            {/if}
+        </div>
+    {/each}
+</dl>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts
new file mode 100644
index 0000000000..66d720cf67
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts
@@ -0,0 +1,72 @@
+import type { ProductTourSummary } from '$generated/api';
+
+import { ProductTourKind } from '$generated/api';
+import { cleanup, render, screen } from '@testing-library/svelte';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import ProductTourTotals from './product-tour-totals.svelte';
+
+const emptyGuide: ProductTourSummary = {
+    activity: [],
+    completed: 0,
+    dismissed: 0,
+    kind: ProductTourKind.Guide,
+    name: 'app-overview',
+    shown: 0,
+    start_sources: [],
+    started: 0,
+    version: 1
+};
+
+afterEach(cleanup);
+
+describe('ProductTourTotals', () => {
+    it('shows only meaningful guide counts without undefined percentage placeholders', () => {
+        // Act
+        render(ProductTourTotals, { tour: emptyGuide });
+
+        // Assert
+        expect(screen.getAllByText('0')).toHaveLength(3);
+        expect(screen.queryByText('Shown')).toBeNull();
+        expect(screen.queryByText('Recorded events')).toBeNull();
+        expect(screen.queryByText(/of starts|—/)).toBeNull();
+    });
+
+    it('shows completion and dismissal percentages when starts exist', () => {
+        // Arrange
+        const tour = { ...emptyGuide, completed: 3, dismissed: 1, started: 4 };
+
+        // Act
+        render(ProductTourTotals, { tour });
+
+        // Assert
+        expect(screen.getByText('75.0% of starts')).toBeTruthy();
+        expect(screen.getByText('25.0% of starts')).toBeTruthy();
+    });
+
+    it('uses invitations shown for invitation rates, without labeling acceptance as completion', () => {
+        // Arrange
+        const tour = { ...emptyGuide, completed: 3, dismissed: 7, kind: ProductTourKind.Prompt, shown: 10, started: 2 };
+
+        // Act
+        render(ProductTourTotals, { tour });
+
+        // Assert
+        expect(screen.getByText('Accepted')).toBeTruthy();
+        expect(screen.queryByText('Completed')).toBeNull();
+        expect(screen.getByText('20.0% of invitations shown')).toBeTruthy();
+        expect(screen.getByText('30.0% of invitations shown')).toBeTruthy();
+    });
+
+    it('does not show undefined rates for invitations that have never been shown', () => {
+        // Arrange
+        const tour = { ...emptyGuide, kind: ProductTourKind.Prompt };
+
+        // Act
+        render(ProductTourTotals, { tour });
+
+        // Assert
+        expect(screen.getAllByText('0')).toHaveLength(4);
+        expect(screen.queryByText(/of invitations shown|—/)).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index df9e20cb5a..d544ff0064 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import type { ProductTourSummary } from '$generated/api';
 
-    import DateTime from '$comp/formatters/date-time.svelte';
     import Number from '$comp/formatters/number.svelte';
     import Percentage from '$comp/formatters/percentage.svelte';
     import TimeAgo from '$comp/formatters/time-ago.svelte';
@@ -17,6 +16,7 @@
     import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
     import ProductTourPeriod from '$features/admin/components/product-tour-period.svelte';
     import { getGuideOutcomeRate, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
+    import { productTourCatalog } from '$features/product-tours/catalog';
 
     const currentMonth = getUtcMonthKey();
     let range = $state<ProductTourUsageRange>({
@@ -29,6 +29,18 @@
     const activeTour = $derived(usage?.tours.find((tour) => `${tour.name}:${tour.version}` === selectedTour));
 
     function title(value: string): string {
+        const guide = productTourCatalog.find((tour) => tour.name === value);
+        if (guide) {
+            return guide.title;
+        }
+
+        if (value === 'app-welcome') {
+            return 'Welcome invitation';
+        }
+
+        if (value === 'exie-announcement') {
+            return 'Exie invitation';
+        }
         return value
             .split('-')
             .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
@@ -36,7 +48,20 @@
     }
 
     function formatSource(source: string): string {
-        return source === 'welcome' ? 'Welcome' : title(source);
+        switch (source) {
+            case 'catalog':
+                return 'Guided Tours menu';
+            case 'command-palette':
+                return 'Command palette';
+            case 'feature-announcement':
+                return 'Exie invitation';
+            case 'help-menu':
+                return 'Help menu';
+            case 'welcome':
+                return 'Welcome invitation';
+            default:
+                return title(source);
+        }
     }
 
     function promptEngagement(tour: ProductTourSummary): null | number {
@@ -54,7 +79,7 @@
 
 <div class="flex flex-col gap-4">
     <Muted>See which guides people start, finish, or dismiss.</Muted>
-    <div class="flex items-center justify-between gap-2" aria-label="Usage filters">
+    <div class="flex items-center gap-2" aria-label="Usage filters">
         <Select.Root type="single" bind:value={selectedTour}>
             <Select.Trigger aria-label="Guide or invitation" class="min-w-0 flex-1 sm:max-w-60">
                 <span class="truncate">{activeTour ? `${title(activeTour.name)} · v${activeTour.version}` : 'Choose a guide'}</span>
@@ -102,22 +127,26 @@
 
             {#if activeTour && usage}
                 <Card.Root>
-                    <Card.Header>
-                        <Card.Title>{title(activeTour.name)}</Card.Title>
-                        <Card.Description
-                            >{activeTour.kind === 'prompt'
-                                ? 'Invitation outcomes as a share of times shown.'
-                                : 'Completion and dismissal rates use starts, not matched users.'}</Card.Description
-                        >
-                    </Card.Header>
-                    <Card.Content>
+                    <Card.Content class="pt-4">
                         <ProductTourActivity tour={activeTour} interval={usage.interval} start={usage.utc_start} end={usage.utc_end} />
                     </Card.Content>
-                    <Card.Footer class="flex flex-wrap items-center justify-between gap-2">
-                        <div class="text-muted-foreground text-xs">Started from {@render SourceMix(activeTour)}</div>
-                        {#if activeTour.last_run_utc}<p class="text-muted-foreground text-xs">Last event <TimeAgo value={activeTour.last_run_utc} /></p>{/if}
-                    </Card.Footer>
+                    {#if activeTour.start_sources.length > 0 || activeTour.last_run_utc}
+                        <Card.Footer class="flex flex-wrap items-center justify-between gap-2">
+                            {#if activeTour.start_sources.length > 0}<div class="flex flex-col gap-1 text-xs">
+                                    <p class="text-muted-foreground">How people opened this guide</p>
+                                    {@render SourceMix(activeTour)}
+                                </div>{/if}
+                            {#if activeTour.last_run_utc}<p class="text-muted-foreground text-xs">
+                                    Last activity <TimeAgo value={activeTour.last_run_utc} />
+                                </p>{/if}
+                        </Card.Footer>
+                    {/if}
                 </Card.Root>
+                <p class="text-muted-foreground text-xs">
+                    Counts are events, not unique people. Rates compare events in this period{activeTour.kind === 'prompt'
+                        ? '; accepted includes starting a guide or browsing guides'
+                        : ''}.
+                </p>
             {/if}
 
             <details class="group">
@@ -139,7 +168,7 @@
                                                 <Table.Head class="pl-4">Invitation</Table.Head>
                                                 <Table.Head class="text-right">Shown</Table.Head>
                                                 <Table.Head class="text-right">Started</Table.Head>
-                                                <Table.Head class="text-right">Engaged</Table.Head>
+                                                <Table.Head class="text-right">Accepted</Table.Head>
                                                 <Table.Head class="text-right">Dismissed</Table.Head>
                                                 <Table.Head>Last event</Table.Head>
                                             </Table.Row>
@@ -173,7 +202,7 @@
                         <Card.Root>
                             <Card.Header>
                                 <Card.Title>Guides</Card.Title>
-                                <Card.Description>Guide outcome and entry-point percentages use starts as the denominator.</Card.Description>
+                                <Card.Description>Completions and dismissals are shown as a percentage of starts in this period.</Card.Description>
                             </Card.Header>
                             <Card.Content class="px-0">
                                 <div class="hidden overflow-x-auto md:block">
@@ -184,7 +213,7 @@
                                                 <Table.Head class="text-right">Started</Table.Head>
                                                 <Table.Head class="text-right">Completed</Table.Head>
                                                 <Table.Head class="text-right">Dismissed</Table.Head>
-                                                <Table.Head>Entry points</Table.Head>
+                                                <Table.Head>Opened from</Table.Head>
                                                 <Table.Head>Last event</Table.Head>
                                             </Table.Row>
                                         </Table.Header>
@@ -214,13 +243,6 @@
                     {/if}
                 </div>
             </details>
-            {#if usage}
-                <p class="text-muted-foreground text-xs">
-                    Retained data: {#if usage.utc_start}<DateTime value={usage.utc_start} />{:else}earliest available event{/if} – <DateTime
-                        value={usage.utc_end}
-                    />. Periods use UTC; these bounds use your local time.
-                </p>
-            {/if}
         {/if}
     {/if}
 </div>
@@ -228,9 +250,7 @@
 {#snippet RateCell(value: number, rate: null | number)}
     <Table.Cell class="text-right">
         <Number {value} />
-        <span class="text-muted-foreground ml-1 text-xs"
-            >({#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if})</span
-        >
+        {#if rate !== null}<span class="text-muted-foreground ml-1 text-xs">(<Percentage percent={rate * 100} />)</span>{/if}
     </Table.Cell>
 {/snippet}
 
@@ -246,15 +266,15 @@
 
 {#snippet SourceMix(tour: ProductTourSummary)}
     {#if tour.started === 0 || tour.start_sources.length === 0}
-        <span class="text-muted-foreground">—</span>
+        <span class="text-muted-foreground">No starts recorded</span>
     {:else}
-        <div class="flex flex-wrap gap-1">
+        <div class="flex flex-wrap gap-x-4 gap-y-1">
             {#each tour.start_sources as source (source.source)}
-                <Badge variant="outline">
+                <span>
                     {formatSource(source.source)}
                     <Number value={source.count} />
                     (<Percentage percent={(getStartSourceShare(source, tour.started) ?? 0) * 100} />)
-                </Badge>
+                </span>
             {/each}
         </div>
     {/if}
@@ -269,7 +289,7 @@
         <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
             {@render Metric('Shown', tour.shown)}
             {@render Metric('Started', tour.started, promptStart(tour))}
-            {@render Metric('Engaged', tour.completed, promptEngagement(tour))}
+            {@render Metric('Accepted', tour.completed, promptEngagement(tour))}
             {@render Metric('Dismissed', tour.dismissed, promptDismissal(tour))}
         </div>
         {#if tour.last_run_utc}
@@ -290,7 +310,7 @@
             {@render Metric('Dismissed', tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
         </div>
         <div class="mt-4">
-            <p class="text-muted-foreground mb-2 text-xs font-medium">Entry points</p>
+            <p class="text-muted-foreground mb-2 text-xs font-medium">Opened from</p>
             {@render SourceMix(tour)}
         </div>
         {#if tour.last_run_utc}
@@ -304,9 +324,7 @@
         <div class="text-muted-foreground text-xs">{label}</div>
         <div class="font-medium">
             <Number {value} />
-            {#if rate !== undefined}<span class="text-muted-foreground text-xs"
-                    >({#if rate === null}—{:else}<Percentage percent={rate * 100} />{/if})</span
-                >{/if}
+            {#if rate !== undefined && rate !== null}<span class="text-muted-foreground text-xs">(<Percentage percent={rate * 100} />)</span>{/if}
         </div>
     </div>
 {/snippet}

From d439b0b2a2e45ab78484d5858323ecbe787857b5 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 15:23:02 -0500
Subject: [PATCH 16/43] Make guided tour analytics a chart-first overview

---
 .../components/product-tour-activity.svelte   |  49 ++-
 .../product-tour-activity.svelte.test.ts      |  69 ++++
 .../(app)/system/product-tours/+page.svelte   | 323 +++---------------
 3 files changed, 161 insertions(+), 280 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 568d23a053..49321623e4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,6 +2,7 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
+    import TimeAgo from '$comp/formatters/time-ago.svelte';
     import * as Chart from '$comp/ui/chart';
     import * as Table from '$comp/ui/table';
     import { scaleUtc } from 'd3-scale';
@@ -41,6 +42,23 @@
     );
     const total = $derived(tour.shown + tour.started + tour.completed + tour.dismissed);
 
+    function sourceLabel(source: string): string {
+        switch (source) {
+            case 'catalog':
+                return 'Guided Tours menu';
+            case 'command-palette':
+                return 'Command palette';
+            case 'feature-announcement':
+                return 'Exie invitation';
+            case 'help-menu':
+                return 'Help menu';
+            case 'welcome':
+                return 'Welcome invitation';
+            default:
+                return source;
+        }
+    }
+
     function dateLabel(value: unknown): string {
         if (!(value instanceof Date)) {
             return '';
@@ -55,15 +73,13 @@
 </script>
 
 <div class="flex flex-col gap-4">
-    <ProductTourTotals {tour} />
     {#if total === 0}
-        <p class="text-muted-foreground text-sm">No activity recorded in this period. Try another period or check that browser telemetry is configured.</p>
+        <p class="text-muted-foreground text-sm">No recorded activity in this period.</p>
     {:else}
-        <p class="text-muted-foreground text-xs">{interval === 'day' ? 'Daily' : 'Monthly'} activity · UTC</p>
         <Chart.Container
             {config}
             class="h-40 w-full"
-            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} guide activity. Exact values are in the activity table below.`}
+            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity. Open View details for totals and exact values.`}
         >
             <LineChart
                 {data}
@@ -71,6 +87,12 @@
                 xScale={scaleUtc()}
                 {series}
                 yDomain={[0, null]}
+                padding={{
+                    bottom: 48,
+                    left: 32,
+                    right: 32,
+                    top: 8
+                }}
                 axis
                 legend
                 props={{
@@ -94,7 +116,24 @@
             </LineChart>
         </Chart.Container>
         <details>
-            <summary class="text-muted-foreground cursor-pointer text-xs">View activity table</summary>
+            <summary class="text-muted-foreground cursor-pointer text-xs">View details</summary>
+            <div class="my-4 space-y-3">
+                <ProductTourTotals {tour} />
+                <p class="text-muted-foreground text-xs">Counts are events, not unique people. Rates compare events in this period.</p>
+                {#if tour.start_sources.length > 0}
+                    <div class="text-xs">
+                        <p class="text-muted-foreground mb-1">How people opened this guide</p>
+                        <ul class="flex flex-wrap gap-x-4 gap-y-1">
+                            {#each tour.start_sources as source (source.source)}
+                                <li>{sourceLabel(source.source)}: <Number value={source.count} /></li>
+                            {/each}
+                        </ul>
+                    </div>
+                {/if}
+                {#if tour.last_run_utc}
+                    <p class="text-muted-foreground text-xs">Last activity <TimeAgo value={tour.last_run_utc} /></p>
+                {/if}
+            </div>
             <Table.Root aria-label="Guide activity by date">
                 <Table.Header
                     ><Table.Row
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
new file mode 100644
index 0000000000..a4a84c2037
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -0,0 +1,69 @@
+import type { ProductTourSummary } from '$generated/api';
+
+import { ProductTourKind, ProductTourLaunchSource, ProductTourUsageInterval } from '$generated/api';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import ProductTourActivity from './product-tour-activity.svelte';
+
+const tour: ProductTourSummary = {
+    activity: [{ completed: 1, date_utc: '2026-01-01T00:00:00Z', dismissed: 0, shown: 0, started: 1 }],
+    completed: 1,
+    dismissed: 0,
+    kind: ProductTourKind.Guide,
+    name: 'app-overview',
+    shown: 0,
+    start_sources: [{ count: 1, source: ProductTourLaunchSource.CommandPalette }],
+    started: 1,
+    version: 1
+};
+
+beforeEach(() => {
+    vi.stubGlobal(
+        'ResizeObserver',
+        class {
+            disconnect() {}
+            observe() {}
+            unobserve() {}
+        }
+    );
+});
+
+afterEach(() => {
+    cleanup();
+    vi.unstubAllGlobals();
+});
+
+describe('ProductTourActivity', () => {
+    it('leads with the chart and keeps exact totals and rows behind details', async () => {
+        // Act
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, start: '2026-01-01T00:00:00Z', tour });
+
+        // Assert
+        expect(screen.getByLabelText(/Monthly guide activity/)).toBeTruthy();
+        const details = screen.getByText('View details').closest('details');
+        expect(details?.open).toBe(false);
+        expect(details?.contains(screen.getByRole('table', { hidden: true }))).toBe(true);
+
+        // Act
+        await fireEvent.click(screen.getByText('View details'));
+
+        // Assert
+        expect(details?.open).toBe(true);
+        expect(screen.getByText('100.0% of starts')).toBeTruthy();
+        expect(screen.getByText(/Command palette:/)).toBeTruthy();
+    });
+
+    it('shows a collection empty state instead of zero-valued completion metrics', () => {
+        // Arrange
+        const empty = { ...tour, activity: [], completed: 0, start_sources: [], started: 0 };
+
+        // Act
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, tour: empty });
+
+        // Assert
+        expect(screen.getByText('No recorded activity in this period.')).toBeTruthy();
+        expect(screen.queryByLabelText('Selected guide totals')).toBeNull();
+        expect(screen.queryByText('View details')).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index d544ff0064..cdc711e392 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -1,32 +1,24 @@
 <script lang="ts">
+    import type { ProductTourUsageRange } from '$features/admin/product-tour-usage';
     import type { ProductTourSummary } from '$generated/api';
 
-    import Number from '$comp/formatters/number.svelte';
-    import Percentage from '$comp/formatters/percentage.svelte';
-    import TimeAgo from '$comp/formatters/time-ago.svelte';
     import { Muted } from '$comp/typography';
-    import { Badge } from '$comp/ui/badge';
     import { Button } from '$comp/ui/button';
     import * as Card from '$comp/ui/card';
-    import * as Select from '$comp/ui/select';
     import { Skeleton } from '$comp/ui/skeleton';
-    import * as Table from '$comp/ui/table';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
-    import { getUtcMonthKey } from '$features/admin/assistant-usage';
     import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
     import ProductTourPeriod from '$features/admin/components/product-tour-period.svelte';
-    import { getGuideOutcomeRate, getRate, getStartSourceShare, type ProductTourUsageRange } from '$features/admin/product-tour-usage';
     import { productTourCatalog } from '$features/product-tours/catalog';
+    import RefreshCw from '@lucide/svelte/icons/refresh-cw';
 
-    const currentMonth = getUtcMonthKey();
     let range = $state<ProductTourUsageRange>({
-        kind: 'month',
-        month: currentMonth
+        kind: 'history'
     });
     const usageQuery = getAdminProductTourUsageQuery(() => range);
     const usage = $derived(usageQuery.data);
-    let selectedTour = $state('app-overview:1');
-    const activeTour = $derived(usage?.tours.find((tour) => `${tour.name}:${tour.version}` === selectedTour));
+    const guides = $derived(usage?.tours.filter((tour) => tour.kind === 'guide') ?? []);
+    const invitations = $derived(usage?.tours.filter((tour) => tour.kind === 'prompt') ?? []);
 
     function title(value: string): string {
         const guide = productTourCatalog.find((tour) => tour.name === value);
@@ -46,57 +38,22 @@
             .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
             .join(' ');
     }
-
-    function formatSource(source: string): string {
-        switch (source) {
-            case 'catalog':
-                return 'Guided Tours menu';
-            case 'command-palette':
-                return 'Command palette';
-            case 'feature-announcement':
-                return 'Exie invitation';
-            case 'help-menu':
-                return 'Help menu';
-            case 'welcome':
-                return 'Welcome invitation';
-            default:
-                return title(source);
-        }
-    }
-
-    function promptEngagement(tour: ProductTourSummary): null | number {
-        return getRate(tour.completed, tour.shown);
-    }
-
-    function promptDismissal(tour: ProductTourSummary): null | number {
-        return getRate(tour.dismissed, tour.shown);
-    }
-
-    function promptStart(tour: ProductTourSummary): null | number {
-        return getRate(tour.started, tour.shown);
-    }
 </script>
 
-<div class="flex flex-col gap-4">
-    <Muted>See which guides people start, finish, or dismiss.</Muted>
-    <div class="flex items-center gap-2" aria-label="Usage filters">
-        <Select.Root type="single" bind:value={selectedTour}>
-            <Select.Trigger aria-label="Guide or invitation" class="min-w-0 flex-1 sm:max-w-60">
-                <span class="truncate">{activeTour ? `${title(activeTour.name)} · v${activeTour.version}` : 'Choose a guide'}</span>
-            </Select.Trigger>
-            <Select.Content>
-                {#each ['guide', 'prompt'] as kind (kind)}
-                    <Select.Group>
-                        <Select.Label>{kind === 'guide' ? 'Guides' : 'Invitations'}</Select.Label>
-                        {#each usage?.tours.filter((tour) => tour.kind === kind) ?? [] as tour (`${tour.name}:${tour.version}`)}
-                            <Select.Item value={`${tour.name}:${tour.version}`}>{title(tour.name)} · v{tour.version}</Select.Item>
-                        {/each}
-                    </Select.Group>
-                {/each}
-            </Select.Content>
-        </Select.Root>
-        <ProductTourPeriod bind:range />
+<div class="space-y-6">
+    <div class="flex flex-wrap items-center justify-between gap-3">
+        <Muted>Recorded guide activity across your installation</Muted>
+        <div class="flex items-center gap-2" aria-label="Usage filters">
+            <ProductTourPeriod bind:range />
+            <Button variant="outline" size="icon" aria-label="Refresh tour activity" disabled={usageQuery.isFetching} onclick={() => usageQuery.refetch()}>
+                <RefreshCw class="size-4" />
+            </Button>
+        </div>
     </div>
+    <p class="text-muted-foreground text-sm">
+        Charts show recorded events. Saved completion badges can include earlier, unrecorded activity.
+        {range.kind === 'history' ? 'History is grouped by month.' : 'This month is grouped by day.'} Dates use UTC.
+    </p>
 
     {#if usageQuery.isError}
         <Card.Root>
@@ -105,226 +62,42 @@
                 <Button class="mt-3" variant="outline" onclick={() => usageQuery.refetch()}>Retry</Button>
             </Card.Content>
         </Card.Root>
+    {:else if usageQuery.isPending}
+        <div class="grid gap-4 lg:grid-cols-2">
+            {#each [0, 1, 2, 3] as index (index)}
+                <Skeleton class="h-56 rounded-xl" aria-label={`Loading guide activity ${index + 1}`} />
+            {/each}
+        </div>
+    {:else if usage?.tours.length === 0}
+        <p class="text-muted-foreground text-sm">No guided-tour activity was recorded in this period.</p>
     {:else}
-        {#if usageQuery.isPending}
-            <Card.Root>
-                <Card.Header>
-                    <Card.Title>Guided-tour usage</Card.Title>
-                </Card.Header>
-                <Card.Content class="flex flex-col gap-3">
-                    {#each [0, 1, 2, 3] as row (row)}
-                        <Skeleton class="h-16 w-full rounded" aria-label={`Loading tour ${row + 1}`} />
-                    {/each}
-                </Card.Content>
-            </Card.Root>
-        {:else if usage?.tours.length === 0}
-            <Card.Root>
-                <Card.Content class="text-muted-foreground py-10 text-center text-sm">No guided-tour usage events were recorded for this range.</Card.Content>
-            </Card.Root>
-        {:else}
-            {@const prompts = usage?.tours.filter((tour) => tour.kind === 'prompt') ?? []}
-            {@const guides = usage?.tours.filter((tour) => tour.kind === 'guide') ?? []}
-
-            {#if activeTour && usage}
-                <Card.Root>
-                    <Card.Content class="pt-4">
-                        <ProductTourActivity tour={activeTour} interval={usage.interval} start={usage.utc_start} end={usage.utc_end} />
-                    </Card.Content>
-                    {#if activeTour.start_sources.length > 0 || activeTour.last_run_utc}
-                        <Card.Footer class="flex flex-wrap items-center justify-between gap-2">
-                            {#if activeTour.start_sources.length > 0}<div class="flex flex-col gap-1 text-xs">
-                                    <p class="text-muted-foreground">How people opened this guide</p>
-                                    {@render SourceMix(activeTour)}
-                                </div>{/if}
-                            {#if activeTour.last_run_utc}<p class="text-muted-foreground text-xs">
-                                    Last activity <TimeAgo value={activeTour.last_run_utc} />
-                                </p>{/if}
-                        </Card.Footer>
-                    {/if}
-                </Card.Root>
-                <p class="text-muted-foreground text-xs">
-                    Counts are events, not unique people. Rates compare events in this period{activeTour.kind === 'prompt'
-                        ? '; accepted includes starting a guide or browsing guides'
-                        : ''}.
+        {@render TourCards(guides)}
+        {#if invitations.length > 0}
+            <details>
+                <summary class="cursor-pointer text-sm font-medium">Invitation activity</summary>
+                <p class="text-muted-foreground my-4 text-sm">
+                    Welcome and feature invitations offer a guide. Shown counts the invitation appearing—not the guide running. Accepted means starting a guide
+                    or browsing guides.
                 </p>
-            {/if}
-
-            <details class="group">
-                <summary class="cursor-pointer text-sm font-medium">Compare all guides and invitations</summary>
-                <div class="mt-4 flex flex-col gap-4">
-                    {#if prompts.length > 0}
-                        <Card.Root>
-                            <Card.Header>
-                                <Card.Title>Guide invitations</Card.Title>
-                                <Card.Description
-                                    >The welcome and feature invitations that offer a guide. Percentages are based on how often each invitation was shown.</Card.Description
-                                >
-                            </Card.Header>
-                            <Card.Content class="px-0">
-                                <div class="hidden overflow-x-auto md:block">
-                                    <Table.Root aria-label="Guide invitation usage" class="min-w-3xl">
-                                        <Table.Header>
-                                            <Table.Row>
-                                                <Table.Head class="pl-4">Invitation</Table.Head>
-                                                <Table.Head class="text-right">Shown</Table.Head>
-                                                <Table.Head class="text-right">Started</Table.Head>
-                                                <Table.Head class="text-right">Accepted</Table.Head>
-                                                <Table.Head class="text-right">Dismissed</Table.Head>
-                                                <Table.Head>Last event</Table.Head>
-                                            </Table.Row>
-                                        </Table.Header>
-                                        <Table.Body>
-                                            {#each prompts as tour (`${tour.name}:${tour.version}`)}
-                                                <Table.Row>
-                                                    <Table.Cell class="pl-4 font-medium"
-                                                        >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
-                                                    >
-                                                    <Table.Cell class="text-right"><Number value={tour.shown} /></Table.Cell>
-                                                    {@render RateCell(tour.started, promptStart(tour))}
-                                                    {@render RateCell(tour.completed, promptEngagement(tour))}
-                                                    {@render RateCell(tour.dismissed, promptDismissal(tour))}
-                                                    {@render LastRun(tour.last_run_utc)}
-                                                </Table.Row>
-                                            {/each}
-                                        </Table.Body>
-                                    </Table.Root>
-                                </div>
-                                <div class="grid gap-3 px-4 md:hidden">
-                                    {#each prompts as tour (`${tour.name}:${tour.version}`)}
-                                        {@render PromptCard(tour)}
-                                    {/each}
-                                </div>
-                            </Card.Content>
-                        </Card.Root>
-                    {/if}
-
-                    {#if guides.length > 0}
-                        <Card.Root>
-                            <Card.Header>
-                                <Card.Title>Guides</Card.Title>
-                                <Card.Description>Completions and dismissals are shown as a percentage of starts in this period.</Card.Description>
-                            </Card.Header>
-                            <Card.Content class="px-0">
-                                <div class="hidden overflow-x-auto md:block">
-                                    <Table.Root aria-label="Guide usage" class="min-w-4xl">
-                                        <Table.Header>
-                                            <Table.Row>
-                                                <Table.Head class="pl-4">Guide</Table.Head>
-                                                <Table.Head class="text-right">Started</Table.Head>
-                                                <Table.Head class="text-right">Completed</Table.Head>
-                                                <Table.Head class="text-right">Dismissed</Table.Head>
-                                                <Table.Head>Opened from</Table.Head>
-                                                <Table.Head>Last event</Table.Head>
-                                            </Table.Row>
-                                        </Table.Header>
-                                        <Table.Body>
-                                            {#each guides as tour (`${tour.name}:${tour.version}`)}
-                                                <Table.Row>
-                                                    <Table.Cell class="pl-4 font-medium"
-                                                        >{title(tour.name)} <span class="text-muted-foreground font-normal">v{tour.version}</span></Table.Cell
-                                                    >
-                                                    <Table.Cell class="text-right"><Number value={tour.started} /></Table.Cell>
-                                                    {@render RateCell(tour.completed, getGuideOutcomeRate(tour, 'completed'))}
-                                                    {@render RateCell(tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
-                                                    <Table.Cell>{@render SourceMix(tour)}</Table.Cell>
-                                                    {@render LastRun(tour.last_run_utc)}
-                                                </Table.Row>
-                                            {/each}
-                                        </Table.Body>
-                                    </Table.Root>
-                                </div>
-                                <div class="grid gap-3 px-4 md:hidden">
-                                    {#each guides as tour (`${tour.name}:${tour.version}`)}
-                                        {@render GuideCard(tour)}
-                                    {/each}
-                                </div>
-                            </Card.Content>
-                        </Card.Root>
-                    {/if}
-                </div>
+                {@render TourCards(invitations)}
             </details>
         {/if}
     {/if}
 </div>
 
-{#snippet RateCell(value: number, rate: null | number)}
-    <Table.Cell class="text-right">
-        <Number {value} />
-        {#if rate !== null}<span class="text-muted-foreground ml-1 text-xs">(<Percentage percent={rate * 100} />)</span>{/if}
-    </Table.Cell>
-{/snippet}
-
-{#snippet LastRun(value: null | string | undefined)}
-    <Table.Cell>
-        {#if value}
-            <TimeAgo {value} />
-        {:else}
-            <span class="text-muted-foreground">Never</span>
-        {/if}
-    </Table.Cell>
-{/snippet}
-
-{#snippet SourceMix(tour: ProductTourSummary)}
-    {#if tour.started === 0 || tour.start_sources.length === 0}
-        <span class="text-muted-foreground">No starts recorded</span>
-    {:else}
-        <div class="flex flex-wrap gap-x-4 gap-y-1">
-            {#each tour.start_sources as source (source.source)}
-                <span>
-                    {formatSource(source.source)}
-                    <Number value={source.count} />
-                    (<Percentage percent={(getStartSourceShare(source, tour.started) ?? 0) * 100} />)
-                </span>
-            {/each}
-        </div>
-    {/if}
-{/snippet}
-
-{#snippet PromptCard(tour: ProductTourSummary)}
-    <div class="rounded-lg border p-4">
-        <div class="flex items-start justify-between gap-3">
-            <div class="font-medium">{title(tour.name)}</div>
-            <Badge variant="outline">v{tour.version}</Badge>
-        </div>
-        <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
-            {@render Metric('Shown', tour.shown)}
-            {@render Metric('Started', tour.started, promptStart(tour))}
-            {@render Metric('Accepted', tour.completed, promptEngagement(tour))}
-            {@render Metric('Dismissed', tour.dismissed, promptDismissal(tour))}
-        </div>
-        {#if tour.last_run_utc}
-            <p class="text-muted-foreground mt-4 text-xs">Last event <TimeAgo value={tour.last_run_utc} /></p>
-        {/if}
-    </div>
-{/snippet}
-
-{#snippet GuideCard(tour: ProductTourSummary)}
-    <div class="rounded-lg border p-4">
-        <div class="flex items-start justify-between gap-3">
-            <div class="font-medium">{title(tour.name)}</div>
-            <Badge variant="outline">v{tour.version}</Badge>
-        </div>
-        <div class="mt-4 grid grid-cols-2 gap-3 text-sm">
-            {@render Metric('Started', tour.started)}
-            {@render Metric('Completed', tour.completed, getGuideOutcomeRate(tour, 'completed'))}
-            {@render Metric('Dismissed', tour.dismissed, getGuideOutcomeRate(tour, 'dismissed'))}
-        </div>
-        <div class="mt-4">
-            <p class="text-muted-foreground mb-2 text-xs font-medium">Opened from</p>
-            {@render SourceMix(tour)}
-        </div>
-        {#if tour.last_run_utc}
-            <p class="text-muted-foreground mt-4 text-xs">Last event <TimeAgo value={tour.last_run_utc} /></p>
-        {/if}
-    </div>
-{/snippet}
-
-{#snippet Metric(label: string, value: number, rate?: null | number)}
-    <div>
-        <div class="text-muted-foreground text-xs">{label}</div>
-        <div class="font-medium">
-            <Number {value} />
-            {#if rate !== undefined && rate !== null}<span class="text-muted-foreground text-xs">(<Percentage percent={rate * 100} />)</span>{/if}
-        </div>
+{#snippet TourCards(tours: ProductTourSummary[])}
+    <div class="grid items-start gap-4 lg:grid-cols-2">
+        {#each tours as tour (`${tour.name}:${tour.version}`)}
+            <Card.Root aria-label={`${title(tour.name)} usage`}>
+                <Card.Header>
+                    <Card.Title>{title(tour.name)} <span class="text-muted-foreground text-xs font-normal">v{tour.version}</span></Card.Title>
+                </Card.Header>
+                <Card.Content>
+                    {#if usage}
+                        <ProductTourActivity {tour} interval={usage.interval} start={usage.utc_start} end={usage.utc_end} />
+                    {/if}
+                </Card.Content>
+            </Card.Root>
+        {/each}
     </div>
 {/snippet}

From 6fc668ee718e2da6e6fb97ebc49ad494420668df Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 15:27:28 -0500
Subject: [PATCH 17/43] Simplify tour chart cards and remove detail disclosures

---
 .../components/product-tour-activity.svelte   | 49 ++-----------
 .../product-tour-activity.svelte.test.ts      | 20 ++----
 .../components/product-tour-totals.svelte     | 47 ------------
 .../product-tour-totals.svelte.test.ts        | 72 -------------------
 .../features/admin/product-tour-usage.test.ts | 15 +---
 .../lib/features/admin/product-tour-usage.ts  | 12 ----
 .../(app)/system/product-tours/+page.svelte   | 28 ++++----
 7 files changed, 24 insertions(+), 219 deletions(-)
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 49321623e4..65a34c9755 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,7 +2,6 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
-    import TimeAgo from '$comp/formatters/time-ago.svelte';
     import * as Chart from '$comp/ui/chart';
     import * as Table from '$comp/ui/table';
     import { scaleUtc } from 'd3-scale';
@@ -10,7 +9,6 @@
     import { LineChart, Points, Spline } from 'layerchart';
 
     import { getProductTourActivity } from '../product-tour-usage';
-    import ProductTourTotals from './product-tour-totals.svelte';
 
     let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
     const prompt = $derived(tour.kind === 'prompt');
@@ -42,23 +40,6 @@
     );
     const total = $derived(tour.shown + tour.started + tour.completed + tour.dismissed);
 
-    function sourceLabel(source: string): string {
-        switch (source) {
-            case 'catalog':
-                return 'Guided Tours menu';
-            case 'command-palette':
-                return 'Command palette';
-            case 'feature-announcement':
-                return 'Exie invitation';
-            case 'help-menu':
-                return 'Help menu';
-            case 'welcome':
-                return 'Welcome invitation';
-            default:
-                return source;
-        }
-    }
-
     function dateLabel(value: unknown): string {
         if (!(value instanceof Date)) {
             return '';
@@ -74,13 +55,9 @@
 
 <div class="flex flex-col gap-4">
     {#if total === 0}
-        <p class="text-muted-foreground text-sm">No recorded activity in this period.</p>
+        <p class="text-muted-foreground flex h-48 items-center justify-center text-sm">No recorded activity in this period.</p>
     {:else}
-        <Chart.Container
-            {config}
-            class="h-40 w-full"
-            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity. Open View details for totals and exact values.`}
-        >
+        <Chart.Container {config} class="h-48 w-full" aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity.`}>
             <LineChart
                 {data}
                 x="date"
@@ -115,25 +92,7 @@
                 {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
-        <details>
-            <summary class="text-muted-foreground cursor-pointer text-xs">View details</summary>
-            <div class="my-4 space-y-3">
-                <ProductTourTotals {tour} />
-                <p class="text-muted-foreground text-xs">Counts are events, not unique people. Rates compare events in this period.</p>
-                {#if tour.start_sources.length > 0}
-                    <div class="text-xs">
-                        <p class="text-muted-foreground mb-1">How people opened this guide</p>
-                        <ul class="flex flex-wrap gap-x-4 gap-y-1">
-                            {#each tour.start_sources as source (source.source)}
-                                <li>{sourceLabel(source.source)}: <Number value={source.count} /></li>
-                            {/each}
-                        </ul>
-                    </div>
-                {/if}
-                {#if tour.last_run_utc}
-                    <p class="text-muted-foreground text-xs">Last activity <TimeAgo value={tour.last_run_utc} /></p>
-                {/if}
-            </div>
+        <div class="sr-only">
             <Table.Root aria-label="Guide activity by date">
                 <Table.Header
                     ><Table.Row
@@ -149,6 +108,6 @@
                         >{/each}</Table.Body
                 >
             </Table.Root>
-        </details>
+        </div>
     {/if}
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
index a4a84c2037..e6f87fc3f6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -1,7 +1,7 @@
 import type { ProductTourSummary } from '$generated/api';
 
 import { ProductTourKind, ProductTourLaunchSource, ProductTourUsageInterval } from '$generated/api';
-import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { cleanup, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import ProductTourActivity from './product-tour-activity.svelte';
@@ -35,23 +35,17 @@ afterEach(() => {
 });
 
 describe('ProductTourActivity', () => {
-    it('leads with the chart and keeps exact totals and rows behind details', async () => {
+    it('shows the chart without disclosures while preserving screen-reader access to values', () => {
         // Act
         render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, start: '2026-01-01T00:00:00Z', tour });
 
         // Assert
         expect(screen.getByLabelText(/Monthly guide activity/)).toBeTruthy();
-        const details = screen.getByText('View details').closest('details');
-        expect(details?.open).toBe(false);
-        expect(details?.contains(screen.getByRole('table', { hidden: true }))).toBe(true);
-
-        // Act
-        await fireEvent.click(screen.getByText('View details'));
-
-        // Assert
-        expect(details?.open).toBe(true);
-        expect(screen.getByText('100.0% of starts')).toBeTruthy();
-        expect(screen.getByText(/Command palette:/)).toBeTruthy();
+        expect(screen.queryByText('View details')).toBeNull();
+        const table = screen.getByRole('table', { name: 'Guide activity by date' });
+        expect(table.closest('.sr-only')).not.toBeNull();
+        expect(table.textContent).toContain('Jan 2026');
+        expect(table.closest('details')).toBeNull();
     });
 
     it('shows a collection empty state instead of zero-valued completion metrics', () => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
deleted file mode 100644
index ce44735fbb..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte
+++ /dev/null
@@ -1,47 +0,0 @@
-<script lang="ts">
-    import type { ProductTourSummary } from '$generated/api';
-
-    import Number from '$comp/formatters/number.svelte';
-    import Percentage from '$comp/formatters/percentage.svelte';
-
-    import { getRate } from '../product-tour-usage';
-
-    let { tour }: { tour: ProductTourSummary } = $props();
-    const invitation = $derived(tour.kind === 'prompt');
-    const metrics = $derived([
-        ...(invitation
-            ? [
-                  {
-                      key: 'shown' as const,
-                      label: 'Shown'
-                  }
-              ]
-            : []),
-        {
-            key: 'started' as const,
-            label: 'Started'
-        },
-        {
-            key: 'completed' as const,
-            label: invitation ? 'Accepted' : 'Completed'
-        },
-        {
-            key: 'dismissed' as const,
-            label: 'Dismissed'
-        }
-    ]);
-</script>
-
-<dl class={['grid gap-3', invitation ? 'grid-cols-2 sm:grid-cols-4' : 'grid-cols-3']} aria-label="Selected guide totals">
-    {#each metrics as metric (metric.key)}
-        {@const rate =
-            metric.key === 'shown' || (!invitation && metric.key === 'started') ? null : getRate(tour[metric.key], invitation ? tour.shown : tour.started)}
-        <div>
-            <dt class="text-muted-foreground text-xs">{metric.label}</dt>
-            <dd class="font-semibold tabular-nums"><Number value={tour[metric.key]} /></dd>
-            {#if rate !== null}
-                <dd class="text-muted-foreground text-xs"><Percentage percent={rate * 100} /> of {invitation ? 'invitations shown' : 'starts'}</dd>
-            {/if}
-        </div>
-    {/each}
-</dl>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts
deleted file mode 100644
index 66d720cf67..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-totals.svelte.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import type { ProductTourSummary } from '$generated/api';
-
-import { ProductTourKind } from '$generated/api';
-import { cleanup, render, screen } from '@testing-library/svelte';
-import { afterEach, describe, expect, it } from 'vitest';
-
-import ProductTourTotals from './product-tour-totals.svelte';
-
-const emptyGuide: ProductTourSummary = {
-    activity: [],
-    completed: 0,
-    dismissed: 0,
-    kind: ProductTourKind.Guide,
-    name: 'app-overview',
-    shown: 0,
-    start_sources: [],
-    started: 0,
-    version: 1
-};
-
-afterEach(cleanup);
-
-describe('ProductTourTotals', () => {
-    it('shows only meaningful guide counts without undefined percentage placeholders', () => {
-        // Act
-        render(ProductTourTotals, { tour: emptyGuide });
-
-        // Assert
-        expect(screen.getAllByText('0')).toHaveLength(3);
-        expect(screen.queryByText('Shown')).toBeNull();
-        expect(screen.queryByText('Recorded events')).toBeNull();
-        expect(screen.queryByText(/of starts|—/)).toBeNull();
-    });
-
-    it('shows completion and dismissal percentages when starts exist', () => {
-        // Arrange
-        const tour = { ...emptyGuide, completed: 3, dismissed: 1, started: 4 };
-
-        // Act
-        render(ProductTourTotals, { tour });
-
-        // Assert
-        expect(screen.getByText('75.0% of starts')).toBeTruthy();
-        expect(screen.getByText('25.0% of starts')).toBeTruthy();
-    });
-
-    it('uses invitations shown for invitation rates, without labeling acceptance as completion', () => {
-        // Arrange
-        const tour = { ...emptyGuide, completed: 3, dismissed: 7, kind: ProductTourKind.Prompt, shown: 10, started: 2 };
-
-        // Act
-        render(ProductTourTotals, { tour });
-
-        // Assert
-        expect(screen.getByText('Accepted')).toBeTruthy();
-        expect(screen.queryByText('Completed')).toBeNull();
-        expect(screen.getByText('20.0% of invitations shown')).toBeTruthy();
-        expect(screen.getByText('30.0% of invitations shown')).toBeTruthy();
-    });
-
-    it('does not show undefined rates for invitations that have never been shown', () => {
-        // Arrange
-        const tour = { ...emptyGuide, kind: ProductTourKind.Prompt };
-
-        // Act
-        render(ProductTourTotals, { tour });
-
-        // Assert
-        expect(screen.getAllByText('0')).toHaveLength(4);
-        expect(screen.queryByText(/of invitations shown|—/)).toBeNull();
-    });
-});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index f01d13eafa..16480e3e83 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -1,7 +1,7 @@
 import { ProductTourUsageInterval } from '$generated/api';
 import { describe, expect, it } from 'vitest';
 
-import { getGuideOutcomeRate, getProductTourActivity, getProductTourUsageParams, getRate, getStartSourceShare } from './product-tour-usage';
+import { getProductTourActivity, getProductTourUsageParams } from './product-tour-usage';
 
 describe('product tour usage helpers', () => {
     it('maps each immutable range to the API query parameters', () => {
@@ -9,19 +9,6 @@ describe('product tour usage helpers', () => {
         expect(getProductTourUsageParams({ kind: 'history' })).toEqual({ history: true });
     });
 
-    it('returns null when a percentage has no denominator', () => {
-        expect(getRate(1, 0)).toBeNull();
-        expect(getGuideOutcomeRate({ completed: 0, dismissed: 0, started: 0 }, 'completed')).toBeNull();
-        expect(getStartSourceShare({ count: 1 }, 0)).toBeNull();
-    });
-
-    it('calculates prompt and guide rates from their declared denominators', () => {
-        expect(getRate(3, 4)).toBe(0.75);
-        expect(getGuideOutcomeRate({ completed: 3, dismissed: 1, started: 5 }, 'completed')).toBe(0.6);
-        expect(getGuideOutcomeRate({ completed: 3, dismissed: 1, started: 5 }, 'dismissed')).toBe(0.2);
-        expect(getStartSourceShare({ count: 2 }, 5)).toBe(0.4);
-    });
-
     it('fills missing UTC days without inventing future activity', () => {
         // Arrange
         const activity = [{ completed: 0, date_utc: '2026-08-02T00:00:00Z', dismissed: 0, shown: 2, started: 1 }];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index 12d166e917..5431def054 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -9,10 +9,6 @@ export type ProductTourUsageRange =
           month: string;
       };
 
-export function getGuideOutcomeRate(value: { completed: number; dismissed: number; started: number }, outcome: 'completed' | 'dismissed'): null | number {
-    return getRate(value[outcome], value.started);
-}
-
 export function getProductTourActivity(
     activity: ProductTourActivity[],
     interval: ProductTourUsageInterval,
@@ -52,11 +48,3 @@ export function getProductTourUsageParams(range: ProductTourUsageRange): Record<
 
     return { month: `${range.month}-01` };
 }
-
-export function getRate(numerator: number, denominator: number): null | number {
-    return denominator > 0 ? numerator / denominator : null;
-}
-
-export function getStartSourceShare(source: { count: number }, started: number): null | number {
-    return getRate(source.count, started);
-}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index cdc711e392..b240cdef6b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -2,6 +2,7 @@
     import type { ProductTourUsageRange } from '$features/admin/product-tour-usage';
     import type { ProductTourSummary } from '$generated/api';
 
+    import TimeAgo from '$comp/formatters/time-ago.svelte';
     import { Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Card from '$comp/ui/card';
@@ -40,20 +41,16 @@
     }
 </script>
 
-<div class="space-y-6">
+<div class="flex flex-col gap-6">
     <div class="flex flex-wrap items-center justify-between gap-3">
-        <Muted>Recorded guide activity across your installation</Muted>
+        <Muted>Guide activity · {range.kind === 'history' ? 'Monthly' : 'Daily'} · UTC</Muted>
         <div class="flex items-center gap-2" aria-label="Usage filters">
             <ProductTourPeriod bind:range />
             <Button variant="outline" size="icon" aria-label="Refresh tour activity" disabled={usageQuery.isFetching} onclick={() => usageQuery.refetch()}>
-                <RefreshCw class="size-4" />
+                <RefreshCw />
             </Button>
         </div>
     </div>
-    <p class="text-muted-foreground text-sm">
-        Charts show recorded events. Saved completion badges can include earlier, unrecorded activity.
-        {range.kind === 'history' ? 'History is grouped by month.' : 'This month is grouped by day.'} Dates use UTC.
-    </p>
 
     {#if usageQuery.isError}
         <Card.Root>
@@ -73,24 +70,23 @@
     {:else}
         {@render TourCards(guides)}
         {#if invitations.length > 0}
-            <details>
-                <summary class="cursor-pointer text-sm font-medium">Invitation activity</summary>
-                <p class="text-muted-foreground my-4 text-sm">
-                    Welcome and feature invitations offer a guide. Shown counts the invitation appearing—not the guide running. Accepted means starting a guide
-                    or browsing guides.
-                </p>
+            <section aria-labelledby="invitation-activity-title" class="flex flex-col gap-4">
+                <h2 id="invitation-activity-title" class="text-sm font-medium">Invitations</h2>
                 {@render TourCards(invitations)}
-            </details>
+            </section>
         {/if}
     {/if}
 </div>
 
 {#snippet TourCards(tours: ProductTourSummary[])}
-    <div class="grid items-start gap-4 lg:grid-cols-2">
+    <div class="grid gap-4 lg:grid-cols-2">
         {#each tours as tour (`${tour.name}:${tour.version}`)}
             <Card.Root aria-label={`${title(tour.name)} usage`}>
-                <Card.Header>
+                <Card.Header class="flex flex-row flex-wrap items-center justify-between gap-x-3 gap-y-1">
                     <Card.Title>{title(tour.name)} <span class="text-muted-foreground text-xs font-normal">v{tour.version}</span></Card.Title>
+                    {#if tour.last_run_utc}
+                        <Card.Description class="whitespace-nowrap">Last event <TimeAgo value={tour.last_run_utc} /></Card.Description>
+                    {/if}
                 </Card.Header>
                 <Card.Content>
                     {#if usage}

From d6531982566a91a49740966d2207cec9f662b97a Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 20:33:03 -0500
Subject: [PATCH 18/43] Refine guided tour chart spacing to match overview

---
 .../admin/components/product-tour-activity.svelte  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 65a34c9755..d57f19b019 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -65,13 +65,15 @@
                 {series}
                 yDomain={[0, null]}
                 padding={{
-                    bottom: 48,
+                    bottom: 20,
                     left: 32,
                     right: 32,
-                    top: 8
+                    top: prompt ? 48 : 32
                 }}
                 axis
-                legend
+                legend={{
+                    placement: 'top-left'
+                }}
                 props={{
                     xAxis: {
                         format: dateLabel,
@@ -85,8 +87,10 @@
             >
                 {#snippet marks({ context })}
                     {#each context.series.visibleSeries as item (item.key)}
-                        <Spline seriesKey={item.key} curve={curveLinear} strokeWidth={2} />
-                        <Points seriesKey={item.key} r={3} fill={item.color} />
+                        <Spline seriesKey={item.key} curve={curveLinear} strokeWidth={1.5} />
+                        {#if data.length === 1}
+                            <Points seriesKey={item.key} r={3} fill={item.color} />
+                        {/if}
                     {/each}
                 {/snippet}
                 {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}

From 90d9da6915b98103031dddc2db012e4972ccd7b7 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 22:35:42 -0500
Subject: [PATCH 19/43] Separate guided tour activity from browser telemetry
 and refine usage charts

---
 .../Models/Data/ProductTours.cs               |  16 +-
 src/Exceptionless.Core/Models/User.cs         |   1 +
 .../Repositories/EventRepository.cs           |  14 +-
 .../Interfaces/IEventRepository.cs            |   2 +-
 .../Repositories/ProductTourUsageResult.cs    |   7 +-
 .../Api/Endpoints/AdminEndpoints.cs           |   5 +-
 .../Api/Endpoints/UserEndpoints.cs            |  20 ++
 .../Api/Handlers/AdminHandler.cs              |  33 ++-
 .../Handlers/ProductTourActivityHandler.cs    |  96 +++++++
 .../Api/Messages/AdminMessages.cs             |   2 +-
 .../Api/Messages/UserMessages.cs              |   2 +
 .../e2e/tests/product-tour-dashboard.e2e.ts   |  83 ++++++
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  63 +++++
 .../components/product-tour-activity.svelte   | 111 +++++++-
 .../product-tour-activity.svelte.test.ts      |  29 ++-
 .../components/product-tour-period.svelte     |  27 +-
 .../features/admin/product-tour-usage.test.ts |   1 +
 .../lib/features/admin/product-tour-usage.ts  |   9 +-
 .../investigation-detail-tour.svelte.test.ts  |   1 +
 .../investigation-list-tour.svelte.test.ts    |   1 +
 .../product-tours/actions.svelte.test.ts      |   2 +-
 .../features/product-tours/actions.svelte.ts  |  28 +-
 .../features/product-tours/api.svelte.test.ts |  65 +++++
 .../lib/features/product-tours/api.svelte.ts  |  90 +++++++
 .../product-tour-catalog-dialog.svelte        |   3 +
 ...product-tour-catalog-dialog.svelte.test.ts |  13 +-
 .../product-tour-feature-announcement.svelte  |   3 +
 .../components/product-tour-host.svelte       |  22 +-
 .../product-tour-privacy-link.svelte          |   9 +
 .../product-tour-privacy-settings.svelte      |  41 +++
 .../components/product-tour-spotlight.svelte  |   9 +-
 .../product-tour-spotlight.svelte.test.ts     |   1 +
 .../components/product-tour-welcome.svelte    |   3 +
 .../features/product-tours/session.test.ts    |  55 ++++
 .../src/lib/features/product-tours/session.ts |  29 ++-
 .../product-tours/state.svelte.test.ts        |  15 ++
 .../features/product-tours/state.svelte.ts    |   9 +
 .../features/product-tours/telemetry.test.ts  |  13 -
 .../lib/features/product-tours/telemetry.ts   |  16 --
 .../src/lib/features/product-tours/types.ts   |   1 +
 .../ClientApp/src/lib/generated/api.ts        |  36 +++
 .../ClientApp/src/lib/generated/schemas.ts    |  43 ++++
 .../routes/(app)/account/manage/+page.svelte  |   2 +
 .../[projectId]/configure/+page.svelte        |   8 +
 .../(app)/system/product-tours/+page.svelte   |  19 +-
 .../Models/Admin/ProductTourUsageResponse.cs  |  12 +-
 .../Models/User/PostProductTourActivity.cs    |  28 ++
 .../Models/User/ViewCurrentUser.cs            |   2 +
 .../Api/Data/endpoint-manifest.json           |  28 ++
 .../Exceptionless.Tests/Api/Data/openapi.json | 242 +++++++++++++++++-
 .../AdminProductTourUsageEndpointTests.cs     |  41 ++-
 .../ProductTourActivityEndpointTests.cs       | 193 ++++++++++++++
 .../Repositories/EventRepositoryTests.cs      |  31 +++
 .../Handlers/ThrottlingMiddlewareTests.cs     |  15 ++
 tests/http/admin.http                         |   2 +-
 tests/http/users.http                         |  21 ++
 56 files changed, 1571 insertions(+), 102 deletions(-)
 create mode 100644 src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
 create mode 100644 src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
 create mode 100644 src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
 create mode 100644 tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index 65ef2328f7..0e58c9eef8 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -6,6 +6,16 @@ namespace Exceptionless.Core.Models.Data;
 
 public static class ProductTours
 {
+    public const string StepTagPrefix = "product-tour-step:";
+
+    public static FrozenDictionary<string, string[]> Steps { get; } = new Dictionary<string, string[]>(StringComparer.Ordinal)
+    {
+        [AppOverview] = ["navigation", "command-search", "saved-views", "exie", "help"],
+        [EventInvestigate] = ["filter-errors", "choose-error", "stack-summary", "stack-triage", "event-occurrence", "tab-overview", "filter-stack-events"],
+        [ExieOverview] = ["open-exie", "exie-context"],
+        [ProjectConfigure] = ["organization-name", "project-name", "choose-platform", "sdk-instructions", "wait-for-event", "event-received"],
+        [SavedViewCreate] = ["open-view-menu", "review-settings", "name-view", "private-view", "save-view", "view-created"]
+    }.ToFrozenDictionary(StringComparer.Ordinal);
     public const string AppOverview = "app-overview";
     public const string AppWelcome = "app-welcome";
     public const string ExieAnnouncement = "exie-announcement";
@@ -47,6 +57,7 @@ public static string CreateTelemetrySource(
         ProductTourTelemetryEvent.Dismissed => "dismissed",
         ProductTourTelemetryEvent.Shown => "shown",
         ProductTourTelemetryEvent.Started => "started",
+        ProductTourTelemetryEvent.StepReached => "step-reached",
         _ => throw new ArgumentOutOfRangeException(nameof(telemetryEvent), telemetryEvent, "Unknown product tour telemetry event.")
     };
 
@@ -88,7 +99,10 @@ public enum ProductTourTelemetryEvent
     Shown,
     [JsonStringEnumMemberName("started")]
     [EnumMember(Value = "started")]
-    Started
+    Started,
+    [JsonStringEnumMemberName("step-reached")]
+    [EnumMember(Value = "step-reached")]
+    StepReached
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/src/Exceptionless.Core/Models/User.cs b/src/Exceptionless.Core/Models/User.cs
index d11525d864..f4ba5b6a66 100644
--- a/src/Exceptionless.Core/Models/User.cs
+++ b/src/Exceptionless.Core/Models/User.cs
@@ -27,6 +27,7 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; init; } = new Collection<UserOrganizationPreference>();
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; init; } = new Collection<UserSavedViewOrderPreference>();
     public IDictionary<string, ProductTourProgress> ProductTours { get; init; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
+    public bool ProductTourAnalyticsEnabled { get; set; } = true;
 
     /// <summary>
     /// Gets or sets the users Full Name.
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index d01f1a020e..0eea3778e6 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -84,7 +84,7 @@ public Task<FindResults<PersistentEvent>> GetByReferenceIdAsync(string projectId
         return FindAsync(q => q.Project(projectId).FieldEquals(e => e.ReferenceId, referenceId).SortDescending(e => e.Date), o => o.PageLimit(10));
     }
 
-    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd)
+    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd, ProductTourUsageInterval? usageInterval = null)
     {
         ArgumentException.ThrowIfNullOrEmpty(projectId);
         if (utcStart.HasValue && utcEnd <= utcStart)
@@ -97,11 +97,13 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
         string sourceField = InferField(ev => ev.Source);
         string countField = InferField(ev => ev.Count);
         string dateField = InferField(ev => ev.Date);
-        bool daily = utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1);
+        string tagsField = InferField(ev => ev.Tags);
+        int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
+        bool daily = usageInterval.HasValue ? usageInterval is ProductTourUsageInterval.Day : utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1);
         string interval = daily ? "1d" : "1M";
 
         var aggregation = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
-            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}~{interval} sum:{countField}~1))"));
+            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}~{interval} sum:{countField}~1) terms:({tagsField}~{stepCount} @include:/{ProductTours.StepTagPrefix}.*/ sum:{countField}~1))"));
 
         var sourceBuckets = aggregation.Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
         var usage = sourceBuckets
@@ -113,6 +115,12 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                     (bucket.Aggregations.DateHistogram($"date_{dateField}")?.Buckets ?? [])
                         .Select(period => new ProductTourUsagePeriod(period.Date, Convert.ToInt64(period.Aggregations.Sum($"sum_{countField}")?.Value ?? period.Total.GetValueOrDefault())))
                         .ToArray())
+                {
+                    Steps = (bucket.Aggregations.Terms<string>($"terms_{tagsField}")?.Buckets ?? [])
+                        .Where(step => step.Key.StartsWith(ProductTours.StepTagPrefix, StringComparison.Ordinal))
+                        .Select(step => new ProductTourStepCount(step.Key[ProductTours.StepTagPrefix.Length..], Convert.ToInt64(step.Aggregations.Sum($"sum_{countField}")?.Value ?? step.Total.GetValueOrDefault())))
+                        .ToArray()
+                }
                 : null)
             .OfType<ProductTourUsageBucket>()
             .ToArray();
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
index 03731764c5..83dd231a67 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
@@ -13,7 +13,7 @@ public interface IEventRepository : IRepositoryOwnedByOrganizationAndProject<Per
     Task<bool> UpdateSessionStartLastActivityAsync(string id, DateTime lastActivityUtc, bool isSessionEnd = false, bool hasError = false, bool sendNotifications = true);
     Task<long> RemoveAllAsync(string organizationId, string? clientIpAddress, DateTime? utcStart, DateTime? utcEnd, CommandOptionsDescriptor<PersistentEvent>? options = null);
     Task<long> RemoveAllByStackIdsAsync(string[] stackIds);
-    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd);
+    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd, ProductTourUsageInterval? usageInterval = null);
 }
 
 public static class EventRepositoryExtensions
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index 1b8603bd88..a6d3774fd3 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -19,7 +19,12 @@ public enum ProductTourUsageInterval
     Month
 }
 
-public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity);
+public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity)
+{
+    public IReadOnlyCollection<ProductTourStepCount> Steps { get; init; } = [];
+}
+
+public sealed record ProductTourStepCount(string Step, long Count);
 
 public sealed record ProductTourUsagePeriod(DateTime DateUtc, long Count);
 
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index 5477ea05b6..89ce8b593f 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -144,6 +144,7 @@ private static async Task<HttpIResult> GetProductTourUsageAsync(
         IMediator mediator,
         IMediatorResultMapper<HttpIResult> resultMapper,
         DateTime? month = null,
-        bool history = false)
-        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, history))).ToHttpResult(resultMapper);
+        bool history = false,
+        int? days = null)
+        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, history, days))).ToHttpResult(resultMapper);
 }
diff --git a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
index 96f0464734..0172f6db08 100644
--- a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
@@ -59,6 +59,26 @@ public static IEndpointRouteBuilder MapUserEndpoints(this IEndpointRouteBuilder
             }
         });
 
+        group.MapPost("users/me/product-tours/{tourName:maxlength(64)}/activity", async (string tourName, PostProductTourActivity activity, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
+            => (await mediator.InvokeAsync<Result>(new UserMessages.RecordProductTourActivity(tourName, activity))).ToHttpResult(resultMapper))
+            .Accepts<PostProductTourActivity>(false, "application/json")
+            .WithMetadata(new RequestSizeLimitAttribute(2048))
+            .Produces(StatusCodes.Status202Accepted)
+            .Produces(StatusCodes.Status204NoContent)
+            .ProducesProblem(StatusCodes.Status400BadRequest)
+            .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
+            .ProducesProblem(StatusCodes.Status404NotFound)
+            .ProducesProblem(StatusCodes.Status503ServiceUnavailable)
+            .WithSummary("Record optional guided-tour activity without identifying context");
+
+        group.MapPut("users/me/product-tour-analytics", async (UpdateProductTourAnalytics settings, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
+            => (await mediator.InvokeAsync<Result>(new UserMessages.UpdateCurrentUserProductTourAnalytics(settings))).ToHttpResult(resultMapper))
+            .Accepts<UpdateProductTourAnalytics>(false, "application/json")
+            .Produces(StatusCodes.Status204NoContent)
+            .ProducesProblem(StatusCodes.Status400BadRequest)
+            .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
+            .WithSummary("Update current user guided-tour analytics preference");
+
         group.MapGet("users/me/oauth-grants", async (IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
             => (await mediator.InvokeAsync<Result<IReadOnlyCollection<ViewOAuthGrant>>>(new UserMessages.GetCurrentUserOAuthGrants())).ToHttpResult(resultMapper))
         .Produces<IReadOnlyCollection<ViewOAuthGrant>>()
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index c590aa3aba..ee923d99be 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -141,6 +141,11 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
         if (message.History && message.Month.HasValue)
             return Result.Invalid(ValidationError.Create("month", "Month cannot be specified when requesting available history."));
 
+        if (message.Days.HasValue && (message.Days is < 1 or > 90 || message.History || message.Month.HasValue))
+        {
+            return Result.Invalid(ValidationError.Create("days", "Choose 1–90 days without month or history."));
+        }
+
         DateTime utcEnd = timeProvider.GetUtcNow().UtcDateTime;
         DateTime monthStart = (message.Month ?? utcEnd).ToUniversalTime().StartOfMonth();
         DateTime? utcStart = message.History
@@ -148,10 +153,16 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
                 ? utcEnd.SubtractDays(appOptions.MaximumRetentionDays)
                 : null
             : monthStart;
-        if (!message.History)
+        if (message.Days.HasValue)
+        {
+            utcStart = utcEnd.Date.AddDays(1 - message.Days.Value);
+        }
+        else if (!message.History)
             utcEnd = monthStart.AddMonths(1);
 
-        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd);
+        var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
+        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd,
+            message.History ? ProductTourUsageInterval.Month : ProductTourUsageInterval.Day);
         var bucketsByTour = usage.Buckets
             .GroupBy(bucket => (bucket.Source.TourName, bucket.Source.Version))
             .ToDictionary(group => group.Key);
@@ -187,17 +198,29 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Started).Sum(period => period.Count),
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Completed).Sum(period => period.Count),
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Dismissed).Sum(period => period.Count)))
-                        .ToArray());
+                        .ToArray())
+                {
+                    Steps = buckets.SelectMany(bucket => bucket.Steps.Select(step => (step.Step, step.Count, bucket.Source.Event)))
+                        .GroupBy(step => step.Step, StringComparer.Ordinal)
+                        .OrderBy(group => group.Key, StringComparer.Ordinal)
+                        .Select(group => new ProductTourStepActivity(group.Key,
+                            group.Where(step => step.Event is ProductTourTelemetryEvent.StepReached).Sum(step => step.Count),
+                            group.Where(step => step.Event is ProductTourTelemetryEvent.Dismissed).Sum(step => step.Count)))
+                        .ToArray()
+                };
             }))
             .OrderBy(tour => tour.Name, StringComparer.Ordinal)
             .ThenBy(tour => tour.Version)
             .ToArray();
 
         return new ProductTourUsageResponse(
-            utcStart,
+            message.History ? usage.Buckets.SelectMany(bucket => bucket.Activity).Where(period => period.Count > 0).Select(period => (DateTime?)period.DateUtc).Min() : utcStart,
             utcEnd,
             tours,
-            usage.Interval);
+            usage.Interval)
+        {
+            CollectionAvailable = project is { IsDeleted: false }
+        };
     }
 
     [HandlerEndpoint(HandlerMethod.Get, "migrations", Group = "Admin")]
diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
new file mode 100644
index 0000000000..7600957f82
--- /dev/null
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -0,0 +1,96 @@
+using Exceptionless.Core;
+using Exceptionless.Core.Models;
+using Exceptionless.Core.Models.Data;
+using Exceptionless.Core.Queues.Models;
+using Exceptionless.Core.Repositories;
+using Exceptionless.Core.Services;
+using Exceptionless.Web.Api.Messages;
+using Exceptionless.Web.Extensions;
+using Exceptionless.Web.Models;
+using Foundatio.Mediator;
+using Foundatio.Repositories;
+using Foundatio.Repositories.Models;
+using Foundatio.Serializer;
+
+namespace Exceptionless.Web.Api.Handlers;
+
+public class ProductTourActivityHandler(
+    IUserRepository userRepository,
+    IProjectRepository projectRepository,
+    EventPostService eventPostService,
+    AppOptions appOptions,
+    ISerializer serializer,
+    TimeProvider timeProvider,
+    IHttpContextAccessor httpContextAccessor)
+{
+    private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
+
+    public async Task<Result> Handle(UpdateCurrentUserProductTourAnalytics message)
+    {
+        await userRepository.PatchAsync(HttpContext.Request.GetUser().Id,
+            new PartialPatch(new { product_tour_analytics_enabled = message.Settings.Enabled!.Value }));
+        return Result.NoContent();
+    }
+
+    public async Task<Result> Handle(RecordProductTourActivity message, CancellationToken cancellationToken)
+    {
+        var activity = message.Activity;
+        if (!ProductTours.IsValid(message.TourName, activity.Version))
+        {
+            return Result.Invalid(ValidationError.Create("tour_name", "Unknown product tour or unsupported version."));
+        }
+
+        if (activity.Step is not null && (!ProductTours.Steps.TryGetValue(message.TourName, out var steps)
+            || !steps.Contains(activity.Step, StringComparer.Ordinal)))
+        {
+            return Result.Invalid(ValidationError.Create("step", "Unknown product tour step."));
+        }
+
+        if (activity.Action is ProductTourTelemetryEvent.StepReached && activity.Step is null)
+        {
+            return Result.Invalid(ValidationError.Create("step", "A reached step is required."));
+        }
+
+        // Re-read the preference so a stale browser or authentication cache cannot bypass opt-out.
+        var user = await userRepository.GetByIdAsync(HttpContext.Request.GetUser().Id, options => options.Cache(false));
+        if (user is null)
+        {
+            return Result.NotFound("User not found.");
+        }
+
+        if (!user.ProductTourAnalyticsEnabled)
+        {
+            return Result.NoContent();
+        }
+
+        var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
+        if (project is null || project.IsDeleted)
+        {
+            return Result.Unavailable("Guided-tour activity storage is unavailable.");
+        }
+
+        var ev = new Event
+        {
+            Type = Event.KnownTypes.FeatureUsage,
+            Source = ProductTours.CreateTelemetrySource(activity.Action!.Value, message.TourName, activity.Version, activity.Source!.Value),
+            Date = timeProvider.GetUtcNow()
+        };
+        if (activity.Step is not null)
+        {
+            ev.Tags!.Add(ProductTours.StepTagPrefix + activity.Step);
+        }
+
+        // Do not use the SDK or copy HTTP metadata: these events need no identifying context.
+        using var stream = new MemoryStream(serializer.SerializeToBytes(ev));
+        var entry = await eventPostService.EnqueueAsync(new EventPost(appOptions.EnableArchive)
+        {
+            ApiVersion = 2,
+            MediaType = "application/json",
+            ProjectId = project.Id,
+            OrganizationId = project.OrganizationId
+        }, stream, cancellationToken);
+        return String.IsNullOrEmpty(entry)
+            ? Result.Unavailable("Guided-tour activity could not be queued.")
+            : Result.Accepted();
+    }
+}
diff --git a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
index 7183ab7392..7d37c9948d 100644
--- a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
@@ -3,7 +3,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetAdminSettings;
 public record GetAdminStats;
 public record GetAdminAssistantUsage(DateTime? Month, int Limit, HttpContext Context);
-public record GetAdminProductTourUsage(DateTime? Month, bool History);
+public record GetAdminProductTourUsage(DateTime? Month, bool History, int? Days = null);
 public record GetAdminMigrations;
 public record GetAdminEcho(HttpContext Context);
 public record GetAdminAssemblies;
diff --git a/src/Exceptionless.Web/Api/Messages/UserMessages.cs b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
index 7973ceae86..29342159aa 100644
--- a/src/Exceptionless.Web/Api/Messages/UserMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
@@ -7,6 +7,8 @@ public record GetCurrentUser;
 public record GetCurrentUserOAuthGrants;
 public record RevokeCurrentUserOAuthGrant(string Id);
 public record UpdateCurrentUserProductTour(string TourName, UpdateProductTourProgress Progress);
+public record RecordProductTourActivity(string TourName, PostProductTourActivity Activity);
+public record UpdateCurrentUserProductTourAnalytics(UpdateProductTourAnalytics Settings);
 public record GetUserById(string Id);
 public record GetUsersByOrganization(string OrganizationId, int Page, int Limit);
 public record UpdateUserMessage(string Id, Delta<UpdateUser> Changes);
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
new file mode 100644
index 0000000000..96b0aff4b9
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -0,0 +1,83 @@
+import { expect, test } from '../fixtures/e2e-test';
+
+test('synthetic activity charts support keyboard, compact ranges, and light/dark layouts', async ({ e2eApi, page }, testInfo) => {
+    // Arrange: isolated response fixture; no synthetic events are written to storage.
+    await page.emulateMedia({ reducedMotion: 'reduce' });
+    const token = await e2eApi.login();
+    await page.addInitScript((token) => localStorage.setItem('satellizer_token', token), token);
+    const today = new Date();
+    today.setUTCHours(0, 0, 0, 0);
+    const activity = Array.from({ length: 30 }, (_, index) => ({
+        completed: 3 + (index % 5),
+        date_utc: new Date(today.getTime() - (29 - index) * 86_400_000).toISOString(),
+        dismissed: index % 3,
+        shown: 15 + (index % 9),
+        started: 8 + (index % 7)
+    }));
+    const sum = (key: 'completed' | 'dismissed' | 'shown' | 'started') => activity.reduce((total, day) => total + day[key], 0);
+    await page.route('**/api/v2/admin/product-tour-usage*', (route) =>
+        route.fulfill({
+            json: {
+                collection_available: true,
+                interval: 'day',
+                tours: ['app-overview', 'project-configure', 'saved-view-create', 'app-welcome'].map((name) => ({
+                    activity,
+                    completed: sum('completed'),
+                    dismissed: sum('dismissed'),
+                    kind: name === 'app-welcome' ? 'prompt' : 'guide',
+                    last_run_utc: new Date().toISOString(),
+                    name,
+                    shown: sum('shown'),
+                    start_sources: [{ count: sum('started'), source: 'catalog' }],
+                    started: sum('started'),
+                    steps: [{ dismissed: 3, reached: 20, step: 'navigation' }],
+                    version: 1
+                })),
+                utc_end: new Date().toISOString(),
+                utc_start: activity[0].date_utc
+            }
+        })
+    );
+
+    // Act & Assert
+    await page.goto('/next/system/product-tours');
+    await expect(page.getByRole('button', { name: 'Usage period: Last 30 days' })).toBeVisible();
+    const chart = page.getByRole('slider').first();
+    await chart.focus();
+    await page.keyboard.press('Home');
+    await expect(chart).toHaveAttribute('aria-valuenow', '0');
+    await expect(chart).toHaveAttribute('aria-valuetext', /Started: 8.*Completed: 3.*Dismissed: 0/);
+    await page.keyboard.press('ArrowRight');
+    await expect(chart).toHaveAttribute('aria-valuenow', '1');
+    await expect(chart).toHaveAttribute('aria-valuetext', /Started: 9/);
+    await page.keyboard.press('Tab');
+    await page.getByRole('button', { name: 'Steps and entry points' }).first().click();
+    await expect(page.getByRole('list', { name: 'Guide entry points' })).toContainText('100%');
+    await page.keyboard.press('Escape');
+    await page.getByRole('button', { name: 'Usage period: Last 30 days' }).click();
+    await page.getByRole('button', { exact: true, name: 'Available history' }).click();
+    await expect(page.getByRole('button', { name: 'Usage period: Available history' })).toBeVisible();
+    await page.getByRole('button', { name: 'Usage period: Available history' }).click();
+    await page.getByRole('button', { exact: true, name: 'Last 30 days' }).click();
+    await page.evaluate(() => {
+        const label = document.createElement('div');
+        label.textContent = 'SYNTHETIC LOCAL FIXTURE — NOT CUSTOMER ACTIVITY';
+        label.style.cssText =
+            'position:fixed;bottom:8px;left:8px;z-index:9999;background:#111;color:#fff;padding:6px 10px;font:10px sans-serif;border-radius:4px';
+        document.body.append(label);
+    });
+    for (const [theme, width] of [
+        ['dark', 1440],
+        ['light', 1440],
+        ['dark', 390]
+    ] as const) {
+        await page.setViewportSize({ height: 960, width });
+        await page.evaluate((theme) => {
+            document.documentElement.classList.toggle('dark', theme === 'dark');
+            document.documentElement.classList.toggle('light', theme === 'light');
+        }, theme);
+        await expect(chart).toBeVisible();
+        await expect.poll(() => page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
+        await page.screenshot({ animations: 'disabled', path: testInfo.outputPath(`synthetic-chart-${theme}-${width}.png`) });
+    }
+});
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 1104066797..6db5c25a63 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -412,6 +412,69 @@ async function expectProductTourSession(page: Page, present: boolean): Promise<v
     }
 }
 
+test('privacy opt-out preserves completion and storage denial keeps guides usable', async ({ e2eScenario, page }, testInfo) => {
+    // Arrange
+    const activities: { action: string; step?: string }[] = [];
+    const oversized = await page.request.post('/api/v2/users/me/product-tours/app-overview/activity', {
+        data: JSON.stringify({ action: 'started', source: 'catalog', version: 1 }) + ' '.repeat(2048),
+        headers: { Authorization: `Bearer ${e2eScenario.userToken}`, 'Content-Type': 'application/json' }
+    });
+    expect(oversized.status()).toBe(413);
+    page.on('request', (request) => {
+        if (request.method() === 'POST' && request.url().includes('/product-tours/app-overview/activity')) {
+            activities.push(request.postDataJSON());
+        }
+    });
+    await page.goto('/next/stack');
+    await startTourFromCommand(page, 'Explore Exceptionless');
+    const tour = page.locator('.driver-popover');
+    await expect(tour.getByText('Your workspace navigation')).toBeVisible();
+    await expect.poll(() => activities.filter((activity) => activity.step === 'navigation')).toHaveLength(1);
+    await tour.getByRole('button', { name: 'Continue' }).click();
+    await expect(tour.getByText('Use the command palette')).toBeVisible();
+    await tour.getByRole('button', { name: 'Back' }).click();
+    await expect(tour.getByText('Your workspace navigation')).toBeVisible();
+    expect(activities.filter((activity) => activity.step === 'navigation')).toHaveLength(1);
+    const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
+    await tour.getByRole('button', { name: 'End guide' }).click();
+    await dismissed;
+
+    // Act
+    await page.goto('/next/account/manage#guided-tour-privacy');
+    const preference = page.getByRole('switch', { name: 'Help improve guided tours' });
+    await expect(preference).toBeChecked();
+    const saved = page.waitForResponse((response) => response.url().endsWith('/users/me/product-tour-analytics') && response.status() === 204);
+    await preference.focus();
+    await page.keyboard.press('Space');
+    await saved;
+    await expect(preference).not.toBeChecked();
+    await page.screenshot({ path: testInfo.outputPath('guide-privacy.png') });
+    const before = activities.length;
+    await page.addInitScript(() =>
+        Object.defineProperty(window, 'sessionStorage', {
+            get() {
+                throw new DOMException('Storage denied', 'SecurityError');
+            }
+        })
+    );
+    await page.goto('/next/stack');
+    await startTourFromCommand(page, 'Explore Exceptionless');
+    for (const title of ['Your workspace navigation', 'Use the command palette', 'Find your saved views']) {
+        await expect(tour.getByText(title)).toBeVisible();
+        await tour.getByRole('button', { name: 'Continue' }).click();
+    }
+    await expect(tour.getByText('Find your next guide')).toBeVisible();
+    const completed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
+    await tour.getByRole('button', { name: 'Browse guides' }).click();
+    const response = await completed;
+
+    // Assert
+    expect(await response.json()).toMatchObject({ status: 1, version: 1 });
+    expect(activities).toHaveLength(before);
+    await expect(page.getByRole('dialog', { name: 'Guided Tours' })).toBeVisible();
+    expect(e2eScenario.email).toContain('@exceptionless.test');
+});
+
 function isSuccessfulTourProgress(tourName: string) {
     return (response: Response): boolean => {
         const path = new URL(response.url()).pathname;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index d57f19b019..84ad4fc211 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,16 +2,19 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
+    import { Button } from '$comp/ui/button';
     import * as Chart from '$comp/ui/chart';
+    import * as Popover from '$comp/ui/popover';
     import * as Table from '$comp/ui/table';
     import { scaleUtc } from 'd3-scale';
     import { curveLinear } from 'd3-shape';
-    import { LineChart, Points, Spline } from 'layerchart';
+    import { type ChartState, LineChart, Points, Spline } from 'layerchart';
 
     import { getProductTourActivity } from '../product-tour-usage';
 
     let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
     const prompt = $derived(tour.kind === 'prompt');
+    const keyboardHelpId = $props.id();
     const data = $derived(getProductTourActivity(tour.activity ?? [], interval, start, end));
     const config = $derived({
         completed: {
@@ -19,19 +22,19 @@
             label: prompt ? 'Accepted' : 'Completed'
         },
         dismissed: {
-            color: 'var(--chart-5)',
+            color: 'var(--chart-6)',
             label: 'Dismissed'
         },
         shown: {
-            color: 'var(--chart-4)',
+            color: 'var(--chart-5)',
             label: 'Shown'
         },
         started: {
-            color: 'var(--chart-2)',
+            color: 'var(--chart-3)',
             label: 'Started'
         }
     } satisfies Chart.ChartConfig);
-    const keys = $derived(prompt ? (['shown', 'started', 'completed', 'dismissed'] as const) : (['started', 'completed', 'dismissed'] as const));
+    const keys = $derived(prompt ? (['shown', 'completed', 'dismissed'] as const) : (['started', 'completed', 'dismissed'] as const));
     const series = $derived(
         keys.map((key) => ({
             key,
@@ -39,6 +42,38 @@
         }))
     );
     const total = $derived(tour.shown + tour.started + tour.completed + tour.dismissed);
+    const commonExit = $derived(
+        tour.steps?.filter((step) => step.dismissed > 0).toSorted((a, b) => b.dismissed - a.dismissed || a.step.localeCompare(b.step))[0]
+    );
+    let context = $state<ChartState>();
+    let keyboardIndex = $state<number>();
+    const selectedIndex = $derived(Math.max(0, Math.min(keyboardIndex ?? data.length - 1, data.length - 1)));
+    const selectedPeriod = $derived(data[selectedIndex]);
+    const keyboardValue = $derived(
+        selectedPeriod ? `${dateLabel(selectedPeriod.date)}. ${keys.map((key) => `${config[key].label}: ${selectedPeriod[key]}`).join('. ')}` : 'No activity'
+    );
+
+    function showSelectedPeriod(): void {
+        if (selectedPeriod) {
+            context?.tooltip.show({
+                data: selectedPeriod
+            });
+        }
+    }
+
+    function inspectDate(event: KeyboardEvent): void {
+        if (!['ArrowLeft', 'ArrowRight', 'End', 'Home'].includes(event.key)) {
+            return;
+        }
+        event.preventDefault();
+        keyboardIndex =
+            event.key === 'Home'
+                ? 0
+                : event.key === 'End'
+                  ? data.length - 1
+                  : Math.max(0, Math.min(data.length - 1, selectedIndex + (event.key === 'ArrowRight' ? 1 : -1)));
+        showSelectedPeriod();
+    }
 
     function dateLabel(value: unknown): string {
         if (!(value instanceof Date)) {
@@ -57,8 +92,31 @@
     {#if total === 0}
         <p class="text-muted-foreground flex h-48 items-center justify-center text-sm">No recorded activity in this period.</p>
     {:else}
-        <Chart.Container {config} class="h-48 w-full" aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity.`}>
+        <ul class="flex flex-wrap gap-x-4 gap-y-1 text-xs" aria-label="Period totals">
+            {#each keys as key (key)}
+                <li class="flex items-center gap-1.5">
+                    <span class="h-0.5 w-3" style={`background: ${config[key].color}`} aria-hidden="true"></span>{config[key].label}
+                    <Number value={tour[key]} />
+                </li>
+            {/each}
+        </ul>
+        <Chart.Container
+            {config}
+            class="focus-visible:outline-ring h-48 w-full rounded-sm focus-visible:outline focus-visible:outline-2"
+            role="slider"
+            tabindex={0}
+            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity.`}
+            aria-describedby={keyboardHelpId}
+            aria-valuemin={0}
+            aria-valuemax={Math.max(0, data.length - 1)}
+            aria-valuenow={selectedIndex}
+            aria-valuetext={keyboardValue}
+            onkeydown={inspectDate}
+            onfocus={showSelectedPeriod}
+            onblur={() => context?.tooltip.hide()}
+        >
             <LineChart
+                bind:context
                 {data}
                 x="date"
                 xScale={scaleUtc()}
@@ -68,12 +126,10 @@
                     bottom: 20,
                     left: 32,
                     right: 32,
-                    top: prompt ? 48 : 32
+                    top: 8
                 }}
                 axis
-                legend={{
-                    placement: 'top-left'
-                }}
+                legend={false}
                 props={{
                     xAxis: {
                         format: dateLabel,
@@ -96,7 +152,42 @@
                 {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
+        {#if commonExit}
+            <p class="text-muted-foreground text-xs">Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></p>
+        {/if}
+        {#if !prompt && (tour.steps?.length || tour.start_sources.length)}
+            <Popover.Root>
+                <Popover.Trigger>
+                    {#snippet child({ props })}
+                        <Button {...props} variant="ghost" size="sm" class="text-muted-foreground w-fit">Steps and entry points</Button>
+                    {/snippet}
+                </Popover.Trigger>
+                <Popover.Content align="start" class="max-h-80 overflow-y-auto text-sm">
+                    {#if tour.steps?.length}
+                        <h3 class="mb-2 font-medium">Steps reached · exits</h3>
+                        <ul class="space-y-1" aria-label="Guide steps reached and explicit exits">
+                            {#each tour.steps as step (step.step)}
+                                <li>
+                                    {step.step.replaceAll('-', ' ')}: <Number value={step.reached} /> reached; <Number value={step.dismissed} /> closed here.
+                                </li>
+                            {/each}
+                        </ul>
+                    {/if}
+                    {#if tour.start_sources.length}
+                        <h3 class="mt-3 mb-2 font-medium">Share of starts</h3>
+                        <ul class="space-y-1" aria-label="Guide entry points">
+                            {#each tour.start_sources as source (source.source)}
+                                <li>
+                                    {source.source.replaceAll('-', ' ')}: <Number value={source.count} /> ({Math.round((source.count / tour.started) * 100)}%)
+                                </li>
+                            {/each}
+                        </ul>
+                    {/if}
+                </Popover.Content>
+            </Popover.Root>
+        {/if}
         <div class="sr-only">
+            <p id={keyboardHelpId}>Use Left and Right arrows to inspect dates, or Home and End to jump to the first and last date. Dates are UTC.</p>
             <Table.Root aria-label="Guide activity by date">
                 <Table.Header
                     ><Table.Row
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
index e6f87fc3f6..e470a563fc 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -1,7 +1,7 @@
 import type { ProductTourSummary } from '$generated/api';
 
 import { ProductTourKind, ProductTourLaunchSource, ProductTourUsageInterval } from '$generated/api';
-import { cleanup, render, screen } from '@testing-library/svelte';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import ProductTourActivity from './product-tour-activity.svelte';
@@ -15,10 +15,12 @@ const tour: ProductTourSummary = {
     shown: 0,
     start_sources: [{ count: 1, source: ProductTourLaunchSource.CommandPalette }],
     started: 1,
+    steps: [],
     version: 1
 };
 
 beforeEach(() => {
+    Object.defineProperty(Element.prototype, 'animate', { configurable: true, value: vi.fn(() => ({ cancel() {}, finished: Promise.resolve() })) });
     vi.stubGlobal(
         'ResizeObserver',
         class {
@@ -32,9 +34,34 @@ beforeEach(() => {
 afterEach(() => {
     cleanup();
     vi.unstubAllGlobals();
+    Reflect.deleteProperty(Element.prototype, 'animate');
 });
 
 describe('ProductTourActivity', () => {
+    it('makes exact daily counts keyboard accessible without relying on color', async () => {
+        // Arrange
+        render(ProductTourActivity, { end: '2026-01-03T00:00:00Z', interval: ProductTourUsageInterval.Day, start: '2026-01-01T00:00:00Z', tour });
+        const chart = screen.getByRole('slider');
+
+        // Act
+        await fireEvent.keyDown(chart, { key: 'Home' });
+
+        // Assert
+        expect(chart.getAttribute('aria-valuenow')).toBe('0');
+        expect(chart.getAttribute('aria-valuetext')).toContain('Completed: 1');
+        await fireEvent.keyDown(chart, { key: 'ArrowRight' });
+        expect(chart.getAttribute('aria-valuenow')).toBe('1');
+        expect(chart.getAttribute('aria-valuetext')).toContain('Completed: 0');
+    });
+
+    it('labels invitation acceptance without a redundant started series', () => {
+        // Act
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, tour: { ...tour, kind: ProductTourKind.Prompt } });
+
+        // Assert
+        expect(screen.getByLabelText('Period totals').textContent).toContain('Accepted');
+        expect(screen.getByLabelText('Period totals').textContent).not.toContain('Started');
+    });
     it('shows the chart without disclosures while preserving screen-reader access to values', () => {
         // Act
         render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, start: '2026-01-01T00:00:00Z', tour });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
index 06a2c4704b..d48107bdff 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-period.svelte
@@ -15,13 +15,15 @@
     const currentMonth = getUtcMonthKey();
     let month = $state(untrack(() => (range.kind === 'month' ? range.month : currentMonth)));
     const label = $derived(
-        range.kind === 'history'
-            ? 'Available history'
-            : new Date(`${range.month}-01T00:00:00Z`).toLocaleDateString(undefined, {
-                  month: 'long',
-                  timeZone: 'UTC',
-                  year: 'numeric'
-              })
+        range.kind === 'days'
+            ? `Last ${range.days} days`
+            : range.kind === 'history'
+              ? 'Available history'
+              : new Date(`${range.month}-01T00:00:00Z`).toLocaleDateString(undefined, {
+                    month: 'long',
+                    timeZone: 'UTC',
+                    year: 'numeric'
+                })
     );
 
     function selectMonth(): void {
@@ -42,6 +44,17 @@
         {/snippet}
     </Popover.Trigger>
     <Popover.Content align="end" class="w-64">
+        <Button
+            class="mb-3 w-full"
+            variant="ghost"
+            onclick={() => {
+                range = {
+                    days: 30,
+                    kind: 'days'
+                };
+                open = false;
+            }}>Last 30 days</Button
+        >
         <form
             class="flex flex-col gap-3"
             onsubmit={(event) => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index 16480e3e83..e9c3596786 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -7,6 +7,7 @@ describe('product tour usage helpers', () => {
     it('maps each immutable range to the API query parameters', () => {
         expect(getProductTourUsageParams({ kind: 'month', month: '2026-08' })).toEqual({ month: '2026-08-01' });
         expect(getProductTourUsageParams({ kind: 'history' })).toEqual({ history: true });
+        expect(getProductTourUsageParams({ days: 30, kind: 'days' })).toEqual({ days: 30 });
     });
 
     it('fills missing UTC days without inventing future activity', () => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index 5431def054..afcea93737 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -1,6 +1,10 @@
 import type { ProductTourActivity, ProductTourUsageInterval } from '$generated/api';
 
 export type ProductTourUsageRange =
+    | {
+          days: number;
+          kind: 'days';
+      }
     | {
           kind: 'history';
       }
@@ -41,7 +45,10 @@ export function getProductTourActivity(
     return result;
 }
 
-export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | string> {
+export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | number | string> {
+    if (range.kind === 'days') {
+        return { days: range.days };
+    }
     if (range.kind === 'history') {
         return { history: true };
     }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
index 0ad94d562d..539dc604c0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
@@ -8,6 +8,7 @@ import InvestigationDetailTour from './investigation-detail-tour.svelte';
 
 const actions = vi.hoisted(() => ({ complete: vi.fn(), dismiss: vi.fn() }));
 vi.mock('$features/product-tours/actions.svelte', () => ({ createProductTourActions: () => actions }));
+vi.mock('$features/product-tours/api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
 
 const event: PersistentEvent = {
     created_utc: '2026-09-01T00:00:00Z',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
index 9106517cbf..9e97160e91 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
@@ -3,6 +3,7 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import InvestigationListTour from './investigation-list-tour.svelte';
+vi.mock('$features/product-tours/api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
 
 vi.mock('$features/product-tours/actions.svelte', () => ({
     createProductTourActions: () => ({ dismiss: vi.fn() })
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
index 4586f9af22..f31d5a850c 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
@@ -10,7 +10,7 @@ const mocks = vi.hoisted(() => ({
     submitFeatureUsage: vi.fn(),
     success: vi.fn()
 }));
-vi.mock('$features/auth/exceptionless-session', () => ({ submitFeatureUsage: mocks.submitFeatureUsage }));
+vi.mock('./api.svelte', () => ({ createProductTourActivity: () => mocks.submitFeatureUsage }));
 vi.mock('$features/users/api.svelte', () => ({ putCurrentUserProductTour: () => ({ mutateAsync: mocks.mutateAsync }) }));
 vi.mock('./controls.svelte', () => ({ tryUseProductTourControls: () => ({ openCatalog: mocks.openCatalog }) }));
 vi.mock('svelte-sonner', () => ({ toast: { error: mocks.error, success: mocks.success } }));
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 45e89d8de2..9fb625acb6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -1,13 +1,12 @@
-import { submitFeatureUsage } from '$features/auth/exceptionless-session';
 import { putCurrentUserProductTour } from '$features/users/api.svelte';
 import { ProductTourStatus } from '$features/users/models';
 import { toast } from 'svelte-sonner';
 
-import type { ProductTourCheckpoint, ProductTourKey, ProductTourLaunchSource } from './types';
+import type { ProductTourCheckpoint } from './types';
 
+import { createProductTourActivity } from './api.svelte';
 import { tryUseProductTourControls } from './controls.svelte';
 import { productTourCheckpoint } from './state.svelte';
-import { buildProductTourTelemetryEvent, type ProductTourTelemetryEvent } from './telemetry';
 
 const COMPLETION_MESSAGES: Record<Exclude<ProductTourCheckpoint['tourName'], 'app-overview'>, string> = {
     'event-investigate': 'You’ve explored an error and its occurrences',
@@ -21,8 +20,12 @@ const domainCompletionRequests = new WeakSet<ProductTourCheckpoint>();
 export function createProductTourActions() {
     const controls = tryUseProductTourControls();
     const progressMutation = putCurrentUserProductTour();
+    const track = createProductTourActivity();
 
     async function complete(checkpoint: ProductTourCheckpoint): Promise<boolean> {
+        if (productTourCheckpoint.markReached(checkpoint)) {
+            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
+        }
         return finish(checkpoint, ProductTourStatus.Completed);
     }
 
@@ -36,6 +39,9 @@ export function createProductTourActions() {
         }
 
         domainCompletionRequests.add(checkpoint);
+        if (productTourCheckpoint.markReached(checkpoint)) {
+            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
+        }
         void progressMutation
             .mutateAsync({
                 progress: {
@@ -75,7 +81,13 @@ export function createProductTourActions() {
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        void track(status === ProductTourStatus.Completed ? 'completed' : 'dismissed', checkpoint.tourName, checkpoint.version, checkpoint.source);
+        void track(
+            status === ProductTourStatus.Completed ? 'completed' : 'dismissed',
+            checkpoint.tourName,
+            checkpoint.version,
+            checkpoint.source,
+            checkpoint.checkpointName
+        );
         if (status === ProductTourStatus.Completed) {
             showCompletion(checkpoint);
         }
@@ -103,11 +115,3 @@ export function createProductTourActions() {
         dismiss
     };
 }
-
-export async function track(event: ProductTourTelemetryEvent, name: ProductTourKey, version: number, source: ProductTourLaunchSource): Promise<void> {
-    try {
-        await submitFeatureUsage(buildProductTourTelemetryEvent(event, name, version, source));
-    } catch (error) {
-        console.warn('Unable to submit product tour telemetry.', error);
-    }
-}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
new file mode 100644
index 0000000000..224f6bc829
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
@@ -0,0 +1,65 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { createProductTourActivity } from './api.svelte';
+
+const mocks = vi.hoisted(() => ({ getQueryData: vi.fn(), postJSON: vi.fn() }));
+vi.mock('$features/users/api.svelte', () => ({ queryKeys: { me: () => ['User', 'me'] } }));
+vi.mock('@foundatiofx/fetchclient', () => ({ useFetchClient: () => ({ postJSON: mocks.postJSON }) }));
+vi.mock('@tanstack/svelte-query', () => ({
+    createMutation: (options: () => { mutationFn: (data: unknown) => Promise<void> }) => ({ mutateAsync: (data: unknown) => options().mutationFn(data) }),
+    useQueryClient: () => ({ getQueryData: mocks.getQueryData })
+}));
+
+describe('optional product-tour activity', () => {
+    beforeEach(() => vi.resetAllMocks());
+
+    it('submits only the bounded activity contract without a browser telemetry key', async () => {
+        // Arrange
+        mocks.getQueryData.mockReturnValue({ email_address: 'private@example.test', product_tour_analytics_enabled: true });
+
+        // Act
+        await createProductTourActivity()('step-reached', 'app-overview', 1, 'catalog', 'navigation');
+
+        // Assert
+        expect(mocks.postJSON).toHaveBeenCalledExactlyOnceWith('users/me/product-tours/app-overview/activity', {
+            action: 'step-reached',
+            source: 'catalog',
+            step: 'navigation',
+            version: 1
+        });
+    });
+
+    it.each([undefined, { product_tour_analytics_enabled: false }])('does not submit without an enabled preference: %j', async (user) => {
+        // Arrange
+        mocks.getQueryData.mockReturnValue(user);
+
+        // Act
+        await createProductTourActivity()('completed', 'app-overview', 1, 'catalog');
+
+        // Assert
+        expect(mocks.postJSON).not.toHaveBeenCalled();
+    });
+
+    it('checks the latest preference instead of capturing it at guide start', async () => {
+        // Arrange
+        const track = createProductTourActivity();
+        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: true });
+        await track('started', 'app-overview', 1, 'catalog');
+        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: false });
+
+        // Act
+        await track('completed', 'app-overview', 1, 'catalog');
+
+        // Assert
+        expect(mocks.postJSON).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not interrupt a guide when collection fails', async () => {
+        // Arrange
+        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: true });
+        mocks.postJSON.mockRejectedValue(new Error('Unavailable'));
+
+        // Act & Assert
+        await expect(createProductTourActivity()('completed', 'app-overview', 1, 'catalog')).resolves.toBeUndefined();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
new file mode 100644
index 0000000000..f26f2d5a28
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
@@ -0,0 +1,90 @@
+import type { PostProductTourActivity, ViewCurrentUser } from '$generated/api';
+
+import { queryKeys as userQueryKeys } from '$features/users/api.svelte';
+import { ProblemDetails, useFetchClient } from '@foundatiofx/fetchclient';
+import { createMutation, useQueryClient } from '@tanstack/svelte-query';
+
+import type { ProductTourKey, ProductTourLaunchSource } from './types';
+
+export function createProductTourActivity() {
+    const queryClient = useQueryClient();
+    const client = useFetchClient();
+    const activity = createMutation(() => ({
+        mutationFn: async ({
+            name,
+            ...activity
+        }: {
+            action: `${NonNullable<PostProductTourActivity['action']>}`;
+            name: ProductTourKey;
+            source: ProductTourLaunchSource;
+            step?: string;
+            version: number;
+        }) => {
+            if (queryClient.getQueryData<ViewCurrentUser>(userQueryKeys.me())?.product_tour_analytics_enabled !== true) {
+                return;
+            }
+            await client.postJSON(`users/me/product-tours/${name}/activity`, activity);
+        },
+        mutationKey: ['product-tours', 'activity'],
+        retry: false
+    }));
+
+    return async (
+        action: `${NonNullable<PostProductTourActivity['action']>}`,
+        name: ProductTourKey,
+        version: number,
+        source: ProductTourLaunchSource,
+        step?: string
+    ): Promise<void> => {
+        try {
+            await activity.mutateAsync({
+                action,
+                name,
+                source,
+                step,
+                version
+            });
+        } catch {
+            // Optional analytics must not interrupt the guide or expose request context through the telemetry SDK.
+        }
+    };
+}
+
+export function putProductTourAnalytics() {
+    const queryClient = useQueryClient();
+    const client = useFetchClient();
+    return createMutation<void, ProblemDetails, boolean, { previous: undefined | ViewCurrentUser }>(() => ({
+        mutationFn: async (enabled) => {
+            await client.putJSON('users/me/product-tour-analytics', {
+                enabled
+            });
+        },
+        mutationKey: ['product-tours', 'analytics'],
+        onError: (_error, _enabled, context) => {
+            if (context?.previous) {
+                queryClient.setQueryData(userQueryKeys.me(), context.previous);
+            }
+        },
+        onMutate: async (enabled) => {
+            await queryClient.cancelQueries({
+                queryKey: userQueryKeys.me()
+            });
+            const previous = queryClient.getQueryData<ViewCurrentUser>(userQueryKeys.me());
+            queryClient.setQueryData<ViewCurrentUser>(
+                userQueryKeys.me(),
+                (user) =>
+                    user && {
+                        ...user,
+                        product_tour_analytics_enabled: enabled
+                    }
+            );
+            return {
+                previous
+            };
+        },
+        onSettled: () =>
+            queryClient.invalidateQueries({
+                queryKey: userQueryKeys.me()
+            })
+    }));
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index a365c65fd2..db8bd43206 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -11,6 +11,8 @@
 
     import type { ProductTourListItem, ProductTourName } from '../../types';
 
+    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
+
     interface Props {
         activeTourName?: ProductTourName;
         items: ProductTourListItem[];
@@ -73,5 +75,6 @@
                 </li>
             {/each}
         </ul>
+        <ProductTourPrivacyLink />
     </Dialog.Content>
 </Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
index ae9feeb08f..bca9da8915 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
@@ -1,11 +1,17 @@
 import { ProductTourStatus } from '$features/users/models';
-import { fireEvent, render, screen } from '@testing-library/svelte';
-import { describe, expect, it, vi } from 'vitest';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getProductTourItems } from '../../catalog';
 import ProductTourCatalogDialog from './product-tour-catalog-dialog.svelte';
 
 describe('ProductTourCatalogDialog', () => {
+    beforeEach(() => vi.useFakeTimers());
+    afterEach(async () => {
+        cleanup();
+        await vi.runOnlyPendingTimersAsync();
+        vi.useRealTimers();
+    });
     it('distinguishes guides and preserves restart, continue, and unavailable actions', async () => {
         // Arrange
         const items = getProductTourItems(
@@ -48,7 +54,8 @@ describe('ProductTourCatalogDialog', () => {
         for (const item of items) {
             expect(screen.getByText(item.description)).toBeTruthy();
         }
-        expect(screen.queryAllByRole('link')).toHaveLength(0);
+        expect(screen.getByRole('link', { name: 'Usage settings' }).getAttribute('href')).toContain('/account/manage#guided-tour-privacy');
+        expect(screen.queryAllByRole('link')).toHaveLength(1);
         expect(screen.queryByText(/\d+ steps/)).toBeNull();
         expect(onStart).not.toHaveBeenCalled();
     });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
index 16af7af542..e033099ec4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
@@ -4,6 +4,8 @@
     import Sparkles from '@lucide/svelte/icons/sparkles';
     import X from '@lucide/svelte/icons/x';
 
+    import ProductTourPrivacyLink from './product-tour-privacy-link.svelte';
+
     interface Props {
         busy?: boolean;
         hasAccess: boolean;
@@ -40,6 +42,7 @@
                 <Button disabled={busy} onclick={onStart} size="sm">{hasAccess ? 'See how it works' : 'View access options'}</Button>
                 <Button disabled={busy} onclick={onDismiss} size="sm" variant="outline">Dismiss</Button>
             </div>
+            <ProductTourPrivacyLink />
         </div>
     </Alert.Root>
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index afe7296b94..101dfcbad6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -13,7 +13,8 @@
 
     import type { ProductTourCheckpoint, ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../types';
 
-    import { createProductTourActions, track } from '../actions.svelte';
+    import { createProductTourActions } from '../actions.svelte';
+    import { createProductTourActivity } from '../api.svelte';
     import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
     import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from '../eligibility';
     import { productTourCheckpoint } from '../state.svelte';
@@ -73,6 +74,7 @@
     let attemptedProjectCompletion: ProductTourCheckpoint | undefined;
 
     const actions = createProductTourActions();
+    const track = createProductTourActivity();
     const progressMutation = putCurrentUserProductTour();
     const projectsQuery = getOrganizationProjectsQuery({
         route: {
@@ -173,7 +175,11 @@
         if (automaticSurfaceUserId !== currentUser.id) {
             automaticSurface = undefined;
             automaticSurfaceUserId = currentUser.id;
-            automaticSurfaceClaimed = sessionStorage.getItem(getAutomaticSurfaceKey(currentUser.id)) === 'shown';
+            try {
+                automaticSurfaceClaimed = sessionStorage.getItem(getAutomaticSurfaceKey(currentUser.id)) === 'shown';
+            } catch {
+                automaticSurfaceClaimed = false;
+            }
             welcomeHandled = false;
             return;
         }
@@ -276,8 +282,8 @@
             return;
         }
 
-        if (active && !(await actions.dismiss(active))) {
-            return;
+        if (active) {
+            productTourCheckpoint.clear(active);
         }
 
         closeOverlays();
@@ -324,7 +330,6 @@
         }
         welcomeHandled = true;
         automaticSurface = undefined;
-        void track('started', 'app-welcome', WELCOME_VERSION, 'welcome');
         void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         await startTour(recommended.name, 'welcome');
     }
@@ -353,7 +358,6 @@
             return;
         }
         automaticSurface = undefined;
-        void track('started', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         void track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         if (assistantAccess?.has_access) {
             await startTour('exie-overview', 'feature-announcement');
@@ -381,7 +385,11 @@
 
         automaticSurface = surface;
         automaticSurfaceClaimed = true;
-        sessionStorage.setItem(getAutomaticSurfaceKey(currentUser.id), 'shown');
+        try {
+            sessionStorage.setItem(getAutomaticSurfaceKey(currentUser.id), 'shown');
+        } catch {
+            // Keep the in-memory claim when browser storage is unavailable.
+        }
     }
 
     function getAutomaticSurfaceKey(userId: string): string {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
new file mode 100644
index 0000000000..d35a582eb0
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+    import { resolve } from '$app/paths';
+    import { A } from '$comp/typography';
+</script>
+
+<p class="text-muted-foreground text-xs">
+    Optional guide usage helps us improve guided tours.
+    <A href={`${resolve('/(app)/account/manage')}#guided-tour-privacy`}>Usage settings</A>
+</p>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
new file mode 100644
index 0000000000..c4144e0899
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+    import * as Field from '$comp/ui/field';
+    import { Switch } from '$comp/ui/switch';
+    import { getMeQuery } from '$features/users/api.svelte';
+    import { toast } from 'svelte-sonner';
+
+    import { putProductTourAnalytics } from '../api.svelte';
+
+    const meQuery = getMeQuery();
+    const preference = putProductTourAnalytics();
+
+    async function update(enabled: boolean): Promise<void> {
+        try {
+            await preference.mutateAsync(enabled);
+            toast.success('Guide usage preference saved.');
+        } catch {
+            toast.error('Could not save your guide usage preference. Please try again.');
+        }
+    }
+</script>
+
+<section id="guided-tour-privacy" aria-label="Guided-tour privacy">
+    <Field.FieldGroup>
+        <Field.Field orientation="horizontal" data-disabled={preference.isPending || !meQuery.data}>
+            <Field.FieldContent>
+                <Field.Label for="product-tour-analytics">Help improve guided tours</Field.Label>
+                <Field.FieldDescription id="product-tour-analytics-description">
+                    Share guide starts, steps reached, completions, and dismissals. We use this only to improve guided tours. Your progress is saved even when
+                    this is off. Turning this off stops future collection, not previously recorded activity.
+                </Field.FieldDescription>
+            </Field.FieldContent>
+            <Switch
+                id="product-tour-analytics"
+                aria-describedby="product-tour-analytics-description"
+                checked={meQuery.data?.product_tour_analytics_enabled ?? false}
+                disabled={preference.isPending || !meQuery.data}
+                onCheckedChange={update}
+            />
+        </Field.Field>
+    </Field.FieldGroup>
+</section>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index 904101e603..57705461cf 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -5,6 +5,7 @@
 
     import type { ProductTourCheckpoint } from '../types';
 
+    import { createProductTourActivity } from '../api.svelte';
     import { productTourCheckpoint } from '../state.svelte';
     import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
     import ProductTourDescription, { type ProductTourShortcut } from './product-tour-description.svelte';
@@ -42,6 +43,7 @@
         title
     }: Props = $props();
     let activeDriver: Driver | undefined;
+    const track = createProductTourActivity();
     let descriptionContent: ReturnType<typeof mount> | undefined;
     let dismissing = false;
     let returnFocus: HTMLElement | null = null;
@@ -139,6 +141,9 @@
         });
         activeDriver = instance;
         instance.drive();
+        if (productTourCheckpoint.markReached(checkpoint)) {
+            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
+        }
         window.addEventListener('keydown', onKeyDown, true);
     }
 
@@ -186,7 +191,9 @@
             onDestroyStarted: undefined
         });
         instance?.destroy();
-        queueMicrotask(() => returnFocus?.focus());
+        if (!productTourCheckpoint.current && returnFocus?.isConnected) {
+            returnFocus.focus();
+        }
     }
 </script>
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
index 6699ecb1de..5b09904913 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
@@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ProductTourCheckpoint } from '../types';
 
 import ProductTourSpotlight from './product-tour-spotlight.svelte';
+vi.mock('../api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
 
 const checkpoint: ProductTourCheckpoint = { checkpointName: 'command-search', source: 'catalog', tourName: 'app-overview', userId: 'user', version: 1 };
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
index 61e091d8cf..f469251fdb 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
@@ -5,6 +5,8 @@
 
     import type { ProductTourListItem } from '../types';
 
+    import ProductTourPrivacyLink from './product-tour-privacy-link.svelte';
+
     interface Props {
         busy?: boolean;
         onBrowse: () => Promise<void>;
@@ -44,5 +46,6 @@
             <Button disabled={busy} onclick={onStart} size="sm">{recommended.name === 'project-configure' ? 'Continue setup' : recommended.title}</Button>
             <Button disabled={busy} onclick={onBrowse} size="sm" variant="ghost">Browse guides</Button>
         </div>
+        <ProductTourPrivacyLink />
     </Alert.Root>
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
new file mode 100644
index 0000000000..f7fd9653aa
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+
+import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
+
+const unavailable = {
+    getItem() {
+        throw new DOMException('Denied', 'SecurityError');
+    },
+    removeItem() {
+        throw new DOMException('Denied', 'SecurityError');
+    },
+    setItem() {
+        throw new DOMException('Full', 'QuotaExceededError');
+    }
+};
+
+describe('product-tour session persistence', () => {
+    it('tolerates unavailable storage on read, write, and clear', () => {
+        // Arrange
+        const checkpoint = { checkpointName: 'navigation', source: 'catalog', tourName: 'app-overview', userId: 'user', version: 1 } as const;
+
+        // Act & Assert
+        expect(readProductTourSession(unavailable)).toBeUndefined();
+        expect(() => writeProductTourSession(checkpoint, unavailable)).not.toThrow();
+        expect(() => clearProductTourSession(unavailable)).not.toThrow();
+    });
+
+    it('preserves reached steps without adding identity to activity', () => {
+        // Arrange
+        const checkpoint = {
+            checkpointName: 'navigation',
+            reachedSteps: ['navigation'],
+            source: 'catalog',
+            tourName: 'app-overview',
+            userId: 'user',
+            version: 1
+        } as const;
+        let value: null | string = null;
+        const storage = {
+            getItem: () => value,
+            removeItem: () => {
+                value = null;
+            },
+            setItem: (_key: string, next: string) => {
+                value = next;
+            }
+        };
+
+        // Act
+        writeProductTourSession({ ...checkpoint, reachedSteps: [...checkpoint.reachedSteps] }, storage);
+
+        // Assert
+        expect(readProductTourSession(storage)?.reachedSteps).toEqual(['navigation']);
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index a68574eb3a..d64055d14d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -5,13 +5,17 @@ import { PRODUCT_TOUR_CHECKPOINTS, PRODUCT_TOUR_LAUNCH_SOURCES } from './types';
 const SESSION_KEY = 'exceptionless.product-tour';
 const SOURCES = new Set<string>(PRODUCT_TOUR_LAUNCH_SOURCES);
 
-export function clearProductTourSession(storage: Pick<Storage, 'removeItem'> = sessionStorage): void {
-    storage.removeItem(SESSION_KEY);
+export function clearProductTourSession(storage?: Pick<Storage, 'removeItem'>): void {
+    try {
+        (storage ?? sessionStorage).removeItem(SESSION_KEY);
+    } catch {
+        // The guide can still run in memory when browser storage is unavailable.
+    }
 }
 
-export function readProductTourSession(storage: Pick<Storage, 'getItem' | 'removeItem'> = sessionStorage): ProductTourCheckpoint | undefined {
+export function readProductTourSession(storage?: Pick<Storage, 'getItem' | 'removeItem'>): ProductTourCheckpoint | undefined {
     try {
-        const value = storage.getItem(SESSION_KEY);
+        const value = (storage ?? sessionStorage).getItem(SESSION_KEY);
         if (!value) return undefined;
 
         const candidate: unknown = JSON.parse(value);
@@ -22,6 +26,7 @@ export function readProductTourSession(storage: Pick<Storage, 'getItem' | 'remov
 
         return {
             checkpointName: candidate.checkpointName,
+            ...(candidate.reachedSteps ? { reachedSteps: candidate.reachedSteps } : {}),
             organizationId: candidate.organizationId,
             source: candidate.source,
             tourName: candidate.tourName,
@@ -34,8 +39,12 @@ export function readProductTourSession(storage: Pick<Storage, 'getItem' | 'remov
     }
 }
 
-export function writeProductTourSession(checkpoint: ProductTourCheckpoint, storage: Pick<Storage, 'setItem'> = sessionStorage): void {
-    storage.setItem(SESSION_KEY, JSON.stringify(checkpoint));
+export function writeProductTourSession(checkpoint: ProductTourCheckpoint, storage?: Pick<Storage, 'setItem'>): void {
+    try {
+        (storage ?? sessionStorage).setItem(SESSION_KEY, JSON.stringify(checkpoint));
+    } catch {
+        // Persistence is best effort; the in-memory checkpoint remains usable.
+    }
 }
 
 function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint {
@@ -53,6 +62,14 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
     if (!isProductTourLaunchSource(value.source) || !isProductTourName(value.tourName)) return false;
 
     const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[value.tourName];
+    if (
+        value.reachedSteps !== undefined &&
+        (!Array.isArray(value.reachedSteps) ||
+            value.reachedSteps.length > checkpoints.length ||
+            !value.reachedSteps.every((step) => typeof step === 'string' && checkpoints.includes(step)))
+    ) {
+        return false;
+    }
     if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) return false;
     return true;
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index e5be7a69a0..96f5ba0a51 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -16,6 +16,21 @@ const checkpoint: ProductTourCheckpoint = {
 describe('product tour checkpoint store', () => {
     beforeEach(() => productTourCheckpoint.clear());
 
+    it('counts a step once across back navigation and starts a new count on replay', () => {
+        // Arrange
+        const first = productTourCheckpoint.start('app-overview', 'navigation', 'catalog', 'user', 1);
+
+        // Act & Assert
+        expect(productTourCheckpoint.markReached(first)).toBe(true);
+        expect(productTourCheckpoint.markReached(first)).toBe(false);
+        const second = productTourCheckpoint.advance(first, 'command-search')!;
+        expect(productTourCheckpoint.markReached(second)).toBe(true);
+        const back = productTourCheckpoint.advance(second, 'navigation')!;
+        expect(productTourCheckpoint.markReached(back)).toBe(false);
+        const replay = productTourCheckpoint.start('app-overview', 'navigation', 'catalog', 'user', 1);
+        expect(productTourCheckpoint.markReached(replay)).toBe(true);
+    });
+
     it('does not let stale work advance or clear a newer tour', () => {
         const first = productTourCheckpoint.start(
             checkpoint.tourName,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
index 6bce990651..6530fc319b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -30,6 +30,15 @@ class ProductTourCheckpointStore {
         return true;
     }
 
+    markReached(expected: ProductTourCheckpoint): boolean {
+        if (this.current !== expected || expected.reachedSteps?.includes(expected.checkpointName)) {
+            return false;
+        }
+        expected.reachedSteps = [...(expected.reachedSteps ?? []), expected.checkpointName];
+        writeProductTourSession(expected);
+        return true;
+    }
+
     restore(userId: string, organizationId?: string): ProductTourCheckpoint | undefined {
         if (this.current) {
             return this.current;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
deleted file mode 100644
index a99276303c..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { buildProductTourTelemetryEvent } from './telemetry';
-
-describe('product tour telemetry', () => {
-    it('records stable lifecycle events without resource data', () => {
-        expect(buildProductTourTelemetryEvent('started', 'app-overview', 1, 'command-palette')).toBe('product-tour.started.app-overview.v1.command-palette');
-    });
-
-    it('rejects invalid versions', () => {
-        expect(() => buildProductTourTelemetryEvent('started', 'exie-overview', 0, 'catalog')).toThrow();
-    });
-});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
deleted file mode 100644
index 0c8ecc8429..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/telemetry.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { ProductTourKey, ProductTourLaunchSource } from './types';
-
-export type ProductTourTelemetryEvent = 'completed' | 'dismissed' | 'shown' | 'started';
-
-export function buildProductTourTelemetryEvent(
-    event: ProductTourTelemetryEvent,
-    name: ProductTourKey,
-    version: number,
-    source: ProductTourLaunchSource
-): string {
-    if (!Number.isSafeInteger(version) || version < 1) {
-        throw new Error('Product tour telemetry requires a positive version.');
-    }
-
-    return ['product-tour', event, name, `v${version}`, source].join('.');
-}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 3c77501d6e..ddd787fada 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -19,6 +19,7 @@ export type ProductTourCheckpoint<Name extends ProductTourName = ProductTourName
     ? {
           checkpointName: ProductTourCheckpointName<Name>;
           organizationId?: string;
+          reachedSteps?: string[];
           source: ProductTourLaunchSource;
           tourName: Name;
           userId: string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 0da2a4ff3b..fec948ac5a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -12,6 +12,14 @@ export enum ProductTourUsageInterval {
   Month = "month",
 }
 
+export enum ProductTourTelemetryEvent {
+  Completed = "completed",
+  Dismissed = "dismissed",
+  Shown = "shown",
+  Started = "started",
+  StepReached = "step-reached",
+}
+
 export enum ProductTourStatus {
   Completed = 1,
   Dismissed = 2,
@@ -494,6 +502,18 @@ export interface PersistentEvent {
   reference_id?: null | string;
 }
 
+export interface PostProductTourActivity {
+  /**
+   * @format int32
+   * @min 1
+   * @max 2147483647
+   */
+  version: number;
+  action?: null | ProductTourTelemetryEvent;
+  source?: null | ProductTourLaunchSource;
+  step?: null | string;
+}
+
 export interface PredefinedSavedViewDefinition {
   key: string;
   name: string;
@@ -542,6 +562,14 @@ export interface ProductTourStartSource {
   count: number;
 }
 
+export interface ProductTourStepActivity {
+  step: string;
+  /** @format int64 */
+  reached: number;
+  /** @format int64 */
+  dismissed: number;
+}
+
 export interface ProductTourSummary {
   name: string;
   /** @format int32 */
@@ -559,6 +587,7 @@ export interface ProductTourSummary {
   last_run_utc?: null | string;
   start_sources: ProductTourStartSource[];
   activity: ProductTourActivity[];
+  steps: ProductTourStepActivity[];
 }
 
 export interface ProductTourUsageResponse {
@@ -568,6 +597,7 @@ export interface ProductTourUsageResponse {
   utc_end: string;
   tours: ProductTourSummary[];
   interval: ProductTourUsageInterval;
+  collection_available: boolean;
 }
 
 export interface ResetPasswordModel {
@@ -724,6 +754,10 @@ export interface UpdateEventSubmissionSettings {
   enabled?: null | boolean;
 }
 
+export interface UpdateProductTourAnalytics {
+  enabled?: null | boolean;
+}
+
 export interface UpdateProductTourProgress {
   status?: null | ProductTourStatus;
   /**
@@ -824,6 +858,7 @@ export interface User {
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
   product_tours: Record<string, ProductTourProgress>;
+  product_tour_analytics_enabled: boolean;
   /** Gets or sets the users Full Name. */
   full_name: string;
   /** @format email */
@@ -867,6 +902,7 @@ export interface UserSavedViewOrderPreference {
 
 export interface ViewCurrentUser {
   hash?: null | string;
+  product_tour_analytics_enabled: boolean;
   has_local_account: boolean;
   o_auth_accounts: OAuthAccount[];
   organization_preferences: UserOrganizationPreference[];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index f1d88e8df3..91c9904fb5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -28,6 +28,13 @@ export const StackStatusSchema = zodEnum([
   "discarded",
 ]);
 export const ProductTourUsageIntervalSchema = zodEnum(["day", "month"]);
+export const ProductTourTelemetryEventSchema = zodEnum([
+  "completed",
+  "dismissed",
+  "shown",
+  "started",
+  "step-reached",
+]);
 export const ProductTourStatusSchema = union([literal(1), literal(2)]);
 export const ProductTourLaunchSourceSchema = zodEnum([
   "welcome",
@@ -605,6 +612,22 @@ export const PersistentEventSchema = object({
 });
 export type PersistentEventFormData = Infer<typeof PersistentEventSchema>;
 
+export const PostProductTourActivitySchema = object({
+  version: int32()
+    .min(1, "Version must be at least 1")
+    .max(2147483647, "Version must be at most 2147483647"),
+  action: ProductTourTelemetryEventSchema,
+  source: ProductTourLaunchSourceSchema,
+  step: string()
+    .min(1, "Step is required")
+    .max(64, "Step must be at most 64 characters")
+    .nullable()
+    .optional(),
+});
+export type PostProductTourActivityFormData = Infer<
+  typeof PostProductTourActivitySchema
+>;
+
 export const PredefinedSavedViewDefinitionSchema = object({
   key: string().min(1, "Key is required"),
   name: string().min(1, "Name is required"),
@@ -663,6 +686,15 @@ export type ProductTourStartSourceFormData = Infer<
   typeof ProductTourStartSourceSchema
 >;
 
+export const ProductTourStepActivitySchema = object({
+  step: string().min(1, "Step is required"),
+  reached: int(),
+  dismissed: int(),
+});
+export type ProductTourStepActivityFormData = Infer<
+  typeof ProductTourStepActivitySchema
+>;
+
 export const ProductTourSummarySchema = object({
   name: string().min(1, "Name is required"),
   version: int32(),
@@ -674,6 +706,7 @@ export const ProductTourSummarySchema = object({
   last_run_utc: iso.datetime().nullable(),
   start_sources: array(lazy(() => ProductTourStartSourceSchema)),
   activity: array(lazy(() => ProductTourActivitySchema)),
+  steps: array(lazy(() => ProductTourStepActivitySchema)),
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
@@ -682,6 +715,7 @@ export const ProductTourUsageResponseSchema = object({
   utc_end: iso.datetime(),
   tours: array(lazy(() => ProductTourSummarySchema)),
   interval: ProductTourUsageIntervalSchema,
+  collection_available: boolean(),
 });
 export type ProductTourUsageResponseFormData = Infer<
   typeof ProductTourUsageResponseSchema
@@ -829,6 +863,13 @@ export type UpdateEventSubmissionSettingsFormData = Infer<
   typeof UpdateEventSubmissionSettingsSchema
 >;
 
+export const UpdateProductTourAnalyticsSchema = object({
+  enabled: boolean().nullable(),
+});
+export type UpdateProductTourAnalyticsFormData = Infer<
+  typeof UpdateProductTourAnalyticsSchema
+>;
+
 export const UpdateProductTourProgressSchema = object({
   status: ProductTourStatusSchema,
   version: int32()
@@ -937,6 +978,7 @@ export const UserSchema = object({
     string(),
     lazy(() => ProductTourProgressSchema),
   ),
+  product_tour_analytics_enabled: boolean(),
   full_name: string().min(1, "Full name is required"),
   email_address: email(),
   avatar_file_name: string()
@@ -990,6 +1032,7 @@ export type UserSavedViewOrderPreferenceFormData = Infer<
 
 export const ViewCurrentUserSchema = object({
   hash: string().min(1, "Hash is required").nullable().optional(),
+  product_tour_analytics_enabled: boolean(),
   has_local_account: boolean(),
   o_auth_accounts: array(lazy(() => OAuthAccountSchema)),
   organization_preferences: array(lazy(() => UserOrganizationPreferenceSchema)),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
index fc98da10d1..cb81263adc 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
@@ -11,6 +11,7 @@
     import { Spinner } from '$comp/ui/spinner';
     import { logout } from '$features/auth/api.svelte';
     import { validateEmailAvailability } from '$features/auth/validators';
+    import ProductTourPrivacySettings from '$features/product-tours/components/product-tour-privacy-settings.svelte';
     import { getProfileImageFileError } from '$features/shared/profile-images';
     import {
         deleteCurrentUser,
@@ -210,6 +211,7 @@
 </script>
 
 <div class="space-y-6">
+    <ProductTourPrivacySettings />
     <div class="flex flex-col gap-4 sm:flex-row sm:items-center">
         <div class="flex items-center gap-3">
             <Input
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index 08bcb189db..d427759638 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -14,6 +14,7 @@
     import { organization } from '$features/organizations/context.svelte';
     import { useHideOrganizationNotifications } from '$features/organizations/hooks/use-hide-organization-notifications.svelte';
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
+    import { createProductTourActivity } from '$features/product-tours/api.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
@@ -53,6 +54,7 @@
     let isProjectTypeOpen = $state(false);
     let openEnableTokenDialog = $state(false);
     const tourActions = createProductTourActions();
+    const trackTourActivity = createProductTourActivity();
     const projectConfigureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'project-configure' ? productTourCheckpoint.current : undefined);
 
     const enableTokenMutation = patchToken({
@@ -245,6 +247,12 @@
     });
 
     const isCommandLine = $derived(selectedProjectType?.platform === 'Command Line');
+    $effect(() => {
+        const checkpoint = projectConfigureCheckpoint;
+        if (checkpoint?.checkpointName === 'sdk-instructions' && selectedProjectType && productTourCheckpoint.markReached(checkpoint)) {
+            void trackTourActivity('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
+        }
+    });
     const isDotNet = $derived(selectedProjectType?.platform === '.NET');
     const isDotNetLegacy = $derived(selectedProjectType?.platform === '.NET Legacy');
     const isJavaScript = $derived(selectedProjectType?.platform === 'JavaScript');
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index b240cdef6b..438b47e562 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -4,6 +4,7 @@
 
     import TimeAgo from '$comp/formatters/time-ago.svelte';
     import { Muted } from '$comp/typography';
+    import * as Alert from '$comp/ui/alert';
     import { Button } from '$comp/ui/button';
     import * as Card from '$comp/ui/card';
     import { Skeleton } from '$comp/ui/skeleton';
@@ -14,7 +15,8 @@
     import RefreshCw from '@lucide/svelte/icons/refresh-cw';
 
     let range = $state<ProductTourUsageRange>({
-        kind: 'history'
+        days: 30,
+        kind: 'days'
     });
     const usageQuery = getAdminProductTourUsageQuery(() => range);
     const usage = $derived(usageQuery.data);
@@ -41,7 +43,7 @@
     }
 </script>
 
-<div class="flex flex-col gap-6">
+<div class="@container flex flex-col gap-6">
     <div class="flex flex-wrap items-center justify-between gap-3">
         <Muted>Guide activity · {range.kind === 'history' ? 'Monthly' : 'Daily'} · UTC</Muted>
         <div class="flex items-center gap-2" aria-label="Usage filters">
@@ -52,6 +54,15 @@
         </div>
     </div>
 
+    {#if usage && !usage.collection_available}
+        <Alert.Root>
+            <Alert.Title>Guide activity collection is unavailable</Alert.Title>
+            <Alert.Description
+                >The internal storage project is unavailable. Guides and saved progress still work; the charts show previously recorded activity.</Alert.Description
+            >
+        </Alert.Root>
+    {/if}
+
     {#if usageQuery.isError}
         <Card.Root>
             <Card.Content class="pt-6">
@@ -60,7 +71,7 @@
             </Card.Content>
         </Card.Root>
     {:else if usageQuery.isPending}
-        <div class="grid gap-4 lg:grid-cols-2">
+        <div class="grid gap-4 @3xl:grid-cols-2">
             {#each [0, 1, 2, 3] as index (index)}
                 <Skeleton class="h-56 rounded-xl" aria-label={`Loading guide activity ${index + 1}`} />
             {/each}
@@ -79,7 +90,7 @@
 </div>
 
 {#snippet TourCards(tours: ProductTourSummary[])}
-    <div class="grid gap-4 lg:grid-cols-2">
+    <div class="grid gap-4 @3xl:grid-cols-2">
         {#each tours as tour (`${tour.name}:${tour.version}`)}
             <Card.Root aria-label={`${title(tour.name)} usage`}>
                 <Card.Header class="flex flex-row flex-wrap items-center justify-between gap-x-3 gap-y-1">
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index e40031b1b8..cc3197e420 100644
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -7,7 +7,10 @@ public sealed record ProductTourUsageResponse(
     DateTime? UtcStart,
     DateTime UtcEnd,
     IReadOnlyCollection<ProductTourSummary> Tours,
-    ProductTourUsageInterval Interval);
+    ProductTourUsageInterval Interval)
+{
+    public bool CollectionAvailable { get; init; }
+}
 
 public sealed record ProductTourSummary(
     string Name,
@@ -19,7 +22,12 @@ public sealed record ProductTourSummary(
     long Dismissed,
     DateTime? LastRunUtc,
     IReadOnlyCollection<ProductTourStartSource> StartSources,
-    IReadOnlyCollection<ProductTourActivity> Activity);
+    IReadOnlyCollection<ProductTourActivity> Activity)
+{
+    public IReadOnlyCollection<ProductTourStepActivity> Steps { get; init; } = [];
+}
+
+public sealed record ProductTourStepActivity(string Step, long Reached, long Dismissed);
 
 public sealed record ProductTourStartSource(ProductTourLaunchSource Source, long Count);
 
diff --git a/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs b/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
new file mode 100644
index 0000000000..77d52f088b
--- /dev/null
+++ b/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+using Exceptionless.Core.Models.Data;
+
+namespace Exceptionless.Web.Models;
+
+[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)]
+public record PostProductTourActivity
+{
+    [Range(1, Int32.MaxValue)]
+    public int Version { get; init; }
+
+    [Required, EnumDataType(typeof(ProductTourTelemetryEvent))]
+    public ProductTourTelemetryEvent? Action { get; init; }
+
+    [Required, EnumDataType(typeof(ProductTourLaunchSource))]
+    public ProductTourLaunchSource? Source { get; init; }
+
+    [StringLength(64, MinimumLength = 1)]
+    public string? Step { get; init; }
+}
+
+[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)]
+public record UpdateProductTourAnalytics
+{
+    [Required]
+    public bool? Enabled { get; init; }
+}
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index 831150634f..2a0f05c8aa 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -26,9 +26,11 @@ public ViewCurrentUser(User user, IntercomOptions options)
         HasLocalAccount = !String.IsNullOrWhiteSpace(user.Password);
         OAuthAccounts = user.OAuthAccounts;
         ProductTours = new Dictionary<string, ProductTourProgress>(user.ProductTours, StringComparer.Ordinal);
+        ProductTourAnalyticsEnabled = user.ProductTourAnalyticsEnabled;
     }
 
     public string? Hash { get; set; }
+    public bool ProductTourAnalyticsEnabled { get; set; } = true;
     public bool HasLocalAccount { get; set; }
     public ICollection<OAuthAccount> OAuthAccounts { get; set; }
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
diff --git a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
index 2b2c591c05..1ad63be45c 100644
--- a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
+++ b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
@@ -2724,6 +2724,34 @@
     "authorizationRoles": [],
     "authenticationSchemes": []
   },
+  {
+    "method": "PUT",
+    "route": "/api/v2/users/me/product-tour-analytics",
+    "displayName": "HTTP: PUT api/v2/users/me/product-tour-analytics",
+    "tags": [
+      "User"
+    ],
+    "allowAnonymous": false,
+    "authorizationPolicies": [
+      "UserPolicy"
+    ],
+    "authorizationRoles": [],
+    "authenticationSchemes": []
+  },
+  {
+    "method": "POST",
+    "route": "/api/v2/users/me/product-tours/{tourName:maxlength(64)}/activity",
+    "displayName": "HTTP: POST api/v2/users/me/product-tours/{tourName:maxlength(64)}/activity",
+    "tags": [
+      "User"
+    ],
+    "allowAnonymous": false,
+    "authorizationPolicies": [
+      "UserPolicy"
+    ],
+    "authorizationRoles": [],
+    "authenticationSchemes": []
+  },
   {
     "method": "PUT",
     "route": "/api/v2/users/me/product-tours/{tourName:regex(^[a-z0-9]\u002B(?:-[a-z0-9]\u002B)*$):maxlength(64)}",
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 4c686e9889..358887c788 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -449,6 +449,14 @@
               "type": "boolean",
               "default": false
             }
+          },
+          {
+            "name": "days",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
           }
         ],
         "responses": {
@@ -4091,6 +4099,126 @@
         }
       }
     },
+    "/api/v2/users/me/product-tours/{tourName}/activity": {
+      "post": {
+        "tags": [
+          "User"
+        ],
+        "summary": "Record optional guided-tour activity without identifying context",
+        "parameters": [
+          {
+            "name": "tourName",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "maxLength": 64,
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PostProductTourActivity"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "202": {
+            "description": "Accepted"
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Unprocessable Entity",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "Service Unavailable",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v2/users/me/product-tour-analytics": {
+      "put": {
+        "tags": [
+          "User"
+        ],
+        "summary": "Update current user guided-tour analytics preference",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateProductTourAnalytics"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "204": {
+            "description": "No Content"
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Unprocessable Entity",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v2/users/me/oauth-grants": {
       "get": {
         "tags": [
@@ -13258,6 +13386,51 @@
           }
         }
       },
+      "PostProductTourActivity": {
+        "required": [
+          "action",
+          "source",
+          "version"
+        ],
+        "type": "object",
+        "properties": {
+          "version": {
+            "maximum": 2147483647,
+            "minimum": 1,
+            "type": "integer",
+            "format": "int32"
+          },
+          "action": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ProductTourTelemetryEvent"
+              }
+            ]
+          },
+          "source": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/components/schemas/ProductTourLaunchSource"
+              }
+            ]
+          },
+          "step": {
+            "maxLength": 64,
+            "minLength": 1,
+            "type": [
+              "null",
+              "string"
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
       "PredefinedSavedViewDefinition": {
         "required": [
           "key",
@@ -13467,6 +13640,27 @@
           "Dismissed"
         ]
       },
+      "ProductTourStepActivity": {
+        "required": [
+          "step",
+          "reached",
+          "dismissed"
+        ],
+        "type": "object",
+        "properties": {
+          "step": {
+            "type": "string"
+          },
+          "reached": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "dismissed": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
       "ProductTourSummary": {
         "required": [
           "name",
@@ -13478,7 +13672,8 @@
           "dismissed",
           "last_run_utc",
           "start_sources",
-          "activity"
+          "activity",
+          "steps"
         ],
         "type": "object",
         "properties": {
@@ -13526,9 +13721,25 @@
             "items": {
               "$ref": "#/components/schemas/ProductTourActivity"
             }
+          },
+          "steps": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ProductTourStepActivity"
+            }
           }
         }
       },
+      "ProductTourTelemetryEvent": {
+        "enum": [
+          "completed",
+          "dismissed",
+          "shown",
+          "started",
+          "step-reached",
+          null
+        ]
+      },
       "ProductTourUsageInterval": {
         "enum": [
           "day",
@@ -13544,7 +13755,8 @@
           "utc_start",
           "utc_end",
           "tours",
-          "interval"
+          "interval",
+          "collection_available"
         ],
         "type": "object",
         "properties": {
@@ -13567,6 +13779,9 @@
           },
           "interval": {
             "$ref": "#/components/schemas/ProductTourUsageInterval"
+          },
+          "collection_available": {
+            "type": "boolean"
           }
         }
       },
@@ -13978,6 +14193,21 @@
           }
         }
       },
+      "UpdateProductTourAnalytics": {
+        "required": [
+          "enabled"
+        ],
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": [
+              "null",
+              "boolean"
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
       "UpdateProductTourProgress": {
         "required": [
           "status",
@@ -14233,6 +14463,7 @@
           "organization_preferences",
           "saved_view_orders",
           "product_tours",
+          "product_tour_analytics_enabled",
           "email_notifications_enabled",
           "is_email_address_verified",
           "verify_email_address_token_expiration",
@@ -14304,6 +14535,9 @@
               "$ref": "#/components/schemas/ProductTourProgress"
             }
           },
+          "product_tour_analytics_enabled": {
+            "type": "boolean"
+          },
           "full_name": {
             "type": "string",
             "description": "Gets or sets the users Full Name."
@@ -14431,6 +14665,7 @@
       },
       "ViewCurrentUser": {
         "required": [
+          "product_tour_analytics_enabled",
           "has_local_account",
           "o_auth_accounts",
           "organization_preferences",
@@ -14454,6 +14689,9 @@
               "string"
             ]
           },
+          "product_tour_analytics_enabled": {
+            "type": "boolean"
+          },
           "has_local_account": {
             "type": "boolean"
           },
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index f1b09da45f..7d72ab1beb 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -117,7 +117,7 @@ await CreateDataAsync(builder => AddUsage(builder,
 
         // Assert
         Assert.NotNull(response);
-        Assert.Equal(now.SubtractDays(_appOptions.MaximumRetentionDays), response.UtcStart);
+        Assert.Equal(retainedEvent.StartOfMonth(), response.UtcStart);
         Assert.Equal(now, response.UtcEnd);
         Assert.Equal(ProductTourUsageInterval.Month, response.Interval);
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
@@ -136,6 +136,45 @@ public Task GetProductTourUsageAsync_WithMonthAndHistory_ReturnsValidationProble
             .StatusCodeShouldBeUnprocessableEntity());
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_RollingDaysAcrossFebruary_UsesDailyUtcBoundaries()
+    {
+        // Arrange
+        var now = new DateTime(2026, 3, 2, 12, 30, 0, DateTimeKind.Utc);
+        TimeProvider.SetUtcNow(now);
+        var start = now.Date.AddDays(-29);
+        var source = ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog);
+        await CreateDataAsync(builder =>
+        {
+            AddUsage(builder, source, start.AddTicks(-1), "outside");
+            AddUsage(builder, source, start, "boundary");
+            AddUsage(builder, source, now.AddMinutes(-1), "today");
+        });
+
+        // Act
+        var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request.AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage").QueryString("days", "30").StatusCodeShouldBeOk());
+
+        // Assert
+        Assert.NotNull(response);
+        Assert.Equal(start, response.UtcStart);
+        Assert.Equal(now, response.UtcEnd);
+        Assert.Equal(ProductTourUsageInterval.Day, response.Interval);
+        Assert.False(response.CollectionAvailable);
+        Assert.Equal(2, Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal)).Started);
+    }
+
+    [Theory]
+    [InlineData("0", "false")]
+    [InlineData("91", "false")]
+    [InlineData("30", "true")]
+    public Task GetProductTourUsageAsync_InvalidRollingRange_ReturnsValidationProblem(string days, string history)
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.AsGlobalAdminUser().AppendPaths("admin", "product-tour-usage")
+            .QueryString("days", days).QueryString("history", history).StatusCodeShouldBeUnprocessableEntity());
+    }
+
     [Fact]
     public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndReturnsZeroRows()
     {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
new file mode 100644
index 0000000000..d6e795cf55
--- /dev/null
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
@@ -0,0 +1,193 @@
+using System.Text.Json;
+using Exceptionless.Core;
+using Exceptionless.Core.Models;
+using Exceptionless.Core.Jobs;
+using Exceptionless.Core.Models.Data;
+using Exceptionless.Core.Queues.Models;
+using Exceptionless.Core.Repositories;
+using Exceptionless.Core.Services;
+using Exceptionless.Core.Utility;
+using Exceptionless.Tests.Extensions;
+using Exceptionless.Web.Models;
+using Foundatio.Queues;
+using Foundatio.Repositories;
+using Foundatio.Serializer;
+using Xunit;
+
+namespace Exceptionless.Tests.Api.Endpoints;
+
+public sealed class ProductTourActivityEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : IntegrationTestsBase(output, factory)
+{
+    protected override async Task ResetDataAsync()
+    {
+        await base.ResetDataAsync();
+        await GetService<IQueue<EventPost>>().DeleteQueueAsync();
+        await GetService<SampleDataService>().CreateDataAsync();
+    }
+
+    [Fact]
+    public async Task RecordProductTourActivity_ValidRequest_QueuesOnlyAllowlistedData()
+    {
+        // Arrange
+        var now = new DateTimeOffset(2026, 9, 2, 12, 0, 0, TimeSpan.Zero);
+        TimeProvider.SetUtcNow(now);
+        await GetService<IProjectRepository>().AddAsync(new Project
+        {
+            Id = GetService<AppOptions>().InternalProjectId,
+            OrganizationId = SampleDataService.TEST_ORG_ID,
+            Name = "Guide activity",
+            NextSummaryEndOfDayTicks = now.UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
+        });
+
+        // Act
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser()
+            .AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.StepReached, Source = ProductTourLaunchSource.Catalog, Step = "navigation" })
+            .StatusCodeShouldBeAccepted());
+
+        // Assert
+        var entry = await GetService<IQueue<EventPost>>().DequeueAsync(TimeSpan.FromSeconds(1));
+        Assert.NotNull(entry);
+        Assert.Null(entry.Value.IpAddress);
+        Assert.Null(entry.Value.UserAgent);
+        Assert.Null(entry.Value.ClientKeyHash);
+        Assert.Equal(GetService<AppOptions>().InternalProjectId, entry.Value.ProjectId);
+        var payload = await GetService<EventPostService>().GetEventPostPayloadAsync(Path.ChangeExtension(entry.Value.FilePath, ".payload"));
+        Assert.NotNull(payload);
+        using var document = JsonDocument.Parse(payload);
+        var ev = document.RootElement;
+        Assert.Equal("product-tour.step-reached.app-overview.v1.catalog", ev.GetProperty("source").GetString());
+        Assert.Equal(now, ev.GetProperty("date").GetDateTimeOffset());
+        Assert.Equal("product-tour-step:navigation", Assert.Single(ev.GetProperty("tags").EnumerateArray()).GetString());
+        Assert.DoesNotContain(ev.EnumerateObject(), property => property.Name.StartsWith('@'));
+        if (ev.TryGetProperty("data", out var data))
+        {
+            Assert.Empty(data.EnumerateObject());
+        }
+        await entry.CompleteAsync();
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAnalytics_ConcurrentProgress_PreservesBothAndStopsCollection()
+    {
+        // Arrange
+        var user = await GetService<IUserRepository>().GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+
+        // Act
+        await Task.WhenAll(
+            SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
+                .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeNoContent()),
+            SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview")
+                .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 }).StatusCodeShouldBeOk()));
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Completed, Source = ProductTourLaunchSource.Catalog })
+            .StatusCodeShouldBeNoContent());
+
+        // Assert
+        var persisted = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache(false));
+        Assert.NotNull(persisted);
+        Assert.False(persisted.ProductTourAnalyticsEnabled);
+        Assert.Equal(ProductTourStatus.Completed, persisted.ProductTours[ProductTours.AppOverview].Status);
+        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
+    }
+
+    [Fact]
+    public void DeserializeUser_LegacyRecord_DefaultsAnalyticsToEnabled()
+    {
+        // Arrange & Act
+        var user = GetService<ITextSerializer>().Deserialize<User>("{}");
+
+        // Assert
+        Assert.NotNull(user);
+        Assert.True(user.ProductTourAnalyticsEnabled);
+        Assert.Empty(user.ProductTours);
+    }
+
+    [Theory]
+    [InlineData("unknown", 1, "navigation")]
+    [InlineData("app-overview", 2, "navigation")]
+    [InlineData("app-overview", 1, "password")]
+    [InlineData("app-overview", 1, null)]
+    public Task RecordProductTourActivity_InvalidCatalogValue_RejectsRequest(string name, int version, string? step)
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath($"users/me/product-tours/{name}/activity")
+            .Content(new PostProductTourActivity { Version = version, Action = ProductTourTelemetryEvent.StepReached, Source = ProductTourLaunchSource.Catalog, Step = step })
+            .StatusCodeShouldBeUnprocessableEntity());
+    }
+
+    [Fact]
+    public Task RecordProductTourActivity_ArbitraryContext_RejectsRequest()
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content("""{"version":1,"action":"started","source":"catalog","email":"private@example.test"}""", "application/json")
+            .StatusCodeShouldBeBadRequest());
+    }
+
+    [Theory]
+    [InlineData("{\"version\":1,\"action\":999,\"source\":\"catalog\"}")]
+    [InlineData("{\"version\":1,\"action\":\"started\",\"source\":999}")]
+    public Task RecordProductTourActivity_InvalidEnum_RejectsRequest(string payload)
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(payload, "application/json").StatusCodeShouldBeUnprocessableEntity());
+    }
+
+    [Fact]
+    public Task UpdateCurrentUserProductTourAnalytics_ClientToken_IsForbidden()
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.Put().AsTestOrganizationClientUser().AppendPath("users/me/product-tour-analytics")
+            .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeForbidden());
+    }
+
+    [Fact]
+    public async Task RecordProductTourActivity_ProcessedEvent_HasNoIdentifyingContext()
+    {
+        // Arrange
+        await GetService<IProjectRepository>().AddAsync(new Project
+        {
+            Id = GetService<AppOptions>().InternalProjectId,
+            OrganizationId = SampleDataService.TEST_ORG_ID,
+            Name = "Guide activity",
+            NextSummaryEndOfDayTicks = TimeProvider.GetUtcNow().UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
+        });
+
+        // Act
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Dismissed, Source = ProductTourLaunchSource.Catalog, Step = "navigation" })
+            .StatusCodeShouldBeAccepted());
+        var result = await GetService<EventPostsJob>().RunAsync(TestCancellationToken);
+        await RefreshDataAsync();
+
+        // Assert
+        Assert.True(result.IsSuccess);
+        var ev = Assert.Single((await GetService<IEventRepository>().GetAllAsync()).Documents);
+        Assert.Equal(GetService<AppOptions>().InternalProjectId, ev.ProjectId);
+        Assert.Equal("product-tour.dismissed.app-overview.v1.catalog", ev.Source);
+        Assert.Contains("product-tour-step:navigation", ev.Tags!);
+        Assert.Empty(ev.Data!);
+    }
+
+    [Fact]
+    public Task RecordProductTourActivity_ClientToken_IsForbidden()
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.Post().AsTestOrganizationClientUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
+            .StatusCodeShouldBeForbidden());
+    }
+
+    [Fact]
+    public async Task RecordProductTourActivity_MissingInternalProject_ReturnsUnavailable()
+    {
+        // Act & Assert
+        var response = await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
+            .ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
+        Assert.Equal(System.Net.HttpStatusCode.ServiceUnavailable, response.StatusCode);
+    }
+}
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 83e690489d..3fa8f11dc5 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -36,6 +36,37 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
         _serializer = GetService<ITextSerializer>();
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_StepsAcrossFebruary_PreservesCoalescedCountsWithDailyBuckets()
+    {
+        // Arrange
+        var start = new DateTime(2026, 2, 1, 0, 0, 0, DateTimeKind.Utc);
+        await CreateDataAsync(builder =>
+        {
+            foreach (var action in new[] { ProductTourTelemetryEvent.StepReached, ProductTourTelemetryEvent.Dismissed })
+            {
+                builder.Event().Organization(TestConstants.OrganizationId).Project(_appOptions.InternalProjectId)
+                    .Type(Event.KnownTypes.FeatureUsage)
+                    .Source(ProductTours.CreateTelemetrySource(action, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog))
+                    .Date(start.AddDays(28))
+                    .Mutate(ev => { ev.Count = 3; ev.Tags = [ProductTours.StepTagPrefix + "navigation"]; });
+            }
+        });
+
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(30), ProductTourUsageInterval.Day);
+
+        // Assert
+        Assert.Equal(ProductTourUsageInterval.Day, result.Interval);
+        Assert.Equal(2, result.Buckets.Count);
+        Assert.All(result.Buckets, bucket =>
+        {
+            Assert.Equal(3, bucket.Count);
+            Assert.Equal(new ProductTourStepCount("navigation", 3), Assert.Single(bucket.Steps));
+            Assert.Equal(start.AddDays(28), Assert.Single(bucket.Activity, period => period.Count > 0).DateUtc);
+        });
+    }
+
     [Fact]
     public async Task GetProductTourUsageAsync_KnownSources_ReturnsPerTourAggregations()
     {
diff --git a/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs b/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
index 294d33c56a..f07c2e9874 100644
--- a/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
+++ b/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
@@ -80,6 +80,21 @@ public async Task Invoke_DoesNotThrottleKnownConfigurationAndHeartbeatRoutes()
         Assert.Equal(2, nextCallCount);
     }
 
+    [Fact]
+    public async Task Invoke_ProductTourActivity_UsesExistingRequestLimit()
+    {
+        // Arrange
+        var middleware = CreateMiddleware(_ => throw new InvalidOperationException("A throttled request must not reach the endpoint."), GetService<ICacheClient>(), maxRequests: 0);
+        var context = CreateContext("/api/v2/users/me/product-tours/app-overview/activity");
+        context.Request.Method = HttpMethods.Post;
+
+        // Act
+        await middleware.Invoke(context);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status429TooManyRequests, context.Response.StatusCode);
+    }
+
     [Fact]
     public async Task Invoke_V1ProjectConfigurationPath_DoesNotThrottleRequest()
     {
diff --git a/tests/http/admin.http b/tests/http/admin.http
index 7ce07dd9ec..a6b0733986 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -55,7 +55,7 @@ GET {{apiUrl}}/admin/assistant-usage
 Authorization: Bearer {{token}}
 
 ### Product Tour Usage (current retained month)
-GET {{apiUrl}}/admin/product-tour-usage
+GET {{apiUrl}}/admin/product-tour-usage?days=30
 Authorization: Bearer {{token}}
 
 ### Product Tour Usage (available retained history; monthly activity for ranges longer than one month)
diff --git a/tests/http/users.http b/tests/http/users.http
index 74801b5b3b..c493592a4a 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -36,6 +36,27 @@ Content-Type: application/json
     "status": 1
 }
 
+### Record Optional Product Tour Activity (no identity or request context)
+POST {{apiUrl}}/users/me/product-tours/app-overview/activity
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+    "version": 1,
+    "action": "step-reached",
+    "source": "catalog",
+    "step": "navigation"
+}
+
+### Stop Future Product Tour Analytics (progress is unaffected)
+PUT {{apiUrl}}/users/me/product-tour-analytics
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+    "enabled": false
+}
+
 ### Get OAuth Grants
 GET {{apiUrl}}/users/me/oauth-grants
 Authorization: Bearer {{token}}

From 9033385ef15c8bc5b6dfa573b9853d384384cd44 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 2 Sep 2026 22:45:07 -0500
Subject: [PATCH 20/43] Improve tour chart contrast and verify keyboard
 tooltips

---
 .../e2e/tests/product-tour-dashboard.e2e.ts          |  2 ++
 .../admin/components/product-tour-activity.svelte    | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index 96b0aff4b9..8549bc374d 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -50,6 +50,8 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     await page.keyboard.press('ArrowRight');
     await expect(chart).toHaveAttribute('aria-valuenow', '1');
     await expect(chart).toHaveAttribute('aria-valuetext', /Started: 9/);
+    await expect(page.getByRole('tooltip')).toBeVisible();
+    await expect(page.getByRole('tooltip').getByText('9', { exact: true })).toBeVisible();
     await page.keyboard.press('Tab');
     await page.getByRole('button', { name: 'Steps and entry points' }).first().click();
     await expect(page.getByRole('list', { name: 'Guide entry points' })).toContainText('100%');
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 84ad4fc211..0dd6d32371 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -18,19 +18,19 @@
     const data = $derived(getProductTourActivity(tour.activity ?? [], interval, start, end));
     const config = $derived({
         completed: {
-            color: 'var(--chart-1)',
+            color: 'color-mix(in srgb, var(--chart-1) var(--tour-chart-strength), black)',
             label: prompt ? 'Accepted' : 'Completed'
         },
         dismissed: {
-            color: 'var(--chart-6)',
+            color: 'color-mix(in srgb, var(--chart-6) var(--tour-chart-strength), black)',
             label: 'Dismissed'
         },
         shown: {
-            color: 'var(--chart-5)',
+            color: 'color-mix(in srgb, var(--chart-5) var(--tour-chart-strength), black)',
             label: 'Shown'
         },
         started: {
-            color: 'var(--chart-3)',
+            color: 'color-mix(in srgb, var(--chart-3) var(--tour-chart-strength), black)',
             label: 'Started'
         }
     } satisfies Chart.ChartConfig);
@@ -88,7 +88,7 @@
     }
 </script>
 
-<div class="flex flex-col gap-4">
+<div class="flex flex-col gap-4 [--tour-chart-strength:70%] dark:[--tour-chart-strength:100%]">
     {#if total === 0}
         <p class="text-muted-foreground flex h-48 items-center justify-center text-sm">No recorded activity in this period.</p>
     {:else}
@@ -149,7 +149,7 @@
                         {/if}
                     {/each}
                 {/snippet}
-                {#snippet tooltip()}<Chart.Tooltip labelFormatter={dateLabel} indicator="line" />{/snippet}
+                {#snippet tooltip()}<Chart.Tooltip role="tooltip" labelFormatter={dateLabel} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
         {#if commonExit}

From 0437ca5aa30695caf4e55eae2275721cbcae26eb Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Thu, 3 Sep 2026 06:51:13 -0500
Subject: [PATCH 21/43] Condense guided tour chart diagnostics

---
 .../e2e/tests/product-tour-dashboard.e2e.ts   | 35 ++++++++++-
 .../product-tour-activity-info.svelte         | 63 +++++++++++++++++++
 .../product-tour-activity-info.svelte.test.ts | 63 +++++++++++++++++++
 .../components/product-tour-activity.svelte   | 47 +++-----------
 .../(app)/system/product-tours/+page.svelte   |  6 +-
 5 files changed, 171 insertions(+), 43 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index 8549bc374d..b3f42bb8e8 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -53,9 +53,16 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     await expect(page.getByRole('tooltip')).toBeVisible();
     await expect(page.getByRole('tooltip').getByText('9', { exact: true })).toBeVisible();
     await page.keyboard.press('Tab');
-    await page.getByRole('button', { name: 'Steps and entry points' }).first().click();
-    await expect(page.getByRole('list', { name: 'Guide entry points' })).toContainText('100%');
+    await expect(page.getByText('Most common exit:', { exact: false })).not.toBeVisible();
+    await expect(page.getByRole('button', { name: 'Steps and entry points' })).toHaveCount(0);
+    const details = page.getByRole('button', { name: 'Explore Exceptionless activity details' });
+    await details.focus();
+    await page.keyboard.press('Enter');
+    await expect(page.getByRole('dialog', { exact: true, name: 'Explore Exceptionless' })).toBeVisible();
+    await expect(page.getByRole('list', { name: 'Guide entry points' })).toContainText('100.0%');
+    await expect(page.getByText('Most common exit: navigation')).toBeVisible();
     await page.keyboard.press('Escape');
+    await expect(details).toBeFocused();
     await page.getByRole('button', { name: 'Usage period: Last 30 days' }).click();
     await page.getByRole('button', { exact: true, name: 'Available history' }).click();
     await expect(page.getByRole('button', { name: 'Usage period: Available history' })).toBeVisible();
@@ -79,7 +86,31 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
             document.documentElement.classList.toggle('light', theme === 'light');
         }, theme);
         await expect(chart).toBeVisible();
+        await expect
+            .poll(async () => {
+                const labels = await chart.locator('.lc-axis-tick-label').evaluateAll((elements) =>
+                    elements.map((element) => ({
+                        bounds: element.getBoundingClientRect().toJSON(),
+                        text: element.textContent
+                    }))
+                );
+                const zero = labels.find((label) => label.text === '0');
+                const firstDate = labels.find((label) => label.text?.match(/[A-Za-z]/));
+                return zero && firstDate ? firstDate.bounds.top - zero.bounds.bottom : 0;
+            })
+            .toBeGreaterThanOrEqual(6);
         await expect.poll(() => page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
         await page.screenshot({ animations: 'disabled', path: testInfo.outputPath(`synthetic-chart-${theme}-${width}.png`) });
+        await details.click();
+        const popover = page.getByRole('dialog', { exact: true, name: 'Explore Exceptionless' });
+        await expect(popover).toBeVisible();
+        await expect
+            .poll(async () => {
+                const bounds = await popover.boundingBox();
+                return bounds !== null && bounds.x >= 16 && bounds.x + bounds.width <= width - 16;
+            })
+            .toBe(true);
+        await page.screenshot({ animations: 'disabled', path: testInfo.outputPath(`synthetic-details-${theme}-${width}.png`) });
+        await page.keyboard.press('Escape');
     }
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte
new file mode 100644
index 0000000000..702ba4994d
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+    import type { ProductTourSummary } from '$generated/api';
+
+    import Number from '$comp/formatters/number.svelte';
+    import Percentage from '$comp/formatters/percentage.svelte';
+    import { Button } from '$comp/ui/button';
+    import * as Popover from '$comp/ui/popover';
+    import Info from '@lucide/svelte/icons/info';
+
+    let { title, tour }: { title: string; tour: ProductTourSummary } = $props();
+    const headingId = $props.id();
+    const commonExit = $derived(
+        tour.steps?.filter((step) => step.dismissed > 0).toSorted((a, b) => b.dismissed - a.dismissed || a.step.localeCompare(b.step))[0]
+    );
+</script>
+
+<Popover.Root>
+    <Popover.Trigger>
+        {#snippet child({ props })}
+            <Button {...props} variant="ghost" size="icon-sm" aria-label={`${title} activity details`}>
+                <Info aria-hidden="true" />
+            </Button>
+        {/snippet}
+    </Popover.Trigger>
+    <Popover.Content align="start" collisionPadding={16} class="max-h-80 max-w-[calc(100vw-2rem)] overflow-y-auto" role="dialog" aria-labelledby={headingId}>
+        <h3 id={headingId} class="font-medium">{title}</h3>
+        <p class="text-muted-foreground text-xs">Activity in the selected period, not unique people.</p>
+        {#if commonExit}
+            <p>Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></p>
+        {/if}
+        {#if tour.kind === 'guide'}
+            {#if tour.steps?.length}
+                <section class="flex flex-col gap-1">
+                    <h4 class="font-medium">Steps reached · exits</h4>
+                    <ul class="flex flex-col gap-1" aria-label="Guide steps reached and explicit exits">
+                        {#each tour.steps as step (step.step)}
+                            <li>{step.step.replaceAll('-', ' ')}: <Number value={step.reached} /> reached; <Number value={step.dismissed} /> closed here.</li>
+                        {/each}
+                    </ul>
+                    <p class="text-muted-foreground text-xs">Exits count explicit closes, not tab closures or navigation.</p>
+                </section>
+            {/if}
+            {#if tour.start_sources.length}
+                <section class="flex flex-col gap-1">
+                    <h4 class="font-medium">Opened from</h4>
+                    <ul class="flex flex-col gap-1" aria-label="Guide entry points">
+                        {#each tour.start_sources as source (source.source)}
+                            <li>
+                                {source.source.replaceAll('-', ' ')}: <Number value={source.count} />
+                                {#if tour.started > 0}(<Percentage percent={(source.count / tour.started) * 100} /> of starts){/if}
+                            </li>
+                        {/each}
+                    </ul>
+                </section>
+            {/if}
+            {#if !tour.steps?.length && !tour.start_sources.length}
+                <p>No step or entry-point activity recorded in this period.</p>
+            {/if}
+        {:else}
+            <p>Shown counts invitation displays; Accepted counts invitations used to open a guide.</p>
+        {/if}
+    </Popover.Content>
+</Popover.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts
new file mode 100644
index 0000000000..13f74062de
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts
@@ -0,0 +1,63 @@
+import type { ProductTourSummary } from '$generated/api';
+
+import { ProductTourKind, ProductTourLaunchSource } from '$generated/api';
+import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import ProductTourActivityInfo from './product-tour-activity-info.svelte';
+
+const tour: ProductTourSummary = {
+    activity: [],
+    completed: 2,
+    dismissed: 1,
+    kind: ProductTourKind.Guide,
+    name: 'app-overview',
+    shown: 0,
+    start_sources: [{ count: 4, source: ProductTourLaunchSource.CommandPalette }],
+    started: 4,
+    steps: [{ dismissed: 1, reached: 4, step: 'navigation' }],
+    version: 1
+};
+
+afterEach(cleanup);
+
+describe('ProductTourActivityInfo', () => {
+    it('keeps diagnostic counts behind a named info button', async () => {
+        // Arrange
+        render(ProductTourActivityInfo, { title: 'Explore Exceptionless', tour });
+        expect(screen.queryByText(/Most common exit/)).toBeNull();
+
+        // Act
+        await fireEvent.click(screen.getByRole('button', { name: 'Explore Exceptionless activity details' }));
+
+        // Assert
+        expect(screen.getByRole('dialog', { name: 'Explore Exceptionless' })).toBeTruthy();
+        expect(screen.getByText(/Most common exit: navigation/)).toBeTruthy();
+        expect(screen.getByRole('list', { name: 'Guide entry points' }).textContent).toContain('100.0%');
+        expect(screen.getByRole('list', { name: 'Guide steps reached and explicit exits' }).textContent).toContain('4 reached; 1 closed here');
+    });
+
+    it('explains missing diagnostics without inventing step counts', async () => {
+        // Arrange
+        render(ProductTourActivityInfo, { title: 'Explore Exceptionless', tour: { ...tour, start_sources: [], steps: [] } });
+
+        // Act
+        await fireEvent.click(screen.getByRole('button'));
+
+        // Assert
+        expect(screen.getByText('No step or entry-point activity recorded in this period.')).toBeTruthy();
+        expect(screen.queryByText(/Most common exit/)).toBeNull();
+    });
+
+    it('explains invitation acceptance without presenting guide steps', async () => {
+        // Arrange
+        render(ProductTourActivityInfo, { title: 'Welcome invitation', tour: { ...tour, kind: ProductTourKind.Prompt, steps: [] } });
+
+        // Act
+        await fireEvent.click(screen.getByRole('button'));
+
+        // Assert
+        expect(screen.getByText(/Accepted counts invitations used to open a guide/)).toBeTruthy();
+        expect(screen.queryByRole('list', { name: 'Guide entry points' })).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 0dd6d32371..185f45e05a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,9 +2,7 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
-    import { Button } from '$comp/ui/button';
     import * as Chart from '$comp/ui/chart';
-    import * as Popover from '$comp/ui/popover';
     import * as Table from '$comp/ui/table';
     import { scaleUtc } from 'd3-scale';
     import { curveLinear } from 'd3-shape';
@@ -42,9 +40,6 @@
         }))
     );
     const total = $derived(tour.shown + tour.started + tour.completed + tour.dismissed);
-    const commonExit = $derived(
-        tour.steps?.filter((step) => step.dismissed > 0).toSorted((a, b) => b.dismissed - a.dismissed || a.step.localeCompare(b.step))[0]
-    );
     let context = $state<ChartState>();
     let keyboardIndex = $state<number>();
     const selectedIndex = $derived(Math.max(0, Math.min(keyboardIndex ?? data.length - 1, data.length - 1)));
@@ -123,7 +118,7 @@
                 {series}
                 yDomain={[0, null]}
                 padding={{
-                    bottom: 20,
+                    bottom: 36,
                     left: 32,
                     right: 32,
                     top: 8
@@ -133,10 +128,16 @@
                 props={{
                     xAxis: {
                         format: dateLabel,
+                        tickLabelProps: {
+                            dy: 20
+                        },
                         ticks: data.filter((_, index) => index % Math.max(1, Math.ceil((data.length - 1) / 4)) === 0).map((period) => period.date)
                     },
                     yAxis: {
                         format: (value) => String(value),
+                        tickLabelProps: {
+                            dx: -8
+                        },
                         ticks: (scale) => scale.ticks?.(3).filter((value: number) => globalThis.Number.isInteger(value))
                     }
                 }}
@@ -152,40 +153,6 @@
                 {#snippet tooltip()}<Chart.Tooltip role="tooltip" labelFormatter={dateLabel} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
-        {#if commonExit}
-            <p class="text-muted-foreground text-xs">Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></p>
-        {/if}
-        {#if !prompt && (tour.steps?.length || tour.start_sources.length)}
-            <Popover.Root>
-                <Popover.Trigger>
-                    {#snippet child({ props })}
-                        <Button {...props} variant="ghost" size="sm" class="text-muted-foreground w-fit">Steps and entry points</Button>
-                    {/snippet}
-                </Popover.Trigger>
-                <Popover.Content align="start" class="max-h-80 overflow-y-auto text-sm">
-                    {#if tour.steps?.length}
-                        <h3 class="mb-2 font-medium">Steps reached · exits</h3>
-                        <ul class="space-y-1" aria-label="Guide steps reached and explicit exits">
-                            {#each tour.steps as step (step.step)}
-                                <li>
-                                    {step.step.replaceAll('-', ' ')}: <Number value={step.reached} /> reached; <Number value={step.dismissed} /> closed here.
-                                </li>
-                            {/each}
-                        </ul>
-                    {/if}
-                    {#if tour.start_sources.length}
-                        <h3 class="mt-3 mb-2 font-medium">Share of starts</h3>
-                        <ul class="space-y-1" aria-label="Guide entry points">
-                            {#each tour.start_sources as source (source.source)}
-                                <li>
-                                    {source.source.replaceAll('-', ' ')}: <Number value={source.count} /> ({Math.round((source.count / tour.started) * 100)}%)
-                                </li>
-                            {/each}
-                        </ul>
-                    {/if}
-                </Popover.Content>
-            </Popover.Root>
-        {/if}
         <div class="sr-only">
             <p id={keyboardHelpId}>Use Left and Right arrows to inspect dates, or Home and End to jump to the first and last date. Dates are UTC.</p>
             <Table.Root aria-label="Guide activity by date">
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 438b47e562..ad1b8e5e8b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -9,6 +9,7 @@
     import * as Card from '$comp/ui/card';
     import { Skeleton } from '$comp/ui/skeleton';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
+    import ProductTourActivityInfo from '$features/admin/components/product-tour-activity-info.svelte';
     import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
     import ProductTourPeriod from '$features/admin/components/product-tour-period.svelte';
     import { productTourCatalog } from '$features/product-tours/catalog';
@@ -94,7 +95,10 @@
         {#each tours as tour (`${tour.name}:${tour.version}`)}
             <Card.Root aria-label={`${title(tour.name)} usage`}>
                 <Card.Header class="flex flex-row flex-wrap items-center justify-between gap-x-3 gap-y-1">
-                    <Card.Title>{title(tour.name)} <span class="text-muted-foreground text-xs font-normal">v{tour.version}</span></Card.Title>
+                    <div class="flex items-center gap-1">
+                        <Card.Title>{title(tour.name)} <span class="text-muted-foreground text-xs font-normal">v{tour.version}</span></Card.Title>
+                        <ProductTourActivityInfo {tour} title={title(tour.name)} />
+                    </div>
                     {#if tour.last_run_utc}
                         <Card.Description class="whitespace-nowrap">Last event <TimeAgo value={tour.last_run_utc} /></Card.Description>
                     {/if}

From aa4bf1c709743e7499ee8147dc6fa608019965ad Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Thu, 3 Sep 2026 12:42:04 -0500
Subject: [PATCH 22/43] Harden guided tour runtime and browser coverage

---
 .../Handlers/ProductTourActivityHandler.cs    |  5 +-
 .../ClientApp/e2e/fixtures/api-client.ts      | 29 +++++++++-
 .../ClientApp/e2e/fixtures/e2e-test.ts        | 38 ++++++++++++-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 55 ++++++++++---------
 .../features/product-tours/catalog.test.ts    | 21 +++++++
 .../src/lib/features/product-tours/catalog.ts | 13 ++---
 ...product-tour-catalog-dialog.svelte.test.ts | 17 +++++-
 .../components/product-tour-host.svelte       | 13 +----
 .../src/lib/features/product-tours/types.ts   |  1 +
 .../components/saved-view-picker.svelte       |  4 +-
 10 files changed, 143 insertions(+), 53 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
index 7600957f82..78d21c5523 100644
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -32,7 +32,7 @@ await userRepository.PatchAsync(HttpContext.Request.GetUser().Id,
         return Result.NoContent();
     }
 
-    public async Task<Result> Handle(RecordProductTourActivity message, CancellationToken cancellationToken)
+    public async Task<Result> Handle(RecordProductTourActivity message)
     {
         var activity = message.Activity;
         if (!ProductTours.IsValid(message.TourName, activity.Version))
@@ -82,13 +82,14 @@ public async Task<Result> Handle(RecordProductTourActivity message, Cancellation
 
         // Do not use the SDK or copy HTTP metadata: these events need no identifying context.
         using var stream = new MemoryStream(serializer.SerializeToBytes(ev));
+        // Once accepted, this small server-side write must finish even if navigation closes the request.
         var entry = await eventPostService.EnqueueAsync(new EventPost(appOptions.EnableArchive)
         {
             ApiVersion = 2,
             MediaType = "application/json",
             ProjectId = project.Id,
             OrganizationId = project.OrganizationId
-        }, stream, cancellationToken);
+        }, stream);
         return String.IsNullOrEmpty(entry)
             ? Result.Unavailable("Guided-tour activity could not be queued.")
             : Result.Accepted();
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
index a2cd26d404..2397c48f3b 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/api-client.ts
@@ -286,10 +286,11 @@ export class E2EApiClient {
         throw new Error(`Timed out waiting for ${path} email sent to ${email}`);
     }
 
-    async signup(name: string, email: string, password: string): Promise<string> {
+    async signup(name: string, email: string, password: string, inviteToken?: string): Promise<string> {
         const response = await this.request.post(this.url('auth/signup'), {
             data: {
                 email,
+                invite_token: inviteToken,
                 name,
                 password
             }
@@ -327,6 +328,32 @@ export class E2EApiClient {
         );
     }
 
+    async waitForInvitationListed(token: string, organizationId: string, inviteToken: string): Promise<void> {
+        await waitForCondition(
+            async () => {
+                const response = await this.request.get(this.url('organizations'), {
+                    headers: this.authHeaders(token),
+                    params: { filter: `id:${organizationId}` }
+                });
+                await expectStatus(response, [200], 'find indexed invitation');
+                const organizations = await readJson(response);
+                return (
+                    Array.isArray(organizations) &&
+                    organizations.some((value) => {
+                        const organization = toRecord(value, 'organization');
+                        return (
+                            organization.id === organizationId &&
+                            Array.isArray(organization.invites) &&
+                            organization.invites.some((invite) => toRecord(invite, 'invitation').token === inviteToken)
+                        );
+                    })
+                );
+            },
+            30_000,
+            'Timed out waiting for the test invitation to be indexed'
+        );
+    }
+
     async waitForOrganizationDeleted(token: string, organizationId: string, timeoutMs = 30_000): Promise<void> {
         await waitForCondition(
             async () => !(await this.getOrganization(token, organizationId)),
diff --git a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
index 0b3877461f..83f3a7265f 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/fixtures/e2e-test.ts
@@ -48,6 +48,8 @@ interface E2EFixtures {
     e2eSecondaryOrganization: E2ESecondaryOrganization;
     e2eSecondaryProject: E2ESecondaryProject;
     e2eUseGeneratedUser: boolean;
+    e2eUseInvitedUser: boolean;
+    e2eUserInvitation: undefined | { organizationId: string; token: string };
     effectDepthGuard: void;
 }
 
@@ -60,7 +62,7 @@ export const test = base.extend<E2EFixtures>({
 
     e2eDismissProductTourWelcome: [true, { option: true }],
 
-    e2eScenario: async ({ e2eApi, e2eCleanupPassword, e2eDismissProductTourWelcome, e2eUseGeneratedUser, page }, use, testInfo) => {
+    e2eScenario: async ({ e2eApi, e2eCleanupPassword, e2eDismissProductTourWelcome, e2eUseGeneratedUser, e2eUserInvitation, page }, use, testInfo) => {
         const run = createRunName(e2eApi.environment.runId, testInfo);
         const userName = `Playwright User ${run}`;
         const email = `playwright-${run}@exceptionless.test`.toLowerCase();
@@ -75,16 +77,20 @@ export const test = base.extend<E2EFixtures>({
         let generatedUserSignupAttempted = false;
 
         try {
-            if (!e2eUseGeneratedUser && !e2eApi.environment.isProduction && e2eApi.environment.email && e2eApi.environment.password) {
+            if (!e2eUseGeneratedUser && !e2eUserInvitation && !e2eApi.environment.isProduction && e2eApi.environment.email && e2eApi.environment.password) {
                 userToken = await e2eApi.login();
             } else {
                 generatedUserSignupAttempted = true;
-                userToken = await e2eApi.signup(userName, email, E2E_TEST_PASSWORD);
+                userToken = await e2eApi.signup(userName, email, E2E_TEST_PASSWORD, e2eUserInvitation?.token);
                 createdUser = true;
             }
 
             const organization = await e2eApi.createOrganization(userToken, organizationName);
             organizationId = organization.id;
+            if (e2eUserInvitation) {
+                await e2eApi.deleteOrganizationUser(userToken, e2eUserInvitation.organizationId, email);
+                await e2eApi.waitForOrganizationNotListed(userToken, e2eUserInvitation.organizationId);
+            }
             const project = await e2eApi.createProject(userToken, organization.id, projectName);
             projectId = project.id;
             const projectToken = await e2eApi.getProjectDefaultToken(userToken, project.id);
@@ -238,6 +244,32 @@ export const test = base.extend<E2EFixtures>({
 
     e2eUseGeneratedUser: [false, { option: true }],
 
+    e2eUseInvitedUser: [false, { option: true }],
+
+    e2eUserInvitation: async ({ e2eApi, e2eUseInvitedUser }, use, testInfo) => {
+        if (!e2eUseInvitedUser) {
+            await use(undefined);
+            return;
+        }
+        if (e2eApi.environment.isProduction) {
+            throw new Error('Invited test users require local Mailpit.');
+        }
+
+        const run = createRunName(e2eApi.environment.runId, testInfo);
+        const email = `playwright-${run}@exceptionless.test`.toLowerCase();
+        const ownerToken = await e2eApi.login();
+        const organization = await e2eApi.createOrganization(ownerToken, `${E2E_ORGANIZATION_NAME_PREFIX} Invitations ${run}`);
+        try {
+            await e2eApi.inviteOrganizationUser(ownerToken, organization.id, email);
+            const inviteToken = await e2eApi.pollForMailToken(email, 'signup');
+            await e2eApi.waitForInvitationListed(ownerToken, organization.id, inviteToken);
+            await use({ organizationId: organization.id, token: inviteToken });
+        } finally {
+            await e2eApi.deleteOrganization(ownerToken, organization.id);
+            await e2eApi.waitForOrganizationDeleted(ownerToken, organization.id);
+        }
+    },
+
     effectDepthGuard: [
         async ({ page }, use) => {
             const errors = new Set<string>();
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 6db5c25a63..a1f89b2467 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -4,7 +4,7 @@ import { E2E_TEST_PASSWORD, expect, test } from '../fixtures/e2e-test';
 import { seedRepresentativeEvent } from '../support/event-data';
 import { createRepresentativeEvent } from '../support/synthetic-event';
 
-test.use({ actionTimeout: 15_000, e2eUseGeneratedUser: true });
+test.use({ actionTimeout: 15_000, e2eUseInvitedUser: true });
 
 test.describe('first-run welcome', () => {
     test.use({ e2eDismissProductTourWelcome: false });
@@ -212,6 +212,9 @@ test.describe('shell and identity checkpoints', () => {
 
 test('project guide preserves the current SDK selection', async ({ e2eScenario, page }) => {
     // Arrange
+    await page.route('**/api/v2/organizations/*/projects*', async (route) => {
+        await route.fulfill({ json: [] });
+    });
     await page.goto(`/next/project/${e2eScenario.projectId}/configure?type=dotnet-legacy-mvc`);
     await expect(page.locator('[data-tour="project-configure-platform"]')).toContainText('ASP.NET MVC');
 
@@ -250,33 +253,33 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
 
         expect(projectId).toBeTruthy();
 
-        await page.locator('[data-tour="project-configure-platform"]').click();
-        await page.getByRole('option', { name: 'Browser applications' }).click();
-        await expect(page.getByText('Waiting for your first event')).toBeVisible();
-        await expect(page.locator('.driver-popover')).toHaveCount(0);
-        await expect(page.locator('.driver-overlay')).toHaveCount(0);
-        await expect(page.locator('[data-tour="project-sdk-instructions"]')).toBeVisible();
-        await expect(page.getByRole('button', { exact: true, name: 'End guide' })).toBeVisible();
-
-        const instructionButtons = page.locator('[data-tour="project-sdk-instructions"]').getByRole('button');
-        const reachedButtons = new Set<number>();
-        await page.locator('[data-tour="project-configure-platform"]').focus();
-        for (let tab = 0; tab < 40 && reachedButtons.size < (await instructionButtons.count()); tab++) {
-            await page.keyboard.press('Tab');
-            const focusedIndex = await instructionButtons.evaluateAll((buttons) => buttons.indexOf(document.activeElement as HTMLButtonElement));
-            if (focusedIndex >= 0) {
-                reachedButtons.add(focusedIndex);
-            }
-        }
-        expect(reachedButtons.size).toBe(await instructionButtons.count());
-
-        let projectProgressRequests = 0;
         const projectProgressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/project-configure';
-        await page.route(projectProgressRoute, async (route) => {
-            projectProgressRequests += 1;
-            await route.fulfill({ json: { title: 'Injected progress failure' }, status: 500 });
-        });
         try {
+            await page.locator('[data-tour="project-configure-platform"]').click();
+            await page.getByRole('option', { name: 'Browser applications' }).click();
+            await expect(page.getByText('Waiting for your first event')).toBeVisible();
+            await expect(page.locator('.driver-popover')).toHaveCount(0);
+            await expect(page.locator('.driver-overlay')).toHaveCount(0);
+            await expect(page.locator('[data-tour="project-sdk-instructions"]')).toBeVisible();
+            await expect(page.getByRole('button', { exact: true, name: 'End guide' })).toBeVisible();
+
+            const instructionButtons = page.locator('[data-tour="project-sdk-instructions"]').getByRole('button');
+            const reachedButtons = new Set<number>();
+            await page.locator('[data-tour="project-configure-platform"]').focus();
+            for (let tab = 0; tab < 40 && reachedButtons.size < (await instructionButtons.count()); tab++) {
+                const focusedIndex = await instructionButtons.evaluateAll((buttons) => buttons.indexOf(document.activeElement as HTMLButtonElement));
+                if (focusedIndex >= 0) {
+                    reachedButtons.add(focusedIndex);
+                }
+                await page.keyboard.press('Tab');
+            }
+            expect(reachedButtons.size).toBe(await instructionButtons.count());
+
+            let projectProgressRequests = 0;
+            await page.route(projectProgressRoute, async (route) => {
+                projectProgressRequests += 1;
+                await route.fulfill({ json: { title: 'Injected progress failure' }, status: 500 });
+            });
             const token = await e2eApi.getProjectDefaultToken(e2eScenario.userToken, projectId!);
             await e2eApi.submitEvent(
                 projectId!,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index d1a5549dbb..ff6aaf4b38 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -7,6 +7,7 @@ import { getProductTourItems, getRecommendedProductTourName, productTourCatalog
 function context(overrides: Partial<ProductTourContext> = {}): ProductTourContext {
     return {
         errorEventAvailability: 'available',
+        isProjectConfigurePage: false,
         isSetupPage: false,
         organizationId: 'organization-id',
         pathname: '/next',
@@ -65,6 +66,7 @@ describe('product tour catalog', () => {
         // Arrange
         const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
         const currentContext = context({
+            isProjectConfigurePage: true,
             pathname: '/next/project/current-project/configure',
             projects: [
                 { id: 'other-project', is_configured: false },
@@ -91,6 +93,25 @@ describe('product tour catalog', () => {
         expect(start).toEqual({ checkpointName: 'choose-platform', route: '/next/project/project-id/configure?redirect=true' });
     });
 
+    it('keeps Client Setup when the organization project list has not caught up', () => {
+        // Arrange
+        const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
+
+        // Act
+        const start = definition.start(
+            context({
+                isProjectConfigurePage: true,
+                organizationId: undefined,
+                pathname: '/next/project/current-project/configure',
+                projects: [],
+                search: '?type=dotnet-legacy-mvc'
+            })
+        );
+
+        // Assert
+        expect(start).toEqual({ checkpointName: 'choose-platform', route: '/next/project/current-project/configure?type=dotnet-legacy-mvc&redirect=true' });
+    });
+
     it('requires actual Exie access', () => {
         const item = getProductTourItems(context({ assistantAccess: { enabled: true, has_access: false, upgrade_required: true } })).find(
             (tour) => tour.name === 'exie-overview'
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 1d3eba3cdc..4787586b2a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -38,19 +38,16 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'project-configure',
         start: (context) => {
-            if (!context.organizationId) {
-                return { checkpointName: 'organization-name', route: resolve('/(app)/organization/add') };
-            }
-
-            const currentProject = context.projects.find(
-                (project) => project.id && context.pathname === resolve('/(app)/project/[projectId]/configure', { projectId: project.id })
-            );
-            if (currentProject) {
+            if (context.isProjectConfigurePage) {
                 const search = new URLSearchParams(context.search);
                 search.set('redirect', 'true');
                 return { checkpointName: 'choose-platform', route: `${context.pathname}?${search}` };
             }
 
+            if (!context.organizationId) {
+                return { checkpointName: 'organization-name', route: resolve('/(app)/organization/add') };
+            }
+
             const unconfiguredProject = context.projects.find((project) => !project.is_configured);
             if (unconfiguredProject?.id) {
                 return {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
index bca9da8915..d627322bc0 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
@@ -15,7 +15,14 @@ describe('ProductTourCatalogDialog', () => {
     it('distinguishes guides and preserves restart, continue, and unavailable actions', async () => {
         // Arrange
         const items = getProductTourItems(
-            { errorEventAvailability: 'empty', isSetupPage: false, organizationId: 'organization', pathname: '/next', projects: [] },
+            {
+                errorEventAvailability: 'empty',
+                isProjectConfigurePage: false,
+                isSetupPage: false,
+                organizationId: 'organization',
+                pathname: '/next',
+                projects: []
+            },
             { 'app-overview': { status: ProductTourStatus.Completed, version: 1 } }
         );
         const onStart = vi.fn(async () => {});
@@ -44,7 +51,13 @@ describe('ProductTourCatalogDialog', () => {
 
     it('keeps the picker focused on outcomes without step counts or documentation detours', () => {
         // Arrange
-        const items = getProductTourItems({ errorEventAvailability: 'empty', isSetupPage: false, pathname: '/next', projects: [] });
+        const items = getProductTourItems({
+            errorEventAvailability: 'empty',
+            isProjectConfigurePage: false,
+            isSetupPage: false,
+            pathname: '/next',
+            projects: []
+        });
         const onStart = vi.fn();
 
         // Act
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 101dfcbad6..7b9e9323a7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -4,6 +4,7 @@
 
     import { goto } from '$app/navigation';
     import { resolve } from '$app/paths';
+    import { page } from '$app/state';
     import { getOrganizationEventsQuery } from '$features/events/api.svelte';
     import { getOrganizationProjectsQuery } from '$features/projects/api.svelte';
     import { putCurrentUserProductTour } from '$features/users/api.svelte';
@@ -84,16 +85,7 @@
         }
     });
     const projects = $derived(projectsQuery.data?.data ?? []);
-    const projectConfigurePage = $derived(
-        projects.some(
-            (project) =>
-                project.id &&
-                pathname ===
-                    resolve('/(app)/project/[projectId]/configure', {
-                        projectId: project.id
-                    })
-        )
-    );
+    const projectConfigurePage = $derived(page.route.id === '/(app)/project/[projectId]/configure');
     const errorEventsQuery = getOrganizationEventsQuery({
         enabled: () => checkErrorAvailability,
         params: {
@@ -121,6 +113,7 @@
     const context = $derived<ProductTourContext>({
         assistantAccess,
         errorEventAvailability,
+        isProjectConfigurePage: projectConfigurePage,
         isSetupPage,
         organizationId,
         pathname,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index ddd787fada..5aed74e619 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -30,6 +30,7 @@ export type ProductTourCheckpointName<Name extends ProductTourName = ProductTour
 export interface ProductTourContext {
     assistantAccess?: AssistantAccess;
     errorEventAvailability: 'available' | 'empty' | 'error' | 'loading';
+    isProjectConfigurePage: boolean;
     isSetupPage: boolean;
     organizationId?: string;
     pathname: string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 78a8e7c9c1..01455173a4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -287,7 +287,9 @@
             const result = await createMutation.mutateAsync(body);
             isSaveDialogOpen = false;
             onLoadView(result);
-            void tour?.created();
+            if (tour) {
+                await tour.created();
+            }
             toast.success(`Saved view "${result.name}" created.`);
         } catch (error) {
             toast.error(getErrorMessage(error, 'Failed to save view. Please try again.'));

From d8cc3618ae142190acf49e9107ff651fa1496133 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 14:27:04 -0500
Subject: [PATCH 23/43] Improve guided tour progress and collection reliability

---
 .../Repositories/EventRepository.cs           |  1 +
 .../Repositories/UserRepository.cs            |  3 +-
 .../Api/Handlers/AdminHandler.cs              |  8 +++-
 .../Handlers/ProductTourActivityHandler.cs    |  8 ++++
 .../ProductTourActivityEndpointTests.cs       | 35 +++++++++++++++++
 .../Api/Endpoints/ProductTourEndpointTests.cs | 38 +++++++++++++++++++
 .../Repositories/EventRepositoryTests.cs      | 37 ++++++++++++++++++
 tests/http/users.http                         |  1 +
 8 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 0eea3778e6..25db8ad511 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -113,6 +113,7 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                     Convert.ToInt64(bucket.Aggregations.Sum($"sum_{countField}")?.Value ?? bucket.Total.GetValueOrDefault()),
                     bucket.Aggregations.Max<DateTime>($"max_{dateField}")?.Value,
                     (bucket.Aggregations.DateHistogram($"date_{dateField}")?.Buckets ?? [])
+                        .Where(period => period.Date < utcEnd)
                         .Select(period => new ProductTourUsagePeriod(period.Date, Convert.ToInt64(period.Aggregations.Sum($"sum_{countField}")?.Value ?? period.Total.GetValueOrDefault())))
                         .ToArray())
                 {
diff --git a/src/Exceptionless.Core/Repositories/UserRepository.cs b/src/Exceptionless.Core/Repositories/UserRepository.cs
index f5cafa976a..d24eac6859 100644
--- a/src/Exceptionless.Core/Repositories/UserRepository.cs
+++ b/src/Exceptionless.Core/Repositories/UserRepository.cs
@@ -89,7 +89,7 @@ public async Task<ProductTourProgress> UpdateProductTourProgressAsync(string use
 
             def current = ctx._source.product_tours[params.tourName];
             if (current != null && (current.version > params.version ||
-                (current.version == params.version && current.status <= params.status))) {
+                (current.version == params.version && (current.status == params.completedStatus || current.status == params.status)))) {
               ctx.op = 'none';
             } else {
               ctx._source.product_tours[params.tourName] = ['status': params.status, 'version': params.version];
@@ -99,6 +99,7 @@ public async Task<ProductTourProgress> UpdateProductTourProgressAsync(string use
         {
             Params = new Dictionary<string, object>
             {
+                ["completedStatus"] = (int)ProductTourStatus.Completed,
                 ["status"] = (int)progress.Status,
                 ["tourName"] = tourName,
                 ["version"] = progress.Version
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index ee923d99be..233ed5ed2e 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -8,6 +8,7 @@
 using Exceptionless.Core.Queues.Models;
 using Exceptionless.Core.Repositories;
 using Exceptionless.Core.Repositories.Configuration;
+using Exceptionless.Core.Services;
 using Exceptionless.Core.Utility;
 using Exceptionless.DateTimeExtensions;
 using Exceptionless.Web.Api.Messages;
@@ -40,6 +41,7 @@ public class AdminHandler(
     BillingPlans plans,
     IMigrationStateRepository migrationStateRepository,
     SampleDataService sampleDataService,
+    UsageService usageService,
     TimeProvider timeProvider,
     ILoggerFactory loggerFactory)
 {
@@ -161,6 +163,10 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             utcEnd = monthStart.AddMonths(1);
 
         var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
+        var organization = project is { IsDeleted: false }
+            ? await organizationRepository.GetByIdAsync(project.OrganizationId, options => options.Cache())
+            : null;
+        bool collectionAvailable = organization is { IsDeleted: false } && await usageService.GetEventsLeftAsync(organization.Id) > 0;
         var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd,
             message.History ? ProductTourUsageInterval.Month : ProductTourUsageInterval.Day);
         var bucketsByTour = usage.Buckets
@@ -219,7 +225,7 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             tours,
             usage.Interval)
         {
-            CollectionAvailable = project is { IsDeleted: false }
+            CollectionAvailable = collectionAvailable
         };
     }
 
diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
index 78d21c5523..70cc03352b 100644
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -17,6 +17,8 @@ namespace Exceptionless.Web.Api.Handlers;
 public class ProductTourActivityHandler(
     IUserRepository userRepository,
     IProjectRepository projectRepository,
+    IOrganizationRepository organizationRepository,
+    UsageService usageService,
     EventPostService eventPostService,
     AppOptions appOptions,
     ISerializer serializer,
@@ -69,6 +71,12 @@ public async Task<Result> Handle(RecordProductTourActivity message)
             return Result.Unavailable("Guided-tour activity storage is unavailable.");
         }
 
+        var organization = await organizationRepository.GetByIdAsync(project.OrganizationId, options => options.Cache());
+        if (organization is null || organization.IsDeleted || await usageService.GetEventsLeftAsync(organization.Id) < 1)
+        {
+            return Result.Unavailable("Guided-tour activity storage is unavailable.");
+        }
+
         var ev = new Event
         {
             Type = Event.KnownTypes.FeatureUsage,
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
index d6e795cf55..137e58d2fc 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
@@ -9,6 +9,7 @@
 using Exceptionless.Core.Utility;
 using Exceptionless.Tests.Extensions;
 using Exceptionless.Web.Models;
+using Exceptionless.Web.Models.Admin;
 using Foundatio.Queues;
 using Foundatio.Repositories;
 using Foundatio.Serializer;
@@ -190,4 +191,38 @@ public async Task RecordProductTourActivity_MissingInternalProject_ReturnsUnavai
             .ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
         Assert.Equal(System.Net.HttpStatusCode.ServiceUnavailable, response.StatusCode);
     }
+
+    [Fact]
+    public async Task RecordProductTourActivity_InternalOrganizationOverLimit_ReportsUnavailableWithoutQueuing()
+    {
+        // Arrange
+        var organizationRepository = GetService<IOrganizationRepository>();
+        var organization = await organizationRepository.GetByIdAsync(SampleDataService.TEST_ORG_ID);
+        Assert.NotNull(organization);
+        organization.MaxEventsPerMonth = 1;
+        organization.BonusEventsPerMonth = 0;
+        await organizationRepository.SaveAsync(organization);
+        var project = await GetService<IProjectRepository>().AddAsync(new Project
+        {
+            Id = GetService<AppOptions>().InternalProjectId,
+            OrganizationId = organization.Id,
+            Name = "Guide activity",
+            NextSummaryEndOfDayTicks = TimeProvider.GetUtcNow().UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
+        });
+        var usage = GetService<UsageService>();
+        await usage.IncrementTotalAsync(organization.Id, project.Id, 2);
+        Assert.Equal(0, await usage.GetEventsLeftAsync(organization.Id));
+
+        // Act
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
+            .ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
+        var report = await SendRequestAsAsync<ProductTourUsageResponse>(request => request.AsGlobalAdminUser()
+            .AppendPath("admin/product-tour-usage").QueryString("days", "30").StatusCodeShouldBeOk());
+
+        // Assert
+        Assert.NotNull(report);
+        Assert.False(report.CollectionAvailable);
+        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
+    }
 }
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 8b0f2de3a5..85cd044643 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -90,6 +90,44 @@ public async Task UpdateCurrentUserProductTourAsync_CompletedProgress_ReplacesDi
         Assert.Equal(replacement, persistedUser.ProductTours["exie-overview"]);
     }
 
+    [Theory]
+    [InlineData(0)]
+    [InlineData(999)]
+    public async Task UpdateCurrentUserProductTourAsync_UnknownStoredStatus_ReplacesWithCompleted(int storedStatus)
+    {
+        // Arrange
+        var currentUser = await GetTestOrganizationUserAsync();
+        currentUser.ProductTours[ProductTours.AppOverview] = new ProductTourProgress
+        {
+            Status = (ProductTourStatus)storedStatus,
+            Version = 1
+        };
+        await _userRepository.SaveAsync(currentUser, options => options.Cache().ImmediateConsistency());
+
+        // Act
+        var progress = await UpdateProgressAsync(ProductTours.AppOverview, ProductTourStatus.Completed, 1);
+
+        // Assert
+        Assert.Equal(ProductTourStatus.Completed, progress.Status);
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(persistedUser);
+        Assert.Equal(progress, persistedUser.ProductTours[ProductTours.AppOverview]);
+    }
+
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_DismissedProgress_PreservesCompletedForSameVersion()
+    {
+        // Arrange
+        await UpdateProgressAsync(ProductTours.AppOverview, ProductTourStatus.Completed, 1);
+
+        // Act
+        var progress = await UpdateProgressAsync(ProductTours.AppOverview, ProductTourStatus.Dismissed, 1);
+
+        // Assert
+        Assert.Equal(ProductTourStatus.Completed, progress.Status);
+        Assert.Equal(1, progress.Version);
+    }
+
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_ConcurrentUpdatesPreserveBothTourKeys()
     {
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 3fa8f11dc5..1612db91a2 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -36,6 +36,43 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
         _serializer = GetService<ITextSerializer>();
     }
 
+    [Fact]
+    public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLargeCounts()
+    {
+        // Arrange
+        var start = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        string[] sources = ProductTours.Definitions.Values
+            .SelectMany(definition => Enum.GetValues<ProductTourTelemetryEvent>()
+                .SelectMany(action => Enum.GetValues<ProductTourLaunchSource>()
+                    .Select(source => ProductTours.CreateTelemetrySource(action, definition.Name, definition.CurrentVersion, source))))
+            .ToArray();
+        await CreateDataAsync(builder =>
+        {
+            foreach (string source in sources)
+            {
+                foreach (var date in new[] { start, start.AddDays(89) })
+                {
+                    builder.Event().Organization(TestConstants.OrganizationId).Project(_appOptions.InternalProjectId)
+                        .Type(Event.KnownTypes.FeatureUsage).Source(source).Date(date)
+                        .Mutate(ev => ev.Count = Int32.MaxValue);
+                }
+            }
+        });
+
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(90), ProductTourUsageInterval.Day);
+
+        // Assert
+        Assert.Equal(sources.Length, result.Buckets.Count);
+        Assert.All(result.Buckets, bucket =>
+        {
+            Assert.Equal(2L * Int32.MaxValue, bucket.Count);
+            Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count));
+            Assert.Equal(2, bucket.Activity.Count(period => period.Count > 0));
+            Assert.InRange(bucket.Activity.Count, 2, 90);
+        });
+    }
+
     [Fact]
     public async Task GetProductTourUsageAsync_StepsAcrossFebruary_PreservesCoalescedCountsWithDailyBuckets()
     {
diff --git a/tests/http/users.http b/tests/http/users.http
index c493592a4a..fea33a1fa0 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -37,6 +37,7 @@ Content-Type: application/json
 }
 
 ### Record Optional Product Tour Activity (no identity or request context)
+# Returns 503 when the internal storage project/organization is unavailable or its event allowance is exhausted.
 POST {{apiUrl}}/users/me/product-tours/app-overview/activity
 Authorization: Bearer {{token}}
 Content-Type: application/json

From 0258980f71b03e988a4fc54a5676428379997ad7 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 14:39:05 -0500
Subject: [PATCH 24/43] Guard stale tour actions and aggregation growth

---
 .../product-tours/actions.svelte.test.ts       | 18 +++++++++++++++++-
 .../features/product-tours/actions.svelte.ts   |  4 ++++
 .../Repositories/EventRepositoryTests.cs       | 11 ++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
index f31d5a850c..d5ab6e93fa 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
@@ -69,7 +69,7 @@ describe('product tour completion', () => {
         expect(mocks.openCatalog).not.toHaveBeenCalled();
     });
 
-    it('does not show a completion action for dismissal or a stale checkpoint', async () => {
+    it('does not submit completion for a dismissed checkpoint', async () => {
         // Arrange
         const checkpoint = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
         const actions = createProductTourActions();
@@ -80,10 +80,26 @@ describe('product tour completion', () => {
 
         // Assert
         expect(completed).toBe(false);
+        expect(mocks.mutateAsync).toHaveBeenCalledOnce();
         expect(mocks.success).not.toHaveBeenCalled();
         expect(mocks.openCatalog).not.toHaveBeenCalled();
     });
 
+    it('does not submit dismissal after another guide replaces the checkpoint', async () => {
+        // Arrange
+        const previous = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
+        const current = productTourCheckpoint.start('saved-view-create', 'open-view-menu', 'catalog', 'user', 1);
+
+        // Act
+        const dismissed = await createProductTourActions().dismiss(previous);
+
+        // Assert
+        expect(dismissed).toBe(false);
+        expect(productTourCheckpoint.current).toBe(current);
+        expect(mocks.mutateAsync).not.toHaveBeenCalled();
+        expect(mocks.submitFeatureUsage).not.toHaveBeenCalled();
+    });
+
     it('offers the next guide once after a first event succeeds', async () => {
         // Arrange
         const checkpoint = productTourCheckpoint.start('project-configure', 'event-received', 'catalog', 'user', 1);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 9fb625acb6..90d4b6c860 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -65,6 +65,10 @@ export function createProductTourActions() {
     }
 
     async function finish(checkpoint: ProductTourCheckpoint, status: ProductTourStatus): Promise<boolean> {
+        if (productTourCheckpoint.current !== checkpoint) {
+            return false;
+        }
+
         try {
             await progressMutation.mutateAsync({
                 progress: {
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 1612db91a2..44f110f627 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -42,10 +42,15 @@ public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLar
         // Arrange
         var start = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         string[] sources = ProductTours.Definitions.Values
-            .SelectMany(definition => Enum.GetValues<ProductTourTelemetryEvent>()
-                .SelectMany(action => Enum.GetValues<ProductTourLaunchSource>()
-                    .Select(source => ProductTours.CreateTelemetrySource(action, definition.Name, definition.CurrentVersion, source))))
+            .SelectMany(definition => Enumerable.Range(1, definition.CurrentVersion)
+                .SelectMany(version => Enum.GetValues<ProductTourTelemetryEvent>()
+                    .SelectMany(action => Enum.GetValues<ProductTourLaunchSource>()
+                        .Select(source => ProductTours.CreateTelemetrySource(action, definition.Name, version, source)))))
             .ToArray();
+        int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
+        // Include the source bucket and the parser's padded end-date bucket. Catalog/version growth
+        // must stay within Elasticsearch's default search.max_buckets before it reaches production.
+        Assert.InRange((long)sources.Length * (1 + 91 + stepCount), 1, 65_536);
         await CreateDataAsync(builder =>
         {
             foreach (string source in sources)

From ebaf034d106854832afa5fc7634721ed06614c27 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 14:52:11 -0500
Subject: [PATCH 25/43] Preserve tour cache updates across account changes

---
 .../lib/features/product-tours/api.svelte.ts  |  13 ++-
 .../product-tours/user-cache.svelte.test.ts   | 101 ++++++++++++++++++
 .../src/lib/features/users/api.svelte.ts      |   7 +-
 3 files changed, 116 insertions(+), 5 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
index f26f2d5a28..d37286ea6e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
@@ -61,8 +61,17 @@ export function putProductTourAnalytics() {
         },
         mutationKey: ['product-tours', 'analytics'],
         onError: (_error, _enabled, context) => {
-            if (context?.previous) {
-                queryClient.setQueryData(userQueryKeys.me(), context.previous);
+            const previous = context?.previous;
+            if (previous) {
+                queryClient.setQueryData<ViewCurrentUser>(userQueryKeys.me(), (user) => {
+                    if (!user || user.id !== previous.id) {
+                        return user;
+                    }
+                    return {
+                        ...user,
+                        product_tour_analytics_enabled: previous.product_tour_analytics_enabled
+                    };
+                });
             }
         },
         onMutate: async (enabled) => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
new file mode 100644
index 0000000000..641a54d894
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
@@ -0,0 +1,101 @@
+import type { ProductTourProgress, ViewCurrentUser } from '$generated/api';
+
+import { putCurrentUserProductTour, queryKeys } from '$features/users/api.svelte';
+import { MutationObserver, type MutationObserverOptions, QueryClient } from '@tanstack/svelte-query';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { putProductTourAnalytics } from './api.svelte';
+
+const mocks = vi.hoisted(() => ({ putJSON: vi.fn(), useQueryClient: vi.fn() }));
+vi.mock('$env/dynamic/public', () => ({ env: {} }));
+vi.mock('@foundatiofx/fetchclient', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('@foundatiofx/fetchclient')>()),
+    useFetchClient: () => ({ putJSON: mocks.putJSON })
+}));
+vi.mock('@tanstack/svelte-query', async (importOriginal) => ({
+    ...(await importOriginal<typeof import('@tanstack/svelte-query')>()),
+    createMutation: <TData, TError, TVariables, TContext>(options: () => MutationObserverOptions<TData, TError, TVariables, TContext>) => {
+        const observer = new MutationObserver(mocks.useQueryClient(), options());
+        return { mutateAsync: (variables: TVariables) => observer.mutate(variables) };
+    },
+    useQueryClient: mocks.useQueryClient
+}));
+
+describe('guided-tour user cache concurrency', () => {
+    let queryClient: QueryClient;
+
+    beforeEach(() => {
+        vi.resetAllMocks();
+        queryClient = new QueryClient();
+        mocks.useQueryClient.mockReturnValue(queryClient);
+        queryClient.setQueryData(queryKeys.me(), user('first-user'));
+    });
+
+    it('preserves progress saved while a preference update fails', async () => {
+        // Arrange
+        const request = Promise.withResolvers<void>();
+        mocks.putJSON.mockReturnValue(request.promise);
+        const pending = putProductTourAnalytics()
+            .mutateAsync(false)
+            .catch(() => undefined);
+        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
+        queryClient.setQueryData<ViewCurrentUser>(queryKeys.me(), (current) => ({
+            ...current!,
+            product_tours: { 'app-overview': { status: 1, version: 1 } }
+        }));
+
+        // Act
+        request.reject(new Error('Unavailable'));
+        await pending;
+
+        // Assert
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())).toMatchObject({
+            product_tour_analytics_enabled: true,
+            product_tours: { 'app-overview': { status: 1, version: 1 } }
+        });
+    });
+
+    it('does not restore the previous account when its preference update fails', async () => {
+        // Arrange
+        const request = Promise.withResolvers<void>();
+        mocks.putJSON.mockReturnValue(request.promise);
+        const pending = putProductTourAnalytics()
+            .mutateAsync(false)
+            .catch(() => undefined);
+        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
+        const nextUser = user('second-user');
+        queryClient.setQueryData(queryKeys.me(), nextUser);
+
+        // Act
+        request.reject(new Error('Unavailable'));
+        await pending;
+
+        // Assert
+        expect(queryClient.getQueryData(queryKeys.me())).toEqual(nextUser);
+    });
+
+    it.each([false, true])('applies delayed completion only to its original account (account changed: %s)', async (changeAccount) => {
+        // Arrange
+        const progress: ProductTourProgress = { status: 1, version: 1 };
+        const request = Promise.withResolvers<{ data: ProductTourProgress; ok: boolean }>();
+        mocks.putJSON.mockReturnValue(request.promise);
+        const pending = putCurrentUserProductTour().mutateAsync({ progress, tourName: 'app-overview' });
+        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
+        const currentUser = { ...user(changeAccount ? 'second-user' : 'first-user'), product_tour_analytics_enabled: false };
+        queryClient.setQueryData(queryKeys.me(), currentUser);
+
+        // Act
+        request.resolve({ data: progress, ok: true });
+        await pending;
+
+        // Assert
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())).toEqual({
+            ...currentUser,
+            product_tours: changeAccount ? {} : { 'app-overview': progress }
+        });
+    });
+});
+
+function user(id: string): ViewCurrentUser {
+    return { id, product_tour_analytics_enabled: true, product_tours: {} } as ViewCurrentUser;
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
index 5795789d13..41b9843f86 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
@@ -277,7 +277,7 @@ export function postEmailAddress(request: PostEmailAddressRequest) {
 
 export function putCurrentUserProductTour() {
     const queryClient = useQueryClient();
-    return createMutation<ProductTourProgress, ProblemDetails, PutCurrentUserProductTourRequest>(() => ({
+    return createMutation<ProductTourProgress, ProblemDetails, PutCurrentUserProductTourRequest, string | undefined>(() => ({
         enabled: () => !!accessToken.current,
         mutationFn: async ({ progress, tourName }) => {
             const client = useFetchClient();
@@ -290,9 +290,10 @@ export function putCurrentUserProductTour() {
             return response.data!;
         },
         mutationKey: queryKeys.productTour(undefined),
-        onSuccess: (progress, { tourName }) => {
+        onMutate: () => queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())?.id,
+        onSuccess: (progress, { tourName }, userId) => {
             const currentUser = queryClient.getQueryData<ViewCurrentUser>(queryKeys.me());
-            if (!currentUser) {
+            if (!currentUser || currentUser.id !== userId) {
                 return;
             }
 

From 2c61327b5356e6b3d7ca535b5d28d1470c0a94af Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 16:40:04 -0500
Subject: [PATCH 26/43] Use date-filtered buckets for guided-tour history

---
 .../Repositories/EventRepository.cs           | 21 +++++--
 .../Repositories/ProductTourUsageResult.cs    |  5 +-
 .../Api/Handlers/AdminHandler.cs              |  2 +-
 .../e2e/tests/product-tour-dashboard.e2e.ts   | 32 +++++++---
 .../components/product-tour-activity.svelte   | 32 +++++++---
 .../product-tour-activity.svelte.test.ts      |  7 ++-
 .../features/admin/product-tour-usage.test.ts | 59 ++++++++++---------
 .../lib/features/admin/product-tour-usage.ts  | 29 ++-------
 .../ClientApp/src/lib/generated/api.ts        |  1 +
 .../ClientApp/src/lib/generated/schemas.ts    |  2 +-
 .../(app)/system/product-tours/+page.svelte   |  2 +-
 .../Exceptionless.Tests/Api/Data/openapi.json |  6 +-
 .../AdminProductTourUsageEndpointTests.cs     |  5 +-
 .../Repositories/EventRepositoryTests.cs      | 56 +++++++++++++++---
 tests/http/admin.http                         |  2 +-
 15 files changed, 170 insertions(+), 91 deletions(-)

diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 25db8ad511..745eef3da8 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -99,11 +99,21 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
         string dateField = InferField(ev => ev.Date);
         string tagsField = InferField(ev => ev.Tags);
         int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
-        bool daily = usageInterval.HasValue ? usageInterval is ProductTourUsageInterval.Day : utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1);
-        string interval = daily ? "1d" : "1M";
+        var interval = usageInterval ?? (utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1) ? ProductTourUsageInterval.Day : ProductTourUsageInterval.Month);
+        // Without a bounded date filter the parser defaults to daily buckets, which can be
+        // unbounded on installations with unlimited retention. Preserve monthly history there.
+        if (interval is ProductTourUsageInterval.Auto && !utcStart.HasValue)
+            interval = ProductTourUsageInterval.Month;
+        string proximity = interval switch
+        {
+            ProductTourUsageInterval.Day => "~1d",
+            ProductTourUsageInterval.Month => "~1M",
+            ProductTourUsageInterval.Auto => String.Empty,
+            _ => throw new ArgumentOutOfRangeException(nameof(usageInterval))
+        };
 
         var aggregation = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
-            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}~{interval} sum:{countField}~1) terms:({tagsField}~{stepCount} @include:/{ProductTours.StepTagPrefix}.*/ sum:{countField}~1))"));
+            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}{proximity} sum:{countField}~1) terms:({tagsField}~{stepCount} @include:/{ProductTours.StepTagPrefix}.*/ sum:{countField}~1))"));
 
         var sourceBuckets = aggregation.Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
         var usage = sourceBuckets
@@ -125,7 +135,7 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                 : null)
             .OfType<ProductTourUsageBucket>()
             .ToArray();
-        return new ProductTourUsageResult(usage, daily ? ProductTourUsageInterval.Day : ProductTourUsageInterval.Month);
+        return new ProductTourUsageResult(usage, interval);
     }
 
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
@@ -138,7 +148,8 @@ private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
         query = query
             .Project(projectId)
             .FieldEquals(ev => ev.Type, Event.KnownTypes.FeatureUsage)
-            .FieldEquals(ev => ev.Source, sources);
+            .FieldEquals(ev => ev.Source, sources)
+            .FieldLessThan(ev => ev.Date, utcEnd);
 
         if (utcStart.HasValue)
             return query.DateRange(utcStart, utcEnd, (PersistentEvent ev) => ev.Date).Index(utcStart, utcEnd);
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index a6d3774fd3..64fcfec7c8 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -16,7 +16,10 @@ public enum ProductTourUsageInterval
     Day,
     [JsonStringEnumMemberName("month")]
     [EnumMember(Value = "month")]
-    Month
+    Month,
+    [JsonStringEnumMemberName("auto")]
+    [EnumMember(Value = "auto")]
+    Auto
 }
 
 public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity)
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 233ed5ed2e..23dfb7ac8b 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -168,7 +168,7 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
             : null;
         bool collectionAvailable = organization is { IsDeleted: false } && await usageService.GetEventsLeftAsync(organization.Id) > 0;
         var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd,
-            message.History ? ProductTourUsageInterval.Month : ProductTourUsageInterval.Day);
+            message.History ? ProductTourUsageInterval.Auto : ProductTourUsageInterval.Day);
         var bucketsByTour = usage.Buckets
             .GroupBy(bucket => (bucket.Source.TourName, bucket.Source.Version))
             .ToDictionary(group => group.Key);
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index b3f42bb8e8..e93fa549dd 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -15,13 +15,20 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
         started: 8 + (index % 7)
     }));
     const sum = (key: 'completed' | 'dismissed' | 'shown' | 'started') => activity.reduce((total, day) => total + day[key], 0);
-    await page.route('**/api/v2/admin/product-tour-usage*', (route) =>
-        route.fulfill({
+    await page.route('**/api/v2/admin/product-tour-usage*', (route) => {
+        const history = new URL(route.request().url()).searchParams.get('history') === 'true';
+        const periods = history
+            ? activity.map((period, index) => ({
+                  ...period,
+                  date_utc: new Date(today.getTime() - (30 - index) * 6 * 3_600_000).toISOString()
+              }))
+            : activity;
+        return route.fulfill({
             json: {
                 collection_available: true,
-                interval: 'day',
+                interval: history ? 'auto' : 'day',
                 tours: ['app-overview', 'project-configure', 'saved-view-create', 'app-welcome'].map((name) => ({
-                    activity,
+                    activity: periods,
                     completed: sum('completed'),
                     dismissed: sum('dismissed'),
                     kind: name === 'app-welcome' ? 'prompt' : 'guide',
@@ -34,10 +41,10 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
                     version: 1
                 })),
                 utc_end: new Date().toISOString(),
-                utc_start: activity[0].date_utc
+                utc_start: periods[0].date_utc
             }
-        })
-    );
+        });
+    });
 
     // Act & Assert
     await page.goto('/next/system/product-tours');
@@ -66,8 +73,15 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     await page.getByRole('button', { name: 'Usage period: Last 30 days' }).click();
     await page.getByRole('button', { exact: true, name: 'Available history' }).click();
     await expect(page.getByRole('button', { name: 'Usage period: Available history' })).toBeVisible();
-    await page.getByRole('button', { name: 'Usage period: Available history' }).click();
-    await page.getByRole('button', { exact: true, name: 'Last 30 days' }).click();
+    await expect(page.getByText('Guide activity · UTC', { exact: true })).toBeVisible();
+    await expect(chart).toHaveAttribute('aria-valuemax', '29');
+    await chart.focus();
+    await page.keyboard.press('Home');
+    await expect(chart).toHaveAttribute('aria-valuetext', /Started: 8.*Completed: 3/);
+    await page.keyboard.press('ArrowRight');
+    await expect(chart).toHaveAttribute('aria-valuetext', /Started: 9/);
+    await expect(page.getByRole('tooltip').getByText('9', { exact: true })).toBeVisible();
+    await page.keyboard.press('Tab');
     await page.evaluate(() => {
         const label = document.createElement('div');
         label.textContent = 'SYNTHETIC LOCAL FIXTURE — NOT CUSTOMER ACTIVITY';
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 185f45e05a..af8959daa6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -13,7 +13,10 @@
     let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
     const prompt = $derived(tour.kind === 'prompt');
     const keyboardHelpId = $props.id();
-    const data = $derived(getProductTourActivity(tour.activity ?? [], interval, start, end));
+    const data = $derived(getProductTourActivity(tour.activity ?? [], start, end));
+    const subdaily = $derived(data[0] && data[1] && data[1].date.getTime() - data[0].date.getTime() < 86_400_000);
+    const lastPeriod = $derived(data.at(-1));
+    const withinDay = $derived(subdaily && data[0] && lastPeriod && lastPeriod.date.getTime() - data[0].date.getTime() < 86_400_000);
     const config = $derived({
         completed: {
             color: 'color-mix(in srgb, var(--chart-1) var(--tour-chart-strength), black)',
@@ -45,7 +48,7 @@
     const selectedIndex = $derived(Math.max(0, Math.min(keyboardIndex ?? data.length - 1, data.length - 1)));
     const selectedPeriod = $derived(data[selectedIndex]);
     const keyboardValue = $derived(
-        selectedPeriod ? `${dateLabel(selectedPeriod.date)}. ${keys.map((key) => `${config[key].label}: ${selectedPeriod[key]}`).join('. ')}` : 'No activity'
+        selectedPeriod ? `${periodLabel(selectedPeriod.date)}. ${keys.map((key) => `${config[key].label}: ${selectedPeriod[key]}`).join('. ')}` : 'No activity'
     );
 
     function showSelectedPeriod(): void {
@@ -71,14 +74,27 @@
     }
 
     function dateLabel(value: unknown): string {
+        if (value instanceof Date && withinDay) {
+            return value.toLocaleTimeString(undefined, {
+                hour: 'numeric',
+                minute: '2-digit',
+                timeZone: 'UTC'
+            });
+        }
+        return periodLabel(value, false);
+    }
+
+    function periodLabel(value: unknown, includeTime = true): string {
         if (!(value instanceof Date)) {
             return '';
         }
-        return value.toLocaleDateString(undefined, {
-            day: interval === 'day' ? 'numeric' : undefined,
+        return value.toLocaleString(undefined, {
+            day: interval !== 'month' ? 'numeric' : undefined,
+            hour: subdaily && includeTime ? 'numeric' : undefined,
+            minute: subdaily && includeTime ? '2-digit' : undefined,
             month: 'short',
             timeZone: 'UTC',
-            year: interval === 'month' ? 'numeric' : undefined
+            year: interval === 'month' || data[0]?.date.getUTCFullYear() !== lastPeriod?.date.getUTCFullYear() ? 'numeric' : undefined
         });
     }
 </script>
@@ -100,7 +116,7 @@
             class="focus-visible:outline-ring h-48 w-full rounded-sm focus-visible:outline focus-visible:outline-2"
             role="slider"
             tabindex={0}
-            aria-label={`${interval === 'day' ? 'Daily' : 'Monthly'} ${prompt ? 'invitation' : 'guide'} activity.`}
+            aria-label={`${interval === 'day' ? 'Daily' : interval === 'month' ? 'Monthly' : 'Recorded'} ${prompt ? 'invitation' : 'guide'} activity.`}
             aria-describedby={keyboardHelpId}
             aria-valuemin={0}
             aria-valuemax={Math.max(0, data.length - 1)}
@@ -150,7 +166,7 @@
                         {/if}
                     {/each}
                 {/snippet}
-                {#snippet tooltip()}<Chart.Tooltip role="tooltip" labelFormatter={dateLabel} indicator="line" />{/snippet}
+                {#snippet tooltip()}<Chart.Tooltip role="tooltip" labelFormatter={(value) => periodLabel(value)} indicator="line" />{/snippet}
             </LineChart>
         </Chart.Container>
         <div class="sr-only">
@@ -164,7 +180,7 @@
                 >
                 <Table.Body
                     >{#each data as period (period.date_utc)}<Table.Row
-                            ><Table.Cell>{dateLabel(period.date)}</Table.Cell>{#each keys as key (key)}<Table.Cell class="text-right"
+                            ><Table.Cell>{periodLabel(period.date)}</Table.Cell>{#each keys as key (key)}<Table.Cell class="text-right"
                                     ><Number value={period[key]} /></Table.Cell
                                 >{/each}</Table.Row
                         >{/each}</Table.Body
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
index e470a563fc..9837987ee7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -40,7 +40,12 @@ afterEach(() => {
 describe('ProductTourActivity', () => {
     it('makes exact daily counts keyboard accessible without relying on color', async () => {
         // Arrange
-        render(ProductTourActivity, { end: '2026-01-03T00:00:00Z', interval: ProductTourUsageInterval.Day, start: '2026-01-01T00:00:00Z', tour });
+        render(ProductTourActivity, {
+            end: '2026-01-03T00:00:00Z',
+            interval: ProductTourUsageInterval.Day,
+            start: '2026-01-01T00:00:00Z',
+            tour: { ...tour, activity: [...tour.activity, { completed: 0, date_utc: '2026-01-02T00:00:00Z', dismissed: 0, shown: 0, started: 0 }] }
+        });
         const chart = screen.getByRole('slider');
 
         // Act
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index e9c3596786..ec1c910529 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -1,4 +1,3 @@
-import { ProductTourUsageInterval } from '$generated/api';
 import { describe, expect, it } from 'vitest';
 
 import { getProductTourActivity, getProductTourUsageParams } from './product-tour-usage';
@@ -10,48 +9,54 @@ describe('product tour usage helpers', () => {
         expect(getProductTourUsageParams({ days: 30, kind: 'days' })).toEqual({ days: 30 });
     });
 
-    it('fills missing UTC days without inventing future activity', () => {
+    it('preserves exact server buckets across a month boundary, including empty and subdaily periods', () => {
         // Arrange
-        const activity = [{ completed: 0, date_utc: '2026-08-02T00:00:00Z', dismissed: 0, shown: 2, started: 1 }];
+        const activity = [
+            { completed: 0, date_utc: '2026-08-31T12:00:00Z', dismissed: 0, shown: 2, started: 1 },
+            { completed: 0, date_utc: '2026-08-31T18:00:00Z', dismissed: 0, shown: 0, started: 0 },
+            { completed: 1, date_utc: '2026-09-01T00:00:00Z', dismissed: 0, shown: 3, started: 2 }
+        ];
 
         // Act
-        const data = getProductTourActivity(
-            activity,
-            ProductTourUsageInterval.Day,
-            '2026-08-01T00:00:00Z',
-            '2026-09-01T00:00:00Z',
-            new Date('2026-08-03T12:00:00Z')
-        );
+        const data = getProductTourActivity(activity, '2026-08-31T12:00:00Z', '2026-09-02T00:00:00Z', new Date('2026-09-03T00:00:00Z'));
 
         // Assert
-        expect(data).toHaveLength(3);
-        expect(data.map((period) => period.shown)).toEqual([0, 2, 0]);
-        expect(data[0]?.date.toISOString()).toBe('2026-08-01T00:00:00.000Z');
+        expect(data).toEqual(activity.map((period) => ({ ...period, date: new Date(period.date_utc) })));
     });
 
-    it('keeps monthly history buckets at UTC month starts', () => {
+    it('trims padding before retained activity and after now without generating new buckets', () => {
         // Arrange
-        const activity = [{ completed: 3, date_utc: '2026-02-01T00:00:00Z', dismissed: 1, shown: 0, started: 5 }];
+        const activity = [1, 3, 5, 7].map((day) => ({
+            completed: 0,
+            date_utc: `2026-08-0${day}T00:00:00Z`,
+            dismissed: 0,
+            shown: 0,
+            started: 0
+        }));
 
         // Act
-        const data = getProductTourActivity(
-            activity,
-            ProductTourUsageInterval.Month,
-            '2026-01-31T15:00:00Z',
-            '2026-04-01T00:00:00Z',
-            new Date('2026-05-01T00:00:00Z')
-        );
+        const data = getProductTourActivity(activity, '2026-08-03T00:00:00Z', '2026-09-01T00:00:00Z', new Date('2026-08-06T12:00:00Z'));
 
         // Assert
-        expect(data.map((period) => period.date.getUTCMonth())).toEqual([0, 1, 2]);
-        expect(data.map((period) => period.started)).toEqual([0, 5, 0]);
+        expect(data.map((period) => period.date_utc)).toEqual(['2026-08-03T00:00:00Z', '2026-08-05T00:00:00Z']);
     });
 
-    it('does not invent a start date for empty unlimited history', () => {
+    it('excludes the upper date boundary', () => {
+        // Arrange
+        const activity = [
+            { completed: 0, date_utc: '2026-02-01T00:00:00Z', dismissed: 0, shown: 0, started: 5 },
+            { completed: 0, date_utc: '2026-03-01T00:00:00Z', dismissed: 0, shown: 0, started: 0 }
+        ];
+
         // Act
-        const data = getProductTourActivity([], ProductTourUsageInterval.Month, null, '2026-04-01T00:00:00Z');
+        const data = getProductTourActivity(activity, null, '2026-03-01T00:00:00Z', new Date('2026-04-01T00:00:00Z'));
 
         // Assert
-        expect(data).toEqual([]);
+        expect(data).toHaveLength(1);
+        expect(data[0]?.started).toBe(5);
+    });
+
+    it('does not invent a start date for empty unlimited history', () => {
+        expect(getProductTourActivity([], null, '2026-04-01T00:00:00Z')).toEqual([]);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index afcea93737..f466fa7b78 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -1,4 +1,4 @@
-import type { ProductTourActivity, ProductTourUsageInterval } from '$generated/api';
+import type { ProductTourActivity } from '$generated/api';
 
 export type ProductTourUsageRange =
     | {
@@ -15,34 +15,15 @@ export type ProductTourUsageRange =
 
 export function getProductTourActivity(
     activity: ProductTourActivity[],
-    interval: ProductTourUsageInterval,
     start: null | string | undefined,
     end: string,
     now = new Date()
 ): (ProductTourActivity & { date: Date })[] {
     const endDate = new Date(Math.min(new Date(end).getTime(), now.getTime()));
-    const firstDate = start ?? activity[0]?.date_utc;
-    if (!firstDate) {
-        return [];
-    }
-
-    const cursor = new Date(firstDate);
-    cursor.setUTCHours(0, 0, 0, 0);
-    if (interval === 'month') {
-        cursor.setUTCDate(1);
-    }
-    const byDate = new Map(activity.map((period) => [period.date_utc.slice(0, 10), period]));
-    const result: (ProductTourActivity & { date: Date })[] = [];
-    while (cursor < endDate) {
-        const key = cursor.toISOString().slice(0, 10);
-        result.push({ completed: 0, dismissed: 0, shown: 0, started: 0, ...byDate.get(key), date: new Date(cursor), date_utc: cursor.toISOString() });
-        if (interval === 'month') {
-            cursor.setUTCMonth(cursor.getUTCMonth() + 1);
-        } else {
-            cursor.setUTCDate(cursor.getUTCDate() + 1);
-        }
-    }
-    return result;
+    const startDate = start ? new Date(start) : undefined;
+    return activity
+        .map((period) => ({ ...period, date: new Date(period.date_utc) }))
+        .filter((period) => (!startDate || period.date >= startDate) && period.date < endDate);
 }
 
 export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | number | string> {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index fec948ac5a..0501dfe77b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -10,6 +10,7 @@ export enum StackStatus {
 export enum ProductTourUsageInterval {
   Day = "day",
   Month = "month",
+  Auto = "auto",
 }
 
 export enum ProductTourTelemetryEvent {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index 91c9904fb5..b1ca37f00a 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,7 +27,7 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
-export const ProductTourUsageIntervalSchema = zodEnum(["day", "month"]);
+export const ProductTourUsageIntervalSchema = zodEnum(["day", "month", "auto"]);
 export const ProductTourTelemetryEventSchema = zodEnum([
   "completed",
   "dismissed",
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index ad1b8e5e8b..e39e4ef134 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -46,7 +46,7 @@
 
 <div class="@container flex flex-col gap-6">
     <div class="flex flex-wrap items-center justify-between gap-3">
-        <Muted>Guide activity · {range.kind === 'history' ? 'Monthly' : 'Daily'} · UTC</Muted>
+        <Muted>Guide activity · {usage?.interval === 'month' ? 'Monthly · ' : usage?.interval === 'day' ? 'Daily · ' : ''}UTC</Muted>
         <div class="flex items-center gap-2" aria-label="Usage filters">
             <ProductTourPeriod bind:range />
             <Button variant="outline" size="icon" aria-label="Refresh tour activity" disabled={usageQuery.isFetching} onclick={() => usageQuery.refetch()}>
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index 358887c788..cda72598d6 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -13743,11 +13743,13 @@
       "ProductTourUsageInterval": {
         "enum": [
           "day",
-          "month"
+          "month",
+          "auto"
         ],
         "x-enumNames": [
           "Day",
-          "Month"
+          "Month",
+          "Auto"
         ]
       },
       "ProductTourUsageResponse": {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 7d72ab1beb..324179146a 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -117,11 +117,12 @@ await CreateDataAsync(builder => AddUsage(builder,
 
         // Assert
         Assert.NotNull(response);
-        Assert.Equal(retainedEvent.StartOfMonth(), response.UtcStart);
         Assert.Equal(now, response.UtcEnd);
-        Assert.Equal(ProductTourUsageInterval.Month, response.Interval);
+        Assert.Equal(ProductTourUsageInterval.Auto, response.Interval);
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
         Assert.Equal(1, overview.Started);
+        Assert.Equal(Assert.Single(overview.Activity, period => period.Started > 0).DateUtc, response.UtcStart);
+        Assert.InRange(overview.Activity.Count, 80, 201);
     }
 
     [Fact]
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 44f110f627..253917e2a6 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -36,8 +36,10 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
         _serializer = GetService<ITextSerializer>();
     }
 
-    [Fact]
-    public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLargeCounts()
+    [Theory]
+    [InlineData(ProductTourUsageInterval.Day)]
+    [InlineData(ProductTourUsageInterval.Auto)]
+    public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLargeCounts(ProductTourUsageInterval interval)
     {
         // Arrange
         var start = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
@@ -50,7 +52,8 @@ public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLar
         int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
         // Include the source bucket and the parser's padded end-date bucket. Catalog/version growth
         // must stay within Elasticsearch's default search.max_buckets before it reaches production.
-        Assert.InRange((long)sources.Length * (1 + 91 + stepCount), 1, 65_536);
+        int maximumPeriods = interval is ProductTourUsageInterval.Auto ? 201 : 90;
+        Assert.InRange((long)sources.Length * (1 + maximumPeriods + 1 + stepCount), 1, 65_536);
         await CreateDataAsync(builder =>
         {
             foreach (string source in sources)
@@ -65,7 +68,7 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(90), ProductTourUsageInterval.Day);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(90), interval);
 
         // Assert
         Assert.Equal(sources.Length, result.Buckets.Count);
@@ -74,10 +77,45 @@ await CreateDataAsync(builder =>
             Assert.Equal(2L * Int32.MaxValue, bucket.Count);
             Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count));
             Assert.Equal(2, bucket.Activity.Count(period => period.Count > 0));
-            Assert.InRange(bucket.Activity.Count, 2, 90);
+            Assert.InRange(bucket.Activity.Count, 2, maximumPeriods);
         });
     }
 
+    [Theory]
+    [InlineData(5)]
+    [InlineData(180)]
+    [InlineData(1095)]
+    public async Task GetProductTourUsageAsync_AutomaticInterval_UsesDateFilterAndPreservesEmptyBuckets(int days)
+    {
+        // Arrange
+        var start = new DateTime(2026, 8, 31, 12, 0, 0, DateTimeKind.Utc);
+        var end = start.AddDays(days);
+        TimeProvider.SetUtcNow(end.AddDays(1));
+        await CreateDataAsync(builder =>
+        {
+            foreach (var date in new[] { start.AddTicks(-1), start, end.AddHours(-1), end })
+            {
+                builder.Event().Organization(TestConstants.OrganizationId).Project(_appOptions.InternalProjectId)
+                    .Type(Event.KnownTypes.FeatureUsage)
+                    .Source(ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog))
+                    .Date(date).Mutate(ev => ev.Count = 3);
+            }
+        });
+
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, end, ProductTourUsageInterval.Auto);
+
+        // Assert
+        Assert.Equal(ProductTourUsageInterval.Auto, result.Interval);
+        var bucket = Assert.Single(result.Buckets);
+        Assert.Equal(6, bucket.Count);
+        Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count));
+        Assert.InRange(bucket.Activity.Count, 80, 201);
+        Assert.Equal(2, bucket.Activity.Count(period => period.Count > 0));
+        Assert.Contains(bucket.Activity, period => period.Count == 0);
+        Assert.All(bucket.Activity, period => Assert.True(period.DateUtc < end));
+    }
+
     [Fact]
     public async Task GetProductTourUsageAsync_StepsAcrossFebruary_PreservesCoalescedCountsWithDailyBuckets()
     {
@@ -158,8 +196,10 @@ await CreateDataAsync(builder =>
         Assert.Equal(2, Assert.Single(catalogStarts.Activity, period => period.DateUtc == month.AddDays(1)).Count);
     }
 
-    [Fact]
-    public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage()
+    [Theory]
+    [InlineData(null)]
+    [InlineData(ProductTourUsageInterval.Auto)]
+    public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage(ProductTourUsageInterval? interval)
     {
         // Arrange
         var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
@@ -170,7 +210,7 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, month.AddMonths(1));
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, month.AddMonths(1), interval);
 
         // Assert
         Assert.Equal(2, result.Buckets.Sum(bucket => bucket.Count));
diff --git a/tests/http/admin.http b/tests/http/admin.http
index a6b0733986..14b334867f 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -58,7 +58,7 @@ Authorization: Bearer {{token}}
 GET {{apiUrl}}/admin/product-tour-usage?days=30
 Authorization: Bearer {{token}}
 
-### Product Tour Usage (available retained history; monthly activity for ranges longer than one month)
+### Product Tour Usage (available retained history; automatic range-based buckets, monthly when retention is unlimited)
 GET {{apiUrl}}/admin/product-tour-usage?history=true
 Authorization: Bearer {{token}}
 

From 55f72a916993fb2c79f9e9bcdedc3364703827d5 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 20:16:29 -0500
Subject: [PATCH 27/43] Refine guided-tour activity limits and validation

---
 .../Api/Endpoints/UserEndpoints.cs            |  2 ++
 .../Api/Handlers/AdminHandler.cs              |  3 ++
 .../Handlers/ProductTourActivityHandler.cs    | 16 +++++++++
 .../e2e/tests/product-tour-dashboard.e2e.ts   | 33 ++++++++++++++++++-
 .../(app)/system/product-tours/+page.svelte   |  2 +-
 .../Exceptionless.Tests/Api/Data/openapi.json | 20 +++++++++++
 .../AdminProductTourUsageEndpointTests.cs     | 10 ++++++
 .../ProductTourActivityEndpointTests.cs       | 32 ++++++++++++++++++
 tests/http/users.http                         |  2 ++
 9 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
index 0172f6db08..63b780afcc 100644
--- a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
@@ -66,8 +66,10 @@ public static IEndpointRouteBuilder MapUserEndpoints(this IEndpointRouteBuilder
             .Produces(StatusCodes.Status202Accepted)
             .Produces(StatusCodes.Status204NoContent)
             .ProducesProblem(StatusCodes.Status400BadRequest)
+            .ProducesProblem(StatusCodes.Status413PayloadTooLarge)
             .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
             .ProducesProblem(StatusCodes.Status404NotFound)
+            .ProducesProblem(StatusCodes.Status429TooManyRequests)
             .ProducesProblem(StatusCodes.Status503ServiceUnavailable)
             .WithSummary("Record optional guided-tour activity without identifying context");
 
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 23dfb7ac8b..8104ef848a 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -150,6 +150,9 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
 
         DateTime utcEnd = timeProvider.GetUtcNow().UtcDateTime;
         DateTime monthStart = (message.Month ?? utcEnd).ToUniversalTime().StartOfMonth();
+        if (monthStart >= DateTime.MaxValue.StartOfMonth())
+            return Result.Invalid(ValidationError.Create("month", "The month must have a representable end date."));
+
         DateTime? utcStart = message.History
             ? appOptions.MaximumRetentionDays > 0
                 ? utcEnd.SubtractDays(appOptions.MaximumRetentionDays)
diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
index 70cc03352b..a066d4b7d8 100644
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -4,9 +4,12 @@
 using Exceptionless.Core.Queues.Models;
 using Exceptionless.Core.Repositories;
 using Exceptionless.Core.Services;
+using Exceptionless.DateTimeExtensions;
 using Exceptionless.Web.Api.Messages;
+using Exceptionless.Web.Api.Results;
 using Exceptionless.Web.Extensions;
 using Exceptionless.Web.Models;
+using Foundatio.Caching;
 using Foundatio.Mediator;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Models;
@@ -22,9 +25,14 @@ public class ProductTourActivityHandler(
     EventPostService eventPostService,
     AppOptions appOptions,
     ISerializer serializer,
+    ICacheClient cacheClient,
     TimeProvider timeProvider,
     IHttpContextAccessor httpContextAccessor)
 {
+    private const int ActivityRequestLimit = 100;
+    private static readonly TimeSpan ActivityRequestWindow = TimeSpan.FromMinutes(15);
+    private readonly ScopedCacheClient _cache = new(cacheClient, "ProductTourActivity");
+
     private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
 
     public async Task<Result> Handle(UpdateCurrentUserProductTourAnalytics message)
@@ -65,6 +73,14 @@ public async Task<Result> Handle(RecordProductTourActivity message)
             return Result.NoContent();
         }
 
+        // Bound writes into the shared internal project independently of the general API limit.
+        var windowStart = timeProvider.GetUtcNow().UtcDateTime.Floor(ActivityRequestWindow);
+        long attempts = await _cache.IncrementAsync($"{user.Id}:{windowStart.Ticks}", 1, windowStart.Add(ActivityRequestWindow));
+        if (attempts > ActivityRequestLimit)
+        {
+            return Result.Invalid(ValidationError.Create(ApiValidationErrorIdentifiers.RateLimit, "Too many guided-tour activity requests. Please try later."));
+        }
+
         var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
         if (project is null || project.IsDeleted)
         {
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index e93fa549dd..94a7114a8d 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -1,5 +1,36 @@
+import type { ProductTourUsageResponse } from '../../src/lib/generated/api';
+
 import { expect, test } from '../fixtures/e2e-test';
 
+test('real dashboard matches repository totals across daily, month, and history filters', async ({ e2eApi, page }, testInfo) => {
+    // Arrange: use the real local API, including its empty/unavailable-storage response.
+    const token = await e2eApi.login();
+    await page.addInitScript((token) => localStorage.setItem('satellizer_token', token), token);
+
+    // Act & Assert
+    for (const period of ['Last 30 days', 'Show month', 'Available history']) {
+        const pending = page.waitForResponse((response) => new URL(response.url()).pathname === '/api/v2/admin/product-tour-usage');
+        if (period === 'Last 30 days') {
+            await page.goto('/next/system/product-tours');
+        } else {
+            await page.getByRole('button', { name: /^Usage period:/ }).click();
+            await page.getByRole('button', { exact: true, name: period }).click();
+        }
+        const response = await pending;
+        expect(response.status()).toBe(200);
+        const usage: ProductTourUsageResponse = await response.json();
+        const overview = usage.tours.find((tour) => tour.name === 'app-overview');
+        expect(overview).toBeDefined();
+        const totals = page.getByLabel('Explore Exceptionless usage', { exact: true }).getByRole('list', { name: 'Period totals' });
+        await expect(totals).toContainText(`Started ${overview!.started}`);
+        await expect(totals).toContainText(`Completed ${overview!.completed}`);
+        await expect(totals).toContainText(`Dismissed ${overview!.dismissed}`);
+        await expect(page.getByText('Guide activity', { exact: true })).toBeVisible();
+        await expect(page.getByText('Failed to load guided-tour usage. Please try again.')).toHaveCount(0);
+        await page.screenshot({ animations: 'disabled', path: testInfo.outputPath(`local-api-${period.toLowerCase().replaceAll(' ', '-')}.png`) });
+    }
+});
+
 test('synthetic activity charts support keyboard, compact ranges, and light/dark layouts', async ({ e2eApi, page }, testInfo) => {
     // Arrange: isolated response fixture; no synthetic events are written to storage.
     await page.emulateMedia({ reducedMotion: 'reduce' });
@@ -73,7 +104,7 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     await page.getByRole('button', { name: 'Usage period: Last 30 days' }).click();
     await page.getByRole('button', { exact: true, name: 'Available history' }).click();
     await expect(page.getByRole('button', { name: 'Usage period: Available history' })).toBeVisible();
-    await expect(page.getByText('Guide activity · UTC', { exact: true })).toBeVisible();
+    await expect(page.getByText('Guide activity', { exact: true })).toBeVisible();
     await expect(chart).toHaveAttribute('aria-valuemax', '29');
     await chart.focus();
     await page.keyboard.press('Home');
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index e39e4ef134..7601422fe2 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -46,7 +46,7 @@
 
 <div class="@container flex flex-col gap-6">
     <div class="flex flex-wrap items-center justify-between gap-3">
-        <Muted>Guide activity · {usage?.interval === 'month' ? 'Monthly · ' : usage?.interval === 'day' ? 'Daily · ' : ''}UTC</Muted>
+        <Muted>Guide activity</Muted>
         <div class="flex items-center gap-2" aria-label="Usage filters">
             <ProductTourPeriod bind:range />
             <Button variant="outline" size="icon" aria-label="Refresh tour activity" disabled={usageQuery.isFetching} onclick={() => usageQuery.refetch()}>
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index cda72598d6..f86c51cc73 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -4143,6 +4143,16 @@
               }
             }
           },
+          "413": {
+            "description": "Payload Too Large",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
           "422": {
             "description": "Unprocessable Entity",
             "content": {
@@ -4163,6 +4173,16 @@
               }
             }
           },
+          "429": {
+            "description": "Too Many Requests",
+            "content": {
+              "application/problem\u002Bjson": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
+          },
           "503": {
             "description": "Service Unavailable",
             "content": {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 324179146a..5025da5ba8 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -206,6 +206,16 @@ public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndRe
         });
     }
 
+    [Fact]
+    public Task GetProductTourUsageAsync_MonthWithoutRepresentableEnd_ReturnsValidationError()
+    {
+        // Act & Assert
+        return SendRequestAsync(request => request.AsGlobalAdminUser()
+            .AppendPaths("admin", "product-tour-usage")
+            .QueryString("month", "9999-12-01T00:00:00Z")
+            .StatusCodeShouldBeUnprocessableEntity());
+    }
+
     [Fact]
     public Task GetProductTourUsageAsync_AsOrganizationUser_ReturnsForbidden()
     {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
index 137e58d2fc..71110001c7 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
@@ -182,6 +182,38 @@ public Task RecordProductTourActivity_ClientToken_IsForbidden()
             .StatusCodeShouldBeForbidden());
     }
 
+    [Fact]
+    public async Task RecordProductTourActivity_RepeatedRequests_ThrottlesOnlyActivityForThatUserAndWindow()
+    {
+        // Arrange: missing storage keeps this boundary test from writing 100 events.
+        TimeProvider.SetUtcNow(new DateTimeOffset(2026, 9, 4, 12, 0, 0, TimeSpan.Zero));
+        var activity = new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog };
+        for (int i = 0; i < 100; i++)
+        {
+            await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+                .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
+        }
+
+        // Act & Assert
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.TooManyRequests));
+        await SendRequestAsync(request => request.Post().AsFreeOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
+        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview")
+            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 }).StatusCodeShouldBeOk());
+        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
+            .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeNoContent());
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(activity).StatusCodeShouldBeNoContent());
+        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
+            .Content(new UpdateProductTourAnalytics { Enabled = true }).StatusCodeShouldBeNoContent());
+
+        TimeProvider.Advance(TimeSpan.FromMinutes(15));
+        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
+            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
+        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
+    }
+
     [Fact]
     public async Task RecordProductTourActivity_MissingInternalProject_ReturnsUnavailable()
     {
diff --git a/tests/http/users.http b/tests/http/users.http
index fea33a1fa0..d97789a057 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -38,6 +38,8 @@ Content-Type: application/json
 
 ### Record Optional Product Tour Activity (no identity or request context)
 # Returns 503 when the internal storage project/organization is unavailable or its event allowance is exhausted.
+# Requests are limited to 2 KB and 100 activity submissions per user per 15-minute window (413/429).
+# Activity throttling does not limit saved progress or changes to the analytics preference.
 POST {{apiUrl}}/users/me/product-tours/app-overview/activity
 Authorization: Bearer {{token}}
 Content-Type: application/json

From 9ec62d2d4adfd0f17fa3aaaf116b01d0c56687f7 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 20:40:06 -0500
Subject: [PATCH 28/43] Remove tour-specific activity throttling

---
 .../Handlers/ProductTourActivityHandler.cs    | 16 ----------
 .../ProductTourActivityEndpointTests.cs       | 32 -------------------
 tests/http/users.http                         |  3 +-
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
index a066d4b7d8..70cc03352b 100644
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -4,12 +4,9 @@
 using Exceptionless.Core.Queues.Models;
 using Exceptionless.Core.Repositories;
 using Exceptionless.Core.Services;
-using Exceptionless.DateTimeExtensions;
 using Exceptionless.Web.Api.Messages;
-using Exceptionless.Web.Api.Results;
 using Exceptionless.Web.Extensions;
 using Exceptionless.Web.Models;
-using Foundatio.Caching;
 using Foundatio.Mediator;
 using Foundatio.Repositories;
 using Foundatio.Repositories.Models;
@@ -25,14 +22,9 @@ public class ProductTourActivityHandler(
     EventPostService eventPostService,
     AppOptions appOptions,
     ISerializer serializer,
-    ICacheClient cacheClient,
     TimeProvider timeProvider,
     IHttpContextAccessor httpContextAccessor)
 {
-    private const int ActivityRequestLimit = 100;
-    private static readonly TimeSpan ActivityRequestWindow = TimeSpan.FromMinutes(15);
-    private readonly ScopedCacheClient _cache = new(cacheClient, "ProductTourActivity");
-
     private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
 
     public async Task<Result> Handle(UpdateCurrentUserProductTourAnalytics message)
@@ -73,14 +65,6 @@ public async Task<Result> Handle(RecordProductTourActivity message)
             return Result.NoContent();
         }
 
-        // Bound writes into the shared internal project independently of the general API limit.
-        var windowStart = timeProvider.GetUtcNow().UtcDateTime.Floor(ActivityRequestWindow);
-        long attempts = await _cache.IncrementAsync($"{user.Id}:{windowStart.Ticks}", 1, windowStart.Add(ActivityRequestWindow));
-        if (attempts > ActivityRequestLimit)
-        {
-            return Result.Invalid(ValidationError.Create(ApiValidationErrorIdentifiers.RateLimit, "Too many guided-tour activity requests. Please try later."));
-        }
-
         var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
         if (project is null || project.IsDeleted)
         {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
index 71110001c7..137e58d2fc 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
@@ -182,38 +182,6 @@ public Task RecordProductTourActivity_ClientToken_IsForbidden()
             .StatusCodeShouldBeForbidden());
     }
 
-    [Fact]
-    public async Task RecordProductTourActivity_RepeatedRequests_ThrottlesOnlyActivityForThatUserAndWindow()
-    {
-        // Arrange: missing storage keeps this boundary test from writing 100 events.
-        TimeProvider.SetUtcNow(new DateTimeOffset(2026, 9, 4, 12, 0, 0, TimeSpan.Zero));
-        var activity = new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog };
-        for (int i = 0; i < 100; i++)
-        {
-            await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-                .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
-        }
-
-        // Act & Assert
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.TooManyRequests));
-        await SendRequestAsync(request => request.Post().AsFreeOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
-        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview")
-            .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 }).StatusCodeShouldBeOk());
-        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
-            .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeNoContent());
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(activity).StatusCodeShouldBeNoContent());
-        await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
-            .Content(new UpdateProductTourAnalytics { Enabled = true }).StatusCodeShouldBeNoContent());
-
-        TimeProvider.Advance(TimeSpan.FromMinutes(15));
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(activity).ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
-        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
-    }
-
     [Fact]
     public async Task RecordProductTourActivity_MissingInternalProject_ReturnsUnavailable()
     {
diff --git a/tests/http/users.http b/tests/http/users.http
index d97789a057..55fd127690 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -38,8 +38,7 @@ Content-Type: application/json
 
 ### Record Optional Product Tour Activity (no identity or request context)
 # Returns 503 when the internal storage project/organization is unavailable or its event allowance is exhausted.
-# Requests are limited to 2 KB and 100 activity submissions per user per 15-minute window (413/429).
-# Activity throttling does not limit saved progress or changes to the analytics preference.
+# Requests are limited to 2 KB (413) and use the existing global API throttle (429).
 POST {{apiUrl}}/users/me/product-tours/app-overview/activity
 Authorization: Bearer {{token}}
 Content-Type: application/json

From 5ecdefc7639ca31d5f4f54ea77a5010ee06bfa70 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 21:17:03 -0500
Subject: [PATCH 29/43] Improve guided tour failure handling and regression
 coverage

---
 .../Api/Handlers/AdminHandler.cs              |  2 +-
 .../e2e/tests/product-tour-dashboard.e2e.ts   | 54 +++++++++++++++++--
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 13 ++++-
 .../ClientApp/e2e/tests/saved-views.e2e.ts    |  5 ++
 .../features/product-tours/catalog.test.ts    | 28 ++++++++++
 .../src/lib/features/product-tours/catalog.ts |  9 ++--
 .../components/product-tour-host.svelte       |  6 +--
 .../src/lib/features/product-tours/types.ts   |  2 +-
 .../Api/Endpoints/ProductTourEndpointTests.cs | 24 +++++++++
 9 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 8104ef848a..94002b3dcc 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -82,7 +82,7 @@ public async Task<Result<object>> Handle(GetAdminStats message)
     public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
     {
         var requestedMonth = message.Month ?? timeProvider.GetUtcNow().UtcDateTime;
-        var month = requestedMonth.ToUniversalTime().StartOfMonth();
+        var month = new DateTime(requestedMonth.Year, requestedMonth.Month, 1, 0, 0, 0, DateTimeKind.Utc);
         var results = await organizationRepository.FindAsync(
             query => query.FieldEquals(organization => organization.AssistantUsage.First().Date, month),
             options => options.SearchAfterPaging().PageLimit(500));
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index 94a7114a8d..de3a8ae94b 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -21,16 +21,62 @@ test('real dashboard matches repository totals across daily, month, and history
         const usage: ProductTourUsageResponse = await response.json();
         const overview = usage.tours.find((tour) => tour.name === 'app-overview');
         expect(overview).toBeDefined();
-        const totals = page.getByLabel('Explore Exceptionless usage', { exact: true }).getByRole('list', { name: 'Period totals' });
-        await expect(totals).toContainText(`Started ${overview!.started}`);
-        await expect(totals).toContainText(`Completed ${overview!.completed}`);
-        await expect(totals).toContainText(`Dismissed ${overview!.dismissed}`);
+        const card = page.getByLabel('Explore Exceptionless usage', { exact: true });
+        if (overview!.shown + overview!.started + overview!.completed + overview!.dismissed === 0) {
+            await expect(card.getByText('No recorded activity in this period.', { exact: true })).toBeVisible();
+        } else {
+            const totals = card.getByRole('list', { name: 'Period totals' });
+            await expect(totals).toContainText(`Started ${overview!.started}`);
+            await expect(totals).toContainText(`Completed ${overview!.completed}`);
+            await expect(totals).toContainText(`Dismissed ${overview!.dismissed}`);
+        }
         await expect(page.getByText('Guide activity', { exact: true })).toBeVisible();
         await expect(page.getByText('Failed to load guided-tour usage. Please try again.')).toHaveCount(0);
         await page.screenshot({ animations: 'disabled', path: testInfo.outputPath(`local-api-${period.toLowerCase().replaceAll(' ', '-')}.png`) });
     }
 });
 
+test('empty activity stays distinct from an unavailable collector', async ({ e2eApi, page }) => {
+    // Arrange: isolated empty response; no changes to local storage or retained events.
+    const token = await e2eApi.login();
+    await page.addInitScript((token) => localStorage.setItem('satellizer_token', token), token);
+    let collectionAvailable = true;
+    await page.route('**/api/v2/admin/product-tour-usage*', (route) =>
+        route.fulfill({
+            json: {
+                collection_available: collectionAvailable,
+                interval: 'day',
+                tours: [
+                    {
+                        activity: [],
+                        completed: 0,
+                        dismissed: 0,
+                        kind: 'guide',
+                        name: 'app-overview',
+                        shown: 0,
+                        start_sources: [],
+                        started: 0,
+                        steps: [],
+                        version: 1
+                    }
+                ],
+                utc_end: new Date().toISOString(),
+                utc_start: null
+            }
+        })
+    );
+
+    // Act & Assert
+    for (const available of [true, false]) {
+        collectionAvailable = available;
+        await page.goto('/next/system/product-tours');
+        const card = page.getByLabel('Explore Exceptionless usage', { exact: true });
+        await expect(card.getByText('No recorded activity in this period.', { exact: true })).toBeVisible();
+        await expect(card.getByRole('slider')).toHaveCount(0);
+        await expect(page.getByText('Guide activity collection is unavailable', { exact: true })).toHaveCount(available ? 0 : 1);
+    }
+});
+
 test('synthetic activity charts support keyboard, compact ranges, and light/dark layouts', async ({ e2eApi, page }, testInfo) => {
     // Arrange: isolated response fixture; no synthetic events are written to storage.
     await page.emulateMedia({ reducedMotion: 'reduce' });
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index a1f89b2467..c1ee191e96 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -176,12 +176,14 @@ test.describe('shell and identity checkpoints', () => {
             await page.keyboard.press('Escape');
         });
 
-        await test.step('an organization change clears an active checkpoint without recording progress', async () => {
+        await test.step('an organization change clears an active checkpoint even when projects fail to load', async () => {
             await mockAssistantAccess(page);
             await page.reload();
             await startTourFromCommand(page, 'Meet Exie');
             await expectProductTourSession(page, true);
             const writesBeforeSwitch = progressWrites.length;
+            const projectsRoute = `**/api/v2/organizations/${e2eSecondaryOrganization.organizationId}/projects*`;
+            await page.route(projectsRoute, (route) => route.fulfill({ json: { title: 'Injected project lookup failure' }, status: 500 }));
 
             const identityTab = await page.context().newPage();
             await identityTab.goto('/next/stack');
@@ -191,6 +193,15 @@ test.describe('shell and identity checkpoints', () => {
             await identityTab.close();
             await expectProductTourSession(page, false);
             expect(progressWrites).toHaveLength(writesBeforeSwitch);
+            await page.getByRole('button', { name: 'Search Exceptionless' }).click();
+            await page.getByRole('dialog').getByText('Guided Tours…', { exact: true }).click();
+            const catalog = page.getByRole('dialog', { name: 'Guided Tours' });
+            await expect(catalog.getByRole('button', { exact: true, name: 'Restart Explore Exceptionless' })).toBeEnabled();
+            await expect(catalog.getByRole('button', { exact: true, name: 'Start Configure a project' })).toBeDisabled();
+            await expect(catalog.getByText('Projects could not be loaded. Try again shortly.', { exact: true })).toBeVisible();
+            await page.keyboard.press('Escape');
+            await page.unroute(projectsRoute);
+            await page.reload();
         });
 
         await test.step('logout clears an active checkpoint without recording progress', async () => {
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/saved-views.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/saved-views.e2e.ts
index da9ab73284..51518373d6 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/saved-views.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/saved-views.e2e.ts
@@ -32,6 +32,11 @@ test('home navigation honors personal and organization saved views and survives
         await openViewMenu(page);
         await page.getByRole('menuitem', { name: 'Save As...' }).click();
         const dialog = page.getByRole('dialog', { name: 'Save View' });
+        await expect(dialog.getByRole('switch', { exact: true, name: 'Private' })).not.toBeChecked();
+        await dialog.getByRole('button', { exact: true, name: 'Cancel' }).click();
+        await expect(dialog).toBeHidden();
+        await openViewMenu(page);
+        await page.getByRole('menuitem', { name: 'Save As...' }).click();
         await dialog.getByLabel('Name', { exact: true }).fill(viewName);
         await dialog.getByRole('button', { name: 'Save' }).click();
         await expect(dialog).toBeHidden({ timeout: 30_000 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index ff6aaf4b38..fcbe17a151 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -51,6 +51,34 @@ describe('product tour catalog', () => {
         expect(getProductTourItems(context()).every((item) => item.version > 0)).toBe(true);
     });
 
+    it('does not mistake an unavailable project list for an empty organization', () => {
+        // Arrange
+        const currentContext = context({ projects: undefined });
+
+        // Act
+        const items = getProductTourItems(currentContext);
+
+        // Assert
+        expect(items.find((item) => item.name === 'project-configure')?.currentAvailability).toEqual({
+            available: false,
+            reason: 'Projects could not be loaded. Try again shortly.'
+        });
+        expect(items.find((item) => item.name === 'app-overview')?.currentAvailability.available).toBe(true);
+        expect(items.find((item) => item.name === 'saved-view-create')?.currentAvailability.available).toBe(true);
+        expect(getRecommendedProductTourName(currentContext)).toBe('app-overview');
+    });
+
+    it.each([{ isProjectConfigurePage: true }, { organizationId: undefined }])('allows setup without a project lookup when %o', (overrides) => {
+        // Arrange
+        const currentContext = context({ projects: undefined, ...overrides });
+
+        // Act
+        const projectGuide = getProductTourItems(currentContext).find((item) => item.name === 'project-configure');
+
+        // Assert
+        expect(projectGuide?.currentAvailability.available).toBe(true);
+    });
+
     it('starts project setup from domain state', () => {
         const definition = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index 4787586b2a..a4a808d1a9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -33,7 +33,10 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
         version: 1
     },
     {
-        availability: () => ({ available: true }),
+        availability: (context) =>
+            context.isProjectConfigurePage || !context.organizationId || context.projects
+                ? { available: true }
+                : { available: false, reason: 'Projects could not be loaded. Try again shortly.' },
         description: 'Continue an unfinished project, or create one and send its first event.',
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'project-configure',
@@ -48,7 +51,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
                 return { checkpointName: 'organization-name', route: resolve('/(app)/organization/add') };
             }
 
-            const unconfiguredProject = context.projects.find((project) => !project.is_configured);
+            const unconfiguredProject = context.projects?.find((project) => !project.is_configured);
             if (unconfiguredProject?.id) {
                 return {
                     checkpointName: 'choose-platform',
@@ -109,7 +112,7 @@ export function getProductTourItems(context: ProductTourContext, progress: Recor
 }
 
 export function getRecommendedProductTourName(context: ProductTourContext): ProductTourName {
-    return !context.organizationId || context.projects.length === 0 || context.projects.some((project) => !project.is_configured)
+    return !context.organizationId || context.projects?.length === 0 || context.projects?.some((project) => !project.is_configured)
         ? 'project-configure'
         : 'app-overview';
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 7b9e9323a7..d46b4d12fc 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -84,7 +84,7 @@
             }
         }
     });
-    const projects = $derived(projectsQuery.data?.data ?? []);
+    const projects = $derived(projectsQuery.data?.data ?? undefined);
     const projectConfigurePage = $derived(page.route.id === '/(app)/project/[projectId]/configure');
     const errorEventsQuery = getOrganizationEventsQuery({
         enabled: () => checkErrorAvailability,
@@ -109,7 +109,7 @@
                 ? 'available'
                 : 'empty'
     );
-    const hostStateSettled = $derived(stateSettled && (!organizationId || projectsQuery.isSuccess));
+    const hostStateSettled = $derived(stateSettled && (!organizationId || projectsQuery.isSuccess || projectsQuery.isError));
     const context = $derived<ProductTourContext>({
         assistantAccess,
         errorEventAvailability,
@@ -196,7 +196,7 @@
     });
 
     $effect(() => {
-        if (!hostStateSettled) {
+        if (!stateSettled) {
             return;
         }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
index 5aed74e619..2f1160c6dd 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
@@ -34,7 +34,7 @@ export interface ProductTourContext {
     isSetupPage: boolean;
     organizationId?: string;
     pathname: string;
-    projects: Pick<ViewProject, 'id' | 'is_configured'>[];
+    projects?: Pick<ViewProject, 'id' | 'is_configured'>[];
     search?: string;
 }
 export interface ProductTourDefinition<Name extends ProductTourName = ProductTourName> {
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
index 85cd044643..54c66b1ae6 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourEndpointTests.cs
@@ -49,6 +49,30 @@ public async Task UpdateCurrentUserProductTourAsync_NewProgress_PersistsAndRetur
         Assert.Equal(progress, persistedUser.ProductTours["app-overview"]);
     }
 
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAsync_UnchangedProgress_PreservesRecentMembership()
+    {
+        // Arrange
+        var currentUser = await GetTestOrganizationUserAsync();
+        await UpdateProgressAsync(ProductTours.AppWelcome, ProductTourStatus.Dismissed, 1);
+        var user = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        Assert.NotNull(user);
+        const string organizationId = "000000000000000000000099";
+        user.OrganizationIds.Add(organizationId);
+        await _userRepository.SaveAsync(user, options => options.Cache());
+
+        // Act
+        await UpdateProgressAsync(ProductTours.AppWelcome, ProductTourStatus.Dismissed, 1);
+
+        // Assert
+        var persistedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache(false));
+        var cachedUser = await _userRepository.GetByIdAsync(currentUser.Id, options => options.Cache());
+        Assert.NotNull(persistedUser);
+        Assert.NotNull(cachedUser);
+        Assert.Contains(organizationId, persistedUser.OrganizationIds);
+        Assert.Contains(organizationId, cachedUser.OrganizationIds);
+    }
+
     [Fact]
     public async Task UpdateCurrentUserProductTourAsync_OlderProgress_PreservesStoredValue()
     {

From 75bd89023ac7303eb5d31839e3866a0be8398339 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 4 Sep 2026 22:01:30 -0500
Subject: [PATCH 30/43] Clarify guided-tour activity preferences

---
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 59 +++++++++++++++++++
 .../components/product-tour-host.svelte       | 12 ++--
 .../product-tour-privacy-settings.svelte      |  4 +-
 .../product-tours/eligibility.test.ts         | 26 ++++----
 .../lib/features/product-tours/eligibility.ts |  8 +--
 5 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index c1ee191e96..eb16d7b225 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -9,6 +9,64 @@ test.use({ actionTimeout: 15_000, e2eUseInvitedUser: true });
 test.describe('first-run welcome', () => {
     test.use({ e2eDismissProductTourWelcome: false });
 
+    for (const [tourName, dismissLabel] of [
+        ['app-welcome', 'Close welcome'],
+        ['exie-announcement', 'Dismiss Exie announcement']
+    ] as const) {
+        test(`${tourName} stays dismissed with analytics off and session storage unavailable`, async ({ e2eApi, e2eScenario, page }) => {
+            // Arrange
+            const preference = await page.request.put('/api/v2/users/me/product-tour-analytics', {
+                data: { enabled: false },
+                headers: { Authorization: `Bearer ${e2eScenario.userToken}` }
+            });
+            expect(preference.status()).toBe(204);
+            if (tourName === 'exie-announcement') {
+                await e2eApi.updateProductTour(e2eScenario.userToken, 'app-welcome', 1, 2);
+            }
+            await mockAssistantAccess(page);
+            const activities: string[] = [];
+            page.on('request', (request) => {
+                if (request.method() === 'POST' && /\/product-tours\/[^/]+\/activity$/.test(new URL(request.url()).pathname)) {
+                    activities.push(request.url());
+                }
+            });
+            await page.goto('/next/stack');
+            const dismiss = page.getByRole('button', { name: dismissLabel });
+            await expect(dismiss).toBeVisible();
+
+            // Act
+            const persisted = page.waitForResponse(isSuccessfulTourProgress(tourName));
+            await dismiss.click();
+            expect(await (await persisted).json()).toMatchObject({ status: 2, version: 1 });
+            await page.addInitScript(() =>
+                Object.defineProperty(window, 'sessionStorage', {
+                    get() {
+                        throw new DOMException('Storage denied', 'SecurityError');
+                    }
+                })
+            );
+            const reloadedUser = page.waitForResponse((response) => new URL(response.url()).pathname === '/api/v2/users/me' && response.status() === 200);
+            const reloadedProjects = page.waitForResponse(
+                (response) => new URL(response.url()).pathname === `/api/v2/organizations/${e2eScenario.organizationId}/projects` && response.status() === 200
+            );
+            await page.reload();
+
+            // Assert
+            expect(await (await reloadedUser).json()).toMatchObject({
+                product_tour_analytics_enabled: false,
+                product_tours: { [tourName]: { status: 2, version: 1 } }
+            });
+            await reloadedProjects;
+            await expect(page.getByRole('button', { name: 'Search Exceptionless' })).toBeVisible();
+            if (tourName === 'app-welcome') {
+                // A different, unseen invitation remains eligible; analytics opt-out is not a hide-all-guides preference.
+                await expect(page.getByRole('button', { name: 'Dismiss Exie announcement' })).toBeVisible();
+            }
+            await expect(dismiss).toBeHidden();
+            expect(activities).toHaveLength(0);
+        });
+    }
+
     test('Browse Guides persists before the catalog opens', async ({ e2eScenario, page }, testInfo) => {
         await test.step(`show the first-run prompt for ${e2eScenario.email}`, async () => {
             await page.goto('/next/stack');
@@ -462,6 +520,7 @@ test('privacy opt-out preserves completion and storage denial keeps guides usabl
     await page.keyboard.press('Space');
     await saved;
     await expect(preference).not.toBeChecked();
+    await expect(preference).toBeEnabled();
     await page.screenshot({ path: testInfo.outputPath('guide-privacy.png') });
     const before = activities.length;
     await page.addInitScript(() =>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index d46b4d12fc..6cd4eb0299 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -17,7 +17,7 @@
     import { createProductTourActions } from '../actions.svelte';
     import { createProductTourActivity } from '../api.svelte';
     import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
-    import { shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from '../eligibility';
+    import { shouldOfferProductTourInvitation } from '../eligibility';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourCatalogDialog from './dialogs/product-tour-catalog-dialog.svelte';
     import ProductTourFeatureAnnouncement from './product-tour-feature-announcement.svelte';
@@ -133,7 +133,7 @@
             !isImpersonating &&
             !isSetupPage &&
             !pathname.startsWith(SYSTEM_PATH) &&
-            shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION)
+            shouldOfferProductTourInvitation(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION)
         )
     );
     const exieAnnouncementOpen = $derived(
@@ -148,8 +148,8 @@
             !checkpoint &&
             !catalogOpen &&
             !isAnyOverlayOpen &&
-            !shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) &&
-            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
+            !shouldOfferProductTourInvitation(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) &&
+            shouldOfferProductTourInvitation(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
         )
     );
 
@@ -181,7 +181,7 @@
             return;
         }
 
-        if (shouldOfferProductTourWelcome(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) && !pathname.startsWith(SYSTEM_PATH)) {
+        if (shouldOfferProductTourInvitation(currentUser.product_tours?.['app-welcome'], WELCOME_VERSION) && !pathname.startsWith(SYSTEM_PATH)) {
             claimAutomaticSurface('welcome');
             return;
         }
@@ -189,7 +189,7 @@
         if (
             assistantAccess?.enabled &&
             (pathname.startsWith(EVENT_PATH) || pathname.startsWith(STACK_PATH)) &&
-            shouldOfferProductTourAnnouncement(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
+            shouldOfferProductTourInvitation(currentUser.product_tours?.['exie-announcement'], EXIE_ANNOUNCEMENT_VERSION)
         ) {
             claimAutomaticSurface('exie-announcement');
         }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
index c4144e0899..5ba1012d97 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
@@ -25,8 +25,8 @@
             <Field.FieldContent>
                 <Field.Label for="product-tour-analytics">Help improve guided tours</Field.Label>
                 <Field.FieldDescription id="product-tour-analytics-description">
-                    Share guide starts, steps reached, completions, and dismissals. We use this only to improve guided tours. Your progress is saved even when
-                    this is off. Turning this off stops future collection, not previously recorded activity.
+                    Share guide starts, steps reached, completions, and dismissals to help us improve guided tours. Completed and dismissed guides are still
+                    remembered when this is off; it does not change which invitations you see. Previously shared activity is not deleted.
                 </Field.FieldDescription>
             </Field.FieldContent>
             <Switch
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
index 9b2cee9e20..2102982441 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.test.ts
@@ -1,7 +1,7 @@
 import { ProductTourStatus } from '$generated/api';
 import { describe, expect, it } from 'vitest';
 
-import { isProductTourSetupRoute, shouldOfferProductTourAnnouncement, shouldOfferProductTourWelcome } from './eligibility';
+import { isProductTourSetupRoute, shouldOfferProductTourInvitation } from './eligibility';
 
 describe('product tour setup routes', () => {
     it.each(['/(app)/organization/add', '/(app)/project/add', '/(app)/project/[projectId]/configure'])('suppresses automatic tours on %s', (routeId) => {
@@ -14,22 +14,18 @@ describe('product tour setup routes', () => {
     });
 });
 
-describe('product tour welcome eligibility', () => {
-    it('offers legacy users and a newer welcome version', () => {
-        expect(shouldOfferProductTourWelcome(undefined, 1)).toBe(true);
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, version: 1 }, 2)).toBe(true);
+describe('product tour invitation eligibility', () => {
+    it('offers an invitation when no progress has been saved', () => {
+        expect(shouldOfferProductTourInvitation(undefined, 1)).toBe(true);
     });
 
-    it('suppresses both explicit Start and Skip outcomes for the current version', () => {
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Completed, version: 1 }, 1)).toBe(false);
-        expect(shouldOfferProductTourWelcome({ status: ProductTourStatus.Dismissed, version: 1 }, 1)).toBe(false);
-    });
-});
+    it.each([ProductTourStatus.Completed, ProductTourStatus.Dismissed])('only offers a newer invitation after status %s', (status) => {
+        // Arrange
+        const progress = { status, version: 2 };
 
-describe('product tour feature announcement eligibility', () => {
-    it('offers a new announcement version until explicitly recorded', () => {
-        expect(shouldOfferProductTourAnnouncement(undefined, 1)).toBe(true);
-        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Dismissed, version: 1 }, 1)).toBe(false);
-        expect(shouldOfferProductTourAnnouncement({ status: ProductTourStatus.Completed, version: 2 }, 1)).toBe(false);
+        // Act / Assert
+        expect(shouldOfferProductTourInvitation(progress, 1)).toBe(false);
+        expect(shouldOfferProductTourInvitation(progress, 2)).toBe(false);
+        expect(shouldOfferProductTourInvitation(progress, 3)).toBe(true);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
index 882d52d3f8..4db1701c89 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/eligibility.ts
@@ -6,10 +6,6 @@ export function isProductTourSetupRoute(routeId: null | string): boolean {
     return !!routeId && SETUP_ROUTE_IDS.has(routeId);
 }
 
-export function shouldOfferProductTourAnnouncement(progress: ProductTourProgress | undefined, announcementVersion: number): boolean {
-    return !progress || progress.version < announcementVersion;
-}
-
-export function shouldOfferProductTourWelcome(progress: ProductTourProgress | undefined, welcomeVersion: number): boolean {
-    return !progress || progress.version < welcomeVersion;
+export function shouldOfferProductTourInvitation(progress: ProductTourProgress | undefined, version: number): boolean {
+    return !progress || progress.version < version;
 }

From 039ca0e500941b3cf2c0013607273e64aa669f72 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 09:47:51 -0500
Subject: [PATCH 31/43] Stabilize browser and dialog test lifecycles

---
 .../ClientApp/e2e/tests/chart-refresh.e2e.ts  |  6 +-
 .../e2e/tests/password-recovery.e2e.ts        | 75 ++++++++++---------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
index 5304344114..b1383e69d5 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/chart-refresh.e2e.ts
@@ -17,9 +17,9 @@ test('dashboard charts stay mounted while list data refreshes', async ({ e2eApi,
         { organizationId, token: userToken }
     );
 
-    await verifyChartRefresh(page, '/next/stack', (route) => isOrganizationEventListRequest(route, organizationId!, 'stack_frequent'));
-    await verifyChartRefresh(page, '/next/event', (route) => isOrganizationEventListRequest(route, organizationId!, 'summary'));
-    await verifyChartRefresh(page, '/next/sessions', (route) => {
+    await verifyChartRefresh(page, '/next/stack/all', (route) => isOrganizationEventListRequest(route, organizationId!, 'stack_frequent'));
+    await verifyChartRefresh(page, '/next/event/all', (route) => isOrganizationEventListRequest(route, organizationId!, 'summary'));
+    await verifyChartRefresh(page, '/next/sessions/all', (route) => {
         return new URL(route.request().url()).pathname === `/api/v2/organizations/${organizationId}/events/sessions`;
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/password-recovery.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/password-recovery.e2e.ts
index 731f23a2d1..76b84be994 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/password-recovery.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/password-recovery.e2e.ts
@@ -3,38 +3,45 @@ import { E2E_TEST_PASSWORD, expect, test } from '../fixtures/e2e-test';
 const RESET_PASSWORD = `${E2E_TEST_PASSWORD}-reset`;
 
 test.skip(process.env.E2E_ENV === 'production', 'Password recovery requires local Mailpit.');
-test.use({ e2eCleanupPassword: RESET_PASSWORD, e2eUseGeneratedUser: true });
-
-test('user can reset a forgotten password and log in @signup', async ({ e2eApi, e2eScenario, page }) => {
-    await test.step('request a password reset through the UI', async () => {
-        await page.goto('/next/forgot-password');
-        await page.getByLabel('Email', { exact: true }).fill(e2eScenario.email);
-        await page.getByRole('button', { name: 'Send Reset Email' }).click();
-
-        await expect(page).toHaveURL(/\/next\/login(?:[?#]|$)/);
-        await expect(page.getByText('Please check your inbox for the password reset email.')).toBeVisible();
-    });
-
-    const resetToken = await test.step('read the reset link from local mail', async () => {
-        return await e2eApi.pollForMailToken(e2eScenario.email, 'reset-password');
-    });
-
-    await test.step('change the password through the emailed route', async () => {
-        await page.goto(`/next/reset-password/${encodeURIComponent(resetToken)}`);
-        await page.getByLabel('New Password', { exact: true }).fill(RESET_PASSWORD);
-        await page.getByLabel('Confirm Password', { exact: true }).fill(RESET_PASSWORD);
-        await page.getByRole('button', { name: 'Change Password' }).click();
-
-        await expect(page).toHaveURL(/\/next\/login(?:[?#]|$)/);
-        await expect(page.getByText('You have successfully changed your password.')).toBeVisible();
-    });
-
-    await test.step('log in with the new password', async () => {
-        await page.getByLabel('Email', { exact: true }).fill(e2eScenario.email);
-        await page.getByPlaceholder('Enter password').fill(RESET_PASSWORD);
-        await page.getByRole('button', { exact: true, name: 'Login' }).click();
-
-        await expect(page.getByRole('heading', { name: 'All' })).toBeVisible({ timeout: 30_000 });
-        await expect(page).toHaveURL(/\/next\/stack\/all(?:[?#]|$)/);
-    });
+test.use({ e2eCleanupPassword: RESET_PASSWORD, e2eUseInvitedUser: true });
+
+test('user can reset a forgotten password and log in @signup', async ({ browser, e2eApi, e2eScenario }) => {
+    const recoveryContext = await browser.newContext({ baseURL: e2eApi.environment.appUrl, ignoreHTTPSErrors: true });
+    const page = await recoveryContext.newPage();
+
+    try {
+        await test.step('request a password reset through the UI', async () => {
+            await page.goto('/next/forgot-password');
+            await page.getByLabel('Email', { exact: true }).fill(e2eScenario.email);
+            await page.getByRole('button', { name: 'Send Reset Email' }).click();
+
+            await expect(page).toHaveURL(/\/next\/login(?:[?#]|$)/);
+            await expect(page.getByText('Please check your inbox for the password reset email.')).toBeVisible();
+        });
+
+        const resetToken = await test.step('read the reset link from local mail', async () => {
+            return await e2eApi.pollForMailToken(e2eScenario.email, 'reset-password');
+        });
+
+        await test.step('change the password through the emailed route', async () => {
+            await page.goto(`/next/reset-password/${encodeURIComponent(resetToken)}`);
+            await page.getByLabel('New Password', { exact: true }).fill(RESET_PASSWORD);
+            await page.getByLabel('Confirm Password', { exact: true }).fill(RESET_PASSWORD);
+            await page.getByRole('button', { name: 'Change Password' }).click();
+
+            await expect(page).toHaveURL(/\/next\/login(?:[?#]|$)/);
+            await expect(page.getByText('You have successfully changed your password.')).toBeVisible();
+        });
+
+        await test.step('log in with the new password', async () => {
+            await page.getByLabel('Email', { exact: true }).fill(e2eScenario.email);
+            await page.getByPlaceholder('Enter password').fill(RESET_PASSWORD);
+            await page.getByRole('button', { exact: true, name: 'Login' }).click();
+
+            await expect(page.getByRole('heading', { name: 'All' })).toBeVisible({ timeout: 30_000 });
+            await expect(page).toHaveURL(/\/next\/stack\/all(?:[?#]|$)/);
+        });
+    } finally {
+        await recoveryContext.close();
+    }
 });

From 850ef767ed551617d1c55ea1a2cc008842266256 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 12:22:34 -0500
Subject: [PATCH 32/43] Align guided tour components with application
 conventions

---
 src/Exceptionless.Web/ClientApp/.gitignore    |  1 +
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  8 ++-
 .../e2e/tests/sessions-saved-views.e2e.ts     |  4 +-
 .../ClientApp/eslint.config.js                |  4 +-
 ...e => product-tour-activity-popover.svelte} | 21 +++---
 ...duct-tour-activity-popover.svelte.test.ts} | 10 +--
 .../components/product-tour-activity.svelte   | 70 +++++++++----------
 .../product-tour-activity.svelte.test.ts      |  5 +-
 .../events/components/events-overview.svelte  |  2 +-
 .../investigation-detail.svelte}              |  6 +-
 .../investigation-detail.svelte.test.ts}      |  4 +-
 .../investigation-list.svelte}                | 32 +++++----
 .../investigation-list.svelte.test.ts}        |  2 +-
 .../features/product-tours/actions.svelte.ts  |  2 +-
 .../lib/features/product-tours/api.svelte.ts  |  2 +-
 .../features/product-tours/catalog.test.ts    |  2 +-
 .../src/lib/features/product-tours/catalog.ts | 18 +++--
 .../product-tour-feature-announcement.svelte  |  7 +-
 .../{ => alerts}/product-tour-welcome.svelte  |  7 +-
 .../product-tour-welcome.svelte.test.ts       |  0
 .../product-tour-catalog-dialog.svelte        |  9 +--
 .../product-tour-description.svelte           | 16 ++---
 .../components/product-tour-host.svelte       |  6 +-
 .../product-tour-privacy-link.svelte          |  6 +-
 .../product-tour-shell-spotlight.svelte       |  3 +-
 .../components/product-tour-spotlight.svelte  |  6 +-
 .../product-tour-spotlight.svelte.test.ts     |  2 +-
 .../product-tours/{types.ts => models.ts}     |  6 ++
 .../product-tours/session.svelte.test.ts      |  2 +-
 .../src/lib/features/product-tours/session.ts | 23 ++++--
 .../product-tours/state.svelte.test.ts        |  2 +-
 .../features/product-tours/state.svelte.ts    |  2 +-
 .../ClientApp/src/routes/(app)/+layout.svelte |  2 +-
 .../src/routes/(app)/event/+page.svelte       |  2 +-
 .../(app)/system/product-tours/+page.svelte   | 12 ++--
 35 files changed, 170 insertions(+), 136 deletions(-)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/{product-tour-activity-info.svelte => product-tour-activity-popover.svelte} (69%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/{product-tour-activity-info.svelte.test.ts => product-tour-activity-popover.svelte.test.ts} (81%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/events/components/{investigation-detail-tour.svelte => tours/investigation-detail.svelte} (96%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/events/components/{investigation-detail-tour.svelte.test.ts => tours/investigation-detail.svelte.test.ts} (97%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/events/components/{investigation-list-tour.svelte => tours/investigation-list.svelte} (72%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/events/components/{investigation-list-tour.svelte.test.ts => tours/investigation-list.svelte.test.ts} (97%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/{ => alerts}/product-tour-feature-announcement.svelte (89%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/{ => alerts}/product-tour-welcome.svelte (85%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/{ => alerts}/product-tour-welcome.svelte.test.ts (100%)
 rename src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/{types.ts => models.ts} (94%)

diff --git a/src/Exceptionless.Web/ClientApp/.gitignore b/src/Exceptionless.Web/ClientApp/.gitignore
index 246cecff7e..e21726351b 100644
--- a/src/Exceptionless.Web/ClientApp/.gitignore
+++ b/src/Exceptionless.Web/ClientApp/.gitignore
@@ -1,4 +1,5 @@
 test-results
+playwright-report
 node_modules
 
 # Output
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index eb16d7b225..5165073219 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -384,7 +384,9 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         let progressRequests = 0;
         const countSavedViewCreation = (request: Request) => {
             const path = new URL(request.url()).pathname;
-            if (request.method() === 'POST' && /^\/api\/v2\/organizations\/[^/]+\/saved-views$/.test(path)) createRequests += 1;
+            if (request.method() === 'POST' && /^\/api\/v2\/organizations\/[^/]+\/saved-views$/.test(path)) {
+                createRequests += 1;
+            }
         };
         const progressRoute = (url: URL) => url.pathname === '/api/v2/users/me/product-tours/saved-view-create';
         page.on('request', countSavedViewCreation);
@@ -458,7 +460,9 @@ test('domain workflows advance only on real success', async ({ e2eApi, e2eScenar
         await mockAssistantAccess(page);
         let chatRequests = 0;
         const countChatRequest = (request: Request) => {
-            if (new URL(request.url()).pathname === '/api/v2/assistant/chat') chatRequests += 1;
+            if (new URL(request.url()).pathname === '/api/v2/assistant/chat') {
+                chatRequests += 1;
+            }
         };
         page.on('request', countChatRequest);
 
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/sessions-saved-views.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/sessions-saved-views.e2e.ts
index 985fa05363..aae7d272a3 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/sessions-saved-views.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/sessions-saved-views.e2e.ts
@@ -273,7 +273,9 @@ test('Sessions ignore legacy structured Type filters and Type URL parameters', a
 
 async function captureEvidence(page: Page, fileName: string): Promise<void> {
     const outputDirectory = process.env.DOGFOOD_OUTPUT;
-    if (!outputDirectory) return;
+    if (!outputDirectory) {
+        return;
+    }
 
     const resolvedDirectory = path.resolve(outputDirectory);
     mkdirSync(resolvedDirectory, { recursive: true });
diff --git a/src/Exceptionless.Web/ClientApp/eslint.config.js b/src/Exceptionless.Web/ClientApp/eslint.config.js
index 0e7fe79173..e681380c26 100644
--- a/src/Exceptionless.Web/ClientApp/eslint.config.js
+++ b/src/Exceptionless.Web/ClientApp/eslint.config.js
@@ -41,7 +41,8 @@ export default ts.config(
     },
     {
         rules: {
-            '@tanstack/query/exhaustive-deps': 'off'
+            '@tanstack/query/exhaustive-deps': 'off',
+            curly: ['error', 'all']
         }
     },
     {
@@ -52,7 +53,6 @@ export default ts.config(
         rules: {
             '@stylistic/brace-style': ['error', '1tbs', { allowSingleLine: false }],
             '@stylistic/object-curly-newline': ['error', { ObjectExpression: { minProperties: 1 } }],
-            curly: ['error', 'all'],
             'padding-line-between-statements': ['error', { blankLine: 'always', next: ['if', 'while', 'for', 'do'], prev: 'block-like' }]
         }
     },
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
similarity index 69%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
index 702ba4994d..3c3f6feaa1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
@@ -3,6 +3,7 @@
 
     import Number from '$comp/formatters/number.svelte';
     import Percentage from '$comp/formatters/percentage.svelte';
+    import * as Typography from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as Popover from '$comp/ui/popover';
     import Info from '@lucide/svelte/icons/info';
@@ -23,26 +24,28 @@
         {/snippet}
     </Popover.Trigger>
     <Popover.Content align="start" collisionPadding={16} class="max-h-80 max-w-[calc(100vw-2rem)] overflow-y-auto" role="dialog" aria-labelledby={headingId}>
-        <h3 id={headingId} class="font-medium">{title}</h3>
-        <p class="text-muted-foreground text-xs">Activity in the selected period, not unique people.</p>
+        <Typography.H3 id={headingId} class="text-sm font-medium">{title}</Typography.H3>
+        <Typography.Muted class="text-xs">Activity in the selected period, not unique people.</Typography.Muted>
         {#if commonExit}
-            <p>Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></p>
+            <Typography.P class="leading-normal not-first:mt-0"
+                >Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></Typography.P
+            >
         {/if}
         {#if tour.kind === 'guide'}
             {#if tour.steps?.length}
                 <section class="flex flex-col gap-1">
-                    <h4 class="font-medium">Steps reached · exits</h4>
+                    <Typography.H4 class="text-sm font-medium">Steps reached · exits</Typography.H4>
                     <ul class="flex flex-col gap-1" aria-label="Guide steps reached and explicit exits">
                         {#each tour.steps as step (step.step)}
                             <li>{step.step.replaceAll('-', ' ')}: <Number value={step.reached} /> reached; <Number value={step.dismissed} /> closed here.</li>
                         {/each}
                     </ul>
-                    <p class="text-muted-foreground text-xs">Exits count explicit closes, not tab closures or navigation.</p>
+                    <Typography.Muted class="text-xs">Exits count explicit closes, not tab closures or navigation.</Typography.Muted>
                 </section>
             {/if}
             {#if tour.start_sources.length}
                 <section class="flex flex-col gap-1">
-                    <h4 class="font-medium">Opened from</h4>
+                    <Typography.H4 class="text-sm font-medium">Opened from</Typography.H4>
                     <ul class="flex flex-col gap-1" aria-label="Guide entry points">
                         {#each tour.start_sources as source (source.source)}
                             <li>
@@ -54,10 +57,12 @@
                 </section>
             {/if}
             {#if !tour.steps?.length && !tour.start_sources.length}
-                <p>No step or entry-point activity recorded in this period.</p>
+                <Typography.P class="leading-normal not-first:mt-0">No step or entry-point activity recorded in this period.</Typography.P>
             {/if}
         {:else}
-            <p>Shown counts invitation displays; Accepted counts invitations used to open a guide.</p>
+            <Typography.P class="leading-normal not-first:mt-0"
+                >Shown counts invitation displays; Accepted counts invitations used to open a guide.</Typography.P
+            >
         {/if}
     </Popover.Content>
 </Popover.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
similarity index 81%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts
rename to src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
index 13f74062de..6c5daa14ce 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-info.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
@@ -4,7 +4,7 @@ import { ProductTourKind, ProductTourLaunchSource } from '$generated/api';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, describe, expect, it } from 'vitest';
 
-import ProductTourActivityInfo from './product-tour-activity-info.svelte';
+import ProductTourActivityPopover from './product-tour-activity-popover.svelte';
 
 const tour: ProductTourSummary = {
     activity: [],
@@ -21,10 +21,10 @@ const tour: ProductTourSummary = {
 
 afterEach(cleanup);
 
-describe('ProductTourActivityInfo', () => {
+describe('ProductTourActivityPopover', () => {
     it('keeps diagnostic counts behind a named info button', async () => {
         // Arrange
-        render(ProductTourActivityInfo, { title: 'Explore Exceptionless', tour });
+        render(ProductTourActivityPopover, { title: 'Explore Exceptionless', tour });
         expect(screen.queryByText(/Most common exit/)).toBeNull();
 
         // Act
@@ -39,7 +39,7 @@ describe('ProductTourActivityInfo', () => {
 
     it('explains missing diagnostics without inventing step counts', async () => {
         // Arrange
-        render(ProductTourActivityInfo, { title: 'Explore Exceptionless', tour: { ...tour, start_sources: [], steps: [] } });
+        render(ProductTourActivityPopover, { title: 'Explore Exceptionless', tour: { ...tour, start_sources: [], steps: [] } });
 
         // Act
         await fireEvent.click(screen.getByRole('button'));
@@ -51,7 +51,7 @@ describe('ProductTourActivityInfo', () => {
 
     it('explains invitation acceptance without presenting guide steps', async () => {
         // Arrange
-        render(ProductTourActivityInfo, { title: 'Welcome invitation', tour: { ...tour, kind: ProductTourKind.Prompt, steps: [] } });
+        render(ProductTourActivityPopover, { title: 'Welcome invitation', tour: { ...tour, kind: ProductTourKind.Prompt, steps: [] } });
 
         // Act
         await fireEvent.click(screen.getByRole('button'));
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index af8959daa6..672ecc7086 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -2,8 +2,10 @@
     import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
+    import * as Typography from '$comp/typography';
     import * as Chart from '$comp/ui/chart';
     import * as Table from '$comp/ui/table';
+    import { formatDateLabel } from '$features/shared/dates';
     import { scaleUtc } from 'd3-scale';
     import { curveLinear } from 'd3-shape';
     import { type ChartState, LineChart, Points, Spline } from 'layerchart';
@@ -14,9 +16,6 @@
     const prompt = $derived(tour.kind === 'prompt');
     const keyboardHelpId = $props.id();
     const data = $derived(getProductTourActivity(tour.activity ?? [], start, end));
-    const subdaily = $derived(data[0] && data[1] && data[1].date.getTime() - data[0].date.getTime() < 86_400_000);
-    const lastPeriod = $derived(data.at(-1));
-    const withinDay = $derived(subdaily && data[0] && lastPeriod && lastPeriod.date.getTime() - data[0].date.getTime() < 86_400_000);
     const config = $derived({
         completed: {
             color: 'color-mix(in srgb, var(--chart-1) var(--tour-chart-strength), black)',
@@ -48,7 +47,7 @@
     const selectedIndex = $derived(Math.max(0, Math.min(keyboardIndex ?? data.length - 1, data.length - 1)));
     const selectedPeriod = $derived(data[selectedIndex]);
     const keyboardValue = $derived(
-        selectedPeriod ? `${periodLabel(selectedPeriod.date)}. ${keys.map((key) => `${config[key].label}: ${selectedPeriod[key]}`).join('. ')}` : 'No activity'
+        selectedPeriod ? `${formatPeriod(selectedPeriod.date)}. ${keys.map((key) => `${config[key].label}: ${selectedPeriod[key]}`).join('. ')}` : 'No activity'
     );
 
     function showSelectedPeriod(): void {
@@ -64,44 +63,35 @@
             return;
         }
         event.preventDefault();
-        keyboardIndex =
-            event.key === 'Home'
-                ? 0
-                : event.key === 'End'
-                  ? data.length - 1
-                  : Math.max(0, Math.min(data.length - 1, selectedIndex + (event.key === 'ArrowRight' ? 1 : -1)));
-        showSelectedPeriod();
-    }
-
-    function dateLabel(value: unknown): string {
-        if (value instanceof Date && withinDay) {
-            return value.toLocaleTimeString(undefined, {
-                hour: 'numeric',
-                minute: '2-digit',
-                timeZone: 'UTC'
-            });
+        switch (event.key) {
+            case 'ArrowLeft':
+                keyboardIndex = Math.max(0, selectedIndex - 1);
+                break;
+            case 'ArrowRight':
+                keyboardIndex = Math.min(data.length - 1, selectedIndex + 1);
+                break;
+            case 'End':
+                keyboardIndex = data.length - 1;
+                break;
+            case 'Home':
+                keyboardIndex = 0;
+                break;
         }
-        return periodLabel(value, false);
+        showSelectedPeriod();
     }
 
-    function periodLabel(value: unknown, includeTime = true): string {
-        if (!(value instanceof Date)) {
-            return '';
-        }
-        return value.toLocaleString(undefined, {
-            day: interval !== 'month' ? 'numeric' : undefined,
-            hour: subdaily && includeTime ? 'numeric' : undefined,
-            minute: subdaily && includeTime ? '2-digit' : undefined,
+    function formatPeriod(value: Date): string {
+        return formatDateLabel(value, undefined, {
+            includeRelative: false,
             month: 'short',
-            timeZone: 'UTC',
-            year: interval === 'month' || data[0]?.date.getUTCFullYear() !== lastPeriod?.date.getUTCFullYear() ? 'numeric' : undefined
+            timeZone: 'UTC'
         });
     }
 </script>
 
 <div class="flex flex-col gap-4 [--tour-chart-strength:70%] dark:[--tour-chart-strength:100%]">
     {#if total === 0}
-        <p class="text-muted-foreground flex h-48 items-center justify-center text-sm">No recorded activity in this period.</p>
+        <Typography.Muted class="flex h-48 items-center justify-center">No recorded activity in this period.</Typography.Muted>
     {:else}
         <ul class="flex flex-wrap gap-x-4 gap-y-1 text-xs" aria-label="Period totals">
             {#each keys as key (key)}
@@ -143,14 +133,12 @@
                 legend={false}
                 props={{
                     xAxis: {
-                        format: dateLabel,
                         tickLabelProps: {
                             dy: 20
                         },
-                        ticks: data.filter((_, index) => index % Math.max(1, Math.ceil((data.length - 1) / 4)) === 0).map((period) => period.date)
+                        ticks: 4
                     },
                     yAxis: {
-                        format: (value) => String(value),
                         tickLabelProps: {
                             dx: -8
                         },
@@ -166,11 +154,17 @@
                         {/if}
                     {/each}
                 {/snippet}
-                {#snippet tooltip()}<Chart.Tooltip role="tooltip" labelFormatter={(value) => periodLabel(value)} indicator="line" />{/snippet}
+                {#snippet tooltip()}<Chart.Tooltip
+                        role="tooltip"
+                        labelFormatter={(value) => (value instanceof Date ? formatPeriod(value) : '')}
+                        indicator="line"
+                    />{/snippet}
             </LineChart>
         </Chart.Container>
         <div class="sr-only">
-            <p id={keyboardHelpId}>Use Left and Right arrows to inspect dates, or Home and End to jump to the first and last date. Dates are UTC.</p>
+            <Typography.P id={keyboardHelpId}
+                >Use Left and Right arrows to inspect dates, or Home and End to jump to the first and last date. Dates are UTC.</Typography.P
+            >
             <Table.Root aria-label="Guide activity by date">
                 <Table.Header
                     ><Table.Row
@@ -180,7 +174,7 @@
                 >
                 <Table.Body
                     >{#each data as period (period.date_utc)}<Table.Row
-                            ><Table.Cell>{periodLabel(period.date)}</Table.Cell>{#each keys as key (key)}<Table.Cell class="text-right"
+                            ><Table.Cell>{formatPeriod(period.date)}</Table.Cell>{#each keys as key (key)}<Table.Cell class="text-right"
                                     ><Number value={period[key]} /></Table.Cell
                                 >{/each}</Table.Row
                         >{/each}</Table.Body
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
index 9837987ee7..66220ea5dd 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -1,5 +1,6 @@
 import type { ProductTourSummary } from '$generated/api';
 
+import { formatDateLabel } from '$features/shared/dates';
 import { ProductTourKind, ProductTourLaunchSource, ProductTourUsageInterval } from '$generated/api';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -76,7 +77,9 @@ describe('ProductTourActivity', () => {
         expect(screen.queryByText('View details')).toBeNull();
         const table = screen.getByRole('table', { name: 'Guide activity by date' });
         expect(table.closest('.sr-only')).not.toBeNull();
-        expect(table.textContent).toContain('Jan 2026');
+        expect(table.textContent).toContain(
+            formatDateLabel(new Date(tour.activity[0]!.date_utc), undefined, { includeRelative: false, month: 'short', timeZone: 'UTC' })
+        );
         expect(table.closest('details')).toBeNull();
     });
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
index da1a008902..767644c0da 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/events-overview.svelte
@@ -31,7 +31,7 @@
 
     import { getSessionId } from '../utils';
     import { shouldResetActiveEventTab } from './events-overview-tab-state';
-    import InvestigationDetailTour from './investigation-detail-tour.svelte';
+    import InvestigationDetailTour from './tours/investigation-detail.svelte';
     import Environment from './views/environment.svelte';
     import Error from './views/error.svelte';
     import ExtendedData from './views/extended-data.svelte';
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
similarity index 96%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
index e497ef58e2..157643d0d8 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
+    import { PRODUCT_TOUR_CHECKPOINTS } from '$features/product-tours/models';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
-    import { PRODUCT_TOUR_CHECKPOINTS } from '$features/product-tours/types';
 
-    import type { PersistentEvent } from '../models';
+    import type { PersistentEvent } from '../../models';
 
-    import { hasErrorOrSimpleError } from '../persistent-event';
+    import { hasErrorOrSimpleError } from '../../persistent-event';
 
     interface Props {
         event?: PersistentEvent;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
similarity index 97%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
rename to src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
index 539dc604c0..ffe6357086 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-detail-tour.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
@@ -2,9 +2,9 @@ import { productTourCheckpoint } from '$features/product-tours/state.svelte';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { PersistentEvent } from '../models';
+import type { PersistentEvent } from '../../models';
 
-import InvestigationDetailTour from './investigation-detail-tour.svelte';
+import InvestigationDetailTour from './investigation-detail.svelte';
 
 const actions = vi.hoisted(() => ({ complete: vi.fn(), dismiss: vi.fn() }));
 vi.mock('$features/product-tours/actions.svelte', () => ({ createProductTourActions: () => actions }));
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte
similarity index 72%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte
index 6b2aec2ec0..5c5bd121e1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import type { ProductTourCheckpoint } from '$features/product-tours/models';
+
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
@@ -12,6 +14,20 @@
 
     const actions = createProductTourActions();
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
+
+    function chooseError(current: ProductTourCheckpoint): void {
+        productTourCheckpoint.advance(current, 'choose-error');
+    }
+
+    function reviewFilters(current: ProductTourCheckpoint): void {
+        productTourCheckpoint.advance(current, 'filter-errors');
+    }
+
+    function openFirstError(): void {
+        if (firstErrorId) {
+            onOpenError(firstErrorId);
+        }
+    }
 </script>
 
 {#if checkpoint?.checkpointName === 'filter-errors'}
@@ -19,9 +35,7 @@
         {checkpoint}
         description="This list shows errors. Use the filters or search to find the one you want to investigate."
         onDismiss={actions.dismiss}
-        onNext={(current) => {
-            productTourCheckpoint.advance(current, 'choose-error');
-        }}
+        onNext={chooseError}
         target="[data-tour='event-filters']"
         title="Start with the right errors"
     />
@@ -34,16 +48,8 @@
                 ? 'Open the first error below, or select another row. The guide continues in the details panel.'
                 : 'No errors are ready to open in this list. Adjust the filters or wait for the results to load.'}
             onDismiss={actions.dismiss}
-            onPrevious={(current) => {
-                productTourCheckpoint.advance(current, 'filter-errors');
-            }}
-            onNext={firstErrorId
-                ? () => {
-                      if (firstErrorId) {
-                          onOpenError(firstErrorId);
-                      }
-                  }
-                : undefined}
+            onPrevious={reviewFilters}
+            onNext={firstErrorId ? openFirstError : undefined}
             target="[data-tour='event-list']"
             title="Open an error"
         />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
similarity index 97%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
rename to src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
index 9e97160e91..f4776aa6e9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/investigation-list-tour.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
@@ -2,7 +2,7 @@ import { productTourCheckpoint } from '$features/product-tours/state.svelte';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import InvestigationListTour from './investigation-list-tour.svelte';
+import InvestigationListTour from './investigation-list.svelte';
 vi.mock('$features/product-tours/api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
 
 vi.mock('$features/product-tours/actions.svelte', () => ({
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 90d4b6c860..3adbd510c9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -2,7 +2,7 @@ import { putCurrentUserProductTour } from '$features/users/api.svelte';
 import { ProductTourStatus } from '$features/users/models';
 import { toast } from 'svelte-sonner';
 
-import type { ProductTourCheckpoint } from './types';
+import type { ProductTourCheckpoint } from './models';
 
 import { createProductTourActivity } from './api.svelte';
 import { tryUseProductTourControls } from './controls.svelte';
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
index d37286ea6e..ef23bb14c2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
@@ -4,7 +4,7 @@ import { queryKeys as userQueryKeys } from '$features/users/api.svelte';
 import { ProblemDetails, useFetchClient } from '@foundatiofx/fetchclient';
 import { createMutation, useQueryClient } from '@tanstack/svelte-query';
 
-import type { ProductTourKey, ProductTourLaunchSource } from './types';
+import type { ProductTourKey, ProductTourLaunchSource } from './models';
 
 export function createProductTourActivity() {
     const queryClient = useQueryClient();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index fcbe17a151..70ccd60063 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import type { ProductTourContext } from './types';
+import type { ProductTourContext } from './models';
 
 import { getProductTourItems, getRecommendedProductTourName, productTourCatalog } from './catalog';
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index a4a808d1a9..a9c69989bd 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -2,7 +2,7 @@ import type { ProductTourProgress } from '$features/users/models';
 
 import { resolve } from '$app/paths';
 
-import type { ProductTourContext, ProductTourDefinition, ProductTourListItem, ProductTourName } from './types';
+import type { ProductTourContext, ProductTourDefinition, ProductTourListItem, ProductTourName } from './models';
 
 function requireApplicationShell(context: ProductTourContext) {
     return context.isSetupPage || !context.organizationId
@@ -11,10 +11,18 @@ function requireApplicationShell(context: ProductTourContext) {
 }
 
 function requireError(context: ProductTourContext) {
-    if (!context.organizationId) return { available: false, reason: 'Create an organization and project first.' };
-    if (context.errorEventAvailability === 'loading') return { available: false, reason: 'Checking for an accessible error report…' };
-    if (context.errorEventAvailability === 'error') return { available: false, reason: 'Error reports could not be checked. Try again shortly.' };
-    if (context.errorEventAvailability === 'empty') return { available: false, reason: 'Send an error report before starting this guide.' };
+    if (!context.organizationId) {
+        return { available: false, reason: 'Create an organization and project first.' };
+    }
+    if (context.errorEventAvailability === 'loading') {
+        return { available: false, reason: 'Checking for an accessible error report…' };
+    }
+    if (context.errorEventAvailability === 'error') {
+        return { available: false, reason: 'Error reports could not be checked. Try again shortly.' };
+    }
+    if (context.errorEventAvailability === 'empty') {
+        return { available: false, reason: 'Send an error report before starting this guide.' };
+    }
     return { available: true };
 }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
similarity index 89%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
index e033099ec4..9a1bcaa486 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-feature-announcement.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import * as Typography from '$comp/typography';
     import * as Alert from '$comp/ui/alert';
     import { Button } from '$comp/ui/button';
     import Sparkles from '@lucide/svelte/icons/sparkles';
     import X from '@lucide/svelte/icons/x';
 
-    import ProductTourPrivacyLink from './product-tour-privacy-link.svelte';
+    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
 
     interface Props {
         busy?: boolean;
@@ -28,11 +29,11 @@
             <div class="flex items-start justify-between gap-3">
                 <div>
                     <Alert.Title>New: Meet Exie</Alert.Title>
-                    <p class="text-muted-foreground mt-1 text-sm">
+                    <Typography.Muted class="mt-1">
                         {hasAccess
                             ? 'Take a short guide to Exie, your AI assistant for investigating errors.'
                             : (message ?? 'Exie is available with an eligible organization plan.')}
-                    </p>
+                    </Typography.Muted>
                 </div>
                 <Button aria-label="Dismiss Exie announcement" class="-mt-1 -mr-1 size-11" disabled={busy} onclick={onDismiss} size="icon" variant="ghost">
                     <X aria-hidden="true" class="size-4" />
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
similarity index 85%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
rename to src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
index f469251fdb..6f766bfdaf 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import * as Typography from '$comp/typography';
     import * as Alert from '$comp/ui/alert';
     import { Button } from '$comp/ui/button';
     import X from '@lucide/svelte/icons/x';
 
-    import type { ProductTourListItem } from '../types';
+    import type { ProductTourListItem } from '../../models';
 
-    import ProductTourPrivacyLink from './product-tour-privacy-link.svelte';
+    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
 
     interface Props {
         busy?: boolean;
@@ -36,7 +37,7 @@
         role="region"
     >
         <div class="flex items-center justify-between gap-2">
-            <Alert.Title><h2>Welcome to Exceptionless</h2></Alert.Title>
+            <Alert.Title><Typography.H2 class="border-0 pb-0 text-sm font-medium">Welcome to Exceptionless</Typography.H2></Alert.Title>
             <Button aria-label="Close welcome" class="-my-2 -mr-2 size-11 shrink-0" disabled={busy} onclick={onDismiss} size="icon" variant="ghost">
                 <X aria-hidden="true" />
             </Button>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts
similarity index 100%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-welcome.svelte.test.ts
rename to src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index db8bd43206..236802ec21 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import * as Typography from '$comp/typography';
     import { Badge } from '$comp/ui/badge';
     import { Button } from '$comp/ui/button';
     import * as Dialog from '$comp/ui/dialog';
@@ -9,7 +10,7 @@
     import Layers from '@lucide/svelte/icons/layers';
     import PanelLeft from '@lucide/svelte/icons/panel-left';
 
-    import type { ProductTourListItem, ProductTourName } from '../../types';
+    import type { ProductTourListItem, ProductTourName } from '../../models';
 
     import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
 
@@ -50,14 +51,14 @@
                         <Icon aria-hidden="true" class="text-muted-foreground mt-0.5 size-5" />
                         <div class="min-w-0">
                             <div class="flex flex-wrap items-center gap-x-2 gap-y-1">
-                                <h3 class="text-sm font-semibold">{item.title}</h3>
+                                <Typography.H3 class="text-sm">{item.title}</Typography.H3>
                                 {#if completed}
                                     <Badge variant="secondary">Completed</Badge>
                                 {/if}
                             </div>
-                            <p class="text-muted-foreground mt-1 text-sm">{item.description}</p>
+                            <Typography.Muted class="mt-1">{item.description}</Typography.Muted>
                             {#if !item.currentAvailability.available}
-                                <p class="text-muted-foreground mt-1 text-xs" id={`${id}-${item.name}-reason`}>{item.currentAvailability.reason}</p>
+                                <Typography.Muted class="mt-1 text-xs" id={`${id}-${item.name}-reason`}>{item.currentAvailability.reason}</Typography.Muted>
                             {/if}
                         </div>
                         <Button
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
index e832696fcf..ed3c602e7f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-description.svelte
@@ -1,28 +1,22 @@
-<script lang="ts" module>
-    import type { KeyboardShortcut } from '$features/shared/keyboard-shortcuts';
-
-    export interface ProductTourShortcut {
-        label: string;
-        shortcut: KeyboardShortcut;
-    }
-</script>
-
 <script lang="ts">
     import type { Snippet } from 'svelte';
 
+    import * as Typography from '$comp/typography';
     import * as Kbd from '$comp/ui/kbd';
     import { formatKeyboardShortcut } from '$features/shared/keyboard-shortcuts';
 
+    import type { ProductTourShortcut } from '../models';
+
     let { description, shortcuts = [] }: { description: Snippet | string; shortcuts?: ProductTourShortcut[] } = $props();
 </script>
 
-<p>
+<Typography.P class="leading-normal not-first:mt-0">
     {#if typeof description === 'string'}
         {description}
     {:else}
         {@render description()}
     {/if}
-</p>
+</Typography.P>
 {#if shortcuts.length}
     <div class="mt-2 flex flex-wrap items-center gap-x-3 gap-y-2">
         {#each shortcuts as { label, shortcut } (label)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 6cd4eb0299..0e0c13e701 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -12,17 +12,17 @@
     import { onMount } from 'svelte';
     import { toast } from 'svelte-sonner';
 
-    import type { ProductTourCheckpoint, ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../types';
+    import type { ProductTourCheckpoint, ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../models';
 
     import { createProductTourActions } from '../actions.svelte';
     import { createProductTourActivity } from '../api.svelte';
     import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
     import { shouldOfferProductTourInvitation } from '../eligibility';
     import { productTourCheckpoint } from '../state.svelte';
+    import ProductTourFeatureAnnouncement from './alerts/product-tour-feature-announcement.svelte';
+    import ProductTourWelcome from './alerts/product-tour-welcome.svelte';
     import ProductTourCatalogDialog from './dialogs/product-tour-catalog-dialog.svelte';
-    import ProductTourFeatureAnnouncement from './product-tour-feature-announcement.svelte';
     import ProductTourShellSpotlight from './product-tour-shell-spotlight.svelte';
-    import ProductTourWelcome from './product-tour-welcome.svelte';
 
     interface Props {
         assistantAccess?: AssistantAccess;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
index d35a582eb0..74b47bfbb5 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { resolve } from '$app/paths';
-    import { A } from '$comp/typography';
+    import { A, Muted } from '$comp/typography';
 </script>
 
-<p class="text-muted-foreground text-xs">
+<Muted class="text-xs">
     Optional guide usage helps us improve guided tours.
     <A href={`${resolve('/(app)/account/manage')}#guided-tour-privacy`}>Usage settings</A>
-</p>
+</Muted>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
index f45b3d017a..2bcad547fd 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-shell-spotlight.svelte
@@ -4,8 +4,7 @@
     import { appKeyboardShortcuts } from '$features/shared/keyboard-shortcuts';
     import { onDestroy, onMount, tick, untrack } from 'svelte';
 
-    import type { ProductTourCheckpoint, ProductTourCheckpointName } from '../types';
-    import type { ProductTourShortcut } from './product-tour-description.svelte';
+    import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourShortcut } from '../models';
 
     import { createProductTourActions } from '../actions.svelte';
     import { tryUseProductTourControls } from '../controls.svelte';
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index 57705461cf..dfa68d0084 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -3,12 +3,12 @@
     import { mount, onMount, type Snippet, tick, unmount } from 'svelte';
     import { toast } from 'svelte-sonner';
 
-    import type { ProductTourCheckpoint } from '../types';
+    import type { ProductTourCheckpoint, ProductTourShortcut } from '../models';
 
     import { createProductTourActivity } from '../api.svelte';
+    import { PRODUCT_TOUR_CHECKPOINTS } from '../models';
     import { productTourCheckpoint } from '../state.svelte';
-    import { PRODUCT_TOUR_CHECKPOINTS } from '../types';
-    import ProductTourDescription, { type ProductTourShortcut } from './product-tour-description.svelte';
+    import ProductTourDescription from './product-tour-description.svelte';
     import 'driver.js/dist/driver.css';
 
     interface Props {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
index 5b09904913..bd94ca1878 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
@@ -2,7 +2,7 @@ import { appKeyboardShortcuts } from '$features/shared/keyboard-shortcuts';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { ProductTourCheckpoint } from '../types';
+import type { ProductTourCheckpoint } from '../models';
 
 import ProductTourSpotlight from './product-tour-spotlight.svelte';
 vi.mock('../api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
similarity index 94%
rename from src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
rename to src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
index 2f1160c6dd..459dc9c4d2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/types.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
@@ -1,5 +1,6 @@
 import type { AssistantAccess } from '$features/assistant/models';
 import type { ViewProject } from '$features/projects/models';
+import type { KeyboardShortcut } from '$features/shared/keyboard-shortcuts';
 import type { ProductTourProgress } from '$features/users/models';
 export const PRODUCT_TOUR_CHECKPOINTS = {
     'app-overview': ['navigation', 'command-search', 'saved-views', 'exie', 'help'],
@@ -57,6 +58,11 @@ export interface ProductTourListItem<Name extends ProductTourName = ProductTourN
 
 export type ProductTourName = keyof typeof PRODUCT_TOUR_CHECKPOINTS;
 
+export interface ProductTourShortcut {
+    label: string;
+    shortcut: KeyboardShortcut;
+}
+
 export interface ProductTourStart<Name extends ProductTourName = ProductTourName> {
     checkpointName: ProductTourCheckpointName<Name>;
     route: string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
index ceb6cba570..0f1ae61ad7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.svelte.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import type { ProductTourCheckpoint } from './types';
+import type { ProductTourCheckpoint } from './models';
 
 import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index d64055d14d..42ca2bfe48 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -1,6 +1,6 @@
-import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName } from './types';
+import type { ProductTourCheckpoint, ProductTourLaunchSource, ProductTourName } from './models';
 
-import { PRODUCT_TOUR_CHECKPOINTS, PRODUCT_TOUR_LAUNCH_SOURCES } from './types';
+import { PRODUCT_TOUR_CHECKPOINTS, PRODUCT_TOUR_LAUNCH_SOURCES } from './models';
 
 const SESSION_KEY = 'exceptionless.product-tour';
 const SOURCES = new Set<string>(PRODUCT_TOUR_LAUNCH_SOURCES);
@@ -16,7 +16,9 @@ export function clearProductTourSession(storage?: Pick<Storage, 'removeItem'>):
 export function readProductTourSession(storage?: Pick<Storage, 'getItem' | 'removeItem'>): ProductTourCheckpoint | undefined {
     try {
         const value = (storage ?? sessionStorage).getItem(SESSION_KEY);
-        if (!value) return undefined;
+        if (!value) {
+            return undefined;
+        }
 
         const candidate: unknown = JSON.parse(value);
         if (!isProductTourCheckpoint(candidate)) {
@@ -56,10 +58,15 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
         typeof value.version !== 'number' ||
         !Number.isSafeInteger(value.version) ||
         value.version < 1
-    )
+    ) {
+        return false;
+    }
+    if (value.organizationId !== undefined && typeof value.organizationId !== 'string') {
         return false;
-    if (value.organizationId !== undefined && typeof value.organizationId !== 'string') return false;
-    if (!isProductTourLaunchSource(value.source) || !isProductTourName(value.tourName)) return false;
+    }
+    if (!isProductTourLaunchSource(value.source) || !isProductTourName(value.tourName)) {
+        return false;
+    }
 
     const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[value.tourName];
     if (
@@ -70,7 +77,9 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
     ) {
         return false;
     }
-    if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) return false;
+    if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) {
+        return false;
+    }
     return true;
 }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index 96f5ba0a51..695be6ac96 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 
-import type { ProductTourCheckpoint } from './types';
+import type { ProductTourCheckpoint } from './models';
 
 import { productTourCheckpoint } from './state.svelte';
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
index 6530fc319b..91eea502df 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -1,4 +1,4 @@
-import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourLaunchSource, ProductTourName } from './types';
+import type { ProductTourCheckpoint, ProductTourCheckpointName, ProductTourLaunchSource, ProductTourName } from './models';
 
 import { clearProductTourSession, readProductTourSession, writeProductTourSession } from './session';
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index c734fba47f..4d349c359a 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import type { AssistantPromptRequest } from '$features/assistant/models';
-    import type { ProductTourLaunchSource } from '$features/product-tours/types';
+    import type { ProductTourLaunchSource } from '$features/product-tours/models';
     import type { SavedView } from '$features/saved-views/models';
     import type { Snippet } from 'svelte';
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
index f8dfbdecde..b438335490 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte
@@ -42,11 +42,11 @@
         updateFilterCache
     } from '$features/events/components/filters/helpers.svelte';
     import OrganizationDefaultsFacetedFilterBuilder from '$features/events/components/filters/organization-defaults-faceted-filter-builder.svelte';
-    import InvestigationListTour from '$features/events/components/investigation-list-tour.svelte';
     import { buildEventDetailsHref, type EventSummaryModel, type SummaryTemplateKeys } from '$features/events/components/summary/index';
     import EventsBulkActionsDropdownMenu from '$features/events/components/table/events-bulk-actions-dropdown-menu.svelte';
     import EventsDataTable from '$features/events/components/table/events-data-table.svelte';
     import { defaultEventColumnVisibility, getColumns } from '$features/events/components/table/options.svelte';
+    import InvestigationListTour from '$features/events/components/tours/investigation-list.svelte';
     import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { organization } from '$features/organizations/context.svelte';
     import { premiumPage } from '$features/organizations/premium-page.svelte';
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index 7601422fe2..fa7f503d3b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -3,13 +3,13 @@
     import type { ProductTourSummary } from '$generated/api';
 
     import TimeAgo from '$comp/formatters/time-ago.svelte';
-    import { Muted } from '$comp/typography';
+    import { H2, Muted, P } from '$comp/typography';
     import * as Alert from '$comp/ui/alert';
     import { Button } from '$comp/ui/button';
     import * as Card from '$comp/ui/card';
     import { Skeleton } from '$comp/ui/skeleton';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
-    import ProductTourActivityInfo from '$features/admin/components/product-tour-activity-info.svelte';
+    import ProductTourActivityPopover from '$features/admin/components/product-tour-activity-popover.svelte';
     import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
     import ProductTourPeriod from '$features/admin/components/product-tour-period.svelte';
     import { productTourCatalog } from '$features/product-tours/catalog';
@@ -67,7 +67,7 @@
     {#if usageQuery.isError}
         <Card.Root>
             <Card.Content class="pt-6">
-                <p class="text-destructive text-sm">Failed to load guided-tour usage. Please try again.</p>
+                <P class="text-destructive text-sm">Failed to load guided-tour usage. Please try again.</P>
                 <Button class="mt-3" variant="outline" onclick={() => usageQuery.refetch()}>Retry</Button>
             </Card.Content>
         </Card.Root>
@@ -78,12 +78,12 @@
             {/each}
         </div>
     {:else if usage?.tours.length === 0}
-        <p class="text-muted-foreground text-sm">No guided-tour activity was recorded in this period.</p>
+        <Muted>No guided-tour activity was recorded in this period.</Muted>
     {:else}
         {@render TourCards(guides)}
         {#if invitations.length > 0}
             <section aria-labelledby="invitation-activity-title" class="flex flex-col gap-4">
-                <h2 id="invitation-activity-title" class="text-sm font-medium">Invitations</h2>
+                <H2 id="invitation-activity-title" class="border-0 pb-0 text-sm font-medium">Invitations</H2>
                 {@render TourCards(invitations)}
             </section>
         {/if}
@@ -97,7 +97,7 @@
                 <Card.Header class="flex flex-row flex-wrap items-center justify-between gap-x-3 gap-y-1">
                     <div class="flex items-center gap-1">
                         <Card.Title>{title(tour.name)} <span class="text-muted-foreground text-xs font-normal">v{tour.version}</span></Card.Title>
-                        <ProductTourActivityInfo {tour} title={title(tour.name)} />
+                        <ProductTourActivityPopover {tour} title={title(tour.name)} />
                     </div>
                     {#if tour.last_run_utc}
                         <Card.Description class="whitespace-nowrap">Last event <TimeAgo value={tour.last_run_utc} /></Card.Description>

From b506eea9ddcf27d35005737fab49b9ed7f86bbc9 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 12:39:55 -0500
Subject: [PATCH 33/43] Simplify guided tour preference caching

---
 .../Handlers/ProductTourActivityHandler.cs    |  3 +-
 .../e2e/tests/product-tour-dashboard.e2e.ts   |  5 ++--
 .../lib/features/product-tours/api.svelte.ts  |  6 +---
 .../product-tours/user-cache.svelte.test.ts   | 14 +++++++++
 .../ProductTourActivityEndpointTests.cs       | 29 ++++++++++++++++++-
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
index 70cc03352b..590e4c2a36 100644
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
@@ -53,8 +53,7 @@ public async Task<Result> Handle(RecordProductTourActivity message)
             return Result.Invalid(ValidationError.Create("step", "A reached step is required."));
         }
 
-        // Re-read the preference so a stale browser or authentication cache cannot bypass opt-out.
-        var user = await userRepository.GetByIdAsync(HttpContext.Request.GetUser().Id, options => options.Cache(false));
+        var user = await userRepository.GetByIdAsync(HttpContext.Request.GetUser().Id, options => options.Cache());
         if (user is null)
         {
             return Result.NotFound("User not found.");
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index de3a8ae94b..edae5835c8 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -182,11 +182,12 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
                 const labels = await chart.locator('.lc-axis-tick-label').evaluateAll((elements) =>
                     elements.map((element) => ({
                         bounds: element.getBoundingClientRect().toJSON(),
+                        placement: element.closest('.lc-axis')?.getAttribute('data-placement'),
                         text: element.textContent
                     }))
                 );
-                const zero = labels.find((label) => label.text === '0');
-                const firstDate = labels.find((label) => label.text?.match(/[A-Za-z]/));
+                const zero = labels.find((label) => label.placement === 'left' && label.text === '0');
+                const firstDate = labels.find((label) => label.placement === 'bottom');
                 return zero && firstDate ? firstDate.bounds.top - zero.bounds.bottom : 0;
             })
             .toBeGreaterThanOrEqual(6);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
index ef23bb14c2..8ad5bf8db7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
@@ -90,10 +90,6 @@ export function putProductTourAnalytics() {
             return {
                 previous
             };
-        },
-        onSettled: () =>
-            queryClient.invalidateQueries({
-                queryKey: userQueryKeys.me()
-            })
+        }
     }));
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
index 641a54d894..69bfc75b4b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
@@ -31,6 +31,20 @@ describe('guided-tour user cache concurrency', () => {
         queryClient.setQueryData(queryKeys.me(), user('first-user'));
     });
 
+    it.each([false, true])('keeps the acknowledged preference without refetching the user (enabled: %s)', async (enabled) => {
+        // Arrange
+        mocks.putJSON.mockResolvedValue(undefined);
+        const invalidate = vi.spyOn(queryClient, 'invalidateQueries');
+
+        // Act
+        await putProductTourAnalytics().mutateAsync(enabled);
+
+        // Assert
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())?.product_tour_analytics_enabled).toBe(enabled);
+        expect(invalidate).not.toHaveBeenCalled();
+        expect(queryClient.getQueryState(queryKeys.me())?.isInvalidated).toBe(false);
+    });
+
     it('preserves progress saved while a preference update fails', async () => {
         // Arrange
         const request = Promise.withResolvers<void>();
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
index 137e58d2fc..7ed3c5362b 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
@@ -74,6 +74,9 @@ public async Task UpdateCurrentUserProductTourAnalytics_ConcurrentProgress_Prese
         // Arrange
         var user = await GetService<IUserRepository>().GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
         Assert.NotNull(user);
+        var cached = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache());
+        Assert.NotNull(cached);
+        Assert.True(cached.ProductTourAnalyticsEnabled);
 
         // Act
         await Task.WhenAll(
@@ -86,13 +89,37 @@ await SendRequestAsync(request => request.Post().AsTestOrganizationUser().Append
             .StatusCodeShouldBeNoContent());
 
         // Assert
-        var persisted = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache(false));
+        var persisted = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache());
         Assert.NotNull(persisted);
         Assert.False(persisted.ProductTourAnalyticsEnabled);
         Assert.Equal(ProductTourStatus.Completed, persisted.ProductTours[ProductTours.AppOverview].Status);
         Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
     }
 
+    [Fact]
+    public async Task UpdateCurrentUserProductTourAnalytics_CachedPreference_ReflectsEachChange()
+    {
+        // Arrange
+        var repository = GetService<IUserRepository>();
+        var user = await repository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
+        Assert.NotNull(user);
+        var cached = await repository.GetByIdAsync(user.Id, options => options.Cache());
+        Assert.NotNull(cached);
+        Assert.True(cached.ProductTourAnalyticsEnabled);
+
+        foreach (bool enabled in new[] { false, true })
+        {
+            // Act
+            await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
+                .Content(new UpdateProductTourAnalytics { Enabled = enabled }).StatusCodeShouldBeNoContent());
+
+            // Assert
+            cached = await repository.GetByIdAsync(user.Id, options => options.Cache());
+            Assert.NotNull(cached);
+            Assert.Equal(enabled, cached.ProductTourAnalyticsEnabled);
+        }
+    }
+
     [Fact]
     public void DeserializeUser_LegacyRecord_DefaultsAnalyticsToEnabled()
     {

From a85bfa521624b8bf05411b4c9fc2a839636e1157 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 13:33:04 -0500
Subject: [PATCH 34/43] Simplify guided tour activity and date range queries

---
 .../Models/Data/ProductTours.cs               |  16 +-
 src/Exceptionless.Core/Models/User.cs         |   1 -
 .../Repositories/EventRepository.cs           |  37 +--
 .../Interfaces/IEventRepository.cs            |   2 +-
 .../Repositories/ProductTourUsageResult.cs    |  27 +-
 .../Api/Endpoints/AdminEndpoints.cs           |   7 +-
 .../Api/Endpoints/UserEndpoints.cs            |  22 --
 .../Api/Handlers/AdminHandler.cs              |  45 +--
 .../Handlers/ProductTourActivityHandler.cs    | 104 -------
 .../Api/Messages/AdminMessages.cs             |   2 +-
 .../Api/Messages/UserMessages.cs              |   2 -
 .../e2e/tests/product-tour-dashboard.e2e.ts   |   7 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  51 +---
 .../product-tour-activity-popover.svelte      |  23 +-
 ...oduct-tour-activity-popover.svelte.test.ts |   9 +-
 .../components/product-tour-activity.svelte   |   6 +-
 .../product-tour-activity.svelte.test.ts      |  12 +-
 .../features/admin/product-tour-usage.test.ts |  17 +-
 .../lib/features/admin/product-tour-usage.ts  |  16 +-
 .../tours/investigation-detail.svelte         |   9 +-
 .../tours/investigation-detail.svelte.test.ts |   2 +-
 .../tours/investigation-list.svelte.test.ts   |   2 +-
 .../product-tours/actions.svelte.test.ts      |  28 +-
 .../features/product-tours/actions.svelte.ts  |  61 ++--
 .../features/product-tours/activity.test.ts   |  44 +++
 .../lib/features/product-tours/activity.ts    |  16 +
 .../features/product-tours/api.svelte.test.ts |  65 ----
 .../lib/features/product-tours/api.svelte.ts  |  95 ------
 .../product-tour-feature-announcement.svelte  |   3 -
 .../alerts/product-tour-welcome.svelte        |   3 -
 .../product-tour-catalog-dialog.svelte        |   3 -
 ...product-tour-catalog-dialog.svelte.test.ts |   3 +-
 .../components/product-tour-host.svelte       |  19 +-
 .../product-tour-privacy-link.svelte          |   9 -
 .../product-tour-privacy-settings.svelte      |  41 ---
 .../components/product-tour-spotlight.svelte  |   5 -
 .../product-tour-spotlight.svelte.test.ts     |   2 +-
 .../src/lib/features/product-tours/models.ts  |   1 -
 .../features/product-tours/session.test.ts    |   7 +-
 .../src/lib/features/product-tours/session.ts |   9 -
 .../product-tours/state.svelte.test.ts        |  10 +-
 .../features/product-tours/state.svelte.ts    |   9 -
 .../product-tours/user-cache.svelte.test.ts   |  63 +---
 .../ClientApp/src/lib/generated/api.ts        |  42 ---
 .../ClientApp/src/lib/generated/schemas.ts    |  44 ---
 .../routes/(app)/account/manage/+page.svelte  |   2 -
 .../[projectId]/configure/+page.svelte        |   8 -
 .../(app)/system/product-tours/+page.svelte   |  13 +-
 .../Models/Admin/ProductTourUsageResponse.cs  |  11 +-
 .../Models/User/PostProductTourActivity.cs    |  28 --
 .../Models/User/ViewCurrentUser.cs            |   2 -
 .../Api/Data/endpoint-manifest.json           |  28 --
 .../Exceptionless.Tests/Api/Data/openapi.json | 280 +-----------------
 .../AdminProductTourUsageEndpointTests.cs     |  38 ++-
 .../ProductTourActivityEndpointTests.cs       | 255 ----------------
 .../Repositories/EventRepositoryTests.cs      |  77 +++--
 tests/http/admin.http                         |  14 +-
 tests/http/users.http                         |  23 --
 58 files changed, 297 insertions(+), 1483 deletions(-)
 delete mode 100644 src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
 delete mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
 delete mode 100644 src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
 delete mode 100644 tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index 0e58c9eef8..65ef2328f7 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -6,16 +6,6 @@ namespace Exceptionless.Core.Models.Data;
 
 public static class ProductTours
 {
-    public const string StepTagPrefix = "product-tour-step:";
-
-    public static FrozenDictionary<string, string[]> Steps { get; } = new Dictionary<string, string[]>(StringComparer.Ordinal)
-    {
-        [AppOverview] = ["navigation", "command-search", "saved-views", "exie", "help"],
-        [EventInvestigate] = ["filter-errors", "choose-error", "stack-summary", "stack-triage", "event-occurrence", "tab-overview", "filter-stack-events"],
-        [ExieOverview] = ["open-exie", "exie-context"],
-        [ProjectConfigure] = ["organization-name", "project-name", "choose-platform", "sdk-instructions", "wait-for-event", "event-received"],
-        [SavedViewCreate] = ["open-view-menu", "review-settings", "name-view", "private-view", "save-view", "view-created"]
-    }.ToFrozenDictionary(StringComparer.Ordinal);
     public const string AppOverview = "app-overview";
     public const string AppWelcome = "app-welcome";
     public const string ExieAnnouncement = "exie-announcement";
@@ -57,7 +47,6 @@ public static string CreateTelemetrySource(
         ProductTourTelemetryEvent.Dismissed => "dismissed",
         ProductTourTelemetryEvent.Shown => "shown",
         ProductTourTelemetryEvent.Started => "started",
-        ProductTourTelemetryEvent.StepReached => "step-reached",
         _ => throw new ArgumentOutOfRangeException(nameof(telemetryEvent), telemetryEvent, "Unknown product tour telemetry event.")
     };
 
@@ -99,10 +88,7 @@ public enum ProductTourTelemetryEvent
     Shown,
     [JsonStringEnumMemberName("started")]
     [EnumMember(Value = "started")]
-    Started,
-    [JsonStringEnumMemberName("step-reached")]
-    [EnumMember(Value = "step-reached")]
-    StepReached
+    Started
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
diff --git a/src/Exceptionless.Core/Models/User.cs b/src/Exceptionless.Core/Models/User.cs
index f4ba5b6a66..d11525d864 100644
--- a/src/Exceptionless.Core/Models/User.cs
+++ b/src/Exceptionless.Core/Models/User.cs
@@ -27,7 +27,6 @@ public record User : IIdentity, IHaveDates, IValidatableObject
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; init; } = new Collection<UserOrganizationPreference>();
     public ICollection<UserSavedViewOrderPreference> SavedViewOrders { get; init; } = new Collection<UserSavedViewOrderPreference>();
     public IDictionary<string, ProductTourProgress> ProductTours { get; init; } = new Dictionary<string, ProductTourProgress>(StringComparer.Ordinal);
-    public bool ProductTourAnalyticsEnabled { get; set; } = true;
 
     /// <summary>
     /// Gets or sets the users Full Name.
diff --git a/src/Exceptionless.Core/Repositories/EventRepository.cs b/src/Exceptionless.Core/Repositories/EventRepository.cs
index 745eef3da8..2699e9ee10 100644
--- a/src/Exceptionless.Core/Repositories/EventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/EventRepository.cs
@@ -84,7 +84,7 @@ public Task<FindResults<PersistentEvent>> GetByReferenceIdAsync(string projectId
         return FindAsync(q => q.Project(projectId).FieldEquals(e => e.ReferenceId, referenceId).SortDescending(e => e.Date), o => o.PageLimit(10));
     }
 
-    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd, ProductTourUsageInterval? usageInterval = null)
+    public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd)
     {
         ArgumentException.ThrowIfNullOrEmpty(projectId);
         if (utcStart.HasValue && utcEnd <= utcStart)
@@ -97,23 +97,22 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
         string sourceField = InferField(ev => ev.Source);
         string countField = InferField(ev => ev.Count);
         string dateField = InferField(ev => ev.Date);
-        string tagsField = InferField(ev => ev.Tags);
-        int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
-        var interval = usageInterval ?? (utcStart.HasValue && utcEnd <= utcStart.Value.AddMonths(1) ? ProductTourUsageInterval.Day : ProductTourUsageInterval.Month);
-        // Without a bounded date filter the parser defaults to daily buckets, which can be
-        // unbounded on installations with unlimited retention. Preserve monthly history there.
-        if (interval is ProductTourUsageInterval.Auto && !utcStart.HasValue)
-            interval = ProductTourUsageInterval.Month;
-        string proximity = interval switch
+        if (!utcStart.HasValue)
         {
-            ProductTourUsageInterval.Day => "~1d",
-            ProductTourUsageInterval.Month => "~1M",
-            ProductTourUsageInterval.Auto => String.Empty,
-            _ => throw new ArgumentOutOfRangeException(nameof(usageInterval))
-        };
+            DateTime? retainedStart = _options.MaximumRetentionDays > 0
+                ? _timeProvider.GetUtcNow().UtcDateTime.SubtractDays(_options.MaximumRetentionDays)
+                : null;
+            var bounds = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, retainedStart, utcEnd, allSources)
+                .AggregationsExpression($"min:{dateField}"));
+            utcStart = bounds.Aggregations.Min<DateTime>($"min_{dateField}")?.Value;
+            if (!utcStart.HasValue)
+            {
+                return new ProductTourUsageResult([]);
+            }
+        }
 
         var aggregation = await CountAsync(query => ApplyProductTourUsageFilter(query, projectId, utcStart, utcEnd, allSources)
-            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField}{proximity} sum:{countField}~1) terms:({tagsField}~{stepCount} @include:/{ProductTours.StepTagPrefix}.*/ sum:{countField}~1))"));
+            .AggregationsExpression($"terms:({sourceField}~{allSources.Length} sum:{countField}~1 max:{dateField} date:({dateField} sum:{countField}~1))"));
 
         var sourceBuckets = aggregation.Aggregations.Terms<string>($"terms_{sourceField}")?.Buckets ?? [];
         var usage = sourceBuckets
@@ -126,16 +125,10 @@ public async Task<ProductTourUsageResult> GetProductTourUsageAsync(string projec
                         .Where(period => period.Date < utcEnd)
                         .Select(period => new ProductTourUsagePeriod(period.Date, Convert.ToInt64(period.Aggregations.Sum($"sum_{countField}")?.Value ?? period.Total.GetValueOrDefault())))
                         .ToArray())
-                {
-                    Steps = (bucket.Aggregations.Terms<string>($"terms_{tagsField}")?.Buckets ?? [])
-                        .Where(step => step.Key.StartsWith(ProductTours.StepTagPrefix, StringComparison.Ordinal))
-                        .Select(step => new ProductTourStepCount(step.Key[ProductTours.StepTagPrefix.Length..], Convert.ToInt64(step.Aggregations.Sum($"sum_{countField}")?.Value ?? step.Total.GetValueOrDefault())))
-                        .ToArray()
-                }
                 : null)
             .OfType<ProductTourUsageBucket>()
             .ToArray();
-        return new ProductTourUsageResult(usage, interval);
+        return new ProductTourUsageResult(usage);
     }
 
     private static IRepositoryQuery<PersistentEvent> ApplyProductTourUsageFilter(
diff --git a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
index 83dd231a67..03731764c5 100644
--- a/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
+++ b/src/Exceptionless.Core/Repositories/Interfaces/IEventRepository.cs
@@ -13,7 +13,7 @@ public interface IEventRepository : IRepositoryOwnedByOrganizationAndProject<Per
     Task<bool> UpdateSessionStartLastActivityAsync(string id, DateTime lastActivityUtc, bool isSessionEnd = false, bool hasError = false, bool sendNotifications = true);
     Task<long> RemoveAllAsync(string organizationId, string? clientIpAddress, DateTime? utcStart, DateTime? utcEnd, CommandOptionsDescriptor<PersistentEvent>? options = null);
     Task<long> RemoveAllByStackIdsAsync(string[] stackIds);
-    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd, ProductTourUsageInterval? usageInterval = null);
+    Task<ProductTourUsageResult> GetProductTourUsageAsync(string projectId, DateTime? utcStart, DateTime utcEnd);
 }
 
 public static class EventRepositoryExtensions
diff --git a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
index 64fcfec7c8..3d774ed916 100644
--- a/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
+++ b/src/Exceptionless.Core/Repositories/ProductTourUsageResult.cs
@@ -1,33 +1,10 @@
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
 using Exceptionless.Core.Models.Data;
 
 namespace Exceptionless.Core.Repositories;
 
-public sealed record ProductTourUsageResult(
-    IReadOnlyCollection<ProductTourUsageBucket> Buckets,
-    ProductTourUsageInterval Interval);
+public sealed record ProductTourUsageResult(IReadOnlyCollection<ProductTourUsageBucket> Buckets);
 
-[JsonConverter(typeof(JsonStringEnumConverter))]
-public enum ProductTourUsageInterval
-{
-    [JsonStringEnumMemberName("day")]
-    [EnumMember(Value = "day")]
-    Day,
-    [JsonStringEnumMemberName("month")]
-    [EnumMember(Value = "month")]
-    Month,
-    [JsonStringEnumMemberName("auto")]
-    [EnumMember(Value = "auto")]
-    Auto
-}
-
-public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity)
-{
-    public IReadOnlyCollection<ProductTourStepCount> Steps { get; init; } = [];
-}
-
-public sealed record ProductTourStepCount(string Step, long Count);
+public sealed record ProductTourUsageBucket(ProductTourUsageSource Source, long Count, DateTime? LastUtc, IReadOnlyCollection<ProductTourUsagePeriod> Activity);
 
 public sealed record ProductTourUsagePeriod(DateTime DateUtc, long Count);
 
diff --git a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
index 89ce8b593f..ba509c9587 100644
--- a/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/AdminEndpoints.cs
@@ -143,8 +143,7 @@ private static EventSubmissionSettings CreateEventSubmissionSettings(bool? enabl
     private static async Task<HttpIResult> GetProductTourUsageAsync(
         IMediator mediator,
         IMediatorResultMapper<HttpIResult> resultMapper,
-        DateTime? month = null,
-        bool history = false,
-        int? days = null)
-        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(month, history, days))).ToHttpResult(resultMapper);
+        DateTime? start = null,
+        DateTime? end = null)
+        => (await mediator.InvokeAsync<Result<object>>(new GetAdminProductTourUsage(start, end))).ToHttpResult(resultMapper);
 }
diff --git a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
index 63b780afcc..96f0464734 100644
--- a/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
+++ b/src/Exceptionless.Web/Api/Endpoints/UserEndpoints.cs
@@ -59,28 +59,6 @@ public static IEndpointRouteBuilder MapUserEndpoints(this IEndpointRouteBuilder
             }
         });
 
-        group.MapPost("users/me/product-tours/{tourName:maxlength(64)}/activity", async (string tourName, PostProductTourActivity activity, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
-            => (await mediator.InvokeAsync<Result>(new UserMessages.RecordProductTourActivity(tourName, activity))).ToHttpResult(resultMapper))
-            .Accepts<PostProductTourActivity>(false, "application/json")
-            .WithMetadata(new RequestSizeLimitAttribute(2048))
-            .Produces(StatusCodes.Status202Accepted)
-            .Produces(StatusCodes.Status204NoContent)
-            .ProducesProblem(StatusCodes.Status400BadRequest)
-            .ProducesProblem(StatusCodes.Status413PayloadTooLarge)
-            .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
-            .ProducesProblem(StatusCodes.Status404NotFound)
-            .ProducesProblem(StatusCodes.Status429TooManyRequests)
-            .ProducesProblem(StatusCodes.Status503ServiceUnavailable)
-            .WithSummary("Record optional guided-tour activity without identifying context");
-
-        group.MapPut("users/me/product-tour-analytics", async (UpdateProductTourAnalytics settings, IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
-            => (await mediator.InvokeAsync<Result>(new UserMessages.UpdateCurrentUserProductTourAnalytics(settings))).ToHttpResult(resultMapper))
-            .Accepts<UpdateProductTourAnalytics>(false, "application/json")
-            .Produces(StatusCodes.Status204NoContent)
-            .ProducesProblem(StatusCodes.Status400BadRequest)
-            .ProducesProblem(StatusCodes.Status422UnprocessableEntity)
-            .WithSummary("Update current user guided-tour analytics preference");
-
         group.MapGet("users/me/oauth-grants", async (IMediator mediator, IMediatorResultMapper<HttpIResult> resultMapper)
             => (await mediator.InvokeAsync<Result<IReadOnlyCollection<ViewOAuthGrant>>>(new UserMessages.GetCurrentUserOAuthGrants())).ToHttpResult(resultMapper))
         .Produces<IReadOnlyCollection<ViewOAuthGrant>>()
diff --git a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
index 94002b3dcc..6bd8acc8a3 100644
--- a/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
+++ b/src/Exceptionless.Web/Api/Handlers/AdminHandler.cs
@@ -140,38 +140,19 @@ public async Task<Result<object>> Handle(GetAdminAssistantUsage message)
 
     public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
     {
-        if (message.History && message.Month.HasValue)
-            return Result.Invalid(ValidationError.Create("month", "Month cannot be specified when requesting available history."));
-
-        if (message.Days.HasValue && (message.Days is < 1 or > 90 || message.History || message.Month.HasValue))
+        DateTime utcEnd = message.End?.ToUniversalTime() ?? timeProvider.GetUtcNow().UtcDateTime;
+        DateTime? utcStart = message.Start?.ToUniversalTime();
+        if (utcStart.HasValue && utcStart >= utcEnd)
         {
-            return Result.Invalid(ValidationError.Create("days", "Choose 1–90 days without month or history."));
+            return Result.Invalid(ValidationError.Create("start", "Start must be earlier than end."));
         }
 
-        DateTime utcEnd = timeProvider.GetUtcNow().UtcDateTime;
-        DateTime monthStart = (message.Month ?? utcEnd).ToUniversalTime().StartOfMonth();
-        if (monthStart >= DateTime.MaxValue.StartOfMonth())
-            return Result.Invalid(ValidationError.Create("month", "The month must have a representable end date."));
-
-        DateTime? utcStart = message.History
-            ? appOptions.MaximumRetentionDays > 0
-                ? utcEnd.SubtractDays(appOptions.MaximumRetentionDays)
-                : null
-            : monthStart;
-        if (message.Days.HasValue)
-        {
-            utcStart = utcEnd.Date.AddDays(1 - message.Days.Value);
-        }
-        else if (!message.History)
-            utcEnd = monthStart.AddMonths(1);
-
         var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
         var organization = project is { IsDeleted: false }
             ? await organizationRepository.GetByIdAsync(project.OrganizationId, options => options.Cache())
             : null;
         bool collectionAvailable = organization is { IsDeleted: false } && await usageService.GetEventsLeftAsync(organization.Id) > 0;
-        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd,
-            message.History ? ProductTourUsageInterval.Auto : ProductTourUsageInterval.Day);
+        var usage = await eventRepository.GetProductTourUsageAsync(appOptions.InternalProjectId, utcStart, utcEnd);
         var bucketsByTour = usage.Buckets
             .GroupBy(bucket => (bucket.Source.TourName, bucket.Source.Version))
             .ToDictionary(group => group.Key);
@@ -207,26 +188,16 @@ public async Task<Result<object>> Handle(GetAdminProductTourUsage message)
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Started).Sum(period => period.Count),
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Completed).Sum(period => period.Count),
                             group.Where(period => period.Event == ProductTourTelemetryEvent.Dismissed).Sum(period => period.Count)))
-                        .ToArray())
-                {
-                    Steps = buckets.SelectMany(bucket => bucket.Steps.Select(step => (step.Step, step.Count, bucket.Source.Event)))
-                        .GroupBy(step => step.Step, StringComparer.Ordinal)
-                        .OrderBy(group => group.Key, StringComparer.Ordinal)
-                        .Select(group => new ProductTourStepActivity(group.Key,
-                            group.Where(step => step.Event is ProductTourTelemetryEvent.StepReached).Sum(step => step.Count),
-                            group.Where(step => step.Event is ProductTourTelemetryEvent.Dismissed).Sum(step => step.Count)))
-                        .ToArray()
-                };
+                        .ToArray());
             }))
             .OrderBy(tour => tour.Name, StringComparer.Ordinal)
             .ThenBy(tour => tour.Version)
             .ToArray();
 
         return new ProductTourUsageResponse(
-            message.History ? usage.Buckets.SelectMany(bucket => bucket.Activity).Where(period => period.Count > 0).Select(period => (DateTime?)period.DateUtc).Min() : utcStart,
+            !message.Start.HasValue ? usage.Buckets.SelectMany(bucket => bucket.Activity).Where(period => period.Count > 0).Select(period => (DateTime?)period.DateUtc).Min() : utcStart,
             utcEnd,
-            tours,
-            usage.Interval)
+            tours)
         {
             CollectionAvailable = collectionAvailable
         };
diff --git a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs b/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
deleted file mode 100644
index 590e4c2a36..0000000000
--- a/src/Exceptionless.Web/Api/Handlers/ProductTourActivityHandler.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using Exceptionless.Core;
-using Exceptionless.Core.Models;
-using Exceptionless.Core.Models.Data;
-using Exceptionless.Core.Queues.Models;
-using Exceptionless.Core.Repositories;
-using Exceptionless.Core.Services;
-using Exceptionless.Web.Api.Messages;
-using Exceptionless.Web.Extensions;
-using Exceptionless.Web.Models;
-using Foundatio.Mediator;
-using Foundatio.Repositories;
-using Foundatio.Repositories.Models;
-using Foundatio.Serializer;
-
-namespace Exceptionless.Web.Api.Handlers;
-
-public class ProductTourActivityHandler(
-    IUserRepository userRepository,
-    IProjectRepository projectRepository,
-    IOrganizationRepository organizationRepository,
-    UsageService usageService,
-    EventPostService eventPostService,
-    AppOptions appOptions,
-    ISerializer serializer,
-    TimeProvider timeProvider,
-    IHttpContextAccessor httpContextAccessor)
-{
-    private HttpContext HttpContext => httpContextAccessor.HttpContext ?? throw new InvalidOperationException("HttpContext is unavailable.");
-
-    public async Task<Result> Handle(UpdateCurrentUserProductTourAnalytics message)
-    {
-        await userRepository.PatchAsync(HttpContext.Request.GetUser().Id,
-            new PartialPatch(new { product_tour_analytics_enabled = message.Settings.Enabled!.Value }));
-        return Result.NoContent();
-    }
-
-    public async Task<Result> Handle(RecordProductTourActivity message)
-    {
-        var activity = message.Activity;
-        if (!ProductTours.IsValid(message.TourName, activity.Version))
-        {
-            return Result.Invalid(ValidationError.Create("tour_name", "Unknown product tour or unsupported version."));
-        }
-
-        if (activity.Step is not null && (!ProductTours.Steps.TryGetValue(message.TourName, out var steps)
-            || !steps.Contains(activity.Step, StringComparer.Ordinal)))
-        {
-            return Result.Invalid(ValidationError.Create("step", "Unknown product tour step."));
-        }
-
-        if (activity.Action is ProductTourTelemetryEvent.StepReached && activity.Step is null)
-        {
-            return Result.Invalid(ValidationError.Create("step", "A reached step is required."));
-        }
-
-        var user = await userRepository.GetByIdAsync(HttpContext.Request.GetUser().Id, options => options.Cache());
-        if (user is null)
-        {
-            return Result.NotFound("User not found.");
-        }
-
-        if (!user.ProductTourAnalyticsEnabled)
-        {
-            return Result.NoContent();
-        }
-
-        var project = await projectRepository.GetByIdAsync(appOptions.InternalProjectId, options => options.Cache());
-        if (project is null || project.IsDeleted)
-        {
-            return Result.Unavailable("Guided-tour activity storage is unavailable.");
-        }
-
-        var organization = await organizationRepository.GetByIdAsync(project.OrganizationId, options => options.Cache());
-        if (organization is null || organization.IsDeleted || await usageService.GetEventsLeftAsync(organization.Id) < 1)
-        {
-            return Result.Unavailable("Guided-tour activity storage is unavailable.");
-        }
-
-        var ev = new Event
-        {
-            Type = Event.KnownTypes.FeatureUsage,
-            Source = ProductTours.CreateTelemetrySource(activity.Action!.Value, message.TourName, activity.Version, activity.Source!.Value),
-            Date = timeProvider.GetUtcNow()
-        };
-        if (activity.Step is not null)
-        {
-            ev.Tags!.Add(ProductTours.StepTagPrefix + activity.Step);
-        }
-
-        // Do not use the SDK or copy HTTP metadata: these events need no identifying context.
-        using var stream = new MemoryStream(serializer.SerializeToBytes(ev));
-        // Once accepted, this small server-side write must finish even if navigation closes the request.
-        var entry = await eventPostService.EnqueueAsync(new EventPost(appOptions.EnableArchive)
-        {
-            ApiVersion = 2,
-            MediaType = "application/json",
-            ProjectId = project.Id,
-            OrganizationId = project.OrganizationId
-        }, stream);
-        return String.IsNullOrEmpty(entry)
-            ? Result.Unavailable("Guided-tour activity could not be queued.")
-            : Result.Accepted();
-    }
-}
diff --git a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
index 7d37c9948d..9e548dee9d 100644
--- a/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/AdminMessages.cs
@@ -3,7 +3,7 @@ namespace Exceptionless.Web.Api.Messages;
 public record GetAdminSettings;
 public record GetAdminStats;
 public record GetAdminAssistantUsage(DateTime? Month, int Limit, HttpContext Context);
-public record GetAdminProductTourUsage(DateTime? Month, bool History, int? Days = null);
+public record GetAdminProductTourUsage(DateTime? Start, DateTime? End);
 public record GetAdminMigrations;
 public record GetAdminEcho(HttpContext Context);
 public record GetAdminAssemblies;
diff --git a/src/Exceptionless.Web/Api/Messages/UserMessages.cs b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
index 29342159aa..7973ceae86 100644
--- a/src/Exceptionless.Web/Api/Messages/UserMessages.cs
+++ b/src/Exceptionless.Web/Api/Messages/UserMessages.cs
@@ -7,8 +7,6 @@ public record GetCurrentUser;
 public record GetCurrentUserOAuthGrants;
 public record RevokeCurrentUserOAuthGrant(string Id);
 public record UpdateCurrentUserProductTour(string TourName, UpdateProductTourProgress Progress);
-public record RecordProductTourActivity(string TourName, PostProductTourActivity Activity);
-public record UpdateCurrentUserProductTourAnalytics(UpdateProductTourAnalytics Settings);
 public record GetUserById(string Id);
 public record GetUsersByOrganization(string OrganizationId, int Page, int Limit);
 public record UpdateUserMessage(string Id, Delta<UpdateUser> Changes);
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index edae5835c8..557ea69e40 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -45,7 +45,6 @@ test('empty activity stays distinct from an unavailable collector', async ({ e2e
         route.fulfill({
             json: {
                 collection_available: collectionAvailable,
-                interval: 'day',
                 tours: [
                     {
                         activity: [],
@@ -56,7 +55,6 @@ test('empty activity stays distinct from an unavailable collector', async ({ e2e
                         shown: 0,
                         start_sources: [],
                         started: 0,
-                        steps: [],
                         version: 1
                     }
                 ],
@@ -93,7 +91,7 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     }));
     const sum = (key: 'completed' | 'dismissed' | 'shown' | 'started') => activity.reduce((total, day) => total + day[key], 0);
     await page.route('**/api/v2/admin/product-tour-usage*', (route) => {
-        const history = new URL(route.request().url()).searchParams.get('history') === 'true';
+        const history = !new URL(route.request().url()).searchParams.has('start');
         const periods = history
             ? activity.map((period, index) => ({
                   ...period,
@@ -103,7 +101,6 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
         return route.fulfill({
             json: {
                 collection_available: true,
-                interval: history ? 'auto' : 'day',
                 tours: ['app-overview', 'project-configure', 'saved-view-create', 'app-welcome'].map((name) => ({
                     activity: periods,
                     completed: sum('completed'),
@@ -114,7 +111,6 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
                     shown: sum('shown'),
                     start_sources: [{ count: sum('started'), source: 'catalog' }],
                     started: sum('started'),
-                    steps: [{ dismissed: 3, reached: 20, step: 'navigation' }],
                     version: 1
                 })),
                 utc_end: new Date().toISOString(),
@@ -144,7 +140,6 @@ test('synthetic activity charts support keyboard, compact ranges, and light/dark
     await page.keyboard.press('Enter');
     await expect(page.getByRole('dialog', { exact: true, name: 'Explore Exceptionless' })).toBeVisible();
     await expect(page.getByRole('list', { name: 'Guide entry points' })).toContainText('100.0%');
-    await expect(page.getByText('Most common exit: navigation')).toBeVisible();
     await page.keyboard.press('Escape');
     await expect(details).toBeFocused();
     await page.getByRole('button', { name: 'Usage period: Last 30 days' }).click();
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 5165073219..d91faa684e 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -13,13 +13,9 @@ test.describe('first-run welcome', () => {
         ['app-welcome', 'Close welcome'],
         ['exie-announcement', 'Dismiss Exie announcement']
     ] as const) {
-        test(`${tourName} stays dismissed with analytics off and session storage unavailable`, async ({ e2eApi, e2eScenario, page }) => {
+        test(`${tourName} stays dismissed when telemetry and session storage are unavailable`, async ({ e2eApi, e2eScenario, page }) => {
             // Arrange
-            const preference = await page.request.put('/api/v2/users/me/product-tour-analytics', {
-                data: { enabled: false },
-                headers: { Authorization: `Bearer ${e2eScenario.userToken}` }
-            });
-            expect(preference.status()).toBe(204);
+            await page.route('**/api/v2/events', (route) => route.abort());
             if (tourName === 'exie-announcement') {
                 await e2eApi.updateProductTour(e2eScenario.userToken, 'app-welcome', 1, 2);
             }
@@ -53,13 +49,12 @@ test.describe('first-run welcome', () => {
 
             // Assert
             expect(await (await reloadedUser).json()).toMatchObject({
-                product_tour_analytics_enabled: false,
                 product_tours: { [tourName]: { status: 2, version: 1 } }
             });
             await reloadedProjects;
             await expect(page.getByRole('button', { name: 'Search Exceptionless' })).toBeVisible();
             if (tourName === 'app-welcome') {
-                // A different, unseen invitation remains eligible; analytics opt-out is not a hide-all-guides preference.
+                // A different, unseen invitation remains eligible; saved outcomes do not hide unrelated guides.
                 await expect(page.getByRole('button', { name: 'Dismiss Exie announcement' })).toBeVisible();
             }
             await expect(dismiss).toBeHidden();
@@ -488,45 +483,10 @@ async function expectProductTourSession(page: Page, present: boolean): Promise<v
     }
 }
 
-test('privacy opt-out preserves completion and storage denial keeps guides usable', async ({ e2eScenario, page }, testInfo) => {
+test('completion survives unavailable telemetry and session storage', async ({ e2eScenario, page }) => {
     // Arrange
-    const activities: { action: string; step?: string }[] = [];
-    const oversized = await page.request.post('/api/v2/users/me/product-tours/app-overview/activity', {
-        data: JSON.stringify({ action: 'started', source: 'catalog', version: 1 }) + ' '.repeat(2048),
-        headers: { Authorization: `Bearer ${e2eScenario.userToken}`, 'Content-Type': 'application/json' }
-    });
-    expect(oversized.status()).toBe(413);
-    page.on('request', (request) => {
-        if (request.method() === 'POST' && request.url().includes('/product-tours/app-overview/activity')) {
-            activities.push(request.postDataJSON());
-        }
-    });
-    await page.goto('/next/stack');
-    await startTourFromCommand(page, 'Explore Exceptionless');
+    await page.route('**/api/v2/events', (route) => route.abort());
     const tour = page.locator('.driver-popover');
-    await expect(tour.getByText('Your workspace navigation')).toBeVisible();
-    await expect.poll(() => activities.filter((activity) => activity.step === 'navigation')).toHaveLength(1);
-    await tour.getByRole('button', { name: 'Continue' }).click();
-    await expect(tour.getByText('Use the command palette')).toBeVisible();
-    await tour.getByRole('button', { name: 'Back' }).click();
-    await expect(tour.getByText('Your workspace navigation')).toBeVisible();
-    expect(activities.filter((activity) => activity.step === 'navigation')).toHaveLength(1);
-    const dismissed = page.waitForResponse(isSuccessfulTourProgress('app-overview'));
-    await tour.getByRole('button', { name: 'End guide' }).click();
-    await dismissed;
-
-    // Act
-    await page.goto('/next/account/manage#guided-tour-privacy');
-    const preference = page.getByRole('switch', { name: 'Help improve guided tours' });
-    await expect(preference).toBeChecked();
-    const saved = page.waitForResponse((response) => response.url().endsWith('/users/me/product-tour-analytics') && response.status() === 204);
-    await preference.focus();
-    await page.keyboard.press('Space');
-    await saved;
-    await expect(preference).not.toBeChecked();
-    await expect(preference).toBeEnabled();
-    await page.screenshot({ path: testInfo.outputPath('guide-privacy.png') });
-    const before = activities.length;
     await page.addInitScript(() =>
         Object.defineProperty(window, 'sessionStorage', {
             get() {
@@ -547,7 +507,6 @@ test('privacy opt-out preserves completion and storage denial keeps guides usabl
 
     // Assert
     expect(await response.json()).toMatchObject({ status: 1, version: 1 });
-    expect(activities).toHaveLength(before);
     await expect(page.getByRole('dialog', { name: 'Guided Tours' })).toBeVisible();
     expect(e2eScenario.email).toContain('@exceptionless.test');
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
index 3c3f6feaa1..6fa033e16d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
@@ -10,9 +10,6 @@
 
     let { title, tour }: { title: string; tour: ProductTourSummary } = $props();
     const headingId = $props.id();
-    const commonExit = $derived(
-        tour.steps?.filter((step) => step.dismissed > 0).toSorted((a, b) => b.dismissed - a.dismissed || a.step.localeCompare(b.step))[0]
-    );
 </script>
 
 <Popover.Root>
@@ -26,23 +23,7 @@
     <Popover.Content align="start" collisionPadding={16} class="max-h-80 max-w-[calc(100vw-2rem)] overflow-y-auto" role="dialog" aria-labelledby={headingId}>
         <Typography.H3 id={headingId} class="text-sm font-medium">{title}</Typography.H3>
         <Typography.Muted class="text-xs">Activity in the selected period, not unique people.</Typography.Muted>
-        {#if commonExit}
-            <Typography.P class="leading-normal not-first:mt-0"
-                >Most common exit: {commonExit.step.replaceAll('-', ' ')} · <Number value={commonExit.dismissed} /></Typography.P
-            >
-        {/if}
         {#if tour.kind === 'guide'}
-            {#if tour.steps?.length}
-                <section class="flex flex-col gap-1">
-                    <Typography.H4 class="text-sm font-medium">Steps reached · exits</Typography.H4>
-                    <ul class="flex flex-col gap-1" aria-label="Guide steps reached and explicit exits">
-                        {#each tour.steps as step (step.step)}
-                            <li>{step.step.replaceAll('-', ' ')}: <Number value={step.reached} /> reached; <Number value={step.dismissed} /> closed here.</li>
-                        {/each}
-                    </ul>
-                    <Typography.Muted class="text-xs">Exits count explicit closes, not tab closures or navigation.</Typography.Muted>
-                </section>
-            {/if}
             {#if tour.start_sources.length}
                 <section class="flex flex-col gap-1">
                     <Typography.H4 class="text-sm font-medium">Opened from</Typography.H4>
@@ -56,8 +37,8 @@
                     </ul>
                 </section>
             {/if}
-            {#if !tour.steps?.length && !tour.start_sources.length}
-                <Typography.P class="leading-normal not-first:mt-0">No step or entry-point activity recorded in this period.</Typography.P>
+            {#if !tour.start_sources.length}
+                <Typography.P class="leading-normal not-first:mt-0">No entry-point activity recorded in this period.</Typography.P>
             {/if}
         {:else}
             <Typography.P class="leading-normal not-first:mt-0"
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
index 6c5daa14ce..3ce5b3cccb 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
@@ -15,7 +15,6 @@ const tour: ProductTourSummary = {
     shown: 0,
     start_sources: [{ count: 4, source: ProductTourLaunchSource.CommandPalette }],
     started: 4,
-    steps: [{ dismissed: 1, reached: 4, step: 'navigation' }],
     version: 1
 };
 
@@ -32,26 +31,24 @@ describe('ProductTourActivityPopover', () => {
 
         // Assert
         expect(screen.getByRole('dialog', { name: 'Explore Exceptionless' })).toBeTruthy();
-        expect(screen.getByText(/Most common exit: navigation/)).toBeTruthy();
         expect(screen.getByRole('list', { name: 'Guide entry points' }).textContent).toContain('100.0%');
-        expect(screen.getByRole('list', { name: 'Guide steps reached and explicit exits' }).textContent).toContain('4 reached; 1 closed here');
     });
 
     it('explains missing diagnostics without inventing step counts', async () => {
         // Arrange
-        render(ProductTourActivityPopover, { title: 'Explore Exceptionless', tour: { ...tour, start_sources: [], steps: [] } });
+        render(ProductTourActivityPopover, { title: 'Explore Exceptionless', tour: { ...tour, start_sources: [] } });
 
         // Act
         await fireEvent.click(screen.getByRole('button'));
 
         // Assert
-        expect(screen.getByText('No step or entry-point activity recorded in this period.')).toBeTruthy();
+        expect(screen.getByText('No entry-point activity recorded in this period.')).toBeTruthy();
         expect(screen.queryByText(/Most common exit/)).toBeNull();
     });
 
     it('explains invitation acceptance without presenting guide steps', async () => {
         // Arrange
-        render(ProductTourActivityPopover, { title: 'Welcome invitation', tour: { ...tour, kind: ProductTourKind.Prompt, steps: [] } });
+        render(ProductTourActivityPopover, { title: 'Welcome invitation', tour: { ...tour, kind: ProductTourKind.Prompt } });
 
         // Act
         await fireEvent.click(screen.getByRole('button'));
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
index 672ecc7086..b5df938d83 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { ProductTourSummary, ProductTourUsageInterval } from '$generated/api';
+    import type { ProductTourSummary } from '$generated/api';
 
     import Number from '$comp/formatters/number.svelte';
     import * as Typography from '$comp/typography';
@@ -12,7 +12,7 @@
 
     import { getProductTourActivity } from '../product-tour-usage';
 
-    let { end, interval, start, tour }: { end: string; interval: ProductTourUsageInterval; start?: null | string; tour: ProductTourSummary } = $props();
+    let { end, start, tour }: { end: string; start?: null | string; tour: ProductTourSummary } = $props();
     const prompt = $derived(tour.kind === 'prompt');
     const keyboardHelpId = $props.id();
     const data = $derived(getProductTourActivity(tour.activity ?? [], start, end));
@@ -106,7 +106,7 @@
             class="focus-visible:outline-ring h-48 w-full rounded-sm focus-visible:outline focus-visible:outline-2"
             role="slider"
             tabindex={0}
-            aria-label={`${interval === 'day' ? 'Daily' : interval === 'month' ? 'Monthly' : 'Recorded'} ${prompt ? 'invitation' : 'guide'} activity.`}
+            aria-label={`Recorded ${prompt ? 'invitation' : 'guide'} activity.`}
             aria-describedby={keyboardHelpId}
             aria-valuemin={0}
             aria-valuemax={Math.max(0, data.length - 1)}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
index 66220ea5dd..2eac420cf1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity.svelte.test.ts
@@ -1,7 +1,7 @@
 import type { ProductTourSummary } from '$generated/api';
 
 import { formatDateLabel } from '$features/shared/dates';
-import { ProductTourKind, ProductTourLaunchSource, ProductTourUsageInterval } from '$generated/api';
+import { ProductTourKind, ProductTourLaunchSource } from '$generated/api';
 import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
@@ -16,7 +16,6 @@ const tour: ProductTourSummary = {
     shown: 0,
     start_sources: [{ count: 1, source: ProductTourLaunchSource.CommandPalette }],
     started: 1,
-    steps: [],
     version: 1
 };
 
@@ -43,7 +42,6 @@ describe('ProductTourActivity', () => {
         // Arrange
         render(ProductTourActivity, {
             end: '2026-01-03T00:00:00Z',
-            interval: ProductTourUsageInterval.Day,
             start: '2026-01-01T00:00:00Z',
             tour: { ...tour, activity: [...tour.activity, { completed: 0, date_utc: '2026-01-02T00:00:00Z', dismissed: 0, shown: 0, started: 0 }] }
         });
@@ -62,7 +60,7 @@ describe('ProductTourActivity', () => {
 
     it('labels invitation acceptance without a redundant started series', () => {
         // Act
-        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, tour: { ...tour, kind: ProductTourKind.Prompt } });
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', tour: { ...tour, kind: ProductTourKind.Prompt } });
 
         // Assert
         expect(screen.getByLabelText('Period totals').textContent).toContain('Accepted');
@@ -70,10 +68,10 @@ describe('ProductTourActivity', () => {
     });
     it('shows the chart without disclosures while preserving screen-reader access to values', () => {
         // Act
-        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, start: '2026-01-01T00:00:00Z', tour });
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', start: '2026-01-01T00:00:00Z', tour });
 
         // Assert
-        expect(screen.getByLabelText(/Monthly guide activity/)).toBeTruthy();
+        expect(screen.getByLabelText(/Recorded guide activity/)).toBeTruthy();
         expect(screen.queryByText('View details')).toBeNull();
         const table = screen.getByRole('table', { name: 'Guide activity by date' });
         expect(table.closest('.sr-only')).not.toBeNull();
@@ -88,7 +86,7 @@ describe('ProductTourActivity', () => {
         const empty = { ...tour, activity: [], completed: 0, start_sources: [], started: 0 };
 
         // Act
-        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', interval: ProductTourUsageInterval.Month, tour: empty });
+        render(ProductTourActivity, { end: '2026-02-01T00:00:00Z', tour: empty });
 
         // Assert
         expect(screen.getByText('No recorded activity in this period.')).toBeTruthy();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
index ec1c910529..b9528b32c2 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.test.ts
@@ -4,9 +4,9 @@ import { getProductTourActivity, getProductTourUsageParams } from './product-tou
 
 describe('product tour usage helpers', () => {
     it('maps each immutable range to the API query parameters', () => {
-        expect(getProductTourUsageParams({ kind: 'month', month: '2026-08' })).toEqual({ month: '2026-08-01' });
-        expect(getProductTourUsageParams({ kind: 'history' })).toEqual({ history: true });
-        expect(getProductTourUsageParams({ days: 30, kind: 'days' })).toEqual({ days: 30 });
+        expect(getProductTourUsageParams({ kind: 'month', month: '2026-08' })).toEqual({ end: '2026-09-01T00:00:00.000Z', start: '2026-08-01T00:00:00.000Z' });
+        expect(getProductTourUsageParams({ kind: 'history' })).toEqual({});
+        expect(getProductTourUsageParams({ days: 30, kind: 'days' }, new Date('2026-03-02T12:00:00Z'))).toEqual({ start: '2026-02-01T00:00:00.000Z' });
     });
 
     it('preserves exact server buckets across a month boundary, including empty and subdaily periods', () => {
@@ -56,6 +56,17 @@ describe('product tour usage helpers', () => {
         expect(data[0]?.started).toBe(5);
     });
 
+    it('keeps activity in a histogram bucket that begins before the requested start', () => {
+        // Arrange
+        const activity = [{ completed: 0, date_utc: '2026-08-03T00:00:00Z', dismissed: 0, shown: 0, started: 1 }];
+
+        // Act
+        const data = getProductTourActivity(activity, '2026-08-03T01:00:00Z', '2026-08-04T00:00:00Z', new Date('2026-08-05T00:00:00Z'));
+
+        // Assert
+        expect(data[0]?.started).toBe(1);
+    });
+
     it('does not invent a start date for empty unlimited history', () => {
         expect(getProductTourActivity([], null, '2026-04-01T00:00:00Z')).toEqual([]);
     });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
index f466fa7b78..dcd334e0d1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/product-tour-usage.ts
@@ -23,16 +23,22 @@ export function getProductTourActivity(
     const startDate = start ? new Date(start) : undefined;
     return activity
         .map((period) => ({ ...period, date: new Date(period.date_utc) }))
-        .filter((period) => (!startDate || period.date >= startDate) && period.date < endDate);
+        .filter(
+            (period) =>
+                (!startDate || period.date >= startDate || period.shown + period.started + period.completed + period.dismissed > 0) && period.date < endDate
+        );
 }
 
-export function getProductTourUsageParams(range: ProductTourUsageRange): Record<string, boolean | number | string> {
+export function getProductTourUsageParams(range: ProductTourUsageRange, now = new Date()): Record<string, string> {
     if (range.kind === 'days') {
-        return { days: range.days };
+        const start = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 1 - range.days));
+        return { start: start.toISOString() };
     }
     if (range.kind === 'history') {
-        return { history: true };
+        return {};
     }
 
-    return { month: `${range.month}-01` };
+    const start = new Date(`${range.month}-01T00:00:00Z`);
+    const end = new Date(Date.UTC(start.getUTCFullYear(), start.getUTCMonth() + 1));
+    return { end: end.toISOString(), start: start.toISOString() };
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
index 157643d0d8..4b3837f281 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte
@@ -16,6 +16,7 @@
     let advancedEventId = $state('');
 
     const actions = createProductTourActions();
+    const firstDetailCheckpoint = 'stack-summary';
     const checkpoint = $derived(productTourCheckpoint.current?.tourName === 'event-investigate' ? productTourCheckpoint.current : undefined);
     const steps = PRODUCT_TOUR_CHECKPOINTS['event-investigate'];
     const stepIndex = $derived(checkpoint ? steps.indexOf(checkpoint.checkpointName) : -1);
@@ -33,7 +34,7 @@
                     target: '[data-tour="stack-events"]',
                     title: 'Compare every occurrence'
                 };
-            case 'stack-summary':
+            case firstDetailCheckpoint:
                 return {
                     description: 'A stack groups similar events. Check its event count and users affected.',
                     target: '[data-tour="stack-metrics"]',
@@ -64,7 +65,7 @@
         advancedEventId = event.id;
         const active = checkpoint;
         if (active?.checkpointName === 'choose-error' && hasErrorOrSimpleError(event)) {
-            productTourCheckpoint.advance(active, 'stack-summary');
+            productTourCheckpoint.advance(active, firstDetailCheckpoint);
         }
     });
 
@@ -84,7 +85,7 @@
 
     function back(): void {
         const previous = steps[stepIndex - 1];
-        if (checkpoint && previous && stepIndex > steps.indexOf('stack-summary')) {
+        if (checkpoint && previous && stepIndex > steps.indexOf(firstDetailCheckpoint)) {
             productTourCheckpoint.advance(checkpoint, previous);
         }
     }
@@ -97,7 +98,7 @@
             continueLabel={checkpoint.checkpointName === 'filter-stack-events' ? 'Finish guide' : 'Continue'}
             description={copy.description}
             onNext={continueTour}
-            onPrevious={stepIndex > steps.indexOf('stack-summary') ? back : undefined}
+            onPrevious={stepIndex > steps.indexOf(firstDetailCheckpoint) ? back : undefined}
             onDismiss={actions.dismiss}
             target={copy.target}
             title={copy.title}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
index ffe6357086..6ff6daa76d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-detail.svelte.test.ts
@@ -8,7 +8,7 @@ import InvestigationDetailTour from './investigation-detail.svelte';
 
 const actions = vi.hoisted(() => ({ complete: vi.fn(), dismiss: vi.fn() }));
 vi.mock('$features/product-tours/actions.svelte', () => ({ createProductTourActions: () => actions }));
-vi.mock('$features/product-tours/api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
+vi.mock('$features/product-tours/activity', () => ({ submitProductTourActivity: vi.fn() }));
 
 const event: PersistentEvent = {
     created_utc: '2026-09-01T00:00:00Z',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
index f4776aa6e9..e10c377d3e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/tours/investigation-list.svelte.test.ts
@@ -3,7 +3,7 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/svelte';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import InvestigationListTour from './investigation-list.svelte';
-vi.mock('$features/product-tours/api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
+vi.mock('$features/product-tours/activity', () => ({ submitProductTourActivity: vi.fn() }));
 
 vi.mock('$features/product-tours/actions.svelte', () => ({
     createProductTourActions: () => ({ dismiss: vi.fn() })
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
index d5ab6e93fa..f243bd8bb1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
@@ -10,7 +10,7 @@ const mocks = vi.hoisted(() => ({
     submitFeatureUsage: vi.fn(),
     success: vi.fn()
 }));
-vi.mock('./api.svelte', () => ({ createProductTourActivity: () => mocks.submitFeatureUsage }));
+vi.mock('./activity', () => ({ submitProductTourActivity: mocks.submitFeatureUsage }));
 vi.mock('$features/users/api.svelte', () => ({ putCurrentUserProductTour: () => ({ mutateAsync: mocks.mutateAsync }) }));
 vi.mock('./controls.svelte', () => ({ tryUseProductTourControls: () => ({ openCatalog: mocks.openCatalog }) }));
 vi.mock('svelte-sonner', () => ({ toast: { error: mocks.error, success: mocks.success } }));
@@ -107,9 +107,7 @@ describe('product tour completion', () => {
         const actions = createProductTourActions();
 
         // Act
-        actions.completeAfterDomainSuccess(checkpoint);
-        actions.completeAfterDomainSuccess(checkpoint);
-        await vi.waitFor(() => expect(productTourCheckpoint.current).toBeUndefined());
+        await Promise.all([actions.completeAfterDomainSuccess(checkpoint), actions.completeAfterDomainSuccess(checkpoint)]);
 
         // Assert
         expect(mocks.mutateAsync).toHaveBeenCalledOnce();
@@ -121,13 +119,33 @@ describe('product tour completion', () => {
         );
     });
 
+    it('does not submit a second outcome while progress is being saved', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('app-overview', 'help', 'catalog', 'user', 1);
+        const pending = Promise.withResolvers<void>();
+        mocks.mutateAsync.mockReturnValue(pending.promise);
+        const actions = createProductTourActions();
+
+        // Act
+        const completion = actions.complete(checkpoint);
+        const dismissed = await actions.dismiss(checkpoint);
+        pending.resolve();
+        const completed = await completion;
+
+        // Assert
+        expect(dismissed).toBe(false);
+        expect(completed).toBe(true);
+        expect(mocks.mutateAsync).toHaveBeenCalledOnce();
+        expect(mocks.submitFeatureUsage).toHaveBeenCalledExactlyOnceWith('completed', 'app-overview', 1, 'catalog');
+    });
+
     it('preserves a domain-success checkpoint for retry when progress saving fails', async () => {
         // Arrange
         const checkpoint = productTourCheckpoint.start('project-configure', 'event-received', 'catalog', 'user', 1);
         mocks.mutateAsync.mockRejectedValueOnce(new Error('Unavailable'));
 
         // Act
-        createProductTourActions().completeAfterDomainSuccess(checkpoint);
+        await createProductTourActions().completeAfterDomainSuccess(checkpoint);
         await vi.waitFor(() => expect(mocks.error).toHaveBeenCalledOnce());
 
         // Assert
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 3adbd510c9..91ce3e6466 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -4,7 +4,7 @@ import { toast } from 'svelte-sonner';
 
 import type { ProductTourCheckpoint } from './models';
 
-import { createProductTourActivity } from './api.svelte';
+import { submitProductTourActivity } from './activity';
 import { tryUseProductTourControls } from './controls.svelte';
 import { productTourCheckpoint } from './state.svelte';
 
@@ -15,60 +15,34 @@ const COMPLETION_MESSAGES: Record<Exclude<ProductTourCheckpoint['tourName'], 'ap
     'saved-view-create': 'Your saved view is ready'
 };
 
-const domainCompletionRequests = new WeakSet<ProductTourCheckpoint>();
+const progressRequests = new WeakSet<ProductTourCheckpoint>();
 
 export function createProductTourActions() {
     const controls = tryUseProductTourControls();
     const progressMutation = putCurrentUserProductTour();
-    const track = createProductTourActivity();
 
     async function complete(checkpoint: ProductTourCheckpoint): Promise<boolean> {
-        if (productTourCheckpoint.markReached(checkpoint)) {
-            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
-        }
-        return finish(checkpoint, ProductTourStatus.Completed);
+        return await finish(checkpoint, ProductTourStatus.Completed);
     }
 
     async function dismiss(checkpoint: ProductTourCheckpoint): Promise<boolean> {
-        return finish(checkpoint, ProductTourStatus.Dismissed);
+        return await finish(checkpoint, ProductTourStatus.Dismissed);
     }
 
-    function completeAfterDomainSuccess(checkpoint: ProductTourCheckpoint): void {
-        if (productTourCheckpoint.current !== checkpoint || domainCompletionRequests.has(checkpoint)) {
-            return;
-        }
-
-        domainCompletionRequests.add(checkpoint);
-        if (productTourCheckpoint.markReached(checkpoint)) {
-            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
-        }
-        void progressMutation
-            .mutateAsync({
-                progress: {
-                    status: ProductTourStatus.Completed,
-                    version: checkpoint.version
-                },
-                tourName: checkpoint.tourName
-            })
-            .then(() => {
-                if (productTourCheckpoint.clear(checkpoint)) {
-                    void track('completed', checkpoint.tourName, checkpoint.version, checkpoint.source);
-                    showCompletion(checkpoint);
-                }
-            })
-            .catch(() => {
-                toast.error('Setup succeeded, but guided-tour progress could not be saved.');
-            })
-            .finally(() => {
-                domainCompletionRequests.delete(checkpoint);
-            });
+    async function completeAfterDomainSuccess(checkpoint: ProductTourCheckpoint): Promise<void> {
+        await finish(checkpoint, ProductTourStatus.Completed, 'Setup succeeded, but guided-tour progress could not be saved.');
     }
 
-    async function finish(checkpoint: ProductTourCheckpoint, status: ProductTourStatus): Promise<boolean> {
-        if (productTourCheckpoint.current !== checkpoint) {
+    async function finish(
+        checkpoint: ProductTourCheckpoint,
+        status: ProductTourStatus,
+        errorMessage = 'We could not save your guided-tour progress. Please try again.'
+    ): Promise<boolean> {
+        if (productTourCheckpoint.current !== checkpoint || progressRequests.has(checkpoint)) {
             return false;
         }
 
+        progressRequests.add(checkpoint);
         try {
             await progressMutation.mutateAsync({
                 progress: {
@@ -78,19 +52,20 @@ export function createProductTourActions() {
                 tourName: checkpoint.tourName
             });
         } catch {
-            toast.error('We could not save your guided-tour progress. Please try again.');
+            toast.error(errorMessage);
             return false;
+        } finally {
+            progressRequests.delete(checkpoint);
         }
 
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        void track(
+        await submitProductTourActivity(
             status === ProductTourStatus.Completed ? 'completed' : 'dismissed',
             checkpoint.tourName,
             checkpoint.version,
-            checkpoint.source,
-            checkpoint.checkpointName
+            checkpoint.source
         );
         if (status === ProductTourStatus.Completed) {
             showCompletion(checkpoint);
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.test.ts
new file mode 100644
index 0000000000..e5196056a1
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.test.ts
@@ -0,0 +1,44 @@
+import { ExceptionlessClient } from '@exceptionless/browser';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { submitProductTourActivity } from './activity';
+
+const submitFeatureUsage = vi.hoisted(() => vi.fn());
+vi.mock('$features/auth/exceptionless-session', () => ({ submitFeatureUsage }));
+
+describe('product-tour activity', () => {
+    beforeEach(() => vi.resetAllMocks());
+
+    it.each(['started', 'completed', 'dismissed', 'shown'] as const)('uses the existing feature-usage pipeline for %s', async (action) => {
+        // Act
+        await submitProductTourActivity(action, 'app-overview', 1, 'catalog');
+
+        // Assert
+        expect(submitFeatureUsage).toHaveBeenCalledExactlyOnceWith(`product-tour.${action}.app-overview.v1.catalog`);
+    });
+
+    it('does not propagate telemetry failures into guide navigation', async () => {
+        // Arrange
+        submitFeatureUsage.mockRejectedValue(new Error('Unavailable'));
+
+        // Act & Assert
+        await expect(submitProductTourActivity('completed', 'app-overview', 1, 'catalog')).resolves.toBeUndefined();
+    });
+
+    it.each(['', 'synthetic-local-test-key'])('honors the existing SDK configuration (key: %s)', async (apiKey) => {
+        // Arrange
+        const client = new ExceptionlessClient();
+        client.config.apiKey = apiKey;
+        const enqueue = vi.spyOn(client.config.services.queue, 'enqueue').mockResolvedValue(undefined);
+        submitFeatureUsage.mockImplementation((feature: string) => client.submitFeatureUsage(feature));
+
+        // Act
+        await submitProductTourActivity('started', 'app-overview', 1, 'catalog');
+
+        // Assert
+        expect(enqueue).toHaveBeenCalledTimes(apiKey ? 1 : 0);
+        if (apiKey) {
+            expect(enqueue).toHaveBeenCalledWith(expect.objectContaining({ source: 'product-tour.started.app-overview.v1.catalog', type: 'usage' }));
+        }
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.ts
new file mode 100644
index 0000000000..b77ae14d71
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/activity.ts
@@ -0,0 +1,16 @@
+import { submitFeatureUsage } from '$features/auth/exceptionless-session';
+
+import type { ProductTourKey, ProductTourLaunchSource } from './models';
+
+export async function submitProductTourActivity(
+    action: 'completed' | 'dismissed' | 'shown' | 'started',
+    name: ProductTourKey,
+    version: number,
+    source: ProductTourLaunchSource
+): Promise<void> {
+    try {
+        await submitFeatureUsage(`product-tour.${action}.${name}.v${version}.${source}`);
+    } catch {
+        // Telemetry must not prevent navigation or saving functional guide progress.
+    }
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
deleted file mode 100644
index 224f6bc829..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { createProductTourActivity } from './api.svelte';
-
-const mocks = vi.hoisted(() => ({ getQueryData: vi.fn(), postJSON: vi.fn() }));
-vi.mock('$features/users/api.svelte', () => ({ queryKeys: { me: () => ['User', 'me'] } }));
-vi.mock('@foundatiofx/fetchclient', () => ({ useFetchClient: () => ({ postJSON: mocks.postJSON }) }));
-vi.mock('@tanstack/svelte-query', () => ({
-    createMutation: (options: () => { mutationFn: (data: unknown) => Promise<void> }) => ({ mutateAsync: (data: unknown) => options().mutationFn(data) }),
-    useQueryClient: () => ({ getQueryData: mocks.getQueryData })
-}));
-
-describe('optional product-tour activity', () => {
-    beforeEach(() => vi.resetAllMocks());
-
-    it('submits only the bounded activity contract without a browser telemetry key', async () => {
-        // Arrange
-        mocks.getQueryData.mockReturnValue({ email_address: 'private@example.test', product_tour_analytics_enabled: true });
-
-        // Act
-        await createProductTourActivity()('step-reached', 'app-overview', 1, 'catalog', 'navigation');
-
-        // Assert
-        expect(mocks.postJSON).toHaveBeenCalledExactlyOnceWith('users/me/product-tours/app-overview/activity', {
-            action: 'step-reached',
-            source: 'catalog',
-            step: 'navigation',
-            version: 1
-        });
-    });
-
-    it.each([undefined, { product_tour_analytics_enabled: false }])('does not submit without an enabled preference: %j', async (user) => {
-        // Arrange
-        mocks.getQueryData.mockReturnValue(user);
-
-        // Act
-        await createProductTourActivity()('completed', 'app-overview', 1, 'catalog');
-
-        // Assert
-        expect(mocks.postJSON).not.toHaveBeenCalled();
-    });
-
-    it('checks the latest preference instead of capturing it at guide start', async () => {
-        // Arrange
-        const track = createProductTourActivity();
-        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: true });
-        await track('started', 'app-overview', 1, 'catalog');
-        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: false });
-
-        // Act
-        await track('completed', 'app-overview', 1, 'catalog');
-
-        // Assert
-        expect(mocks.postJSON).toHaveBeenCalledTimes(1);
-    });
-
-    it('does not interrupt a guide when collection fails', async () => {
-        // Arrange
-        mocks.getQueryData.mockReturnValue({ product_tour_analytics_enabled: true });
-        mocks.postJSON.mockRejectedValue(new Error('Unavailable'));
-
-        // Act & Assert
-        await expect(createProductTourActivity()('completed', 'app-overview', 1, 'catalog')).resolves.toBeUndefined();
-    });
-});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
deleted file mode 100644
index 8ad5bf8db7..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/api.svelte.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import type { PostProductTourActivity, ViewCurrentUser } from '$generated/api';
-
-import { queryKeys as userQueryKeys } from '$features/users/api.svelte';
-import { ProblemDetails, useFetchClient } from '@foundatiofx/fetchclient';
-import { createMutation, useQueryClient } from '@tanstack/svelte-query';
-
-import type { ProductTourKey, ProductTourLaunchSource } from './models';
-
-export function createProductTourActivity() {
-    const queryClient = useQueryClient();
-    const client = useFetchClient();
-    const activity = createMutation(() => ({
-        mutationFn: async ({
-            name,
-            ...activity
-        }: {
-            action: `${NonNullable<PostProductTourActivity['action']>}`;
-            name: ProductTourKey;
-            source: ProductTourLaunchSource;
-            step?: string;
-            version: number;
-        }) => {
-            if (queryClient.getQueryData<ViewCurrentUser>(userQueryKeys.me())?.product_tour_analytics_enabled !== true) {
-                return;
-            }
-            await client.postJSON(`users/me/product-tours/${name}/activity`, activity);
-        },
-        mutationKey: ['product-tours', 'activity'],
-        retry: false
-    }));
-
-    return async (
-        action: `${NonNullable<PostProductTourActivity['action']>}`,
-        name: ProductTourKey,
-        version: number,
-        source: ProductTourLaunchSource,
-        step?: string
-    ): Promise<void> => {
-        try {
-            await activity.mutateAsync({
-                action,
-                name,
-                source,
-                step,
-                version
-            });
-        } catch {
-            // Optional analytics must not interrupt the guide or expose request context through the telemetry SDK.
-        }
-    };
-}
-
-export function putProductTourAnalytics() {
-    const queryClient = useQueryClient();
-    const client = useFetchClient();
-    return createMutation<void, ProblemDetails, boolean, { previous: undefined | ViewCurrentUser }>(() => ({
-        mutationFn: async (enabled) => {
-            await client.putJSON('users/me/product-tour-analytics', {
-                enabled
-            });
-        },
-        mutationKey: ['product-tours', 'analytics'],
-        onError: (_error, _enabled, context) => {
-            const previous = context?.previous;
-            if (previous) {
-                queryClient.setQueryData<ViewCurrentUser>(userQueryKeys.me(), (user) => {
-                    if (!user || user.id !== previous.id) {
-                        return user;
-                    }
-                    return {
-                        ...user,
-                        product_tour_analytics_enabled: previous.product_tour_analytics_enabled
-                    };
-                });
-            }
-        },
-        onMutate: async (enabled) => {
-            await queryClient.cancelQueries({
-                queryKey: userQueryKeys.me()
-            });
-            const previous = queryClient.getQueryData<ViewCurrentUser>(userQueryKeys.me());
-            queryClient.setQueryData<ViewCurrentUser>(
-                userQueryKeys.me(),
-                (user) =>
-                    user && {
-                        ...user,
-                        product_tour_analytics_enabled: enabled
-                    }
-            );
-            return {
-                previous
-            };
-        }
-    }));
-}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
index 9a1bcaa486..63412e4ac6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-feature-announcement.svelte
@@ -5,8 +5,6 @@
     import Sparkles from '@lucide/svelte/icons/sparkles';
     import X from '@lucide/svelte/icons/x';
 
-    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
-
     interface Props {
         busy?: boolean;
         hasAccess: boolean;
@@ -43,7 +41,6 @@
                 <Button disabled={busy} onclick={onStart} size="sm">{hasAccess ? 'See how it works' : 'View access options'}</Button>
                 <Button disabled={busy} onclick={onDismiss} size="sm" variant="outline">Dismiss</Button>
             </div>
-            <ProductTourPrivacyLink />
         </div>
     </Alert.Root>
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
index 6f766bfdaf..14ceb4d61d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte
@@ -6,8 +6,6 @@
 
     import type { ProductTourListItem } from '../../models';
 
-    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
-
     interface Props {
         busy?: boolean;
         onBrowse: () => Promise<void>;
@@ -47,6 +45,5 @@
             <Button disabled={busy} onclick={onStart} size="sm">{recommended.name === 'project-configure' ? 'Continue setup' : recommended.title}</Button>
             <Button disabled={busy} onclick={onBrowse} size="sm" variant="ghost">Browse guides</Button>
         </div>
-        <ProductTourPrivacyLink />
     </Alert.Root>
 {/if}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
index 236802ec21..e41c74e9ae 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte
@@ -12,8 +12,6 @@
 
     import type { ProductTourListItem, ProductTourName } from '../../models';
 
-    import ProductTourPrivacyLink from '../product-tour-privacy-link.svelte';
-
     interface Props {
         activeTourName?: ProductTourName;
         items: ProductTourListItem[];
@@ -76,6 +74,5 @@
                 </li>
             {/each}
         </ul>
-        <ProductTourPrivacyLink />
     </Dialog.Content>
 </Dialog.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
index d627322bc0..9c9e562d7d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/dialogs/product-tour-catalog-dialog.svelte.test.ts
@@ -67,8 +67,7 @@ describe('ProductTourCatalogDialog', () => {
         for (const item of items) {
             expect(screen.getByText(item.description)).toBeTruthy();
         }
-        expect(screen.getByRole('link', { name: 'Usage settings' }).getAttribute('href')).toContain('/account/manage#guided-tour-privacy');
-        expect(screen.queryAllByRole('link')).toHaveLength(1);
+        expect(screen.queryAllByRole('link')).toHaveLength(0);
         expect(screen.queryByText(/\d+ steps/)).toBeNull();
         expect(onStart).not.toHaveBeenCalled();
     });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index 0e0c13e701..b9c0864853 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -15,7 +15,7 @@
     import type { ProductTourCheckpoint, ProductTourContext, ProductTourLaunchSource, ProductTourListItem, ProductTourName } from '../models';
 
     import { createProductTourActions } from '../actions.svelte';
-    import { createProductTourActivity } from '../api.svelte';
+    import { submitProductTourActivity } from '../activity';
     import { getProductTourItems, getRecommendedProductTourName } from '../catalog';
     import { shouldOfferProductTourInvitation } from '../eligibility';
     import { productTourCheckpoint } from '../state.svelte';
@@ -75,7 +75,6 @@
     let attemptedProjectCompletion: ProductTourCheckpoint | undefined;
 
     const actions = createProductTourActions();
-    const track = createProductTourActivity();
     const progressMutation = putCurrentUserProductTour();
     const projectsQuery = getOrganizationProjectsQuery({
         route: {
@@ -231,7 +230,7 @@
         const impression = `${currentUser.id}:${WELCOME_VERSION}`;
         if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
             lastTrackedWelcomeImpression = impression;
-            void track('shown', 'app-welcome', WELCOME_VERSION, 'welcome');
+            void submitProductTourActivity('shown', 'app-welcome', WELCOME_VERSION, 'welcome');
         }
     });
 
@@ -243,7 +242,7 @@
         const impression = `${currentUser.id}:${EXIE_ANNOUNCEMENT_VERSION}`;
         if (exieAnnouncementOpen && lastTrackedAnnouncementImpression !== impression) {
             lastTrackedAnnouncementImpression = impression;
-            void track('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+            void submitProductTourActivity('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         }
     });
 
@@ -286,7 +285,7 @@
             search: window.location.search
         });
         const next = productTourCheckpoint.start(name, start.checkpointName, source, currentUser.id, item.version, organizationId);
-        void track('started', name, item.version, source);
+        await submitProductTourActivity('started', name, item.version, source);
 
         const destination = start.route;
         if (`${pathname}${window.location.search}` !== destination) {
@@ -323,7 +322,7 @@
         }
         welcomeHandled = true;
         automaticSurface = undefined;
-        void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        await submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         await startTour(recommended.name, 'welcome');
     }
 
@@ -333,7 +332,7 @@
         }
         welcomeHandled = true;
         automaticSurface = undefined;
-        void track('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        await submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         await openCatalog('catalog');
     }
 
@@ -343,7 +342,7 @@
         }
         welcomeHandled = true;
         automaticSurface = undefined;
-        void track('dismissed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        await submitProductTourActivity('dismissed', 'app-welcome', WELCOME_VERSION, 'welcome');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
@@ -351,7 +350,7 @@
             return;
         }
         automaticSurface = undefined;
-        void track('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await submitProductTourActivity('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         if (assistantAccess?.has_access) {
             await startTour('exie-overview', 'feature-announcement');
         } else {
@@ -364,7 +363,7 @@
             return;
         }
         automaticSurface = undefined;
-        void track('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        await submitProductTourActivity('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
     }
 
     function getItem<Name extends ProductTourName>(name: Name): ProductTourListItem<Name> {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
deleted file mode 100644
index 74b47bfbb5..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-link.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script lang="ts">
-    import { resolve } from '$app/paths';
-    import { A, Muted } from '$comp/typography';
-</script>
-
-<Muted class="text-xs">
-    Optional guide usage helps us improve guided tours.
-    <A href={`${resolve('/(app)/account/manage')}#guided-tour-privacy`}>Usage settings</A>
-</Muted>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
deleted file mode 100644
index 5ba1012d97..0000000000
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-privacy-settings.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts">
-    import * as Field from '$comp/ui/field';
-    import { Switch } from '$comp/ui/switch';
-    import { getMeQuery } from '$features/users/api.svelte';
-    import { toast } from 'svelte-sonner';
-
-    import { putProductTourAnalytics } from '../api.svelte';
-
-    const meQuery = getMeQuery();
-    const preference = putProductTourAnalytics();
-
-    async function update(enabled: boolean): Promise<void> {
-        try {
-            await preference.mutateAsync(enabled);
-            toast.success('Guide usage preference saved.');
-        } catch {
-            toast.error('Could not save your guide usage preference. Please try again.');
-        }
-    }
-</script>
-
-<section id="guided-tour-privacy" aria-label="Guided-tour privacy">
-    <Field.FieldGroup>
-        <Field.Field orientation="horizontal" data-disabled={preference.isPending || !meQuery.data}>
-            <Field.FieldContent>
-                <Field.Label for="product-tour-analytics">Help improve guided tours</Field.Label>
-                <Field.FieldDescription id="product-tour-analytics-description">
-                    Share guide starts, steps reached, completions, and dismissals to help us improve guided tours. Completed and dismissed guides are still
-                    remembered when this is off; it does not change which invitations you see. Previously shared activity is not deleted.
-                </Field.FieldDescription>
-            </Field.FieldContent>
-            <Switch
-                id="product-tour-analytics"
-                aria-describedby="product-tour-analytics-description"
-                checked={meQuery.data?.product_tour_analytics_enabled ?? false}
-                disabled={preference.isPending || !meQuery.data}
-                onCheckedChange={update}
-            />
-        </Field.Field>
-    </Field.FieldGroup>
-</section>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
index dfa68d0084..e7455cf1b9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte
@@ -5,7 +5,6 @@
 
     import type { ProductTourCheckpoint, ProductTourShortcut } from '../models';
 
-    import { createProductTourActivity } from '../api.svelte';
     import { PRODUCT_TOUR_CHECKPOINTS } from '../models';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourDescription from './product-tour-description.svelte';
@@ -43,7 +42,6 @@
         title
     }: Props = $props();
     let activeDriver: Driver | undefined;
-    const track = createProductTourActivity();
     let descriptionContent: ReturnType<typeof mount> | undefined;
     let dismissing = false;
     let returnFocus: HTMLElement | null = null;
@@ -141,9 +139,6 @@
         });
         activeDriver = instance;
         instance.drive();
-        if (productTourCheckpoint.markReached(checkpoint)) {
-            void track('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
-        }
         window.addEventListener('keydown', onKeyDown, true);
     }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
index bd94ca1878..4032392b69 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-spotlight.svelte.test.ts
@@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ProductTourCheckpoint } from '../models';
 
 import ProductTourSpotlight from './product-tour-spotlight.svelte';
-vi.mock('../api.svelte', () => ({ createProductTourActivity: () => vi.fn() }));
+vi.mock('../activity', () => ({ submitProductTourActivity: vi.fn() }));
 
 const checkpoint: ProductTourCheckpoint = { checkpointName: 'command-search', source: 'catalog', tourName: 'app-overview', userId: 'user', version: 1 };
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
index 459dc9c4d2..70da9ae801 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
@@ -20,7 +20,6 @@ export type ProductTourCheckpoint<Name extends ProductTourName = ProductTourName
     ? {
           checkpointName: ProductTourCheckpointName<Name>;
           organizationId?: string;
-          reachedSteps?: string[];
           source: ProductTourLaunchSource;
           tourName: Name;
           userId: string;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
index f7fd9653aa..9c01883ae6 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.test.ts
@@ -25,11 +25,10 @@ describe('product-tour session persistence', () => {
         expect(() => clearProductTourSession(unavailable)).not.toThrow();
     });
 
-    it('preserves reached steps without adding identity to activity', () => {
+    it('round-trips only the current functional checkpoint', () => {
         // Arrange
         const checkpoint = {
             checkpointName: 'navigation',
-            reachedSteps: ['navigation'],
             source: 'catalog',
             tourName: 'app-overview',
             userId: 'user',
@@ -47,9 +46,9 @@ describe('product-tour session persistence', () => {
         };
 
         // Act
-        writeProductTourSession({ ...checkpoint, reachedSteps: [...checkpoint.reachedSteps] }, storage);
+        writeProductTourSession(checkpoint, storage);
 
         // Assert
-        expect(readProductTourSession(storage)?.reachedSteps).toEqual(['navigation']);
+        expect(readProductTourSession(storage)).toEqual(checkpoint);
     });
 });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
index 42ca2bfe48..d639d69b71 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/session.ts
@@ -28,7 +28,6 @@ export function readProductTourSession(storage?: Pick<Storage, 'getItem' | 'remo
 
         return {
             checkpointName: candidate.checkpointName,
-            ...(candidate.reachedSteps ? { reachedSteps: candidate.reachedSteps } : {}),
             organizationId: candidate.organizationId,
             source: candidate.source,
             tourName: candidate.tourName,
@@ -69,14 +68,6 @@ function isProductTourCheckpoint(value: unknown): value is ProductTourCheckpoint
     }
 
     const checkpoints: readonly string[] = PRODUCT_TOUR_CHECKPOINTS[value.tourName];
-    if (
-        value.reachedSteps !== undefined &&
-        (!Array.isArray(value.reachedSteps) ||
-            value.reachedSteps.length > checkpoints.length ||
-            !value.reachedSteps.every((step) => typeof step === 'string' && checkpoints.includes(step)))
-    ) {
-        return false;
-    }
     if (typeof value.checkpointName !== 'string' || !checkpoints.includes(value.checkpointName)) {
         return false;
     }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
index 695be6ac96..d0e001c376 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.test.ts
@@ -16,19 +16,17 @@ const checkpoint: ProductTourCheckpoint = {
 describe('product tour checkpoint store', () => {
     beforeEach(() => productTourCheckpoint.clear());
 
-    it('counts a step once across back navigation and starts a new count on replay', () => {
+    it('preserves the current checkpoint across forward and back navigation', () => {
         // Arrange
         const first = productTourCheckpoint.start('app-overview', 'navigation', 'catalog', 'user', 1);
 
         // Act & Assert
-        expect(productTourCheckpoint.markReached(first)).toBe(true);
-        expect(productTourCheckpoint.markReached(first)).toBe(false);
         const second = productTourCheckpoint.advance(first, 'command-search')!;
-        expect(productTourCheckpoint.markReached(second)).toBe(true);
+        expect(productTourCheckpoint.current).toBe(second);
         const back = productTourCheckpoint.advance(second, 'navigation')!;
-        expect(productTourCheckpoint.markReached(back)).toBe(false);
+        expect(back.checkpointName).toBe('navigation');
         const replay = productTourCheckpoint.start('app-overview', 'navigation', 'catalog', 'user', 1);
-        expect(productTourCheckpoint.markReached(replay)).toBe(true);
+        expect(productTourCheckpoint.current).toBe(replay);
     });
 
     it('does not let stale work advance or clear a newer tour', () => {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
index 91eea502df..aa0de5b6a3 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/state.svelte.ts
@@ -30,15 +30,6 @@ class ProductTourCheckpointStore {
         return true;
     }
 
-    markReached(expected: ProductTourCheckpoint): boolean {
-        if (this.current !== expected || expected.reachedSteps?.includes(expected.checkpointName)) {
-            return false;
-        }
-        expected.reachedSteps = [...(expected.reachedSteps ?? []), expected.checkpointName];
-        writeProductTourSession(expected);
-        return true;
-    }
-
     restore(userId: string, organizationId?: string): ProductTourCheckpoint | undefined {
         if (this.current) {
             return this.current;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
index 69bfc75b4b..429726df2d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
@@ -4,8 +4,6 @@ import { putCurrentUserProductTour, queryKeys } from '$features/users/api.svelte
 import { MutationObserver, type MutationObserverOptions, QueryClient } from '@tanstack/svelte-query';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { putProductTourAnalytics } from './api.svelte';
-
 const mocks = vi.hoisted(() => ({ putJSON: vi.fn(), useQueryClient: vi.fn() }));
 vi.mock('$env/dynamic/public', () => ({ env: {} }));
 vi.mock('@foundatiofx/fetchclient', async (importOriginal) => ({
@@ -31,63 +29,6 @@ describe('guided-tour user cache concurrency', () => {
         queryClient.setQueryData(queryKeys.me(), user('first-user'));
     });
 
-    it.each([false, true])('keeps the acknowledged preference without refetching the user (enabled: %s)', async (enabled) => {
-        // Arrange
-        mocks.putJSON.mockResolvedValue(undefined);
-        const invalidate = vi.spyOn(queryClient, 'invalidateQueries');
-
-        // Act
-        await putProductTourAnalytics().mutateAsync(enabled);
-
-        // Assert
-        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())?.product_tour_analytics_enabled).toBe(enabled);
-        expect(invalidate).not.toHaveBeenCalled();
-        expect(queryClient.getQueryState(queryKeys.me())?.isInvalidated).toBe(false);
-    });
-
-    it('preserves progress saved while a preference update fails', async () => {
-        // Arrange
-        const request = Promise.withResolvers<void>();
-        mocks.putJSON.mockReturnValue(request.promise);
-        const pending = putProductTourAnalytics()
-            .mutateAsync(false)
-            .catch(() => undefined);
-        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
-        queryClient.setQueryData<ViewCurrentUser>(queryKeys.me(), (current) => ({
-            ...current!,
-            product_tours: { 'app-overview': { status: 1, version: 1 } }
-        }));
-
-        // Act
-        request.reject(new Error('Unavailable'));
-        await pending;
-
-        // Assert
-        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())).toMatchObject({
-            product_tour_analytics_enabled: true,
-            product_tours: { 'app-overview': { status: 1, version: 1 } }
-        });
-    });
-
-    it('does not restore the previous account when its preference update fails', async () => {
-        // Arrange
-        const request = Promise.withResolvers<void>();
-        mocks.putJSON.mockReturnValue(request.promise);
-        const pending = putProductTourAnalytics()
-            .mutateAsync(false)
-            .catch(() => undefined);
-        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
-        const nextUser = user('second-user');
-        queryClient.setQueryData(queryKeys.me(), nextUser);
-
-        // Act
-        request.reject(new Error('Unavailable'));
-        await pending;
-
-        // Assert
-        expect(queryClient.getQueryData(queryKeys.me())).toEqual(nextUser);
-    });
-
     it.each([false, true])('applies delayed completion only to its original account (account changed: %s)', async (changeAccount) => {
         // Arrange
         const progress: ProductTourProgress = { status: 1, version: 1 };
@@ -95,7 +36,7 @@ describe('guided-tour user cache concurrency', () => {
         mocks.putJSON.mockReturnValue(request.promise);
         const pending = putCurrentUserProductTour().mutateAsync({ progress, tourName: 'app-overview' });
         await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
-        const currentUser = { ...user(changeAccount ? 'second-user' : 'first-user'), product_tour_analytics_enabled: false };
+        const currentUser = { ...user(changeAccount ? 'second-user' : 'first-user'), full_name: 'Updated name' };
         queryClient.setQueryData(queryKeys.me(), currentUser);
 
         // Act
@@ -111,5 +52,5 @@ describe('guided-tour user cache concurrency', () => {
 });
 
 function user(id: string): ViewCurrentUser {
-    return { id, product_tour_analytics_enabled: true, product_tours: {} } as ViewCurrentUser;
+    return { id, product_tours: {} } as ViewCurrentUser;
 }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
index 0501dfe77b..306d4ce5d9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/api.ts
@@ -7,20 +7,6 @@ export enum StackStatus {
   Discarded = "discarded",
 }
 
-export enum ProductTourUsageInterval {
-  Day = "day",
-  Month = "month",
-  Auto = "auto",
-}
-
-export enum ProductTourTelemetryEvent {
-  Completed = "completed",
-  Dismissed = "dismissed",
-  Shown = "shown",
-  Started = "started",
-  StepReached = "step-reached",
-}
-
 export enum ProductTourStatus {
   Completed = 1,
   Dismissed = 2,
@@ -503,18 +489,6 @@ export interface PersistentEvent {
   reference_id?: null | string;
 }
 
-export interface PostProductTourActivity {
-  /**
-   * @format int32
-   * @min 1
-   * @max 2147483647
-   */
-  version: number;
-  action?: null | ProductTourTelemetryEvent;
-  source?: null | ProductTourLaunchSource;
-  step?: null | string;
-}
-
 export interface PredefinedSavedViewDefinition {
   key: string;
   name: string;
@@ -563,14 +537,6 @@ export interface ProductTourStartSource {
   count: number;
 }
 
-export interface ProductTourStepActivity {
-  step: string;
-  /** @format int64 */
-  reached: number;
-  /** @format int64 */
-  dismissed: number;
-}
-
 export interface ProductTourSummary {
   name: string;
   /** @format int32 */
@@ -588,7 +554,6 @@ export interface ProductTourSummary {
   last_run_utc?: null | string;
   start_sources: ProductTourStartSource[];
   activity: ProductTourActivity[];
-  steps: ProductTourStepActivity[];
 }
 
 export interface ProductTourUsageResponse {
@@ -597,7 +562,6 @@ export interface ProductTourUsageResponse {
   /** @format date-time */
   utc_end: string;
   tours: ProductTourSummary[];
-  interval: ProductTourUsageInterval;
   collection_available: boolean;
 }
 
@@ -755,10 +719,6 @@ export interface UpdateEventSubmissionSettings {
   enabled?: null | boolean;
 }
 
-export interface UpdateProductTourAnalytics {
-  enabled?: null | boolean;
-}
-
 export interface UpdateProductTourProgress {
   status?: null | ProductTourStatus;
   /**
@@ -859,7 +819,6 @@ export interface User {
   organization_preferences: UserOrganizationPreference[];
   saved_view_orders: UserSavedViewOrderPreference[];
   product_tours: Record<string, ProductTourProgress>;
-  product_tour_analytics_enabled: boolean;
   /** Gets or sets the users Full Name. */
   full_name: string;
   /** @format email */
@@ -903,7 +862,6 @@ export interface UserSavedViewOrderPreference {
 
 export interface ViewCurrentUser {
   hash?: null | string;
-  product_tour_analytics_enabled: boolean;
   has_local_account: boolean;
   o_auth_accounts: OAuthAccount[];
   organization_preferences: UserOrganizationPreference[];
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
index b1ca37f00a..f91ccb4942 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/generated/schemas.ts
@@ -27,14 +27,6 @@ export const StackStatusSchema = zodEnum([
   "ignored",
   "discarded",
 ]);
-export const ProductTourUsageIntervalSchema = zodEnum(["day", "month", "auto"]);
-export const ProductTourTelemetryEventSchema = zodEnum([
-  "completed",
-  "dismissed",
-  "shown",
-  "started",
-  "step-reached",
-]);
 export const ProductTourStatusSchema = union([literal(1), literal(2)]);
 export const ProductTourLaunchSourceSchema = zodEnum([
   "welcome",
@@ -612,22 +604,6 @@ export const PersistentEventSchema = object({
 });
 export type PersistentEventFormData = Infer<typeof PersistentEventSchema>;
 
-export const PostProductTourActivitySchema = object({
-  version: int32()
-    .min(1, "Version must be at least 1")
-    .max(2147483647, "Version must be at most 2147483647"),
-  action: ProductTourTelemetryEventSchema,
-  source: ProductTourLaunchSourceSchema,
-  step: string()
-    .min(1, "Step is required")
-    .max(64, "Step must be at most 64 characters")
-    .nullable()
-    .optional(),
-});
-export type PostProductTourActivityFormData = Infer<
-  typeof PostProductTourActivitySchema
->;
-
 export const PredefinedSavedViewDefinitionSchema = object({
   key: string().min(1, "Key is required"),
   name: string().min(1, "Name is required"),
@@ -686,15 +662,6 @@ export type ProductTourStartSourceFormData = Infer<
   typeof ProductTourStartSourceSchema
 >;
 
-export const ProductTourStepActivitySchema = object({
-  step: string().min(1, "Step is required"),
-  reached: int(),
-  dismissed: int(),
-});
-export type ProductTourStepActivityFormData = Infer<
-  typeof ProductTourStepActivitySchema
->;
-
 export const ProductTourSummarySchema = object({
   name: string().min(1, "Name is required"),
   version: int32(),
@@ -706,7 +673,6 @@ export const ProductTourSummarySchema = object({
   last_run_utc: iso.datetime().nullable(),
   start_sources: array(lazy(() => ProductTourStartSourceSchema)),
   activity: array(lazy(() => ProductTourActivitySchema)),
-  steps: array(lazy(() => ProductTourStepActivitySchema)),
 });
 export type ProductTourSummaryFormData = Infer<typeof ProductTourSummarySchema>;
 
@@ -714,7 +680,6 @@ export const ProductTourUsageResponseSchema = object({
   utc_start: iso.datetime().nullable(),
   utc_end: iso.datetime(),
   tours: array(lazy(() => ProductTourSummarySchema)),
-  interval: ProductTourUsageIntervalSchema,
   collection_available: boolean(),
 });
 export type ProductTourUsageResponseFormData = Infer<
@@ -863,13 +828,6 @@ export type UpdateEventSubmissionSettingsFormData = Infer<
   typeof UpdateEventSubmissionSettingsSchema
 >;
 
-export const UpdateProductTourAnalyticsSchema = object({
-  enabled: boolean().nullable(),
-});
-export type UpdateProductTourAnalyticsFormData = Infer<
-  typeof UpdateProductTourAnalyticsSchema
->;
-
 export const UpdateProductTourProgressSchema = object({
   status: ProductTourStatusSchema,
   version: int32()
@@ -978,7 +936,6 @@ export const UserSchema = object({
     string(),
     lazy(() => ProductTourProgressSchema),
   ),
-  product_tour_analytics_enabled: boolean(),
   full_name: string().min(1, "Full name is required"),
   email_address: email(),
   avatar_file_name: string()
@@ -1032,7 +989,6 @@ export type UserSavedViewOrderPreferenceFormData = Infer<
 
 export const ViewCurrentUserSchema = object({
   hash: string().min(1, "Hash is required").nullable().optional(),
-  product_tour_analytics_enabled: boolean(),
   has_local_account: boolean(),
   o_auth_accounts: array(lazy(() => OAuthAccountSchema)),
   organization_preferences: array(lazy(() => UserOrganizationPreferenceSchema)),
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
index cb81263adc..fc98da10d1 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/account/manage/+page.svelte
@@ -11,7 +11,6 @@
     import { Spinner } from '$comp/ui/spinner';
     import { logout } from '$features/auth/api.svelte';
     import { validateEmailAvailability } from '$features/auth/validators';
-    import ProductTourPrivacySettings from '$features/product-tours/components/product-tour-privacy-settings.svelte';
     import { getProfileImageFileError } from '$features/shared/profile-images';
     import {
         deleteCurrentUser,
@@ -211,7 +210,6 @@
 </script>
 
 <div class="space-y-6">
-    <ProductTourPrivacySettings />
     <div class="flex flex-col gap-4 sm:flex-row sm:items-center">
         <div class="flex items-center gap-3">
             <Input
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
index d427759638..08bcb189db 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/configure/+page.svelte
@@ -14,7 +14,6 @@
     import { organization } from '$features/organizations/context.svelte';
     import { useHideOrganizationNotifications } from '$features/organizations/hooks/use-hide-organization-notifications.svelte';
     import { createProductTourActions } from '$features/product-tours/actions.svelte';
-    import { createProductTourActivity } from '$features/product-tours/api.svelte';
     import ProductTourSpotlight from '$features/product-tours/components/product-tour-spotlight.svelte';
     import { productTourCheckpoint } from '$features/product-tours/state.svelte';
     import { getProjectDefaultTokenQuery, patchToken } from '$features/tokens/api.svelte';
@@ -54,7 +53,6 @@
     let isProjectTypeOpen = $state(false);
     let openEnableTokenDialog = $state(false);
     const tourActions = createProductTourActions();
-    const trackTourActivity = createProductTourActivity();
     const projectConfigureCheckpoint = $derived(productTourCheckpoint.current?.tourName === 'project-configure' ? productTourCheckpoint.current : undefined);
 
     const enableTokenMutation = patchToken({
@@ -247,12 +245,6 @@
     });
 
     const isCommandLine = $derived(selectedProjectType?.platform === 'Command Line');
-    $effect(() => {
-        const checkpoint = projectConfigureCheckpoint;
-        if (checkpoint?.checkpointName === 'sdk-instructions' && selectedProjectType && productTourCheckpoint.markReached(checkpoint)) {
-            void trackTourActivity('step-reached', checkpoint.tourName, checkpoint.version, checkpoint.source, checkpoint.checkpointName);
-        }
-    });
     const isDotNet = $derived(selectedProjectType?.platform === '.NET');
     const isDotNetLegacy = $derived(selectedProjectType?.platform === '.NET Legacy');
     const isJavaScript = $derived(selectedProjectType?.platform === 'JavaScript');
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
index fa7f503d3b..f7f8b1564b 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/system/product-tours/+page.svelte
@@ -8,6 +8,7 @@
     import { Button } from '$comp/ui/button';
     import * as Card from '$comp/ui/card';
     import { Skeleton } from '$comp/ui/skeleton';
+    import { env } from '$env/dynamic/public';
     import { getAdminProductTourUsageQuery } from '$features/admin/api.svelte';
     import ProductTourActivityPopover from '$features/admin/components/product-tour-activity-popover.svelte';
     import ProductTourActivity from '$features/admin/components/product-tour-activity.svelte';
@@ -55,6 +56,16 @@
         </div>
     </div>
 
+    {#if !env.PUBLIC_EXCEPTIONLESS_API_KEY}
+        <Alert.Root>
+            <Alert.Title>Application telemetry is not configured</Alert.Title>
+            <Alert.Description>
+                Guide activity uses the application's Exceptionless client. Configure application telemetry to collect new activity. Saved guide progress is
+                unaffected.
+            </Alert.Description>
+        </Alert.Root>
+    {/if}
+
     {#if usage && !usage.collection_available}
         <Alert.Root>
             <Alert.Title>Guide activity collection is unavailable</Alert.Title>
@@ -105,7 +116,7 @@
                 </Card.Header>
                 <Card.Content>
                     {#if usage}
-                        <ProductTourActivity {tour} interval={usage.interval} start={usage.utc_start} end={usage.utc_end} />
+                        <ProductTourActivity {tour} start={usage.utc_start} end={usage.utc_end} />
                     {/if}
                 </Card.Content>
             </Card.Root>
diff --git a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
index cc3197e420..24cf7ec7c1 100644
--- a/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
+++ b/src/Exceptionless.Web/Models/Admin/ProductTourUsageResponse.cs
@@ -1,13 +1,11 @@
 using Exceptionless.Core.Models.Data;
-using Exceptionless.Core.Repositories;
 
 namespace Exceptionless.Web.Models.Admin;
 
 public sealed record ProductTourUsageResponse(
     DateTime? UtcStart,
     DateTime UtcEnd,
-    IReadOnlyCollection<ProductTourSummary> Tours,
-    ProductTourUsageInterval Interval)
+    IReadOnlyCollection<ProductTourSummary> Tours)
 {
     public bool CollectionAvailable { get; init; }
 }
@@ -22,12 +20,7 @@ public sealed record ProductTourSummary(
     long Dismissed,
     DateTime? LastRunUtc,
     IReadOnlyCollection<ProductTourStartSource> StartSources,
-    IReadOnlyCollection<ProductTourActivity> Activity)
-{
-    public IReadOnlyCollection<ProductTourStepActivity> Steps { get; init; } = [];
-}
-
-public sealed record ProductTourStepActivity(string Step, long Reached, long Dismissed);
+    IReadOnlyCollection<ProductTourActivity> Activity);
 
 public sealed record ProductTourStartSource(ProductTourLaunchSource Source, long Count);
 
diff --git a/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs b/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
deleted file mode 100644
index 77d52f088b..0000000000
--- a/src/Exceptionless.Web/Models/User/PostProductTourActivity.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.Text.Json.Serialization;
-using Exceptionless.Core.Models.Data;
-
-namespace Exceptionless.Web.Models;
-
-[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)]
-public record PostProductTourActivity
-{
-    [Range(1, Int32.MaxValue)]
-    public int Version { get; init; }
-
-    [Required, EnumDataType(typeof(ProductTourTelemetryEvent))]
-    public ProductTourTelemetryEvent? Action { get; init; }
-
-    [Required, EnumDataType(typeof(ProductTourLaunchSource))]
-    public ProductTourLaunchSource? Source { get; init; }
-
-    [StringLength(64, MinimumLength = 1)]
-    public string? Step { get; init; }
-}
-
-[JsonUnmappedMemberHandling(JsonUnmappedMemberHandling.Disallow)]
-public record UpdateProductTourAnalytics
-{
-    [Required]
-    public bool? Enabled { get; init; }
-}
diff --git a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
index 2a0f05c8aa..831150634f 100644
--- a/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
+++ b/src/Exceptionless.Web/Models/User/ViewCurrentUser.cs
@@ -26,11 +26,9 @@ public ViewCurrentUser(User user, IntercomOptions options)
         HasLocalAccount = !String.IsNullOrWhiteSpace(user.Password);
         OAuthAccounts = user.OAuthAccounts;
         ProductTours = new Dictionary<string, ProductTourProgress>(user.ProductTours, StringComparer.Ordinal);
-        ProductTourAnalyticsEnabled = user.ProductTourAnalyticsEnabled;
     }
 
     public string? Hash { get; set; }
-    public bool ProductTourAnalyticsEnabled { get; set; } = true;
     public bool HasLocalAccount { get; set; }
     public ICollection<OAuthAccount> OAuthAccounts { get; set; }
     public ICollection<UserOrganizationPreference> OrganizationPreferences { get; set; }
diff --git a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
index 1ad63be45c..2b2c591c05 100644
--- a/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
+++ b/tests/Exceptionless.Tests/Api/Data/endpoint-manifest.json
@@ -2724,34 +2724,6 @@
     "authorizationRoles": [],
     "authenticationSchemes": []
   },
-  {
-    "method": "PUT",
-    "route": "/api/v2/users/me/product-tour-analytics",
-    "displayName": "HTTP: PUT api/v2/users/me/product-tour-analytics",
-    "tags": [
-      "User"
-    ],
-    "allowAnonymous": false,
-    "authorizationPolicies": [
-      "UserPolicy"
-    ],
-    "authorizationRoles": [],
-    "authenticationSchemes": []
-  },
-  {
-    "method": "POST",
-    "route": "/api/v2/users/me/product-tours/{tourName:maxlength(64)}/activity",
-    "displayName": "HTTP: POST api/v2/users/me/product-tours/{tourName:maxlength(64)}/activity",
-    "tags": [
-      "User"
-    ],
-    "allowAnonymous": false,
-    "authorizationPolicies": [
-      "UserPolicy"
-    ],
-    "authorizationRoles": [],
-    "authenticationSchemes": []
-  },
   {
     "method": "PUT",
     "route": "/api/v2/users/me/product-tours/{tourName:regex(^[a-z0-9]\u002B(?:-[a-z0-9]\u002B)*$):maxlength(64)}",
diff --git a/tests/Exceptionless.Tests/Api/Data/openapi.json b/tests/Exceptionless.Tests/Api/Data/openapi.json
index f86c51cc73..d53d9629d5 100644
--- a/tests/Exceptionless.Tests/Api/Data/openapi.json
+++ b/tests/Exceptionless.Tests/Api/Data/openapi.json
@@ -435,7 +435,7 @@
         ],
         "parameters": [
           {
-            "name": "month",
+            "name": "start",
             "in": "query",
             "schema": {
               "type": "string",
@@ -443,19 +443,11 @@
             }
           },
           {
-            "name": "history",
-            "in": "query",
-            "schema": {
-              "type": "boolean",
-              "default": false
-            }
-          },
-          {
-            "name": "days",
+            "name": "end",
             "in": "query",
             "schema": {
-              "type": "integer",
-              "format": "int32"
+              "type": "string",
+              "format": "date-time"
             }
           }
         ],
@@ -4099,146 +4091,6 @@
         }
       }
     },
-    "/api/v2/users/me/product-tours/{tourName}/activity": {
-      "post": {
-        "tags": [
-          "User"
-        ],
-        "summary": "Record optional guided-tour activity without identifying context",
-        "parameters": [
-          {
-            "name": "tourName",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "maxLength": 64,
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/PostProductTourActivity"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "202": {
-            "description": "Accepted"
-          },
-          "204": {
-            "description": "No Content"
-          },
-          "400": {
-            "description": "Bad Request",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "413": {
-            "description": "Payload Too Large",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Unprocessable Entity",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "429": {
-            "description": "Too Many Requests",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "Service Unavailable",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/v2/users/me/product-tour-analytics": {
-      "put": {
-        "tags": [
-          "User"
-        ],
-        "summary": "Update current user guided-tour analytics preference",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateProductTourAnalytics"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "204": {
-            "description": "No Content"
-          },
-          "400": {
-            "description": "Bad Request",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Unprocessable Entity",
-            "content": {
-              "application/problem\u002Bjson": {
-                "schema": {
-                  "$ref": "#/components/schemas/ProblemDetails"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/v2/users/me/oauth-grants": {
       "get": {
         "tags": [
@@ -13406,51 +13258,6 @@
           }
         }
       },
-      "PostProductTourActivity": {
-        "required": [
-          "action",
-          "source",
-          "version"
-        ],
-        "type": "object",
-        "properties": {
-          "version": {
-            "maximum": 2147483647,
-            "minimum": 1,
-            "type": "integer",
-            "format": "int32"
-          },
-          "action": {
-            "oneOf": [
-              {
-                "type": "null"
-              },
-              {
-                "$ref": "#/components/schemas/ProductTourTelemetryEvent"
-              }
-            ]
-          },
-          "source": {
-            "oneOf": [
-              {
-                "type": "null"
-              },
-              {
-                "$ref": "#/components/schemas/ProductTourLaunchSource"
-              }
-            ]
-          },
-          "step": {
-            "maxLength": 64,
-            "minLength": 1,
-            "type": [
-              "null",
-              "string"
-            ]
-          }
-        },
-        "additionalProperties": false
-      },
       "PredefinedSavedViewDefinition": {
         "required": [
           "key",
@@ -13660,27 +13467,6 @@
           "Dismissed"
         ]
       },
-      "ProductTourStepActivity": {
-        "required": [
-          "step",
-          "reached",
-          "dismissed"
-        ],
-        "type": "object",
-        "properties": {
-          "step": {
-            "type": "string"
-          },
-          "reached": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "dismissed": {
-            "type": "integer",
-            "format": "int64"
-          }
-        }
-      },
       "ProductTourSummary": {
         "required": [
           "name",
@@ -13692,8 +13478,7 @@
           "dismissed",
           "last_run_utc",
           "start_sources",
-          "activity",
-          "steps"
+          "activity"
         ],
         "type": "object",
         "properties": {
@@ -13741,43 +13526,14 @@
             "items": {
               "$ref": "#/components/schemas/ProductTourActivity"
             }
-          },
-          "steps": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ProductTourStepActivity"
-            }
           }
         }
       },
-      "ProductTourTelemetryEvent": {
-        "enum": [
-          "completed",
-          "dismissed",
-          "shown",
-          "started",
-          "step-reached",
-          null
-        ]
-      },
-      "ProductTourUsageInterval": {
-        "enum": [
-          "day",
-          "month",
-          "auto"
-        ],
-        "x-enumNames": [
-          "Day",
-          "Month",
-          "Auto"
-        ]
-      },
       "ProductTourUsageResponse": {
         "required": [
           "utc_start",
           "utc_end",
           "tours",
-          "interval",
           "collection_available"
         ],
         "type": "object",
@@ -13799,9 +13555,6 @@
               "$ref": "#/components/schemas/ProductTourSummary"
             }
           },
-          "interval": {
-            "$ref": "#/components/schemas/ProductTourUsageInterval"
-          },
           "collection_available": {
             "type": "boolean"
           }
@@ -14215,21 +13968,6 @@
           }
         }
       },
-      "UpdateProductTourAnalytics": {
-        "required": [
-          "enabled"
-        ],
-        "type": "object",
-        "properties": {
-          "enabled": {
-            "type": [
-              "null",
-              "boolean"
-            ]
-          }
-        },
-        "additionalProperties": false
-      },
       "UpdateProductTourProgress": {
         "required": [
           "status",
@@ -14485,7 +14223,6 @@
           "organization_preferences",
           "saved_view_orders",
           "product_tours",
-          "product_tour_analytics_enabled",
           "email_notifications_enabled",
           "is_email_address_verified",
           "verify_email_address_token_expiration",
@@ -14557,9 +14294,6 @@
               "$ref": "#/components/schemas/ProductTourProgress"
             }
           },
-          "product_tour_analytics_enabled": {
-            "type": "boolean"
-          },
           "full_name": {
             "type": "string",
             "description": "Gets or sets the users Full Name."
@@ -14687,7 +14421,6 @@
       },
       "ViewCurrentUser": {
         "required": [
-          "product_tour_analytics_enabled",
           "has_local_account",
           "o_auth_accounts",
           "organization_preferences",
@@ -14711,9 +14444,6 @@
               "string"
             ]
           },
-          "product_tour_analytics_enabled": {
-            "type": "boolean"
-          },
           "has_local_account": {
             "type": "boolean"
           },
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
index 5025da5ba8..05b6f8229c 100644
--- a/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
+++ b/tests/Exceptionless.Tests/Api/Endpoints/AdminProductTourUsageEndpointTests.cs
@@ -59,14 +59,14 @@ await CreateDataAsync(builder =>
         var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
-            .QueryString("month", "2026-08-01")
+            .QueryString("start", "2026-08-01T00:00:00Z")
+            .QueryString("end", "2026-09-01T00:00:00Z")
             .StatusCodeShouldBeOk());
 
         // Assert
         Assert.NotNull(response);
         Assert.Equal(month, response.UtcStart);
         Assert.Equal(month.AddMonths(1), response.UtcEnd);
-        Assert.Equal(ProductTourUsageInterval.Day, response.Interval);
         Assert.Equal(ProductTours.Definitions.Values.Sum(definition => definition.CurrentVersion), response.Tours.Count);
 
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
@@ -88,7 +88,7 @@ await CreateDataAsync(builder =>
         Assert.Equal(1, welcome.Dismissed);
         Assert.Equal(1, Assert.Single(welcome.StartSources).Count);
         Assert.Equal(ProductTourLaunchSource.Welcome, welcome.StartSources.Single().Source);
-        var welcomeDay = Assert.Single(welcome.Activity, period => period.DateUtc == month.AddDays(1));
+        var welcomeDay = Assert.Single(welcome.Activity, period => period.Shown > 0);
         Assert.Equal(2, welcomeDay.Shown);
         Assert.Equal(1, welcomeDay.Started);
         Assert.Equal(1, welcomeDay.Completed);
@@ -112,13 +112,11 @@ await CreateDataAsync(builder => AddUsage(builder,
         var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
-            .QueryString("history", "true")
             .StatusCodeShouldBeOk());
 
         // Assert
         Assert.NotNull(response);
         Assert.Equal(now, response.UtcEnd);
-        Assert.Equal(ProductTourUsageInterval.Auto, response.Interval);
         var overview = Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal));
         Assert.Equal(1, overview.Started);
         Assert.Equal(Assert.Single(overview.Activity, period => period.Started > 0).DateUtc, response.UtcStart);
@@ -126,19 +124,19 @@ await CreateDataAsync(builder => AddUsage(builder,
     }
 
     [Fact]
-    public Task GetProductTourUsageAsync_WithMonthAndHistory_ReturnsValidationProblem()
+    public Task GetProductTourUsageAsync_ReversedBounds_ReturnsValidationProblem()
     {
         // Act & Assert
         return SendRequestAsync(request => request
             .AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
-            .QueryString("month", "2026-08-01")
-            .QueryString("history", "true")
+            .QueryString("start", "2026-10-01T00:00:00Z")
+            .QueryString("end", "2026-09-01T00:00:00Z")
             .StatusCodeShouldBeUnprocessableEntity());
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_RollingDaysAcrossFebruary_UsesDailyUtcBoundaries()
+    public async Task GetProductTourUsageAsync_RangeAcrossFebruary_PreservesUtcBoundaries()
     {
         // Arrange
         var now = new DateTime(2026, 3, 2, 12, 30, 0, DateTimeKind.Utc);
@@ -154,30 +152,28 @@ await CreateDataAsync(builder =>
 
         // Act
         var response = await SendRequestAsAsync<ProductTourUsageResponse>(request => request.AsGlobalAdminUser()
-            .AppendPaths("admin", "product-tour-usage").QueryString("days", "30").StatusCodeShouldBeOk());
+            .AppendPaths("admin", "product-tour-usage").QueryString("start", start.ToString("O")).StatusCodeShouldBeOk());
 
         // Assert
         Assert.NotNull(response);
         Assert.Equal(start, response.UtcStart);
         Assert.Equal(now, response.UtcEnd);
-        Assert.Equal(ProductTourUsageInterval.Day, response.Interval);
         Assert.False(response.CollectionAvailable);
         Assert.Equal(2, Assert.Single(response.Tours, tour => String.Equals(tour.Name, ProductTours.AppOverview, StringComparison.Ordinal)).Started);
     }
 
     [Theory]
-    [InlineData("0", "false")]
-    [InlineData("91", "false")]
-    [InlineData("30", "true")]
-    public Task GetProductTourUsageAsync_InvalidRollingRange_ReturnsValidationProblem(string days, string history)
+    [InlineData("2026-09-01", "2026-09-01")]
+    [InlineData("2026-10-01", "2026-09-01")]
+    public Task GetProductTourUsageAsync_InvalidDateRange_ReturnsValidationProblem(string start, string end)
     {
         // Act & Assert
         return SendRequestAsync(request => request.AsGlobalAdminUser().AppendPaths("admin", "product-tour-usage")
-            .QueryString("days", days).QueryString("history", history).StatusCodeShouldBeUnprocessableEntity());
+            .QueryString("start", start).QueryString("end", end).StatusCodeShouldBeUnprocessableEntity());
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndReturnsZeroRows()
+    public async Task GetProductTourUsageAsync_WithoutBounds_ReturnsEmptyHistoryWithoutInventingStart()
     {
         // Arrange
         var now = new DateTime(2026, 9, 17, 12, 0, 0, DateTimeKind.Utc);
@@ -191,8 +187,8 @@ public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndRe
 
         // Assert
         Assert.NotNull(response);
-        Assert.Equal(now.StartOfMonth(), response.UtcStart);
-        Assert.Equal(now.StartOfMonth().AddMonths(1), response.UtcEnd);
+        Assert.Null(response.UtcStart);
+        Assert.Equal(now, response.UtcEnd);
         Assert.Equal(ProductTours.Definitions.Values.Sum(definition => definition.CurrentVersion), response.Tours.Count);
         Assert.All(response.Tours, tour =>
         {
@@ -207,12 +203,12 @@ public async Task GetProductTourUsageAsync_WithoutMonth_UsesCurrentUtcMonthAndRe
     }
 
     [Fact]
-    public Task GetProductTourUsageAsync_MonthWithoutRepresentableEnd_ReturnsValidationError()
+    public Task GetProductTourUsageAsync_StartAfterDefaultEnd_ReturnsValidationError()
     {
         // Act & Assert
         return SendRequestAsync(request => request.AsGlobalAdminUser()
             .AppendPaths("admin", "product-tour-usage")
-            .QueryString("month", "9999-12-01T00:00:00Z")
+            .QueryString("start", "9999-12-01T00:00:00Z")
             .StatusCodeShouldBeUnprocessableEntity());
     }
 
diff --git a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs b/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
deleted file mode 100644
index 7ed3c5362b..0000000000
--- a/tests/Exceptionless.Tests/Api/Endpoints/ProductTourActivityEndpointTests.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-using System.Text.Json;
-using Exceptionless.Core;
-using Exceptionless.Core.Models;
-using Exceptionless.Core.Jobs;
-using Exceptionless.Core.Models.Data;
-using Exceptionless.Core.Queues.Models;
-using Exceptionless.Core.Repositories;
-using Exceptionless.Core.Services;
-using Exceptionless.Core.Utility;
-using Exceptionless.Tests.Extensions;
-using Exceptionless.Web.Models;
-using Exceptionless.Web.Models.Admin;
-using Foundatio.Queues;
-using Foundatio.Repositories;
-using Foundatio.Serializer;
-using Xunit;
-
-namespace Exceptionless.Tests.Api.Endpoints;
-
-public sealed class ProductTourActivityEndpointTests(ITestOutputHelper output, AppWebHostFactory factory) : IntegrationTestsBase(output, factory)
-{
-    protected override async Task ResetDataAsync()
-    {
-        await base.ResetDataAsync();
-        await GetService<IQueue<EventPost>>().DeleteQueueAsync();
-        await GetService<SampleDataService>().CreateDataAsync();
-    }
-
-    [Fact]
-    public async Task RecordProductTourActivity_ValidRequest_QueuesOnlyAllowlistedData()
-    {
-        // Arrange
-        var now = new DateTimeOffset(2026, 9, 2, 12, 0, 0, TimeSpan.Zero);
-        TimeProvider.SetUtcNow(now);
-        await GetService<IProjectRepository>().AddAsync(new Project
-        {
-            Id = GetService<AppOptions>().InternalProjectId,
-            OrganizationId = SampleDataService.TEST_ORG_ID,
-            Name = "Guide activity",
-            NextSummaryEndOfDayTicks = now.UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
-        });
-
-        // Act
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser()
-            .AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.StepReached, Source = ProductTourLaunchSource.Catalog, Step = "navigation" })
-            .StatusCodeShouldBeAccepted());
-
-        // Assert
-        var entry = await GetService<IQueue<EventPost>>().DequeueAsync(TimeSpan.FromSeconds(1));
-        Assert.NotNull(entry);
-        Assert.Null(entry.Value.IpAddress);
-        Assert.Null(entry.Value.UserAgent);
-        Assert.Null(entry.Value.ClientKeyHash);
-        Assert.Equal(GetService<AppOptions>().InternalProjectId, entry.Value.ProjectId);
-        var payload = await GetService<EventPostService>().GetEventPostPayloadAsync(Path.ChangeExtension(entry.Value.FilePath, ".payload"));
-        Assert.NotNull(payload);
-        using var document = JsonDocument.Parse(payload);
-        var ev = document.RootElement;
-        Assert.Equal("product-tour.step-reached.app-overview.v1.catalog", ev.GetProperty("source").GetString());
-        Assert.Equal(now, ev.GetProperty("date").GetDateTimeOffset());
-        Assert.Equal("product-tour-step:navigation", Assert.Single(ev.GetProperty("tags").EnumerateArray()).GetString());
-        Assert.DoesNotContain(ev.EnumerateObject(), property => property.Name.StartsWith('@'));
-        if (ev.TryGetProperty("data", out var data))
-        {
-            Assert.Empty(data.EnumerateObject());
-        }
-        await entry.CompleteAsync();
-    }
-
-    [Fact]
-    public async Task UpdateCurrentUserProductTourAnalytics_ConcurrentProgress_PreservesBothAndStopsCollection()
-    {
-        // Arrange
-        var user = await GetService<IUserRepository>().GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        var cached = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache());
-        Assert.NotNull(cached);
-        Assert.True(cached.ProductTourAnalyticsEnabled);
-
-        // Act
-        await Task.WhenAll(
-            SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
-                .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeNoContent()),
-            SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview")
-                .Content(new UpdateProductTourProgress { Status = ProductTourStatus.Completed, Version = 1 }).StatusCodeShouldBeOk()));
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Completed, Source = ProductTourLaunchSource.Catalog })
-            .StatusCodeShouldBeNoContent());
-
-        // Assert
-        var persisted = await GetService<IUserRepository>().GetByIdAsync(user.Id, options => options.Cache());
-        Assert.NotNull(persisted);
-        Assert.False(persisted.ProductTourAnalyticsEnabled);
-        Assert.Equal(ProductTourStatus.Completed, persisted.ProductTours[ProductTours.AppOverview].Status);
-        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
-    }
-
-    [Fact]
-    public async Task UpdateCurrentUserProductTourAnalytics_CachedPreference_ReflectsEachChange()
-    {
-        // Arrange
-        var repository = GetService<IUserRepository>();
-        var user = await repository.GetByEmailAddressAsync(SampleDataService.TEST_ORG_USER_EMAIL);
-        Assert.NotNull(user);
-        var cached = await repository.GetByIdAsync(user.Id, options => options.Cache());
-        Assert.NotNull(cached);
-        Assert.True(cached.ProductTourAnalyticsEnabled);
-
-        foreach (bool enabled in new[] { false, true })
-        {
-            // Act
-            await SendRequestAsync(request => request.Put().AsTestOrganizationUser().AppendPath("users/me/product-tour-analytics")
-                .Content(new UpdateProductTourAnalytics { Enabled = enabled }).StatusCodeShouldBeNoContent());
-
-            // Assert
-            cached = await repository.GetByIdAsync(user.Id, options => options.Cache());
-            Assert.NotNull(cached);
-            Assert.Equal(enabled, cached.ProductTourAnalyticsEnabled);
-        }
-    }
-
-    [Fact]
-    public void DeserializeUser_LegacyRecord_DefaultsAnalyticsToEnabled()
-    {
-        // Arrange & Act
-        var user = GetService<ITextSerializer>().Deserialize<User>("{}");
-
-        // Assert
-        Assert.NotNull(user);
-        Assert.True(user.ProductTourAnalyticsEnabled);
-        Assert.Empty(user.ProductTours);
-    }
-
-    [Theory]
-    [InlineData("unknown", 1, "navigation")]
-    [InlineData("app-overview", 2, "navigation")]
-    [InlineData("app-overview", 1, "password")]
-    [InlineData("app-overview", 1, null)]
-    public Task RecordProductTourActivity_InvalidCatalogValue_RejectsRequest(string name, int version, string? step)
-    {
-        // Act & Assert
-        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath($"users/me/product-tours/{name}/activity")
-            .Content(new PostProductTourActivity { Version = version, Action = ProductTourTelemetryEvent.StepReached, Source = ProductTourLaunchSource.Catalog, Step = step })
-            .StatusCodeShouldBeUnprocessableEntity());
-    }
-
-    [Fact]
-    public Task RecordProductTourActivity_ArbitraryContext_RejectsRequest()
-    {
-        // Act & Assert
-        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content("""{"version":1,"action":"started","source":"catalog","email":"private@example.test"}""", "application/json")
-            .StatusCodeShouldBeBadRequest());
-    }
-
-    [Theory]
-    [InlineData("{\"version\":1,\"action\":999,\"source\":\"catalog\"}")]
-    [InlineData("{\"version\":1,\"action\":\"started\",\"source\":999}")]
-    public Task RecordProductTourActivity_InvalidEnum_RejectsRequest(string payload)
-    {
-        // Act & Assert
-        return SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(payload, "application/json").StatusCodeShouldBeUnprocessableEntity());
-    }
-
-    [Fact]
-    public Task UpdateCurrentUserProductTourAnalytics_ClientToken_IsForbidden()
-    {
-        // Act & Assert
-        return SendRequestAsync(request => request.Put().AsTestOrganizationClientUser().AppendPath("users/me/product-tour-analytics")
-            .Content(new UpdateProductTourAnalytics { Enabled = false }).StatusCodeShouldBeForbidden());
-    }
-
-    [Fact]
-    public async Task RecordProductTourActivity_ProcessedEvent_HasNoIdentifyingContext()
-    {
-        // Arrange
-        await GetService<IProjectRepository>().AddAsync(new Project
-        {
-            Id = GetService<AppOptions>().InternalProjectId,
-            OrganizationId = SampleDataService.TEST_ORG_ID,
-            Name = "Guide activity",
-            NextSummaryEndOfDayTicks = TimeProvider.GetUtcNow().UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
-        });
-
-        // Act
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Dismissed, Source = ProductTourLaunchSource.Catalog, Step = "navigation" })
-            .StatusCodeShouldBeAccepted());
-        var result = await GetService<EventPostsJob>().RunAsync(TestCancellationToken);
-        await RefreshDataAsync();
-
-        // Assert
-        Assert.True(result.IsSuccess);
-        var ev = Assert.Single((await GetService<IEventRepository>().GetAllAsync()).Documents);
-        Assert.Equal(GetService<AppOptions>().InternalProjectId, ev.ProjectId);
-        Assert.Equal("product-tour.dismissed.app-overview.v1.catalog", ev.Source);
-        Assert.Contains("product-tour-step:navigation", ev.Tags!);
-        Assert.Empty(ev.Data!);
-    }
-
-    [Fact]
-    public Task RecordProductTourActivity_ClientToken_IsForbidden()
-    {
-        // Act & Assert
-        return SendRequestAsync(request => request.Post().AsTestOrganizationClientUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
-            .StatusCodeShouldBeForbidden());
-    }
-
-    [Fact]
-    public async Task RecordProductTourActivity_MissingInternalProject_ReturnsUnavailable()
-    {
-        // Act & Assert
-        var response = await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
-            .ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
-        Assert.Equal(System.Net.HttpStatusCode.ServiceUnavailable, response.StatusCode);
-    }
-
-    [Fact]
-    public async Task RecordProductTourActivity_InternalOrganizationOverLimit_ReportsUnavailableWithoutQueuing()
-    {
-        // Arrange
-        var organizationRepository = GetService<IOrganizationRepository>();
-        var organization = await organizationRepository.GetByIdAsync(SampleDataService.TEST_ORG_ID);
-        Assert.NotNull(organization);
-        organization.MaxEventsPerMonth = 1;
-        organization.BonusEventsPerMonth = 0;
-        await organizationRepository.SaveAsync(organization);
-        var project = await GetService<IProjectRepository>().AddAsync(new Project
-        {
-            Id = GetService<AppOptions>().InternalProjectId,
-            OrganizationId = organization.Id,
-            Name = "Guide activity",
-            NextSummaryEndOfDayTicks = TimeProvider.GetUtcNow().UtcDateTime.Date.AddDays(1).AddHours(1).Ticks
-        });
-        var usage = GetService<UsageService>();
-        await usage.IncrementTotalAsync(organization.Id, project.Id, 2);
-        Assert.Equal(0, await usage.GetEventsLeftAsync(organization.Id));
-
-        // Act
-        await SendRequestAsync(request => request.Post().AsTestOrganizationUser().AppendPath("users/me/product-tours/app-overview/activity")
-            .Content(new PostProductTourActivity { Version = 1, Action = ProductTourTelemetryEvent.Started, Source = ProductTourLaunchSource.Catalog })
-            .ExpectedStatus(System.Net.HttpStatusCode.ServiceUnavailable));
-        var report = await SendRequestAsAsync<ProductTourUsageResponse>(request => request.AsGlobalAdminUser()
-            .AppendPath("admin/product-tour-usage").QueryString("days", "30").StatusCodeShouldBeOk());
-
-        // Assert
-        Assert.NotNull(report);
-        Assert.False(report.CollectionAvailable);
-        Assert.Equal(0, (await GetService<IQueue<EventPost>>().GetQueueStatsAsync()).Enqueued);
-    }
-}
diff --git a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
index 253917e2a6..2990d10e06 100644
--- a/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
+++ b/tests/Exceptionless.Tests/Repositories/EventRepositoryTests.cs
@@ -36,10 +36,8 @@ public EventRepositoryTests(ITestOutputHelper output, AppWebHostFactory factory)
         _serializer = GetService<ITextSerializer>();
     }
 
-    [Theory]
-    [InlineData(ProductTourUsageInterval.Day)]
-    [InlineData(ProductTourUsageInterval.Auto)]
-    public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLargeCounts(ProductTourUsageInterval interval)
+    [Fact]
+    public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLargeCounts()
     {
         // Arrange
         var start = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
@@ -49,11 +47,10 @@ public async Task GetProductTourUsageAsync_AllSourcesOverNinetyDays_PreservesLar
                     .SelectMany(action => Enum.GetValues<ProductTourLaunchSource>()
                         .Select(source => ProductTours.CreateTelemetrySource(action, definition.Name, version, source)))))
             .ToArray();
-        int stepCount = ProductTours.Steps.Values.SelectMany(steps => steps).Distinct(StringComparer.Ordinal).Count();
         // Include the source bucket and the parser's padded end-date bucket. Catalog/version growth
         // must stay within Elasticsearch's default search.max_buckets before it reaches production.
-        int maximumPeriods = interval is ProductTourUsageInterval.Auto ? 201 : 90;
-        Assert.InRange((long)sources.Length * (1 + maximumPeriods + 1 + stepCount), 1, 65_536);
+        int maximumPeriods = 201;
+        Assert.InRange((long)sources.Length * (1 + maximumPeriods + 1), 1, 65_536);
         await CreateDataAsync(builder =>
         {
             foreach (string source in sources)
@@ -68,7 +65,7 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(90), interval);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(90));
 
         // Assert
         Assert.Equal(sources.Length, result.Buckets.Count);
@@ -103,10 +100,9 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, end, ProductTourUsageInterval.Auto);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, end);
 
         // Assert
-        Assert.Equal(ProductTourUsageInterval.Auto, result.Interval);
         var bucket = Assert.Single(result.Buckets);
         Assert.Equal(6, bucket.Count);
         Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count));
@@ -117,33 +113,31 @@ await CreateDataAsync(builder =>
     }
 
     [Fact]
-    public async Task GetProductTourUsageAsync_StepsAcrossFebruary_PreservesCoalescedCountsWithDailyBuckets()
+    public async Task GetProductTourUsageAsync_ActivityAcrossFebruary_PreservesCoalescedCounts()
     {
         // Arrange
         var start = new DateTime(2026, 2, 1, 0, 0, 0, DateTimeKind.Utc);
         await CreateDataAsync(builder =>
         {
-            foreach (var action in new[] { ProductTourTelemetryEvent.StepReached, ProductTourTelemetryEvent.Dismissed })
+            foreach (var action in new[] { ProductTourTelemetryEvent.Started, ProductTourTelemetryEvent.Dismissed })
             {
                 builder.Event().Organization(TestConstants.OrganizationId).Project(_appOptions.InternalProjectId)
                     .Type(Event.KnownTypes.FeatureUsage)
                     .Source(ProductTours.CreateTelemetrySource(action, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog))
                     .Date(start.AddDays(28))
-                    .Mutate(ev => { ev.Count = 3; ev.Tags = [ProductTours.StepTagPrefix + "navigation"]; });
+                    .Mutate(ev => ev.Count = 3);
             }
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(30), ProductTourUsageInterval.Day);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, start, start.AddDays(30));
 
         // Assert
-        Assert.Equal(ProductTourUsageInterval.Day, result.Interval);
         Assert.Equal(2, result.Buckets.Count);
         Assert.All(result.Buckets, bucket =>
         {
             Assert.Equal(3, bucket.Count);
-            Assert.Equal(new ProductTourStepCount("navigation", 3), Assert.Single(bucket.Steps));
-            Assert.Equal(start.AddDays(28), Assert.Single(bucket.Activity, period => period.Count > 0).DateUtc);
+            Assert.InRange(Assert.Single(bucket.Activity, period => period.Count > 0).DateUtc, start.AddDays(27), start.AddDays(28));
         });
     }
 
@@ -190,16 +184,13 @@ await CreateDataAsync(builder =>
         Assert.Equal(1, welcome.Count);
 
         Assert.All(result.Buckets, item => Assert.True(ProductTours.IsValid(item.Source.TourName, item.Source.Version)));
-        Assert.Equal(ProductTourUsageInterval.Day, result.Interval);
         Assert.All(result.Buckets, bucket => Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count)));
         var catalogStarts = Assert.Single(overview, bucket => bucket.Source.Event == ProductTourTelemetryEvent.Started && bucket.Source.LaunchSource == ProductTourLaunchSource.Catalog);
-        Assert.Equal(2, Assert.Single(catalogStarts.Activity, period => period.DateUtc == month.AddDays(1)).Count);
+        Assert.InRange(Assert.Single(catalogStarts.Activity, period => period.Count == 2).DateUtc, month, month.AddDays(1));
     }
 
-    [Theory]
-    [InlineData(null)]
-    [InlineData(ProductTourUsageInterval.Auto)]
-    public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage(ProductTourUsageInterval? interval)
+    [Fact]
+    public async Task GetProductTourUsageAsync_WithoutDates_ReturnsAllUsage()
     {
         // Arrange
         var month = new DateTime(2026, 8, 1, 0, 0, 0, DateTimeKind.Utc);
@@ -210,12 +201,46 @@ await CreateDataAsync(builder =>
         });
 
         // Act
-        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, month.AddMonths(1), interval);
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, month.AddMonths(1));
 
         // Assert
         Assert.Equal(2, result.Buckets.Sum(bucket => bucket.Count));
-        Assert.Equal(ProductTourUsageInterval.Month, result.Interval);
-        Assert.Contains(result.Buckets.SelectMany(bucket => bucket.Activity), period => period.DateUtc == month.AddMonths(-1) && period.Count == 1);
+        Assert.Contains(result.Buckets.SelectMany(bucket => bucket.Activity), period => period.DateUtc <= month.AddMonths(-1) && period.Count == 1);
+    }
+
+    [Fact]
+    public async Task GetProductTourUsageAsync_History_UsesRetainedActivityBoundsForAutomaticBuckets()
+    {
+        // Arrange
+        var first = new DateTime(2026, 8, 1, 12, 0, 0, DateTimeKind.Utc);
+        var end = first.AddDays(7);
+        TimeProvider.SetUtcNow(end);
+        string source = ProductTours.CreateTelemetrySource(ProductTourTelemetryEvent.Started, ProductTours.AppOverview, 1, ProductTourLaunchSource.Catalog);
+        await CreateDataAsync(builder =>
+        {
+            AddProductTourUsage(builder, source, first, "first");
+            AddProductTourUsage(builder, source, end.AddSeconds(-1), "last");
+        });
+
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, end);
+
+        // Assert
+        var bucket = Assert.Single(result.Buckets);
+        Assert.Equal(2, bucket.Count);
+        Assert.Equal(bucket.Count, bucket.Activity.Sum(period => period.Count));
+        Assert.InRange(bucket.Activity.Count, 80, 201);
+        Assert.All(bucket.Activity, period => Assert.InRange(period.DateUtc, first.AddDays(-1), end));
+    }
+
+    [Fact]
+    public async Task GetProductTourUsageAsync_EmptyHistory_DoesNotInventDateBounds()
+    {
+        // Act
+        var result = await _repository.GetProductTourUsageAsync(_appOptions.InternalProjectId, null, TimeProvider.GetUtcNow().UtcDateTime);
+
+        // Assert
+        Assert.Empty(result.Buckets);
     }
 
     [Fact]
diff --git a/tests/http/admin.http b/tests/http/admin.http
index 14b334867f..9d0087fb64 100644
--- a/tests/http/admin.http
+++ b/tests/http/admin.http
@@ -54,12 +54,12 @@ Authorization: Bearer {{token}}
 GET {{apiUrl}}/admin/assistant-usage
 Authorization: Bearer {{token}}
 
-### Product Tour Usage (current retained month)
-GET {{apiUrl}}/admin/product-tour-usage?days=30
+### Product Tour Usage (explicit UTC range)
+GET {{apiUrl}}/admin/product-tour-usage?start=2026-08-01T00:00:00Z&end=2026-08-31T00:00:00Z
 Authorization: Bearer {{token}}
 
-### Product Tour Usage (available retained history; automatic range-based buckets, monthly when retention is unlimited)
-GET {{apiUrl}}/admin/product-tour-usage?history=true
+### Product Tour Usage (available retained history; automatic range-based buckets)
+GET {{apiUrl}}/admin/product-tour-usage
 Authorization: Bearer {{token}}
 
 ### Get Exie Settings
@@ -125,13 +125,13 @@ Content-Type: application/json
 }
 
 ### Product Tour Usage
-# Includes weighted daily activity alongside unchanged per-guide totals.
-GET {{apiUrl}}/admin/product-tour-usage?month=2026-08-01
+# Includes weighted activity in automatic date buckets alongside per-guide totals.
+GET {{apiUrl}}/admin/product-tour-usage?start=2026-08-01T00:00:00Z&end=2026-09-01T00:00:00Z
 Authorization: Bearer {{token}}
 
 ###
 
-GET {{apiUrl}}/admin/product-tour-usage?history=true
+GET {{apiUrl}}/admin/product-tour-usage
 Authorization: Bearer {{token}}
 
 ### Suspend
diff --git a/tests/http/users.http b/tests/http/users.http
index 55fd127690..74801b5b3b 100644
--- a/tests/http/users.http
+++ b/tests/http/users.http
@@ -36,29 +36,6 @@ Content-Type: application/json
     "status": 1
 }
 
-### Record Optional Product Tour Activity (no identity or request context)
-# Returns 503 when the internal storage project/organization is unavailable or its event allowance is exhausted.
-# Requests are limited to 2 KB (413) and use the existing global API throttle (429).
-POST {{apiUrl}}/users/me/product-tours/app-overview/activity
-Authorization: Bearer {{token}}
-Content-Type: application/json
-
-{
-    "version": 1,
-    "action": "step-reached",
-    "source": "catalog",
-    "step": "navigation"
-}
-
-### Stop Future Product Tour Analytics (progress is unaffected)
-PUT {{apiUrl}}/users/me/product-tour-analytics
-Authorization: Bearer {{token}}
-Content-Type: application/json
-
-{
-    "enabled": false
-}
-
 ### Get OAuth Grants
 GET {{apiUrl}}/users/me/oauth-grants
 Authorization: Bearer {{token}}

From 335c13ae49dd2ca5ebe9e5e7b3f7a671c0807f71 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 13:59:52 -0500
Subject: [PATCH 35/43] Remove retired tour collector remnants

---
 .../Models/Data/ProductTours.cs                   |  9 ---------
 .../e2e/tests/product-tour-dashboard.e2e.ts       |  2 +-
 .../ClientApp/e2e/tests/product-tours.e2e.ts      |  7 -------
 .../Utility/Handlers/ThrottlingMiddlewareTests.cs | 15 ---------------
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/src/Exceptionless.Core/Models/Data/ProductTours.cs b/src/Exceptionless.Core/Models/Data/ProductTours.cs
index 65ef2328f7..532fbba990 100644
--- a/src/Exceptionless.Core/Models/Data/ProductTours.cs
+++ b/src/Exceptionless.Core/Models/Data/ProductTours.cs
@@ -74,20 +74,11 @@ public enum ProductTourKind
     Prompt
 }
 
-[JsonConverter(typeof(JsonStringEnumConverter))]
 public enum ProductTourTelemetryEvent
 {
-    [JsonStringEnumMemberName("completed")]
-    [EnumMember(Value = "completed")]
     Completed,
-    [JsonStringEnumMemberName("dismissed")]
-    [EnumMember(Value = "dismissed")]
     Dismissed,
-    [JsonStringEnumMemberName("shown")]
-    [EnumMember(Value = "shown")]
     Shown,
-    [JsonStringEnumMemberName("started")]
-    [EnumMember(Value = "started")]
     Started
 }
 
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
index 557ea69e40..ad35ee2c66 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tour-dashboard.e2e.ts
@@ -2,7 +2,7 @@ import type { ProductTourUsageResponse } from '../../src/lib/generated/api';
 
 import { expect, test } from '../fixtures/e2e-test';
 
-test('real dashboard matches repository totals across daily, month, and history filters', async ({ e2eApi, page }, testInfo) => {
+test('real dashboard matches repository totals across rolling, month, and history ranges', async ({ e2eApi, page }, testInfo) => {
     // Arrange: use the real local API, including its empty/unavailable-storage response.
     const token = await e2eApi.login();
     await page.addInitScript((token) => localStorage.setItem('satellizer_token', token), token);
diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index d91faa684e..d3bb723e87 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -20,12 +20,6 @@ test.describe('first-run welcome', () => {
                 await e2eApi.updateProductTour(e2eScenario.userToken, 'app-welcome', 1, 2);
             }
             await mockAssistantAccess(page);
-            const activities: string[] = [];
-            page.on('request', (request) => {
-                if (request.method() === 'POST' && /\/product-tours\/[^/]+\/activity$/.test(new URL(request.url()).pathname)) {
-                    activities.push(request.url());
-                }
-            });
             await page.goto('/next/stack');
             const dismiss = page.getByRole('button', { name: dismissLabel });
             await expect(dismiss).toBeVisible();
@@ -58,7 +52,6 @@ test.describe('first-run welcome', () => {
                 await expect(page.getByRole('button', { name: 'Dismiss Exie announcement' })).toBeVisible();
             }
             await expect(dismiss).toBeHidden();
-            expect(activities).toHaveLength(0);
         });
     }
 
diff --git a/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs b/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
index f07c2e9874..294d33c56a 100644
--- a/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
+++ b/tests/Exceptionless.Tests/Utility/Handlers/ThrottlingMiddlewareTests.cs
@@ -80,21 +80,6 @@ public async Task Invoke_DoesNotThrottleKnownConfigurationAndHeartbeatRoutes()
         Assert.Equal(2, nextCallCount);
     }
 
-    [Fact]
-    public async Task Invoke_ProductTourActivity_UsesExistingRequestLimit()
-    {
-        // Arrange
-        var middleware = CreateMiddleware(_ => throw new InvalidOperationException("A throttled request must not reach the endpoint."), GetService<ICacheClient>(), maxRequests: 0);
-        var context = CreateContext("/api/v2/users/me/product-tours/app-overview/activity");
-        context.Request.Method = HttpMethods.Post;
-
-        // Act
-        await middleware.Invoke(context);
-
-        // Assert
-        Assert.Equal(StatusCodes.Status429TooManyRequests, context.Response.StatusCode);
-    }
-
     [Fact]
     public async Task Invoke_V1ProjectConfigurationPath_DoesNotThrottleRequest()
     {

From b1018d9152fa150a7d99be0ad3591e9ab7fa0e8c Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 14:48:50 -0500
Subject: [PATCH 36/43] Keep welcome invitations out of manually started guides

---
 .../ClientApp/e2e/tests/product-tours.e2e.ts  | 27 +++++++++++++++++++
 .../components/product-tour-host.svelte       |  1 +
 2 files changed, 28 insertions(+)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index d3bb723e87..47b4ae8cda 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -55,6 +55,33 @@ test.describe('first-run welcome', () => {
         });
     }
 
+    test('a manual guide does not compete with or accept the pending welcome', async ({ e2eScenario, page }) => {
+        // Arrange
+        const welcome = page.getByRole('region', { name: 'Welcome to Exceptionless' });
+        await test.step(`show the pending welcome for ${e2eScenario.email}`, async () => {
+            await page.goto('/next/stack/all');
+            await expect(welcome).toBeVisible();
+        });
+        const invitationWrites: Request[] = [];
+        page.on('request', (request) => {
+            if (request.method() === 'PUT' && new URL(request.url()).pathname.endsWith('/product-tours/app-welcome')) {
+                invitationWrites.push(request);
+            }
+        });
+
+        // Act
+        await startTourFromCommand(page, 'Explore Exceptionless');
+
+        // Assert
+        const guide = page.locator('.driver-popover');
+        await expect(guide.getByText('Your workspace navigation')).toBeVisible();
+        await expect(welcome).toBeHidden();
+        await guide.getByRole('button', { name: 'End guide' }).click();
+        await expect(guide).toBeHidden();
+        await expect(welcome).toBeHidden();
+        expect(invitationWrites).toEqual([]);
+    });
+
     test('Browse Guides persists before the catalog opens', async ({ e2eScenario, page }, testInfo) => {
         await test.step(`show the first-run prompt for ${e2eScenario.email}`, async () => {
             await page.goto('/next/stack');
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index b9c0864853..effed5cfa1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -267,6 +267,7 @@
             return;
         }
 
+        automaticSurface = undefined;
         const active = productTourCheckpoint.current;
         if (active?.tourName === name && isActiveTourRenderable(active)) {
             closeOverlays();

From bf2c3ea8f76c7ba1feb1800f7602c655bdc77b29 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sat, 5 Sep 2026 22:01:42 -0500
Subject: [PATCH 37/43] Clarify guided tour invitation activity

---
 .../admin/components/product-tour-activity-popover.svelte       | 2 +-
 .../components/product-tour-activity-popover.svelte.test.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
index 6fa033e16d..6b57f622ad 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte
@@ -42,7 +42,7 @@
             {/if}
         {:else}
             <Typography.P class="leading-normal not-first:mt-0"
-                >Shown counts invitation displays; Accepted counts invitations used to open a guide.</Typography.P
+                >Shown counts invitation displays; Accepted counts choosing to start or browse guides, or open Exie.</Typography.P
             >
         {/if}
     </Popover.Content>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
index 3ce5b3cccb..0f6924d9fa 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/admin/components/product-tour-activity-popover.svelte.test.ts
@@ -54,7 +54,7 @@ describe('ProductTourActivityPopover', () => {
         await fireEvent.click(screen.getByRole('button'));
 
         // Assert
-        expect(screen.getByText(/Accepted counts invitations used to open a guide/)).toBeTruthy();
+        expect(screen.getByText(/Accepted counts choosing to start or browse guides, or open Exie/)).toBeTruthy();
         expect(screen.queryByRole('list', { name: 'Guide entry points' })).toBeNull();
     });
 });

From 0b67631f1b48a1d86eec6bb9f81af47e7a270e71 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 14:47:38 -0500
Subject: [PATCH 38/43] Simplify guided tour coordination and completion

---
 .../ClientApp/e2e/tests/product-tours.e2e.ts  |  20 ++++
 .../product-tours/actions.svelte.test.ts      |  14 +++
 .../features/product-tours/actions.svelte.ts  |   2 +-
 .../features/product-tours/catalog.test.ts    |  24 +++++
 .../src/lib/features/product-tours/catalog.ts |  13 +++
 .../product-tour-welcome.svelte.test.ts       |   1 +
 .../components/product-tour-host.svelte       | 100 ++++++------------
 .../components/saved-view-create-tour.svelte  |  22 +---
 .../src/lib/features/product-tours/models.ts  |   1 +
 .../components/saved-view-picker.svelte       |   4 -
 10 files changed, 106 insertions(+), 95 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
index 47b4ae8cda..3a301321f6 100644
--- a/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
+++ b/src/Exceptionless.Web/ClientApp/e2e/tests/product-tours.e2e.ts
@@ -314,6 +314,26 @@ test('project guide preserves the current SDK selection', async ({ e2eScenario,
     expect(new URL(page.url()).pathname).toBe(`/next/project/${e2eScenario.projectId}/configure`);
 });
 
+test('a saved-view guide allows submitting the form before finishing its steps', async ({ e2eScenario, page }) => {
+    // Arrange
+    await page.goto('/next/event');
+    await startTourFromCommand(page, 'Create a saved view');
+    const guide = page.locator('.driver-popover');
+    await guide.getByRole('button', { name: 'Open View' }).click();
+    await guide.getByRole('button', { name: 'Save As…' }).click();
+    const name = page.getByLabel('Name', { exact: true });
+    await name.fill(`Early Save ${e2eScenario.run}`);
+    const completed = page.waitForResponse(isSuccessfulTourProgress('saved-view-create'));
+
+    // Act
+    await name.press('Enter');
+
+    // Assert
+    await completed;
+    await expectProductTourSession(page, false);
+    await expect(page.getByText('Your saved view is ready', { exact: true })).toBeVisible();
+});
+
 test('domain workflows advance only on real success', async ({ e2eApi, e2eScenario, page }) => {
     test.setTimeout(300_000);
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
index f243bd8bb1..8de68a4f03 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.test.ts
@@ -16,6 +16,20 @@ vi.mock('./controls.svelte', () => ({ tryUseProductTourControls: () => ({ openCa
 vi.mock('svelte-sonner', () => ({ toast: { error: mocks.error, success: mocks.success } }));
 
 describe('product tour completion', () => {
+    it('finishes saved progress without waiting for telemetry', async () => {
+        // Arrange
+        const checkpoint = productTourCheckpoint.start('saved-view-create', 'view-created', 'catalog', 'user', 1);
+        mocks.submitFeatureUsage.mockReturnValue(new Promise<void>(() => {}));
+
+        // Act
+        const completed = await createProductTourActions().complete(checkpoint);
+
+        // Assert
+        expect(completed).toBe(true);
+        expect(productTourCheckpoint.current).toBeUndefined();
+        expect(mocks.success).toHaveBeenCalledOnce();
+    });
+
     afterEach(() => {
         productTourCheckpoint.clear();
         vi.resetAllMocks();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
index 91ce3e6466..53aa529635 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/actions.svelte.ts
@@ -61,7 +61,7 @@ export function createProductTourActions() {
         if (!productTourCheckpoint.clear(checkpoint)) {
             return false;
         }
-        await submitProductTourActivity(
+        void submitProductTourActivity(
             status === ProductTourStatus.Completed ? 'completed' : 'dismissed',
             checkpoint.tourName,
             checkpoint.version,
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
index 70ccd60063..e6e2833ff1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.test.ts
@@ -17,6 +17,30 @@ function context(overrides: Partial<ProductTourContext> = {}): ProductTourContex
 }
 
 describe('product tour catalog', () => {
+    it('resumes project setup using route identity rather than path substrings', () => {
+        // Arrange
+        const guide = productTourCatalog.find((tour) => tour.name === 'project-configure')!;
+
+        // Act / Assert
+        expect(guide.canResume('organization-name', '/(app)/organization/add')).toBe(true);
+        expect(guide.canResume('project-name', '/(app)/project/add')).toBe(true);
+        expect(guide.canResume('sdk-instructions', '/(app)/project/[projectId]/configure')).toBe(true);
+        expect(guide.canResume('sdk-instructions', '/(app)/project/add')).toBe(false);
+        expect(guide.canResume('sdk-instructions', null)).toBe(false);
+    });
+
+    it('does not resume dialog or detail checkpoints on their parent list', () => {
+        // Arrange
+        const savedView = productTourCatalog.find((tour) => tour.name === 'saved-view-create')!;
+        const investigation = productTourCatalog.find((tour) => tour.name === 'event-investigate')!;
+
+        // Act / Assert
+        expect(savedView.canResume('open-view-menu', '/(app)/event')).toBe(true);
+        expect(savedView.canResume('name-view', '/(app)/event')).toBe(false);
+        expect(investigation.canResume('choose-error', '/(app)/event')).toBe(true);
+        expect(investigation.canResume('stack-summary', '/(app)/event')).toBe(false);
+    });
+
     it('contains only durable metadata for the five named tours', () => {
         expect(productTourCatalog.map((tour) => tour.name)).toEqual([
             'app-overview',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
index a9c69989bd..fc9da28a89 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/catalog.ts
@@ -33,6 +33,7 @@ function requireOrganization(context: ProductTourContext) {
 export const productTourCatalog: readonly ProductTourDefinition[] = [
     {
         availability: requireApplicationShell,
+        canResume: () => true,
         description: 'Navigate stacks and events, use the command palette, and reopen saved views.',
         keywords: ['navigation', 'ui', 'search', 'command palette', 'help', 'saved views', 'stacks', 'occurrences'],
         name: 'app-overview',
@@ -45,6 +46,15 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
             context.isProjectConfigurePage || !context.organizationId || context.projects
                 ? { available: true }
                 : { available: false, reason: 'Projects could not be loaded. Try again shortly.' },
+        canResume: (checkpoint, routeId) => {
+            if (checkpoint === 'organization-name') {
+                return routeId === '/(app)/organization/add';
+            }
+            if (checkpoint === 'project-name') {
+                return routeId === '/(app)/organization/add' || routeId === '/(app)/project/add';
+            }
+            return routeId === '/(app)/project/[projectId]/configure';
+        },
         description: 'Continue an unfinished project, or create one and send its first event.',
         keywords: ['add project', 'configure', 'sdk', 'api key', 'first event'],
         name: 'project-configure',
@@ -74,6 +84,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     },
     {
         availability: requireOrganization,
+        canResume: (checkpoint, routeId) => routeId === '/(app)/event' && (checkpoint === 'open-view-menu' || checkpoint === 'view-created'),
         description: 'Save your event filters and layout in a view only you can see.',
         keywords: ['saved view', 'filter', 'columns', 'private', 'dashboard'],
         name: 'saved-view-create',
@@ -83,6 +94,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
     },
     {
         availability: requireError,
+        canResume: (checkpoint, routeId) => routeId === '/(app)/event' && (checkpoint === 'filter-errors' || checkpoint === 'choose-error'),
         description: 'Understand stacks, review status, and inspect individual event occurrences.',
         keywords: ['error report', 'event details', 'occurrences', 'exception', 'filter', 'stack', 'triage'],
         name: 'event-investigate',
@@ -100,6 +112,7 @@ export const productTourCatalog: readonly ProductTourDefinition[] = [
                 ? { available: true }
                 : { available: false, reason: context.assistantAccess.message ?? 'Exie requires access.' };
         },
+        canResume: (checkpoint) => checkpoint === 'open-exie',
         description: 'Explore the AI assistant. This guide does not send an AI request.',
         keywords: ['exie', 'assistant', 'ai', 'help', 'investigate'],
         name: 'exie-overview',
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts
index c979c38ee0..a6fadb8d29 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/alerts/product-tour-welcome.svelte.test.ts
@@ -5,6 +5,7 @@ import ProductTourWelcome from './product-tour-welcome.svelte';
 
 const recommended = {
     availability: vi.fn(() => ({ available: true })),
+    canResume: () => true,
     currentAvailability: { available: true },
     description: 'Learn navigation and search.',
     keywords: ['navigation'],
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index effed5cfa1..2fa41b672f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -41,8 +41,6 @@
 
     const EVENT_PATH = resolve('/(app)/event');
     const EXIE_ANNOUNCEMENT_VERSION = 1;
-    const ORGANIZATION_ADD_PATH = resolve('/(app)/organization/add');
-    const PROJECT_ADD_PATH = resolve('/(app)/project/add');
     const STACK_PATH = resolve('/(app)/stack');
     const SYSTEM_PATH = resolve('/(app)/system');
     const WELCOME_VERSION = 1;
@@ -64,14 +62,10 @@
 
     let catalogOpen = $state(false);
     let catalogSource = $state<ProductTourLaunchSource>('catalog');
-    let checkErrorAvailability = $state(false);
-    let automaticSurface = $state<'exie-announcement' | 'welcome'>();
+    let automaticSurface = $state<'exie-announcement' | 'handled' | 'welcome'>();
     let automaticSurfaceReady = $state(false);
-    let automaticSurfaceClaimed = $state(false);
     let automaticSurfaceUserId = $state<string>();
-    let lastTrackedAnnouncementImpression = $state('');
-    let lastTrackedWelcomeImpression = $state('');
-    let welcomeHandled = $state(false);
+    let lastTrackedImpression = '';
     let attemptedProjectCompletion: ProductTourCheckpoint | undefined;
 
     const actions = createProductTourActions();
@@ -86,7 +80,7 @@
     const projects = $derived(projectsQuery.data?.data ?? undefined);
     const projectConfigurePage = $derived(page.route.id === '/(app)/project/[projectId]/configure');
     const errorEventsQuery = getOrganizationEventsQuery({
-        enabled: () => checkErrorAvailability,
+        enabled: () => catalogOpen,
         params: {
             filter: 'type:error',
             limit: 1,
@@ -100,7 +94,7 @@
         }
     });
     const errorEventAvailability = $derived<ProductTourContext['errorEventAvailability']>(
-        !organizationId || !checkErrorAvailability || errorEventsQuery.isPending
+        !organizationId || !catalogOpen || errorEventsQuery.isPending
             ? 'loading'
             : errorEventsQuery.isError
               ? 'error'
@@ -126,7 +120,7 @@
             hostStateSettled &&
             automaticSurface === 'welcome' &&
             currentUser &&
-            !welcomeHandled &&
+            !checkpoint &&
             !catalogOpen &&
             !isAnyOverlayOpen &&
             !isImpersonating &&
@@ -160,7 +154,6 @@
         if (!automaticSurfaceReady || !currentUser) {
             automaticSurface = undefined;
             automaticSurfaceUserId = undefined;
-            automaticSurfaceClaimed = false;
             return;
         }
 
@@ -168,15 +161,14 @@
             automaticSurface = undefined;
             automaticSurfaceUserId = currentUser.id;
             try {
-                automaticSurfaceClaimed = sessionStorage.getItem(getAutomaticSurfaceKey(currentUser.id)) === 'shown';
+                automaticSurface = sessionStorage.getItem(getAutomaticSurfaceKey(currentUser.id)) === 'shown' ? 'handled' : undefined;
             } catch {
-                automaticSurfaceClaimed = false;
+                automaticSurface = undefined;
             }
-            welcomeHandled = false;
             return;
         }
 
-        if (automaticSurfaceClaimed || !hostStateSettled || isImpersonating || isSetupPage) {
+        if (automaticSurface || !hostStateSettled || isImpersonating || isSetupPage || checkpoint) {
             return;
         }
 
@@ -227,22 +219,15 @@
             return;
         }
 
-        const impression = `${currentUser.id}:${WELCOME_VERSION}`;
-        if (welcomeOpen && lastTrackedWelcomeImpression !== impression) {
-            lastTrackedWelcomeImpression = impression;
-            void submitProductTourActivity('shown', 'app-welcome', WELCOME_VERSION, 'welcome');
-        }
-    });
-
-    $effect(() => {
-        if (!currentUser) {
+        const invitation = welcomeOpen ? 'app-welcome' : exieAnnouncementOpen ? 'exie-announcement' : undefined;
+        if (!invitation) {
             return;
         }
-
-        const impression = `${currentUser.id}:${EXIE_ANNOUNCEMENT_VERSION}`;
-        if (exieAnnouncementOpen && lastTrackedAnnouncementImpression !== impression) {
-            lastTrackedAnnouncementImpression = impression;
-            void submitProductTourActivity('shown', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        const version = invitation === 'app-welcome' ? WELCOME_VERSION : EXIE_ANNOUNCEMENT_VERSION;
+        const impression = `${currentUser.id}:${invitation}:${version}`;
+        if (lastTrackedImpression !== impression) {
+            lastTrackedImpression = impression;
+            void submitProductTourActivity('shown', invitation, version, invitation === 'app-welcome' ? 'welcome' : 'feature-announcement');
         }
     });
 
@@ -252,12 +237,11 @@
             return;
         }
         closeOverlays();
-        checkErrorAvailability = true;
         catalogSource = source;
         catalogOpen = true;
     }
 
-    export async function startTour<Name extends ProductTourName>(name: Name, source: ProductTourLaunchSource = 'catalog'): Promise<void> {
+    export async function startTour(name: ProductTourName, source: ProductTourLaunchSource = 'catalog'): Promise<void> {
         if (!currentUser) {
             return;
         }
@@ -267,7 +251,7 @@
             return;
         }
 
-        automaticSurface = undefined;
+        automaticSurface = 'handled';
         const active = productTourCheckpoint.current;
         if (active?.tourName === name && isActiveTourRenderable(active)) {
             closeOverlays();
@@ -286,7 +270,7 @@
             search: window.location.search
         });
         const next = productTourCheckpoint.start(name, start.checkpointName, source, currentUser.id, item.version, organizationId);
-        await submitProductTourActivity('started', name, item.version, source);
+        void submitProductTourActivity('started', name, item.version, source);
 
         const destination = start.route;
         if (`${pathname}${window.location.search}` !== destination) {
@@ -321,9 +305,8 @@
         if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        welcomeHandled = true;
-        automaticSurface = undefined;
-        await submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        automaticSurface = 'handled';
+        void submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         await startTour(recommended.name, 'welcome');
     }
 
@@ -331,9 +314,8 @@
         if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        welcomeHandled = true;
-        automaticSurface = undefined;
-        await submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        automaticSurface = 'handled';
+        void submitProductTourActivity('completed', 'app-welcome', WELCOME_VERSION, 'welcome');
         await openCatalog('catalog');
     }
 
@@ -341,17 +323,16 @@
         if (!(await recordPreference('app-welcome', WELCOME_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
-        welcomeHandled = true;
-        automaticSurface = undefined;
-        await submitProductTourActivity('dismissed', 'app-welcome', WELCOME_VERSION, 'welcome');
+        automaticSurface = 'handled';
+        void submitProductTourActivity('dismissed', 'app-welcome', WELCOME_VERSION, 'welcome');
     }
 
     async function onExieAnnouncementStart(): Promise<void> {
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Completed))) {
             return;
         }
-        automaticSurface = undefined;
-        await submitProductTourActivity('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        automaticSurface = 'handled';
+        void submitProductTourActivity('completed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
         if (assistantAccess?.has_access) {
             await startTour('exie-overview', 'feature-announcement');
         } else {
@@ -363,12 +344,12 @@
         if (!(await recordPreference('exie-announcement', EXIE_ANNOUNCEMENT_VERSION, ProductTourStatus.Dismissed))) {
             return;
         }
-        automaticSurface = undefined;
-        await submitProductTourActivity('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
+        automaticSurface = 'handled';
+        void submitProductTourActivity('dismissed', 'exie-announcement', EXIE_ANNOUNCEMENT_VERSION, 'feature-announcement');
     }
 
-    function getItem<Name extends ProductTourName>(name: Name): ProductTourListItem<Name> {
-        return items.find((item) => item.name === name)! as ProductTourListItem<Name>;
+    function getItem(name: ProductTourName): ProductTourListItem {
+        return items.find((item) => item.name === name)!;
     }
 
     function claimAutomaticSurface(surface: 'exie-announcement' | 'welcome'): void {
@@ -377,7 +358,6 @@
         }
 
         automaticSurface = surface;
-        automaticSurfaceClaimed = true;
         try {
             sessionStorage.setItem(getAutomaticSurfaceKey(currentUser.id), 'shown');
         } catch {
@@ -390,25 +370,7 @@
     }
 
     function isActiveTourRenderable(active: NonNullable<typeof checkpoint>): boolean {
-        switch (active.tourName) {
-            case 'app-overview':
-                return true;
-            case 'event-investigate':
-                return pathname.startsWith(EVENT_PATH) && (active.checkpointName === 'filter-errors' || active.checkpointName === 'choose-error');
-            case 'exie-overview':
-                return active.checkpointName === 'open-exie';
-            case 'project-configure':
-                if (active.checkpointName === 'organization-name') {
-                    return pathname === ORGANIZATION_ADD_PATH;
-                }
-
-                if (active.checkpointName === 'project-name') {
-                    return pathname === ORGANIZATION_ADD_PATH || pathname === PROJECT_ADD_PATH;
-                }
-                return pathname.startsWith(PROJECT_ADD_PATH.slice(0, -3)) && pathname.endsWith('/configure');
-            case 'saved-view-create':
-                return pathname.startsWith(EVENT_PATH) && (active.checkpointName === 'open-view-menu' || active.checkpointName === 'view-created');
-        }
+        return getItem(active.tourName).canResume(active.checkpointName, page.route.id);
     }
 </script>
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
index 49a9100c1c..6c2729f7b9 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/saved-view-create-tour.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-    import { toast } from 'svelte-sonner';
-
     import { createProductTourActions } from '../actions.svelte';
     import { productTourCheckpoint } from '../state.svelte';
     import ProductTourSpotlight from './product-tour-spotlight.svelte';
@@ -29,31 +27,13 @@
         }
     }
 
-    export function validateSave(isPrivate: boolean): boolean {
-        if (!checkpoint) {
-            return true;
-        }
-
-        if (checkpoint.checkpointName !== 'save-view') {
-            toast.error('Complete the guide steps before saving your view.');
-            return false;
-        }
-
-        if (isPrivate) {
-            return true;
-        }
-
-        toast.error('Turn on Private so only you can see this view.');
-        return false;
-    }
-
     export function shouldDefaultPrivate(): boolean {
         return Boolean(checkpoint);
     }
 
     export async function created(): Promise<void> {
         const active = checkpoint;
-        if (!active || active.checkpointName !== 'save-view') {
+        if (!active) {
             return;
         }
 
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
index 70da9ae801..b6dee1897d 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/models.ts
@@ -39,6 +39,7 @@ export interface ProductTourContext {
 }
 export interface ProductTourDefinition<Name extends ProductTourName = ProductTourName> {
     availability: (context: ProductTourContext) => ProductTourAvailability;
+    canResume: (checkpointName: ProductTourCheckpointName<Name>, routeId: null | string) => boolean;
     description: string;
     keywords: readonly string[];
     name: Name;
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
index 01455173a4..68aeb68a5f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/saved-view-picker.svelte
@@ -263,10 +263,6 @@
         }
 
         const tour = savedViewCreateTour;
-        if (tour && !tour.validateSave(isPrivate)) {
-            return;
-        }
-
         const filterDefinitions = serializeFilters(filters);
         const body: NewSavedView = {
             columns: getSavedColumnSettings(),

From 0fbc67ef78f81b510089b044c788c91720c6c762 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 15:32:00 -0500
Subject: [PATCH 39/43] Preserve filter controls during initialization

---
 .../faceted-filter-builder.svelte             | 34 ++++++-----
 .../faceted-filter-builder.svelte.test.ts     | 60 +++++++++++++++++++
 ...faceted-filter-builder.test-harness.svelte | 16 +++++
 3 files changed, 95 insertions(+), 15 deletions(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
index be99e2e38a..39e9aaef60 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
@@ -28,7 +28,7 @@
 
     const CREATE_KEYWORD_FILTER_COMMAND_ITEM = 'CREATE_KEYWORD_FILTER_COMMAND_ITEM';
     let open = $state(false);
-    let lastOpenFilterId = $state<string>();
+    let lastOpenFilterKey = $state<string>();
     let search = $state('');
     let showHiddenFilters = $state(false);
 
@@ -37,6 +37,10 @@
     let facets: FacetedFilter<IFilter>[] = $state([]);
 
     $effect.pre(() => {
+        if (facets.some((facet) => facet.filter.key === lastOpenFilterKey) && !filters.some((filter) => filter.key === lastOpenFilterKey)) {
+            lastOpenFilterKey = undefined;
+        }
+
         if (builderContext.size === 0) {
             facets = [];
             return;
@@ -51,7 +55,7 @@
 
                 const f = builder.create(filter);
                 // Reuse existing facet to preserve open state and avoid component recreation
-                const existing = facets.find((facet) => facet.filter.id === f.id);
+                const existing = facets.find((facet) => facet.filter.key === f.key);
                 if (existing) {
                     existing.filter = f;
                     existing.component = builder.component;
@@ -62,15 +66,15 @@
                 return {
                     component: builder.component,
                     filter: f,
-                    open: lastOpenFilterId === f.id,
+                    open: lastOpenFilterKey === f.key,
                     title: builder.title
                 };
             })
             .filter((f): f is FacetedFilter<IFilter> => !!f);
 
         // Only replace the array if the set of facets actually changed
-        const idsMatch = newFacets.length === facets.length && newFacets.every((f, i) => f.filter.id === facets[i]?.filter.id);
-        if (!idsMatch) {
+        const keysMatch = newFacets.length === facets.length && newFacets.every((f, i) => f.filter.key === facets[i]?.filter.key);
+        if (!keysMatch) {
             facets = newFacets;
         }
     });
@@ -105,20 +109,20 @@
                 showHiddenFilters = true;
             }
 
-            const existingFacet = facets.find((facet) => facet.filter.id === existingFilter.id);
+            const existingFacet = facets.find((facet) => facet.filter.key === existingFilter.key);
             if (existingFacet) {
                 existingFacet.open = true;
             }
 
             open = false;
-            lastOpenFilterId = existingFilter.id;
+            lastOpenFilterKey = existingFilter.key;
             return;
         }
 
         changed(filter);
 
         open = false;
-        lastOpenFilterId = filter.id;
+        lastOpenFilterKey = filter.key;
     }
 
     function filterChanged(filter: IFilter) {
@@ -126,15 +130,15 @@
     }
 
     function filterRemoved(filter: IFilter) {
-        if (lastOpenFilterId === filter.id) {
-            lastOpenFilterId = undefined;
+        if (lastOpenFilterKey === filter.key) {
+            lastOpenFilterKey = undefined;
         }
 
         remove(filter);
     }
 
     function onRemoveAll() {
-        lastOpenFilterId = undefined;
+        lastOpenFilterKey = undefined;
         remove();
     }
 
@@ -165,7 +169,7 @@
         if (existingKeywordFilter) {
             open = false;
             search = '';
-            lastOpenFilterId = existingKeywordFilter.id;
+            lastOpenFilterKey = existingKeywordFilter.key;
             return;
         }
 
@@ -177,7 +181,7 @@
 
             open = false;
             search = '';
-            lastOpenFilterId = filter.id;
+            lastOpenFilterKey = filter.key;
         }
     }
 
@@ -198,7 +202,7 @@
     {@render children()}
 {/if}
 
-{#each visibleFacets as facet (facet.filter.id)}
+{#each visibleFacets as facet (facet.filter.key)}
     {@const Facet = facet.component}
     <div class:opacity-70={facet.filter.hidden}>
         <Facet
@@ -208,7 +212,7 @@
             bind:open={
                 () => facet.open,
                 (isOpen) => {
-                    lastOpenFilterId = isOpen ? facet.filter.id : undefined;
+                    lastOpenFilterKey = isOpen ? facet.filter.key : undefined;
                     facet.open = isOpen;
                 }
             }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
new file mode 100644
index 0000000000..8c1764d7de
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
@@ -0,0 +1,60 @@
+import { DateFilter } from '$features/events/components/filters/models.svelte';
+import { fireEvent, render, screen, waitFor } from '@testing-library/svelte';
+import { describe, expect, it, vi } from 'vitest';
+
+import type { IFilter } from './models';
+
+import Harness from './faceted-filter-builder.test-harness.svelte';
+
+describe('faceted filter initialization', () => {
+    it('opens a newly added filter after the parent supplies it', async () => {
+        // Arrange
+        const changed = vi.fn<(filter: IFilter) => void>();
+        const view = render(Harness, { changed, filters: [], remove: vi.fn() });
+        await fireEvent.click(screen.getByRole('button', { name: 'Manage filters' }));
+
+        // Act
+        await fireEvent.click(await screen.findByRole('option', { name: 'Date' }));
+        expect(changed).toHaveBeenCalledOnce();
+        const added = changed.mock.calls[0]![0];
+        await view.rerender({ filters: [added] });
+
+        // Assert
+        expect(screen.getByRole('button', { name: /^Date/ }).getAttribute('aria-expanded')).toBe('true');
+    });
+
+    it('does not reopen a removed filter when it is added again', async () => {
+        // Arrange
+        const view = render(Harness, { changed: vi.fn(), filters: [new DateFilter('date', '[now-90d TO now]')], remove: vi.fn() });
+        await fireEvent.click(await screen.findByRole('button', { name: /^Date/ }));
+        await screen.findByRole('button', { name: 'Last 30 days' });
+
+        // Act
+        await view.rerender({ filters: [] });
+        await view.rerender({ filters: [new DateFilter('date', '[now-7d TO now]')] });
+
+        // Assert
+        expect(screen.getByRole('button', { name: /^Date/ }).getAttribute('aria-expanded')).toBe('false');
+    });
+
+    it('keeps the date picker open when hydration replaces a filter instance', async () => {
+        // Arrange
+        const changed = vi.fn();
+        const initial = new DateFilter('date', '[now-90d TO now]');
+        const hydrated = new DateFilter('date', '[now-90d TO now]');
+        const view = render(Harness, { changed, filters: [initial], remove: vi.fn() });
+        const trigger = await screen.findByRole('button', { name: /^Date/ });
+        await fireEvent.click(trigger);
+        await screen.findByRole('button', { name: 'Last 30 days' });
+
+        // Act
+        await view.rerender({ filters: [hydrated] });
+
+        // Assert
+        await waitFor(() => expect(trigger.getAttribute('aria-expanded')).toBe('true'));
+        expect(screen.getByRole('button', { name: /^Date/ })).toBe(trigger);
+        await fireEvent.click(screen.getByRole('button', { name: 'Last 30 days' }));
+        expect(changed).toHaveBeenCalledWith(hydrated);
+        expect(hydrated.value).toBe('[now-30d TO now]');
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte
new file mode 100644
index 0000000000..f59507cb72
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+    import * as Tooltip from '$comp/ui/tooltip';
+    import DateFacetedFilterBuilder from '$features/events/components/filters/date-faceted-filter-builder.svelte';
+
+    import type { IFilter } from './models';
+
+    import FacetedFilterBuilder from './faceted-filter-builder.svelte';
+
+    let { changed, filters, remove }: { changed: (filter: IFilter) => void; filters: IFilter[]; remove: (filter?: IFilter) => void } = $props();
+</script>
+
+<Tooltip.Provider>
+    <FacetedFilterBuilder {filters} {changed} {remove}>
+        <DateFacetedFilterBuilder term="date" title="Date" />
+    </FacetedFilterBuilder>
+</Tooltip.Provider>

From dae155a1a340a5a88f5385322c9217b829600f3f Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 15:46:33 -0500
Subject: [PATCH 40/43] Keep duplicate filter instances distinct

---
 .../faceted-filter-builder.svelte             | 41 ++++++++++---------
 .../faceted-filter-builder.svelte.test.ts     | 20 ++++++++-
 ...faceted-filter-builder.test-harness.svelte |  2 +
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
index 39e9aaef60..63d062f970 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
@@ -28,7 +28,7 @@
 
     const CREATE_KEYWORD_FILTER_COMMAND_ITEM = 'CREATE_KEYWORD_FILTER_COMMAND_ITEM';
     let open = $state(false);
-    let lastOpenFilterKey = $state<string>();
+    let lastOpenFilterId = $state<string>();
     let search = $state('');
     let showHiddenFilters = $state(false);
 
@@ -37,10 +37,6 @@
     let facets: FacetedFilter<IFilter>[] = $state([]);
 
     $effect.pre(() => {
-        if (facets.some((facet) => facet.filter.key === lastOpenFilterKey) && !filters.some((filter) => filter.key === lastOpenFilterKey)) {
-            lastOpenFilterKey = undefined;
-        }
-
         if (builderContext.size === 0) {
             facets = [];
             return;
@@ -55,8 +51,15 @@
 
                 const f = builder.create(filter);
                 // Reuse existing facet to preserve open state and avoid component recreation
-                const existing = facets.find((facet) => facet.filter.key === f.key);
+                // Raw-filter drafts can contain multiple filters with the same key.
+                const sameKeyFacets = facets.filter((facet) => facet.filter.key === f.key);
+                const existing =
+                    facets.find((facet) => facet.filter.id === f.id) ??
+                    (sameKeyFacets.length === 1 && filters.filter((candidate) => candidate.key === f.key).length === 1 ? sameKeyFacets[0] : undefined);
                 if (existing) {
+                    if (lastOpenFilterId === existing.filter.id) {
+                        lastOpenFilterId = f.id;
+                    }
                     existing.filter = f;
                     existing.component = builder.component;
                     existing.title = builder.title;
@@ -66,15 +69,15 @@
                 return {
                     component: builder.component,
                     filter: f,
-                    open: lastOpenFilterKey === f.key,
+                    open: lastOpenFilterId === f.id,
                     title: builder.title
                 };
             })
             .filter((f): f is FacetedFilter<IFilter> => !!f);
 
         // Only replace the array if the set of facets actually changed
-        const keysMatch = newFacets.length === facets.length && newFacets.every((f, i) => f.filter.key === facets[i]?.filter.key);
-        if (!keysMatch) {
+        const idsMatch = newFacets.length === facets.length && newFacets.every((f, i) => f.filter.id === facets[i]?.filter.id);
+        if (!idsMatch) {
             facets = newFacets;
         }
     });
@@ -109,20 +112,20 @@
                 showHiddenFilters = true;
             }
 
-            const existingFacet = facets.find((facet) => facet.filter.key === existingFilter.key);
+            const existingFacet = facets.find((facet) => facet.filter.id === existingFilter.id);
             if (existingFacet) {
                 existingFacet.open = true;
             }
 
             open = false;
-            lastOpenFilterKey = existingFilter.key;
+            lastOpenFilterId = existingFilter.id;
             return;
         }
 
         changed(filter);
 
         open = false;
-        lastOpenFilterKey = filter.key;
+        lastOpenFilterId = filter.id;
     }
 
     function filterChanged(filter: IFilter) {
@@ -130,15 +133,15 @@
     }
 
     function filterRemoved(filter: IFilter) {
-        if (lastOpenFilterKey === filter.key) {
-            lastOpenFilterKey = undefined;
+        if (lastOpenFilterId === filter.id) {
+            lastOpenFilterId = undefined;
         }
 
         remove(filter);
     }
 
     function onRemoveAll() {
-        lastOpenFilterKey = undefined;
+        lastOpenFilterId = undefined;
         remove();
     }
 
@@ -169,7 +172,7 @@
         if (existingKeywordFilter) {
             open = false;
             search = '';
-            lastOpenFilterKey = existingKeywordFilter.key;
+            lastOpenFilterId = existingKeywordFilter.id;
             return;
         }
 
@@ -181,7 +184,7 @@
 
             open = false;
             search = '';
-            lastOpenFilterKey = filter.key;
+            lastOpenFilterId = filter.id;
         }
     }
 
@@ -202,7 +205,7 @@
     {@render children()}
 {/if}
 
-{#each visibleFacets as facet (facet.filter.key)}
+{#each visibleFacets as facet (facet)}
     {@const Facet = facet.component}
     <div class:opacity-70={facet.filter.hidden}>
         <Facet
@@ -212,7 +215,7 @@
             bind:open={
                 () => facet.open,
                 (isOpen) => {
-                    lastOpenFilterKey = isOpen ? facet.filter.key : undefined;
+                    lastOpenFilterId = isOpen ? facet.filter.id : undefined;
                     facet.open = isOpen;
                 }
             }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
index 8c1764d7de..c297af1b85 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte.test.ts
@@ -1,4 +1,4 @@
-import { DateFilter } from '$features/events/components/filters/models.svelte';
+import { DateFilter, KeywordFilter } from '$features/events/components/filters/models.svelte';
 import { fireEvent, render, screen, waitFor } from '@testing-library/svelte';
 import { describe, expect, it, vi } from 'vitest';
 
@@ -7,6 +7,24 @@ import type { IFilter } from './models';
 import Harness from './faceted-filter-builder.test-harness.svelte';
 
 describe('faceted filter initialization', () => {
+    it('keeps duplicate raw filters distinct when another filter is added', async () => {
+        // Arrange
+        const local = new KeywordFilter('error.type:Local');
+        const remote = new KeywordFilter('error.type:Remote');
+        const view = render(Harness, { changed: vi.fn(), filters: [local], remove: vi.fn() });
+        const original = await screen.findByRole('button', { name: /^Raw Filter.*error\.type:Local/ });
+
+        // Act
+        await view.rerender({ filters: [local, remote] });
+
+        // Assert
+        expect(screen.getByRole('button', { name: /^Raw Filter.*error\.type:Local/ })).toBe(original);
+        expect(screen.getByRole('button', { name: /^Raw Filter.*error\.type:Remote/ })).not.toBe(original);
+
+        await view.rerender({ filters: [new KeywordFilter('error.type:Local'), new KeywordFilter('error.type:Remote')] });
+        expect(screen.getAllByRole('button', { name: /^Raw Filter/ })).toHaveLength(2);
+    });
+
     it('opens a newly added filter after the parent supplies it', async () => {
         // Arrange
         const changed = vi.fn<(filter: IFilter) => void>();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte
index f59507cb72..0649f5b3b7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.test-harness.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import * as Tooltip from '$comp/ui/tooltip';
     import DateFacetedFilterBuilder from '$features/events/components/filters/date-faceted-filter-builder.svelte';
+    import KeywordFacetedFilterBuilder from '$features/events/components/filters/keyword-faceted-filter-builder.svelte';
 
     import type { IFilter } from './models';
 
@@ -12,5 +13,6 @@
 <Tooltip.Provider>
     <FacetedFilterBuilder {filters} {changed} {remove}>
         <DateFacetedFilterBuilder term="date" title="Date" />
+        <KeywordFacetedFilterBuilder />
     </FacetedFilterBuilder>
 </Tooltip.Provider>

From 6e2df00f2252773a96fcbf1a2a5c23c0f1e0d674 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 16:17:30 -0500
Subject: [PATCH 41/43] Preserve saved-view drafts when a guide ends

---
 .../components/save-view-dialog.svelte        |  3 +-
 .../save-view-dialog.svelte.test.ts           | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte.test.ts

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
index 0452ec7930..d8e26fc82f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte
@@ -5,6 +5,7 @@
     import { Input } from '$comp/ui/input';
     import { Label } from '$comp/ui/label';
     import { Switch } from '$comp/ui/switch';
+    import { untrack } from 'svelte';
 
     import type { SavedView } from '../models';
 
@@ -88,7 +89,7 @@
             saveName = '';
             saveSlug = '';
             isSlugDirty = false;
-            isPrivate = defaultPrivate;
+            isPrivate = untrack(() => defaultPrivate);
             attemptedSubmit = false;
         }
     });
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte.test.ts
new file mode 100644
index 0000000000..7a96b89106
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/saved-views/components/save-view-dialog.svelte.test.ts
@@ -0,0 +1,32 @@
+import '@testing-library/jest-dom/vitest';
+import { fireEvent, render, screen } from '@testing-library/svelte';
+import { describe, expect, it, vi } from 'vitest';
+
+import SaveViewDialog from './save-view-dialog.svelte';
+
+describe('SaveViewDialog', () => {
+    it('preserves the draft when the guide default changes while open', async () => {
+        const { rerender } = render(SaveViewDialog, {
+            defaultPrivate: true,
+            onClose: vi.fn(),
+            onLoadView: vi.fn(),
+            onSave: vi.fn(),
+            open: true,
+            savedViews: [],
+            saving: false
+        });
+        await fireEvent.input(screen.getByLabelText('Name'), { target: { value: 'My errors' } });
+
+        await rerender({ defaultPrivate: false });
+
+        expect(screen.getByLabelText('Name')).toHaveValue('My errors');
+        expect(screen.getByLabelText('URL name')).toHaveValue('my-errors');
+        expect(screen.getByRole('switch', { name: 'Private' })).toHaveAttribute('aria-checked', 'true');
+
+        await rerender({ open: false });
+        await rerender({ open: true });
+
+        expect(screen.getByLabelText('Name')).toHaveValue('');
+        expect(screen.getByRole('switch', { name: 'Private' })).toHaveAttribute('aria-checked', 'false');
+    });
+});

From 164eacf076a35c186baa21e5cad795b5102b08fa Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 16:21:01 -0500
Subject: [PATCH 42/43] Preserve newer guided-tour progress in the user cache

---
 .../product-tours/user-cache.svelte.test.ts   | 35 +++++++++++++++++++
 .../src/lib/features/users/api.svelte.ts      | 11 ++++++
 2 files changed, 46 insertions(+)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
index 429726df2d..bdeba2592f 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
@@ -29,6 +29,22 @@ describe('guided-tour user cache concurrency', () => {
         queryClient.setQueryData(queryKeys.me(), user('first-user'));
     });
 
+    it.each([{ status: 1, version: 1 }, { status: 2, version: 2 }])('accepts forward progress: %o', async (progress) => {
+        // Arrange
+        queryClient.setQueryData(queryKeys.me(), {
+            ...user('first-user'),
+            product_tours: { 'app-overview': { status: 2, version: 1 } }
+        });
+        mocks.putJSON.mockResolvedValue({ data: progress, ok: true });
+
+        // Act
+        await putCurrentUserProductTour().mutateAsync({ progress, tourName: 'app-overview' });
+
+        // Assert
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())?.product_tours?.['app-overview']).toEqual(progress);
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.id('first-user'))?.product_tours?.['app-overview']).toEqual(progress);
+    });
+
     it.each([false, true])('applies delayed completion only to its original account (account changed: %s)', async (changeAccount) => {
         // Arrange
         const progress: ProductTourProgress = { status: 1, version: 1 };
@@ -49,6 +65,25 @@ describe('guided-tour user cache concurrency', () => {
             product_tours: changeAccount ? {} : { 'app-overview': progress }
         });
     });
+    it.each([
+        { status: 1, version: 1 },
+        { status: 2, version: 2 }
+    ])('preserves newer cached progress when an older response arrives: %o', async (stored) => {
+        // Arrange
+        const progress: ProductTourProgress = { status: 2, version: 1 };
+        const request = Promise.withResolvers<{ data: ProductTourProgress; ok: boolean }>();
+        mocks.putJSON.mockReturnValue(request.promise);
+        const pending = putCurrentUserProductTour().mutateAsync({ progress, tourName: 'app-overview' });
+        await vi.waitFor(() => expect(mocks.putJSON).toHaveBeenCalledOnce());
+        queryClient.setQueryData(queryKeys.me(), { ...user('first-user'), product_tours: { 'app-overview': stored } });
+
+        // Act
+        request.resolve({ data: progress, ok: true });
+        await pending;
+
+        // Assert
+        expect(queryClient.getQueryData<ViewCurrentUser>(queryKeys.me())?.product_tours?.['app-overview']).toEqual(stored);
+    });
 });
 
 function user(id: string): ViewCurrentUser {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
index 41b9843f86..a3971221c1 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/users/api.svelte.ts
@@ -18,6 +18,8 @@ import type {
     ViewUser
 } from './models';
 
+import { ProductTourStatus } from './models';
+
 export async function invalidateUserQueries(queryClient: QueryClient, message: WebSocketMessageValue<'UserChanged'>) {
     const { id } = message;
     if (id) {
@@ -297,6 +299,15 @@ export function putCurrentUserProductTour() {
                 return;
             }
 
+            const storedProgress = currentUser.product_tours?.[tourName];
+            if (
+                storedProgress &&
+                (storedProgress.version > progress.version ||
+                    (storedProgress.version === progress.version && storedProgress.status === ProductTourStatus.Completed))
+            ) {
+                return;
+            }
+
             const updatedUser = {
                 ...currentUser,
                 product_tours: {

From cff474104a6f22b406ed5b6dc8178c5e2a94b0b5 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Sun, 6 Sep 2026 16:21:44 -0500
Subject: [PATCH 43/43] Format guided-tour cache regressions

---
 .../src/lib/features/product-tours/user-cache.svelte.test.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
index bdeba2592f..d6c1c7d166 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/user-cache.svelte.test.ts
@@ -29,7 +29,10 @@ describe('guided-tour user cache concurrency', () => {
         queryClient.setQueryData(queryKeys.me(), user('first-user'));
     });
 
-    it.each([{ status: 1, version: 1 }, { status: 2, version: 2 }])('accepts forward progress: %o', async (progress) => {
+    it.each([
+        { status: 1, version: 1 },
+        { status: 2, version: 2 }
+    ])('accepts forward progress: %o', async (progress) => {
         // Arrange
         queryClient.setQueryData(queryKeys.me(), {
             ...user('first-user'),