From 7cede9bc7d5a59e70434983746ec7c8a05149ee2 Mon Sep 17 00:00:00 2001
From: "Eric J. Smith" <eric@codesmithtools.com>
Date: Mon, 8 Jun 2026 15:31:21 -0500
Subject: [PATCH 1/2] Support scoped worktree Aspire runs

---
 .../Extensions/WorktreeScope.cs               | 125 ++++++++++++++
 src/Exceptionless.AppHost/Program.cs          | 118 +++++++++----
 .../grunt/task-configs/connect.js             |   4 +
 .../grunt/task-configs/watch.js               |   4 +-
 .../ClientApp.angular/index.html              |   3 -
 src/Exceptionless.Web/ClientApp/package.json  |   1 +
 .../ClientApp/scripts/resolve-url.mjs         | 157 ++++++++++++++++++
 .../src/lib/features/status/models.ts         |   1 +
 .../ClientApp/vite.config.ts                  |   7 +-
 .../Controllers/StatusController.cs           |   1 +
 .../Exceptionless.Tests/AppWebHostFactory.cs  |  35 ++--
 .../Controllers/StatusControllerTests.cs      |  17 +-
 12 files changed, 408 insertions(+), 65 deletions(-)
 create mode 100644 src/Exceptionless.AppHost/Extensions/WorktreeScope.cs
 create mode 100644 src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs

diff --git a/src/Exceptionless.AppHost/Extensions/WorktreeScope.cs b/src/Exceptionless.AppHost/Extensions/WorktreeScope.cs
new file mode 100644
index 0000000000..0baeaf3ab9
--- /dev/null
+++ b/src/Exceptionless.AppHost/Extensions/WorktreeScope.cs
@@ -0,0 +1,125 @@
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+
+public sealed record WorktreePorts(
+    int DashboardHttps,
+    int DashboardHttp,
+    int DashboardOtlp,
+    int ResourceService,
+    int ApiHttp,
+    int ApiHttps,
+    int JobsHttp,
+    int OldAppHttp,
+    int OldAppHttps,
+    int OldAppLiveReload,
+    int AppHttps)
+{
+    public string ApiHttpUrl => $"http://localhost:{ApiHttp}";
+    public string ApiHttpsUrl => $"https://localhost:{ApiHttps}";
+    public string OldAppHttpsUrl => $"https://angular-ex.dev.localhost:{OldAppHttps}";
+}
+
+public static class WorktreeScope
+{
+    public static string? Resolve()
+    {
+        var explicitScope = Environment.GetEnvironmentVariable("Scope");
+        if (!String.IsNullOrWhiteSpace(explicitScope))
+        {
+            return Sanitize(explicitScope);
+        }
+
+        for (var dir = new DirectoryInfo(AppContext.BaseDirectory); dir != null; dir = dir.Parent)
+        {
+            var dotGit = Path.Combine(dir.FullName, ".git");
+            if (File.Exists(dotGit))
+            {
+                return Sanitize(ResolveGitWorktreeName(dotGit) ?? dir.Name);
+            }
+
+            if (Directory.Exists(dotGit))
+            {
+                return null;
+            }
+        }
+
+        return null;
+    }
+
+    public static WorktreePorts AssignFreePorts()
+    {
+        var ports = FreePorts(11);
+        var assignments = new WorktreePorts(
+            ports[0],
+            ports[1],
+            ports[2],
+            ports[3],
+            ports[4],
+            ports[5],
+            ports[6],
+            ports[7],
+            ports[8],
+            ports[9],
+            ports[10]);
+
+        Environment.SetEnvironmentVariable("ASPNETCORE_URLS", $"https://localhost:{assignments.DashboardHttps};http://localhost:{assignments.DashboardHttp}");
+        Environment.SetEnvironmentVariable("DOTNET_DASHBOARD_OTLP_ENDPOINT_URL", $"https://localhost:{assignments.DashboardOtlp}");
+        Environment.SetEnvironmentVariable("DOTNET_RESOURCE_SERVICE_ENDPOINT_URL", $"https://localhost:{assignments.ResourceService}");
+
+        return assignments;
+    }
+
+    private static int[] FreePorts(int count)
+    {
+        var listeners = new List<TcpListener>(count);
+        try
+        {
+            for (var i = 0; i < count; i++)
+            {
+                var listener = new TcpListener(IPAddress.Loopback, 0);
+                listener.Start();
+                listeners.Add(listener);
+            }
+
+            return listeners.Select(l => ((IPEndPoint)l.LocalEndpoint).Port).ToArray();
+        }
+        finally
+        {
+            foreach (var listener in listeners)
+            {
+                listener.Stop();
+            }
+        }
+    }
+
+    private static string? ResolveGitWorktreeName(string dotGitPath)
+    {
+        var content = File.ReadAllText(dotGitPath).Trim();
+        const string gitDirPrefix = "gitdir:";
+        if (!content.StartsWith(gitDirPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            return null;
+        }
+
+        var gitDir = content[gitDirPrefix.Length..].Trim().TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        return Path.GetFileName(gitDir);
+    }
+
+    private static string Sanitize(string value)
+    {
+        var builder = new StringBuilder(value.Length);
+        foreach (var ch in value.ToLowerInvariant())
+        {
+            builder.Append(Char.IsLetterOrDigit(ch) ? ch : '-');
+        }
+
+        var cleaned = builder.ToString().Trim('-');
+        while (cleaned.Contains("--", StringComparison.Ordinal))
+        {
+            cleaned = cleaned.Replace("--", "-", StringComparison.Ordinal);
+        }
+
+        return cleaned.Length > 40 ? cleaned[..40].Trim('-') : cleaned;
+    }
+}
diff --git a/src/Exceptionless.AppHost/Program.cs b/src/Exceptionless.AppHost/Program.cs
index cd49b1a8a6..0da796a76e 100644
--- a/src/Exceptionless.AppHost/Program.cs
+++ b/src/Exceptionless.AppHost/Program.cs
@@ -2,25 +2,33 @@
 using Aspire.Hosting.JavaScript;
 using Microsoft.Extensions.Hosting;
 
+var scope = WorktreeScope.Resolve();
+var isScoped = !String.IsNullOrWhiteSpace(scope);
+var worktreePorts = isScoped ? WorktreeScope.AssignFreePorts() : null;
 var builder = DistributedApplication.CreateBuilder(args);
 var servicesOnly = args.Any(arg => StringComparer.OrdinalIgnoreCase.Equals(arg, "--services-only") || StringComparer.OrdinalIgnoreCase.Equals(arg, "services-only"));
+var oldAppHttpPort = worktreePorts?.OldAppHttp ?? 7120;
+var oldAppPort = worktreePorts?.OldAppHttps ?? 7121;
+var oldAppLiveReloadPort = worktreePorts?.OldAppLiveReload ?? 35729;
+var oldAppAspNetCoreUrls = String.Concat("http://localhost:", oldAppHttpPort);
+var appPort = worktreePorts?.AppHttps ?? 7131;
+const string SharedEmailConnectionString = "smtp://localhost:1025";
 
 var elastic = builder.AddElasticsearch("Elasticsearch", port: 9200)
-    .WithDataVolume(servicesOnly ? null : "exceptionless.data.v1");
+    .WithDataVolume("exceptionless.data.v1")
+    .WithEndpointProxySupport(false);
 
 var storage = builder.AddAzureStorage("Storage")
     .RunAsEmulator(c =>
     {
+        c.WithEndpointProxySupport(false);
         c.WithUrlForEndpoint("blob", u => { u.DisplayText = "Blobs"; u.DisplayLocation = UrlDisplayLocation.DetailsOnly; });
         c.WithUrlForEndpoint("queue", u => { u.DisplayText = "Queues"; u.DisplayLocation = UrlDisplayLocation.DetailsOnly; });
         c.WithUrlForEndpoint("table", u => { u.DisplayText = "Tables"; u.DisplayLocation = UrlDisplayLocation.DetailsOnly; });
 
-        if (!servicesOnly)
-        {
-            c.WithLifetime(ContainerLifetime.Persistent);
-            c.WithContainerName("Exceptionless-Storage");
-            c.WithDataVolume();
-        }
+        c.WithLifetime(ContainerLifetime.Persistent);
+        c.WithContainerName("Exceptionless-Storage");
+        c.WithDataVolume("exceptionless.storage.data.v1");
     });
 
 var storageBlobs = storage.AddBlobs("StorageBlobs");
@@ -28,6 +36,8 @@
 
 var cache = builder.AddRedis("Redis", port: 6379)
     .WithImageTag("8.6")
+    .WithDataVolume("exceptionless.redis.data.v1")
+    .WithEndpointProxySupport(false)
     .WithClearCommand()
     .WithUrls(c =>
     {
@@ -39,41 +49,54 @@
 
 var mail = builder.AddContainer("Mail", "axllent/mailpit")
     .WithImageTag("v1.27.10")
+    .WithEndpointProxySupport(false)
     .WithHttpEndpoint(8025, 8025, "http")
     .WithUrlForEndpoint("http", u => { u.DisplayText = "Mail"; u.DisplayOrder = 100; })
     .WithHttpHealthCheck("/readyz")
     .WithEndpoint(1025, 1025)
     .WithUrlForEndpoint("tcp", u => u.DisplayLocation = UrlDisplayLocation.DetailsOnly);
 
+var ownedElastic = elastic;
+elastic = ownedElastic
+    .WithLifetime(ContainerLifetime.Persistent)
+    .WithContainerName("Exceptionless-Elasticsearch");
+
 if (!servicesOnly)
 {
-    elastic = elastic
+    elastic = elastic.WithKibana(b => b
         .WithLifetime(ContainerLifetime.Persistent)
-        .WithContainerName("Exceptionless-Elasticsearch")
-        .WithKibana(b => b
-            .WithLifetime(ContainerLifetime.Persistent)
-            .WithContainerName("Exceptionless-Kibana")
-            .WithParentRelationship(elastic));
+        .WithEndpointProxySupport(false)
+        .WithContainerName("Exceptionless-Kibana")
+        .WithParentRelationship(ownedElastic));
+}
 
-    cache = cache
-        .WithLifetime(ContainerLifetime.Persistent)
-        .WithContainerName("Exceptionless-Redis")
-        .WithRedisInsight(b => b
-            .WithLifetime(ContainerLifetime.Persistent)
-            .WithContainerName("Exceptionless-RedisInsight")
-            .WithUrlForEndpoint("http", u => u.DisplayText = "Redis")
-            .WithParentRelationship(cache), containerName: "Redis-insight");
-
-    mail = mail
+var ownedCache = cache;
+cache = ownedCache
+    .WithLifetime(ContainerLifetime.Persistent)
+    .WithContainerName("Exceptionless-Redis");
+
+if (!servicesOnly)
+{
+    cache = cache.WithRedisInsight(b => b
         .WithLifetime(ContainerLifetime.Persistent)
-        .WithContainerName("Exceptionless-Mail");
+        .WithEndpointProxySupport(false)
+        .WithContainerName("Exceptionless-RedisInsight")
+        .WithUrlForEndpoint("http", u => u.DisplayText = "Redis")
+        .WithParentRelationship(ownedCache), containerName: "Redis-insight");
+}
+
+mail = mail
+    .WithLifetime(ContainerLifetime.Persistent)
+    .WithContainerName("Exceptionless-Mail");
 
+if (!servicesOnly)
+{
     var api = builder.AddProject<Projects.Exceptionless_Web>("Api")
         .WithReference(cache)
         .WithReference(elastic)
         .WithReference(storageBlobs, "AzureStorage")
         .WithReference(storageQueues, "AzureQueues")
-        .WithEnvironment("ConnectionStrings:Email", "smtp://localhost:1025")
+        .WithEnvironment("ConnectionStrings:Email", SharedEmailConnectionString)
         .WithEnvironment("RunJobsInProcess", "false")
         .WaitFor(elastic)
         .WaitFor(cache)
@@ -83,12 +106,20 @@
         .WithUrlForEndpoint("http", u => u.DisplayLocation = UrlDisplayLocation.DetailsOnly)
         .WithHttpHealthCheck("/health");
 
-    builder.AddProject<Projects.Exceptionless_Job>("Jobs", "AllJobs")
+    if (worktreePorts is not null)
+    {
+        api.WithEnvironment("Scope", scope!)
+            .WithEnvironment("AppScope", scope!)
+            .WithEndpoint("http", e => e.Port = worktreePorts.ApiHttp)
+            .WithEndpoint("https", e => e.Port = worktreePorts.ApiHttps);
+    }
+
+    var jobs = builder.AddProject<Projects.Exceptionless_Job>("Jobs", "AllJobs")
         .WithReference(cache)
         .WithReference(elastic)
         .WithReference(storageBlobs, "AzureStorage")
         .WithReference(storageQueues, "AzureQueues")
-        .WithEnvironment("ConnectionStrings:Email", "smtp://localhost:1025")
+        .WithEnvironment("ConnectionStrings:Email", SharedEmailConnectionString)
         .WaitFor(elastic)
         .WaitFor(cache)
         .WaitFor(mail)
@@ -105,14 +136,22 @@
         .WithHttpHealthCheck("/health")
         .WithParentRelationship(api);
 
+    if (worktreePorts is not null)
+    {
+        jobs.WithEnvironment("Scope", scope!)
+            .WithEnvironment("AppScope", scope!)
+            .WithEndpoint("http", e => e.Port = worktreePorts.JobsHttp);
+    }
+
 #pragma warning disable ASPIREBROWSERLOGS001
     var oldApp = builder.AddJavaScriptApp("OldApp", "../../src/Exceptionless.Web/ClientApp.angular", "serve")
         .WithBrowserLogs()
         .WithReference(api)
         .RemoveJavaScriptDebuggingAnnotation()
-        .WithEnvironment("ASPNETCORE_URLS", "http://localhost:7120")
+        .WithEnvironment("ASPNETCORE_URLS", oldAppAspNetCoreUrls)
         .WithEnvironment("USE_HTTPS", "true")
-        .WithHttpEndpoint(port: 7121, targetPort: 7121, name: "https", env: "PORT", isProxied: false)
+        .WithEnvironment("LIVERELOAD_PORT", oldAppLiveReloadPort.ToString())
+        .WithHttpEndpoint(port: oldAppPort, targetPort: oldAppPort, name: "https", env: "PORT", isProxied: false)
         .WithEndpoint("https", e =>
         {
             e.TargetHost = "angular-ex.dev.localhost";
@@ -125,19 +164,26 @@
             u.DisplayOrder = 100;
         })
         .WithParentRelationship(api);
+
+    if (worktreePorts is not null)
+    {
+        oldApp.WithEnvironment("API_HTTP", worktreePorts.ApiHttpUrl)
+            .WithEnvironment("API_HTTPS", worktreePorts.ApiHttpsUrl);
+    }
 #pragma warning restore ASPIREBROWSERLOGS001
 
 #pragma warning disable ASPIREBROWSERLOGS001
-    builder.AddViteApp("App", "../Exceptionless.Web/ClientApp")
+    var app = builder.AddViteApp("App", "../Exceptionless.Web/ClientApp")
         .WithBrowserLogs()
         .WithReference(api)
         .WithReference(oldApp)
         .RemoveJavaScriptDebuggingAnnotation()
+        .WithEnvironment("PORT", appPort.ToString())
         .WithEndpoint("http", e =>
         {
             // 7131 (HTTPS via Aspire dev cert) instead of Vite's default 5173 to avoid clashing with other local Vite projects.
-            e.Port = 7131;
-            e.TargetPort = 7131;
+            e.Port = appPort;
+            e.TargetPort = appPort;
             e.TargetHost = "web-ex.dev.localhost";
             e.IsProxied = false;
         })
@@ -149,6 +195,14 @@
             u.Url = $"{u.Url.TrimEnd('/')}/next/";
         })
         .WithParentRelationship(api);
+
+    if (worktreePorts is not null)
+    {
+        app.WithEnvironment("API_HTTP", worktreePorts.ApiHttpUrl)
+            .WithEnvironment("API_HTTPS", worktreePorts.ApiHttpsUrl)
+            .WithEnvironment("OLDAPP_HTTP", worktreePorts.OldAppHttpsUrl)
+            .WithEnvironment("OLDAPP_HTTPS", worktreePorts.OldAppHttpsUrl);
+    }
 #pragma warning restore ASPIREBROWSERLOGS001
 }
 
diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js
index a4a6621fde..0a3dfc3006 100644
--- a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js
+++ b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js
@@ -2,12 +2,15 @@ var path = require("path");
 var fs = require("fs");
 var s = require("child_process");
 // eslint-disable-next-line import/no-extraneous-dependencies
+var livereload = require("connect-livereload");
+// eslint-disable-next-line import/no-extraneous-dependencies
 var proxyRequest = require("grunt-connect-proxy2/lib/utils").proxyRequest;
 
 module.exports = function () {
     var target = getTarget();
     var useHttps = String(process.env.USE_HTTPS || "").toLowerCase() === "true";
     var port = Number(process.env.PORT) || 7121;
+    var liveReloadPort = Number(process.env.LIVERELOAD_PORT) || 35729;
     var certs = useHttps ? generateCerts() : { cert: undefined, key: undefined };
 
     return {
@@ -19,6 +22,7 @@ module.exports = function () {
                 cert: certs.cert,
                 middleware: function (connect, options, middlewares) {
                     middlewares.unshift(proxyRequest);
+                    middlewares.splice(1, 0, livereload({ port: liveReloadPort }));
                     return middlewares;
                 },
             },
diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/watch.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/watch.js
index 766648cc5f..722d21ef9b 100644
--- a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/watch.js
+++ b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/watch.js
@@ -1,8 +1,10 @@
 module.exports = function (grunt) {
+    var liveReloadPort = Number(process.env.LIVERELOAD_PORT) || 35729;
+
     return {
         main: {
             options: {
-                livereload: true,
+                livereload: liveReloadPort,
                 livereloadOnError: false,
                 spawn: false,
             },
diff --git a/src/Exceptionless.Web/ClientApp.angular/index.html b/src/Exceptionless.Web/ClientApp.angular/index.html
index 4326a7b212..a65c9f7172 100644
--- a/src/Exceptionless.Web/ClientApp.angular/index.html
+++ b/src/Exceptionless.Web/ClientApp.angular/index.html
@@ -83,9 +83,6 @@
             data-remove="true"
         ></script>
 
-        <!-- Livereload script for development only (stripped during dist build) -->
-        <script src="http://localhost:35729/livereload.js" data-concat="false"></script>
-
         <!-- JS from npm Components -->
         <script src="node_modules/exceptionless/dist/exceptionless.js"></script>
         <script type="application/javascript" data-concat="false" data-remove="true">
diff --git a/src/Exceptionless.Web/ClientApp/package.json b/src/Exceptionless.Web/ClientApp/package.json
index ca2226ec6a..34d9be2a7d 100644
--- a/src/Exceptionless.Web/ClientApp/package.json
+++ b/src/Exceptionless.Web/ClientApp/package.json
@@ -5,6 +5,7 @@
     "scripts": {
         "dev": "cross-env NODE_OPTIONS=--trace-warnings vite dev",
         "dev:api": "cross-env API_HTTP=https://dev-collector.exceptionless.io OLDAPP_HTTP=https://dev-app.exceptionless.io vite dev",
+        "urls": "node scripts/resolve-url.mjs",
         "build": "vite build",
         "preview": "vite preview",
         "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
diff --git a/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs b/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs
new file mode 100644
index 0000000000..eeeb4c2244
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs
@@ -0,0 +1,157 @@
+// @ts-check
+import { execFileSync } from 'node:child_process';
+import { existsSync, readFileSync, statSync } from 'node:fs';
+import { basename, dirname, join, normalize } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+function git(args) {
+    try {
+        return execFileSync('git', args, { encoding: 'utf8' }).trim();
+    } catch {
+        return '';
+    }
+}
+
+function findGitRoot() {
+    for (let dir = process.cwd(); ; dir = dirname(dir)) {
+        const dotGit = join(dir, '.git');
+        if (existsSync(dotGit)) {
+            if (statSync(dotGit).isFile()) {
+                const content = readFileSync(dotGit, 'utf8').trim();
+                const gitDir = content.replace(/^gitdir:\s*/i, '').trim();
+                return {
+                    root: dir,
+                    worktreeName: basename(normalize(gitDir).replace(/[\\/]+$/, ''))
+                };
+            }
+
+            return { root: dir, worktreeName: '' };
+        }
+
+        const parent = dirname(dir);
+        if (parent === dir) {
+            return { root: '', worktreeName: '' };
+        }
+    }
+}
+
+function deriveScope() {
+    const gitDir = git(['rev-parse', '--git-dir']);
+    const normalizedGitDir = gitDir ? normalize(gitDir).replace(/[\\/]+$/, '') : '';
+    const gitRoot = findGitRoot();
+    const worktreeName = /[\\/]worktrees[\\/]/i.test(normalizedGitDir) ? basename(normalizedGitDir) : gitRoot.worktreeName;
+    const name = worktreeName || basename(git(['rev-parse', '--show-toplevel']) || gitRoot.root || 'Exceptionless');
+
+    return (
+        name
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, '-')
+            .replace(/^-+|-+$/g, '') || 'exceptionless'
+    );
+}
+
+const isAppResource = (resource) => /^app$/i.test(resource.displayName ?? '') || /^app$/i.test(resource.name ?? '');
+const isOldAppResource = (resource) => /^oldapp$/i.test(resource.displayName ?? '') || /^oldapp$/i.test(resource.name ?? '');
+const isApiResource = (resource) => /^api$/i.test(resource.displayName ?? '') || /^api$/i.test(resource.name ?? '');
+
+function fromAspire() {
+    const root = git(['rev-parse', '--show-toplevel']) || findGitRoot().root;
+    let raw;
+
+    try {
+        raw = execFileSync(
+            'aspire',
+            [
+                'describe',
+                '--apphost',
+                join(root, 'src', 'Exceptionless.AppHost', 'Exceptionless.AppHost.csproj'),
+                '--non-interactive',
+                '--format',
+                'Json'
+            ],
+            { cwd: root || undefined, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 60_000 }
+        );
+    } catch {
+        return { found: false };
+    }
+
+    const start = raw.indexOf('{');
+    const end = raw.lastIndexOf('}');
+    if (start === -1 || end === -1) {
+        return { found: false };
+    }
+
+    let resources;
+    try {
+        resources = JSON.parse(raw.slice(start, end + 1)).resources ?? [];
+    } catch {
+        return { found: false };
+    }
+
+    let found = false;
+    let appUrl;
+    let oldAppUrl;
+    let apiUrl;
+
+    for (const resource of resources) {
+        const app = isAppResource(resource);
+        const oldApp = isOldAppResource(resource);
+        const api = isApiResource(resource);
+        if (!app && !oldApp && !api) {
+            continue;
+        }
+
+        if (app) {
+            found = true;
+        }
+
+        if (resource.state && resource.state !== 'Running') {
+            continue;
+        }
+
+        const urls = (resource.urls ?? []).filter((url) => /^https?:\/\//i.test(url.url ?? ''));
+        if (app) {
+            appUrl ??= (urls.find((url) => /open app$/i.test(url.displayName ?? '')) ?? urls[0])?.url;
+        } else if (oldApp) {
+            oldAppUrl ??= (urls.find((url) => /old/i.test(url.displayName ?? '')) ?? urls[0])?.url;
+        } else if (api) {
+            apiUrl ??= (urls.find((url) => /open api|api/i.test(url.displayName ?? '')) ?? urls[0])?.url;
+        }
+    }
+
+    return { found, appUrl, oldAppUrl, apiUrl };
+}
+
+export function resolveUrls() {
+    const clean = (url) => url && url.replace(/\/$/, '');
+    const scope = deriveScope();
+    const { found, appUrl, oldAppUrl, apiUrl } = fromAspire();
+
+    if (appUrl) {
+        return {
+            status: 'ready',
+            scope,
+            appUrl: clean(appUrl),
+            oldAppUrl: clean(oldAppUrl),
+            apiUrl: clean(apiUrl)
+        };
+    }
+
+    if (found) {
+        return {
+            status: 'starting',
+            scope,
+            message: "The app is starting up; its Svelte frontend isn't ready yet. Wait with `aspire wait App`."
+        };
+    }
+
+    return {
+        status: 'no-app',
+        scope,
+        message: 'No running app found. Start it with `aspire run`, then run `npm run urls` again.'
+    };
+}
+
+if (process.argv[1] && pathToFileURL(process.argv[1]).href === import.meta.url) {
+    process.stdout.write(`${JSON.stringify(resolveUrls(), null, 2)}\n`);
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/status/models.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/status/models.ts
index 32ec2aea0f..a6a9a2ff81 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/status/models.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/status/models.ts
@@ -1,5 +1,6 @@
 export interface About {
     app_mode: string;
+    app_scope: string;
     informational_version: string;
     machine_name: string;
 }
diff --git a/src/Exceptionless.Web/ClientApp/vite.config.ts b/src/Exceptionless.Web/ClientApp/vite.config.ts
index c3b4817cee..4df7ec7fdc 100644
--- a/src/Exceptionless.Web/ClientApp/vite.config.ts
+++ b/src/Exceptionless.Web/ClientApp/vite.config.ts
@@ -9,12 +9,13 @@ const apiProxy = { changeOrigin: true, target: apiTarget };
 const oldAppTarget = process.env.OLDAPP_HTTPS || process.env.OLDAPP_HTTP;
 const oldAppProxy = { changeOrigin: true, secure: false, target: oldAppTarget };
 
+const port = Number(process.env.PORT) || 7131;
 const codespaceName = process.env.CODESPACE_NAME;
 const codespaceDomain = process.env.GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN;
-const hmr = codespaceName && codespaceDomain ? { clientPort: 443, host: `${codespaceName}-7131.${codespaceDomain}`, protocol: 'wss' as const } : undefined;
+const hmr = codespaceName && codespaceDomain ? { clientPort: 443, host: `${codespaceName}-${port}.${codespaceDomain}`, protocol: 'wss' as const } : undefined;
 const allowedHosts = ['web-ex.dev.localhost', 'localhost', '127.0.0.1'];
 if (codespaceName && codespaceDomain) {
-    allowedHosts.push(`${codespaceName}-7131.${codespaceDomain}`);
+    allowedHosts.push(`${codespaceName}-${port}.${codespaceDomain}`);
 }
 
 export default defineConfig({
@@ -28,7 +29,7 @@ export default defineConfig({
     server: {
         allowedHosts,
         hmr,
-        port: 7131,
+        port,
         proxy: {
             '/api': { ...apiProxy, ws: true },
             '/docs': apiProxy,
diff --git a/src/Exceptionless.Web/Controllers/StatusController.cs b/src/Exceptionless.Web/Controllers/StatusController.cs
index ad2733e99a..ee65118d8d 100644
--- a/src/Exceptionless.Web/Controllers/StatusController.cs
+++ b/src/Exceptionless.Web/Controllers/StatusController.cs
@@ -53,6 +53,7 @@ public IActionResult IndexAsync()
         {
             _appOptions.InformationalVersion,
             AppMode = _appOptions.AppMode.ToString(),
+            _appOptions.AppScope,
             Environment.MachineName
         });
     }
diff --git a/tests/Exceptionless.Tests/AppWebHostFactory.cs b/tests/Exceptionless.Tests/AppWebHostFactory.cs
index 19aa9d17cf..1e50184f17 100644
--- a/tests/Exceptionless.Tests/AppWebHostFactory.cs
+++ b/tests/Exceptionless.Tests/AppWebHostFactory.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Net;
 using Aspire.Hosting;
-using Aspire.Hosting.ApplicationModel;
+using Aspire.Hosting.Testing;
 using Exceptionless.Insulation.Configuration;
 using Exceptionless.Web;
 using Microsoft.AspNetCore.Mvc.Testing;
@@ -12,9 +12,10 @@ namespace Exceptionless.Tests;
 
 public class AppWebHostFactory : WebApplicationFactory<Startup>, IAsyncLifetime
 {
+    private const string SharedElasticsearchUrl = "http://localhost:9200";
     private static int s_counter = -1;
+    private static readonly Lazy<Task<DistributedApplication>> s_sharedAppHost = new(StartSharedAppHostAsync, LazyThreadSafetyMode.ExecutionAndPublication);
     private static readonly ConcurrentQueue<int> s_pool = new();
-    private static readonly Lazy<Task<DistributedApplication>> s_sharedApplication = new(StartSharedApplicationAsync, LazyThreadSafetyMode.ExecutionAndPublication);
     private bool _sliceReleased;
 
     public AppWebHostFactory()
@@ -32,28 +33,15 @@ public AppWebHostFactory()
 
     public async ValueTask InitializeAsync()
     {
-        _ = await s_sharedApplication.Value;
+        _ = await s_sharedAppHost.Value;
+        await WaitForElasticsearchAsync(new Uri(SharedElasticsearchUrl));
     }
 
-    private static async Task<DistributedApplication> StartSharedApplicationAsync()
+    private static async Task<DistributedApplication> StartSharedAppHostAsync()
     {
-        var options = new DistributedApplicationOptions { AssemblyName = typeof(ElasticsearchResource).Assembly.FullName, DisableDashboard = true };
-        var builder = DistributedApplication.CreateBuilder(options);
-
-        // don't use random ports for tests
-        builder.Configuration["DcpPublisher:RandomizePorts"] = "false";
-
-        var elasticsearch = builder.AddElasticsearch("Elasticsearch", port: 9200)
-            .WithContainerName("Exceptionless-Elasticsearch-Test")
-            .WithLifetime(ContainerLifetime.Persistent);
-
-        var app = builder.Build();
-
-        await app.StartAsync();
-
-        var connectionString = await elasticsearch.Resource.GetConnectionStringAsync()
-            ?? throw new InvalidOperationException("Could not resolve Elasticsearch connection string.");
-        await WaitForElasticsearchAsync(new Uri(connectionString));
+        var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.Exceptionless_AppHost>(["services-only"], CancellationToken.None);
+        var app = await appHost.BuildAsync(CancellationToken.None);
+        await app.StartAsync(CancellationToken.None);
 
         return app;
     }
@@ -81,7 +69,7 @@ private static async Task WaitForElasticsearchAsync(Uri elasticsearchUri)
             await Task.Delay(TimeSpan.FromMilliseconds(250));
         }
 
-        throw new TimeoutException("Timed out waiting for Elasticsearch test container to be ready.");
+        throw new TimeoutException("Timed out waiting for the shared Elasticsearch container to be ready.");
     }
 
     protected override void ConfigureWebHost(IWebHostBuilder builder)
@@ -96,7 +84,8 @@ protected override IHostBuilder CreateHostBuilder()
             .AddYamlFile("appsettings.yml", optional: false, reloadOnChange: false)
             .AddInMemoryCollection(new Dictionary<string, string?>
             {
-                ["AppScope"] = AppScope
+                ["AppScope"] = AppScope,
+                ["ConnectionStrings:Elasticsearch"] = SharedElasticsearchUrl
             })
             .Build();
 
diff --git a/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs b/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs
index 58e1afc97e..ef7377d010 100644
--- a/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs
+++ b/tests/Exceptionless.Tests/Controllers/StatusControllerTests.cs
@@ -1,3 +1,4 @@
+using System.Text.Json;
 using Exceptionless.Core.Messaging.Models;
 using Exceptionless.Core.Utility;
 using Exceptionless.DateTimeExtensions;
@@ -10,7 +11,12 @@ namespace Exceptionless.Tests.Controllers;
 
 public class StatusControllerTests : IntegrationTestsBase
 {
-    public StatusControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory) { }
+    private readonly AppWebHostFactory _factory;
+
+    public StatusControllerTests(ITestOutputHelper output, AppWebHostFactory factory) : base(output, factory)
+    {
+        _factory = factory;
+    }
 
     protected override async Task ResetDataAsync()
     {
@@ -57,11 +63,16 @@ public async Task CanSendReleaseNotification(string? message, bool critical, boo
     }
 
     [Fact]
-    public Task GetAboutAsync_Anonymous_ReturnsVersionInfo()
+    public async Task GetAboutAsync_Anonymous_ReturnsVersionInfo()
     {
-        return SendRequestAsync(r => r
+        var response = await SendRequestAsync(r => r
             .AppendPath("about")
             .StatusCodeShouldBeOk());
+
+        var document = await response.DeserializeAsync<JsonDocument>();
+        Assert.NotNull(document);
+        using var _ = document;
+        Assert.Equal(_factory.AppScope, document.RootElement.GetProperty("app_scope").GetString());
     }
 
     [Fact]

From 5441daf55fe3f06fbe1465608ed170b06b6353dd Mon Sep 17 00:00:00 2001
From: "Eric J. Smith" <eric@codesmithtools.com>
Date: Mon, 8 Jun 2026 16:43:23 -0500
Subject: [PATCH 2/2] Fix client URL helper lint

---
 .../ClientApp/scripts/resolve-url.mjs         | 109 ++++++++----------
 1 file changed, 51 insertions(+), 58 deletions(-)

diff --git a/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs b/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs
index eeeb4c2244..b39dee9466 100644
--- a/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs
+++ b/src/Exceptionless.Web/ClientApp/scripts/resolve-url.mjs
@@ -4,12 +4,19 @@ import { existsSync, readFileSync, statSync } from 'node:fs';
 import { basename, dirname, join, normalize } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
-function git(args) {
-    try {
-        return execFileSync('git', args, { encoding: 'utf8' }).trim();
-    } catch {
-        return '';
-    }
+function deriveScope() {
+    const gitDir = git(['rev-parse', '--git-dir']);
+    const normalizedGitDir = gitDir ? normalize(gitDir).replace(/[\\/]+$/, '') : '';
+    const gitRoot = findGitRoot();
+    const worktreeName = /[\\/]worktrees[\\/]/i.test(normalizedGitDir) ? basename(normalizedGitDir) : gitRoot.worktreeName;
+    const name = worktreeName || basename(git(['rev-parse', '--show-toplevel']) || gitRoot.root || 'Exceptionless');
+
+    return (
+        name
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, '-')
+            .replace(/^-+|-+$/g, '') || 'exceptionless'
+    );
 }
 
 function findGitRoot() {
@@ -35,25 +42,48 @@ function findGitRoot() {
     }
 }
 
-function deriveScope() {
-    const gitDir = git(['rev-parse', '--git-dir']);
-    const normalizedGitDir = gitDir ? normalize(gitDir).replace(/[\\/]+$/, '') : '';
-    const gitRoot = findGitRoot();
-    const worktreeName = /[\\/]worktrees[\\/]/i.test(normalizedGitDir) ? basename(normalizedGitDir) : gitRoot.worktreeName;
-    const name = worktreeName || basename(git(['rev-parse', '--show-toplevel']) || gitRoot.root || 'Exceptionless');
-
-    return (
-        name
-            .toLowerCase()
-            .replace(/[^a-z0-9]+/g, '-')
-            .replace(/^-+|-+$/g, '') || 'exceptionless'
-    );
+function git(args) {
+    try {
+        return execFileSync('git', args, { encoding: 'utf8' }).trim();
+    } catch {
+        return '';
+    }
 }
 
 const isAppResource = (resource) => /^app$/i.test(resource.displayName ?? '') || /^app$/i.test(resource.name ?? '');
 const isOldAppResource = (resource) => /^oldapp$/i.test(resource.displayName ?? '') || /^oldapp$/i.test(resource.name ?? '');
 const isApiResource = (resource) => /^api$/i.test(resource.displayName ?? '') || /^api$/i.test(resource.name ?? '');
 
+export function resolveUrls() {
+    const clean = (url) => url && url.replace(/\/$/, '');
+    const scope = deriveScope();
+    const { apiUrl, appUrl, found, oldAppUrl } = fromAspire();
+
+    if (appUrl) {
+        return {
+            apiUrl: clean(apiUrl),
+            appUrl: clean(appUrl),
+            oldAppUrl: clean(oldAppUrl),
+            scope,
+            status: 'ready'
+        };
+    }
+
+    if (found) {
+        return {
+            message: "The app is starting up; its Svelte frontend isn't ready yet. Wait with `aspire wait App`.",
+            scope,
+            status: 'starting'
+        };
+    }
+
+    return {
+        message: 'No running app found. Start it with `aspire run`, then run `npm run urls` again.',
+        scope,
+        status: 'no-app'
+    };
+}
+
 function fromAspire() {
     const root = git(['rev-parse', '--show-toplevel']) || findGitRoot().root;
     let raw;
@@ -61,14 +91,7 @@ function fromAspire() {
     try {
         raw = execFileSync(
             'aspire',
-            [
-                'describe',
-                '--apphost',
-                join(root, 'src', 'Exceptionless.AppHost', 'Exceptionless.AppHost.csproj'),
-                '--non-interactive',
-                '--format',
-                'Json'
-            ],
+            ['describe', '--apphost', join(root, 'src', 'Exceptionless.AppHost', 'Exceptionless.AppHost.csproj'), '--non-interactive', '--format', 'Json'],
             { cwd: root || undefined, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 60_000 }
         );
     } catch {
@@ -119,37 +142,7 @@ function fromAspire() {
         }
     }
 
-    return { found, appUrl, oldAppUrl, apiUrl };
-}
-
-export function resolveUrls() {
-    const clean = (url) => url && url.replace(/\/$/, '');
-    const scope = deriveScope();
-    const { found, appUrl, oldAppUrl, apiUrl } = fromAspire();
-
-    if (appUrl) {
-        return {
-            status: 'ready',
-            scope,
-            appUrl: clean(appUrl),
-            oldAppUrl: clean(oldAppUrl),
-            apiUrl: clean(apiUrl)
-        };
-    }
-
-    if (found) {
-        return {
-            status: 'starting',
-            scope,
-            message: "The app is starting up; its Svelte frontend isn't ready yet. Wait with `aspire wait App`."
-        };
-    }
-
-    return {
-        status: 'no-app',
-        scope,
-        message: 'No running app found. Start it with `aspire run`, then run `npm run urls` again.'
-    };
+    return { apiUrl, appUrl, found, oldAppUrl };
 }
 
 if (process.argv[1] && pathToFileURL(process.argv[1]).href === import.meta.url) {