Pick a private-capable proxy cluster when bootstrapping the agent network

The connect-provider wizard bootstraps the account's agent network
endpoint from a proxy cluster it auto-picks off /reverse-proxies/domains,
taking the first validated free domain. That list includes clusters that
cannot host the endpoint: the endpoint is a private service, reachable
only from connected peers and authorised by their tunnel identity, which
needs a cluster with at least one connected embedded proxy — the same
supports_private flag the Reverse Proxy modal gates NetBird-Only Access
on. Management refuses a bootstrap onto a cluster reporting it false, so
the wizard was able to propose a pick the API rejects, and the endpoint
it assigns is immutable.

Filter the candidates on supports_private before auto-picking, and give
the "nothing to pick" callout a second message for the case where
clusters exist but none of them has an embedded proxy — a different
problem from having no proxy at all, and a different fix.

Only an explicit false disqualifies a cluster: a management build that
predates the flag reports nothing at all, and dropping every cluster
there would block setup on a backend that would have accepted it. That
matches how the server reads an unreported capability.

Callout takes an optional data-testid so a spec can assert on the state
it announces rather than on its copy.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

.github/workflows/build_and_push.yml

@@ -98,24 +98,6 @@ jobs:
             type=ref,event=pr
             type=sha
 
-      - name: Docker meta (rootless)
-        id: meta_rootless
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.DOCKERHUB_IMAGE }}
-            ${{ env.GHCR_IMAGE }}
-          flavor: |
-            latest=false
-            suffix=-rootless,onlatest=true
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=tag
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=ref,event=pr
-            type=sha
-
       - name: Log in to Docker Hub
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
         uses: docker/login-action@v3
@@ -141,18 +123,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-      - name: Build and push rootless Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/Dockerfile.rootless
-          push: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
-          platforms: linux/amd64,linux/arm64,linux/arm
-          tags: ${{ steps.meta_rootless.outputs.tags }}
-          labels: ${{ steps.meta_rootless.outputs.labels }}
-
       - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
         run: |
           echo '### Pushed tags' >> $GITHUB_STEP_SUMMARY
           echo '${{ steps.meta.outputs.tags }}' >> $GITHUB_STEP_SUMMARY
-          echo '${{ steps.meta_rootless.outputs.tags }}' >> $GITHUB_STEP_SUMMARY

build.sh

@@ -11,7 +11,6 @@
 #   ./build.sh                # build + export netbird-dashboard.tar.gz
 #   IMAGE_TAG=v1 ./build.sh   # override the image tag
 #   SKIP_BUILD=1 ./build.sh   # reuse an existing out/ (skip npm build)
-#   ROOTLESS=1 ./build.sh     # build the amd64-rootless image variant
 #
 set -euo pipefail
 
@@ -20,26 +19,8 @@ cd "$(dirname "$0")"
 
 IMAGE_NAME="${IMAGE_NAME:-netbird-dashboard}"
 IMAGE_TAG="${IMAGE_TAG:-amd64}"
-DOCKERFILE="docker/Dockerfile"
-CONTAINER_PORT=80
-OUTPUT_SUFFIX=""
-
-case "${ROOTLESS:-0}" in
-  0) ;;
-  1)
-    DOCKERFILE="docker/Dockerfile.rootless"
-    CONTAINER_PORT=8080
-    OUTPUT_SUFFIX="-rootless"
-    [[ "${IMAGE_TAG}" == *-rootless ]] || IMAGE_TAG="${IMAGE_TAG}-rootless"
-    ;;
-  *)
-    echo "ERROR: ROOTLESS must be 0 or 1." >&2
-    exit 1
-    ;;
-esac
-
 IMAGE="${IMAGE_NAME}:${IMAGE_TAG}"
-OUTPUT="${OUTPUT:-${IMAGE_NAME}${OUTPUT_SUFFIX}.tar.gz}"
+OUTPUT="${OUTPUT:-${IMAGE_NAME}.tar.gz}"
 
 # Build the static export (out/) unless told to reuse an existing one. Next 16
 # no longer runs ESLint during `next build`; types are checked by the build via
@@ -58,10 +39,17 @@ if [[ ! -d out ]]; then
   exit 1
 fi
 
+# The .dockerignore lives under docker/, but Docker reads it from the build
+# context root. Stage it for the duration of the build so node_modules/.next
+# don't get shipped into the build context.
+cleanup() { rm -f .dockerignore; }
+trap cleanup EXIT
+cp docker/.dockerignore .dockerignore
+
 echo "==> Building ${IMAGE} for linux/amd64"
 docker build \
   --platform linux/amd64 \
-  -f "${DOCKERFILE}" \
+  -f docker/Dockerfile \
   -t "${IMAGE}" \
   .
 
@@ -72,13 +60,13 @@ echo "==> Done: ${OUTPUT} ($(du -h "${OUTPUT}" | cut -f1))"
 echo
 echo "Copy and run on the server:"
 echo "  scp ${OUTPUT} user@your-server:/tmp/"
-echo "  docker load < /tmp/${OUTPUT##*/}"
+echo "  docker load < /tmp/${OUTPUT}"
 echo
-echo "Run (nginx serves on container port ${CONTAINER_PORT}). Set the runtime env vars the"
+echo "Run (nginx serves on container port 80). Set the runtime env vars the"
 echo "dashboard templates at startup — for the Agent Network onboarding test,"
 echo "flip NETBIRD_AGENT_NETWORK_ONLY=true:"
 echo "  docker run -d --name ${IMAGE_NAME} --restart unless-stopped \\"
-echo "    -p 8080:${CONTAINER_PORT} \\"
+echo "    -p 8080:80 \\"
 echo "    -e NETBIRD_MGMT_API_ENDPOINT=https://your-mgmt:443 \\"
 echo "    -e AUTH_AUTHORITY=https://your-idp/realms/netbird \\"
 echo "    -e AUTH_CLIENT_ID=netbird-dashboard \\"

config.json

@@ -24,6 +24,5 @@
   "hubspotSignupFormId": "$NETBIRD_HUBSPOT_SIGNUP_FORM_ID",
   "hubspotOnboardingFormId": "$NETBIRD_HUBSPOT_ONBOARDING_FORM_ID",
   "hubspotSurveyFormId": "$NETBIRD_HUBSPOT_SURVEY_FORM_ID",
-  "analyticsExcludedEmails": "$NETBIRD_ANALYTICS_EXCLUDED_EMAILS",
-  "announcement": "$NETBIRD_ANNOUNCEMENT"
+  "analyticsExcludedEmails": "$NETBIRD_ANALYTICS_EXCLUDED_EMAILS"
 }

docker/Dockerfile.rootless

@@ -1,29 +0,0 @@
-FROM alpine:3.24
-
-RUN apk add --no-cache bash ca-certificates gettext nginx tzdata && \
-    rm -rf /var/cache/apk/* && \
-    mkdir -p /tmp/nginx
-
-STOPSIGNAL SIGINT
-EXPOSE 8080
-
-WORKDIR /usr/share/nginx/html
-
-COPY docker/default.conf /etc/nginx/http.d/default.conf
-COPY docker/nginx.conf /etc/nginx/nginx.conf
-COPY docker/rootless.conf /etc/nginx/http.d/rootless.conf
-COPY docker/init_react_envs.sh /usr/local/init_react_envs.sh
-COPY out/ /usr/share/nginx/html/
-
-RUN sed -i \
-      -e 's/listen 80 default_server;/listen 8080 default_server;/' \
-      -e 's/listen \[::\]:80 default_server;/listen [::]:8080 default_server;/' \
-      /etc/nginx/http.d/default.conf && \
-    sed -i '/^user nginx;$/d' /etc/nginx/nginx.conf && \
-    chmod +x /usr/local/init_react_envs.sh && \
-    chgrp -R 0 /etc/nginx/http.d /usr/share/nginx/html /tmp/nginx && \
-    chmod -R g=u /etc/nginx/http.d /usr/share/nginx/html /tmp/nginx
-
-USER 10001:0
-ENTRYPOINT ["/usr/local/init_react_envs.sh"]
-CMD ["/usr/sbin/nginx", "-e", "/dev/stderr", "-g", "pid /tmp/nginx.pid;"]

docker/README.md

@@ -1,59 +1,23 @@
 # NetBird Dashboard
-
-NetBird Dashboard is NetBird's management server UI.
-
+NetBird Dashboard is NetBirds Management server UI. It allows users to signin, view setup keys and manage peers. This image is **not ready** for production use.
 ## Tags
+```latest``` ```vX.X.X``` not available yet.
 
-Each published image tag also has a rootless variant with the `-rootless`
-suffix. For example, `main` is also published as `main-rootless`.
-
+```main``` built on every PR being merged to the repository
 ## How to use this image
-
-HTTP:
-
+HTTP run:
 ```shell
-docker run -d --rm -p 80:80 netbirdio/dashboard:main
+docker run -d --rm -p 80:80 wiretrustee/dashboard:main
 ```
-
-Using an SSL certificate from Let's Encrypt:
-
+Using SSL certificate from Let's Encrypt®:
 ```shell
 docker run -d --rm -p 80:80 -p 443:443 \
   -e LETSENCRYPT_DOMAIN=app.mydomain.com \
   -e LETSENCRYPT_EMAIL=hello@mydomain.com \
   netbirdio/dashboard:main
 ```
-
-For certificate generation, the server needs a public IP and a domain name
-pointing to it.
-
-### Rootless and OpenShift
-
-The rootless image listens on port `8080`, runs as UID `10001` by default, and
-supports OpenShift's arbitrary UID when the container retains GID `0`:
-
-```shell
-docker run -d --rm \
-  --user 12345:0 \
-  -p 8080:8080 \
-  -e AUTH_AUTHORITY=https://idp.example.com \
-  -e AUTH_CLIENT_ID=netbird-dashboard \
-  -e AUTH_AUDIENCE=netbird-dashboard \
-  -e AUTH_SUPPORTED_SCOPES='openid profile email' \
-  -e USE_AUTH0=false \
-  -e NETBIRD_MGMT_API_ENDPOINT=https://api.example.com \
-  netbirdio/dashboard:main-rootless
-```
-
-The rootless image does not include Certbot or expose HTTPS. Terminate TLS at
-the OpenShift Route, Ingress, or another reverse proxy.
-
+> For SSL generation, you need to run this image in a server with proper public IP and a domain name pointing to it.
 ## Environment variables
-
-- `NGINX_SSL_PORT` changes the port that Nginx listens to. Defaults to `443`.
-- `LETSENCRYPT_DOMAIN` enables Certbot for the specified domain. Defaults to
-  `none`.
-- `LETSENCRYPT_EMAIL` is used to register the certificate request. Defaults to
-  `example@local`.
-
-These certificate variables apply only to the standard image.
+* ```NGINX_SSL_PORT``` Changes the port that Nginx listens to. Defaults to ```443```
+* ```LETSENCRYPT_DOMAIN``` Enables Certbot`s client execution for the specified domain. Defaults to ```none```
+* ```LETSENCRYPT_EMAIL``` Email used in Certbot`s client execution to register the certificate request. Defaults to ```example@local```

docker/init_react_envs.sh

@@ -73,8 +73,6 @@ export NETBIRD_HUBSPOT_SIGNUP_FORM_ID=${NETBIRD_HUBSPOT_SIGNUP_FORM_ID}
 export NETBIRD_HUBSPOT_ONBOARDING_FORM_ID=${NETBIRD_HUBSPOT_ONBOARDING_FORM_ID}
 export NETBIRD_HUBSPOT_SURVEY_FORM_ID=${NETBIRD_HUBSPOT_SURVEY_FORM_ID}
 export NETBIRD_ANALYTICS_EXCLUDED_EMAILS=${NETBIRD_ANALYTICS_EXCLUDED_EMAILS}
-# A permanent banner for this deployment, shown to every user; empty for none.
-export NETBIRD_ANNOUNCEMENT=${NETBIRD_ANNOUNCEMENT}
 
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"
 
@@ -165,7 +163,7 @@ sed -i "s|add_header Content-Security-Policy \"[^\"]*\" always;|$CSP_HEADER|g" /
 }
 
 # replace ENVs in the config
-ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$NETBIRD_GOOGLE_TAG_MANAGER_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS \$\$NETBIRD_AUTH_SERVICE_URL \$\$NETBIRD_WASM_PATH \$\$NETBIRD_LICENSED \$\$NETBIRD_CLOUD \$\$NETBIRD_AGENT_NETWORK_ONLY \$\$NETBIRD_AGENT_NETWORK_ENABLED \$\$NETBIRD_HUBSPOT_PORTAL_ID \$\$NETBIRD_HUBSPOT_SIGNUP_FORM_ID \$\$NETBIRD_HUBSPOT_ONBOARDING_FORM_ID \$\$NETBIRD_HUBSPOT_SURVEY_FORM_ID \$\$NETBIRD_ANALYTICS_EXCLUDED_EMAILS \$\$NETBIRD_ANNOUNCEMENT"
+ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$NETBIRD_GOOGLE_TAG_MANAGER_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS \$\$NETBIRD_AUTH_SERVICE_URL \$\$NETBIRD_WASM_PATH \$\$NETBIRD_LICENSED \$\$NETBIRD_CLOUD \$\$NETBIRD_AGENT_NETWORK_ONLY \$\$NETBIRD_AGENT_NETWORK_ENABLED \$\$NETBIRD_HUBSPOT_PORTAL_ID \$\$NETBIRD_HUBSPOT_SIGNUP_FORM_ID \$\$NETBIRD_HUBSPOT_ONBOARDING_FORM_ID \$\$NETBIRD_HUBSPOT_SURVEY_FORM_ID \$\$NETBIRD_ANALYTICS_EXCLUDED_EMAILS"
 
 OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
 envsubst "$ENV_STR" < "$OIDC_TRUSTED_DOMAINS".tmpl > "$OIDC_TRUSTED_DOMAINS"
@@ -175,12 +173,6 @@ for f in $(grep -R -l AUTH_SUPPORTED_SCOPES /usr/share/nginx/html); do
     rm "$f".copy
 done
 
-# When a command is provided, initialization happens before the server starts.
-# The rootless image uses this path so nginx never needs to be reloaded.
-if (( $# > 0 )); then
-    exec "$@"
-fi
-
 # Reload nginx so the patched CSP header takes effect.
 # supervisord starts nginx (priority 100) before this script (priority 201) and
 # never reloads it, so without this nginx keeps serving the static default.conf

docker/rootless.conf

@@ -1,7 +0,0 @@
-# nginx includes this file inside the http context.
-# All runtime state stays in a directory writable by the arbitrary UID used by OpenShift.
-client_body_temp_path /tmp/nginx/client_temp;
-proxy_temp_path /tmp/nginx/proxy_temp;
-fastcgi_temp_path /tmp/nginx/fastcgi_temp;
-uwsgi_temp_path /tmp/nginx/uwsgi_temp;
-scgi_temp_path /tmp/nginx/scgi_temp;

e2e/environment/.gitignore

@@ -1,7 +1,6 @@
 # Ignore zitadel environment
 .env
 Caddyfile
-agentgateway-stub.Caddyfile
 management.json
 turnserver.conf
 zitadel.env

e2e/environment/clean-test-env.sh

@@ -19,7 +19,7 @@ check_docker_compose() {
 DOCKER_COMPOSE_COMMAND=$(check_docker_compose)
 
 $DOCKER_COMPOSE_COMMAND down --volumes
-rm -f docker-compose.yml Caddyfile agentgateway-stub.Caddyfile zitadel.env .env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json proxy.env proxy-no-ports.env
+rm -f docker-compose.yml Caddyfile zitadel.env .env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json proxy.env proxy-no-ports.env
 rm -rf proxy-certs proxy-certs-no-ports
 rm -f ../../.test-config.json ../playwright.env.json
 rm -f ../fixtures/auth/owner.json ../fixtures/auth/user.json

e2e/environment/create-test-env.sh

@@ -532,7 +532,7 @@ initEnvironment() {
     echo "Generated files already exist, if you want to reinitialize the environment, please remove them first."
     echo "You can use the following commands:"
     echo "  $DOCKER_COMPOSE_COMMAND down --volumes # to remove all containers and volumes"
-    echo "  rm -f docker-compose.yml Caddyfile agentgateway-stub.Caddyfile zitadel.env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json proxy.env proxy-no-ports.env && rm -rf proxy-certs proxy-certs-no-ports"
+    echo "  rm -f docker-compose.yml Caddyfile zitadel.env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json proxy.env proxy-no-ports.env && rm -rf proxy-certs proxy-certs-no-ports"
     echo "Be aware that this will remove all data from the database, and you will have to reconfigure the dashboard."
     exit 1
   fi
@@ -540,7 +540,6 @@ initEnvironment() {
   echo Rendering initial files...
   renderDockerCompose > docker-compose.yml
   renderCaddyfile > Caddyfile
-  renderAgentGatewayStub > agentgateway-stub.Caddyfile
   renderZitadelEnv > zitadel.env
   echo "" > turnserver.conf
   echo "" > management.json
@@ -613,30 +612,6 @@ initEnvironment() {
   echo "Password: $ZITADEL_ADMIN_PASSWORD" | tee -a .env
 }
 
-# Saving an Agent Network provider makes management call the upstream and
-# refuses the save unless it answers a model listing, so a provider spec needs
-# a reachable OpenAI-compatible endpoint. agentgateway is self-hosted and has
-# no public one; this stub stands in for it, inside the compose network where
-# management can reach it and without depending on a vendor being up.
-renderAgentGatewayStub() {
-  cat <<'EOF'
-{
-	admin off
-	auto_https off
-}
-
-:8088 {
-	handle /v1/models {
-		header Content-Type application/json
-		respond `{"object":"list","data":[{"id":"agentgateway-e2e-model","object":"model","owned_by":"netbird-e2e"}]}` 200
-	}
-	handle {
-		respond 404
-	}
-}
-EOF
-}
-
 renderCaddyfile() {
   cat <<EOF
 {
@@ -843,15 +818,6 @@ services:
     volumes:
       - netbird_caddy_data:/data
       - ./Caddyfile:/etc/caddy/Caddyfile
-  # Stand-in upstream for the Agent Network provider specs: answers the model
-  # listing management probes before it accepts a provider save. Reachable
-  # only from inside the compose network, at http://agentgateway-stub:8088.
-  agentgateway-stub:
-    image: caddy
-    restart: unless-stopped
-    networks: [ netbird ]
-    volumes:
-      - ./agentgateway-stub.Caddyfile:/etc/caddy/Caddyfile
   # Management
   management:
     image: ghcr.io/netbirdio/management-cloud:${MANAGEMENT_IMAGE_TAG}
@@ -926,16 +892,6 @@ services:
       # GeoLite2 download removes a startup stall of up to 2 minutes
       # when pkgs.netbird.io is slow.
       - NB_PROXY_DISABLE_GEOLOCATION=true
-      # Declare the private capability so this cluster can host the agent
-      # network endpoint. That endpoint is a private service — reachable only
-      # from connected peers — and management refuses to bootstrap it onto a
-      # cluster without a private-capable proxy; the connect-provider wizard
-      # reads the same flag (supports_private) to pick its cluster. Without
-      # it no cluster qualifies and the wizard stops at the provider tab,
-      # which strands every spec that walks through it. The no-ports proxy
-      # below stays centralised, so the pick has to skip past a cluster that
-      # does not qualify.
-      - NB_PROXY_PRIVATE=true
     volumes:
       - ./proxy-certs:/certs:ro
     command: [

e2e/helpers/auth.ts

@@ -33,7 +33,7 @@ export async function loginToApp(
   // Use locators that match either outcome — Playwright auto-waits.
   const appReady = page.getByTestId("left-navigation-item").first();
   const setupModal = page.getByTestId("setup-netbird-modal");
-  const approvalPending = page.getByTestId("pending-approval");
+  const approvalPending = page.getByText("User Approval Pending");
   const onboarding = page.getByText("Add new device to your network");
   const selectAccount = page.getByText("Select account");
   const loginInput = page.locator("input[id=loginName]");

e2e/helpers/control-center.ts

@@ -24,31 +24,6 @@ export async function openControlCenter(page: Page, tab?: FlowView) {
   await dismissBlockingOverlays(page);
 }
 
-/**
- * Opens the groups view already showing `groupName`.
- *
- * The view picks its own group on first render (getFirstGroup: the highest
- * peers_count that is a policy source), and that ranking runs over every group
- * in the account — including ones a spec on the other worker seeded moments
- * ago. Deleting the spec's own fixtures first is not enough to pin it, so
- * select the group by name and let the view rebuild around it.
- */
-export async function openGroupView(page: Page, groupName: string) {
-  await openControlCenter(page, "groups");
-  const selector = canvasNode(page, "select-group-node");
-  await expect(selector).toBeVisible();
-  // Unforced on purpose: the opening fitView animates the canvas, and the
-  // actionability check is what waits for the node to stop moving.
-  await selector.click();
-  await page.getByTestId("select-dropdown-search").fill(groupName);
-  await page
-    .locator('[role="option"]')
-    .filter({ hasText: groupName })
-    .first()
-    .click({ force: true });
-  await expect(selector).toContainText(groupName);
-}
-
 export async function switchFlowView(page: Page, view: FlowView) {
   await dismissBlockingOverlays(page);
   await page.getByTestId(`cc-flow-${view}`).click({ force: true });

e2e/tests/agent-network-agentgateway-provider.spec.ts

@@ -1,156 +0,0 @@
-/**
- * Agent Network agentgateway provider spec.
- *
- * Exercises the catalog-driven provider flow against a management build that
- * includes the agentgateway catalog entry. Older builds skip the test.
- */
-import {
-  deleteAgentNetworkProvidersByPrefix,
-  listAgentNetworkCatalog,
-  supportsAgentNetworkSettingsBootstrap,
-} from "../helpers/api";
-import { navigateTo } from "../helpers/auth";
-import { expect, test } from "../helpers/fixtures";
-import { generateRandomName } from "../helpers/utils";
-
-const AGENT_NETWORK_CONFIG_KEY = "netbird-test-agent-network";
-const AGENTGATEWAY_CATALOG_ID = "agentgateway";
-const PROVIDER_PREFIX = "e2e-agentgateway-";
-
-test.describe
-  .serial("Agent Network agentgateway provider @agent-network", () => {
-  test("connect agentgateway with its trusted identity mapping", async ({
-    dashboardAsOwner: page,
-  }) => {
-    await page.addInitScript(
-      ([key, value]) => {
-        try {
-          window.localStorage.setItem(key as string, value as string);
-        } catch {}
-      },
-      [AGENT_NETWORK_CONFIG_KEY, "enabled"],
-    );
-
-    const catalog = await listAgentNetworkCatalog(page);
-    test.skip(
-      !catalog.some((entry) => entry.id === AGENTGATEWAY_CATALOG_ID),
-      `management catalog has no ${AGENTGATEWAY_CATALOG_ID} entry`,
-    );
-    test.skip(
-      !(await supportsAgentNetworkSettingsBootstrap(page)),
-      "management build does not support Agent Network settings bootstrap",
-    );
-
-    await deleteAgentNetworkProvidersByPrefix(page, PROVIDER_PREFIX);
-    try {
-      await navigateTo(page, "/agent-network/providers");
-
-      await page
-        .getByTestId("connect-agent-network-provider")
-        .first()
-        .click({ force: true });
-      await page
-        .getByTestId("agent-network-provider-type")
-        .click({ force: true });
-      await page
-        .getByTestId("select-dropdown-search")
-        .fill(AGENTGATEWAY_CATALOG_ID);
-      await page
-        .getByTestId("agent-network-provider-option-agentgateway")
-        .click({ force: true });
-
-      // Saving a provider makes management call the upstream, and it refuses
-      // the save with a 422 unless the upstream answers a model listing — so a
-      // made-up host cannot be used here. agentgateway is self-hosted and has
-      // no public endpoint to point at, so create-test-env.sh runs a stub that
-      // answers that probe inside the compose network.
-      const upstreamURL = "http://agentgateway-stub:8088";
-      await page
-        .getByTestId("agent-network-provider-upstream-url")
-        .fill(upstreamURL);
-      await page
-        .getByTestId("agent-network-provider-api-key")
-        .fill("e2e-agentgateway-virtual-key");
-
-      const providerName = generateRandomName(PROVIDER_PREFIX);
-      await page.getByTestId("agent-network-provider-name").fill(providerName);
-
-      await page
-        .getByTestId("agent-network-provider-models-tab")
-        .click({ force: true });
-      await expect(
-        page.getByTestId("agent-network-provider-models-help"),
-      ).toContainText("Empty = all catalog models");
-      await page
-        .getByTestId("agent-network-provider-continue")
-        .click({ force: true });
-
-      await expect(
-        page.getByTestId("agent-network-provider-mappings-tab"),
-      ).toHaveAttribute("data-state", "active");
-      await expect(
-        page.getByTestId("agent-network-provider-user-mapping"),
-      ).toContainText("x-netbird-user-id");
-      await expect(
-        page.getByTestId("agent-network-provider-groups-mapping"),
-      ).toContainText("x-netbird-groups");
-      await expect(
-        page.getByTestId("agent-network-provider-groups-guidance"),
-      ).toContainText("must not be used as an agentgateway authorization claim");
-
-      const createResponse = page.waitForResponse(
-        (response) =>
-          response.url().includes("/agent-network/providers") &&
-          response.request().method() === "POST",
-        { timeout: 30_000 },
-      );
-      await page.getByTestId("agent-network-provider-submit").click({
-        force: true,
-      });
-      const created = await createResponse;
-      expect([200, 201]).toContain(created.status());
-
-      const body = created.request().postDataJSON();
-      expect(body).toMatchObject({
-        provider_id: AGENTGATEWAY_CATALOG_ID,
-        name: providerName,
-        upstream_url: upstreamURL,
-        models: [],
-        metadata_disabled: false,
-      });
-      expect(body).not.toHaveProperty("identity_header_user_id");
-      expect(body).not.toHaveProperty("identity_header_groups");
-      await expect(
-        page.getByTestId("agent-network-provider-modal"),
-      ).toBeHidden();
-
-      await expect(page.getByTestId(providerName)).toBeVisible();
-      await expect(
-        page.getByTestId(`provider-models-${providerName}`),
-      ).toHaveText("All Models");
-
-      await page.getByTestId(providerName).click({ force: true });
-      await expect(
-        page.getByTestId("agent-network-provider-modal"),
-      ).toBeVisible();
-      await expect(
-        page.getByTestId("agent-network-provider-upstream-url"),
-      ).toHaveValue(upstreamURL);
-      await page
-        .getByTestId("agent-network-provider-mappings-tab")
-        .click({ force: true });
-      await expect(
-        page.getByTestId("agent-network-provider-user-mapping"),
-      ).toContainText("x-netbird-user-id");
-      await expect(
-        page.getByTestId("agent-network-provider-groups-mapping"),
-      ).toContainText("x-netbird-groups");
-      await page
-        .getByTestId("agent-network-provider-modal")
-        .getByTestId("modal-close")
-        .click({ force: true });
-    } finally {
-      await deleteAgentNetworkProvidersByPrefix(page, PROVIDER_PREFIX);
-    }
-  });
-});

e2e/tests/agent-network-bootstrap-cluster.spec.ts

@@ -5,8 +5,8 @@
  * cluster the connect-provider wizard pins it to, and it is immutable after
  * that. Not every live cluster can host it: the endpoint is a private service,
  * reachable only from connected peers and authorised by their tunnel identity,
- * which only a cluster with private capabilities can serve. Management
- * reports that per cluster as supports_private and refuses a
+ * which only a cluster with a connected embedded proxy (`netbird proxy`) can
+ * serve. Management reports that per cluster as supports_private and refuses a
  * bootstrap onto a cluster without it.
  *
  * This spec pins the wizard's half of that contract: it picks a
@@ -25,7 +25,7 @@ const AGENT_NETWORK_CONFIG_KEY = "netbird-test-agent-network";
 // bug this spec guards against.
 const CENTRAL_CLUSTER = "central.proxy.netbird.io";
 // Listed second, and the only valid pick.
-const PRIVATE_CLUSTER = "private.proxy.netbird.io";
+const EMBEDDED_CLUSTER = "embedded.proxy.netbird.io";
 
 const UNBOOTSTRAPPED_DEFAULTS = {
   endpoint: "",
@@ -39,8 +39,8 @@ const UNBOOTSTRAPPED_DEFAULTS = {
 
 const BOOTSTRAPPED_SETTINGS = {
   ...UNBOOTSTRAPPED_DEFAULTS,
-  endpoint: `violet.${PRIVATE_CLUSTER}`,
-  proxy_address: PRIVATE_CLUSTER,
+  endpoint: `violet.${EMBEDDED_CLUSTER}`,
+  proxy_address: EMBEDDED_CLUSTER,
   created_at: "2026-01-01T00:00:00Z",
   updated_at: "2026-01-01T00:00:00Z",
 };
@@ -121,9 +121,7 @@ async function openWizard(
 
 /** Fills the provider tab with the minimum a create needs. */
 async function fillProviderTab(page: Page) {
-  await page
-    .getByPlaceholder("https://api.openai.com")
-    .fill("https://api.openai.com");
+  await page.getByPlaceholder("https://api.openai.com").fill("https://api.openai.com");
   await page.getByPlaceholder("sk-...").first().fill("sk-e2e-bootstrap-key");
 }
 
@@ -133,7 +131,7 @@ test.describe("Agent Network bootstrap cluster @agent-network", () => {
   }) => {
     const { page, close } = await openWizard(browser, [
       freeDomain(CENTRAL_CLUSTER, false),
-      freeDomain(PRIVATE_CLUSTER, true),
+      freeDomain(EMBEDDED_CLUSTER, true),
     ]);
     try {
       await page
@@ -156,22 +154,20 @@ test.describe("Agent Network bootstrap cluster @agent-network", () => {
         { timeout: 30_000 },
       );
 
-      await page
-        .getByRole("button", { name: "Continue" })
-        .click({ force: true });
+      await page.getByRole("button", { name: "Continue" }).click({ force: true });
       await page
         .getByRole("button", { name: "Connect Provider" })
         .last()
         .click({ force: true });
 
       const payload = (await bootstrap).request().postDataJSON();
-      expect(payload.proxy_address).toBe(PRIVATE_CLUSTER);
+      expect(payload.proxy_address).toBe(EMBEDDED_CLUSTER);
     } finally {
       await close();
     }
   });
 
-  test("blocks setup when no listed cluster has private capabilities", async ({
+  test("blocks setup when no listed cluster has an embedded proxy", async ({
     browser,
   }) => {
     const { page, close } = await openWizard(browser, [
@@ -185,13 +181,7 @@ test.describe("Agent Network bootstrap cluster @agent-network", () => {
 
       const callout = page.getByTestId("agent-network-no-cluster-callout");
       await expect(callout).toBeVisible({ timeout: 10_000 });
-      await expect(callout).toContainText("private capabilities");
-      // The fix lives in the agent network's own Clusters section, not the
-      // generic Reverse Proxy page, so that is where the callout sends users.
-      await expect(callout.getByRole("link")).toHaveAttribute(
-        "href",
-        "/agent-network/configuration?tab=clusters",
-      );
+      await expect(callout).toContainText("embedded proxy");
 
       // With nothing to pin to there is no bootstrap to make, so the wizard
       // cannot advance — rather than sending a request management refuses.

e2e/tests/agent-network-provider-save-refused.spec.ts

@@ -1,195 +0,0 @@
-/**
- * Agent Network provider save: what the operator sees when the backend refuses.
- *
- * Saving a provider checks its upstream URL and credential against the vendor
- * before storing anything, so a 422 naming the field to correct is an ordinary
- * outcome of the form rather than a server fault. Four things have to hold,
- * and each one has been wrong at some point:
- *
- *   - while the check runs the submit says so and refuses a second click. The
- *     vendor call is the slow part and an unreachable upstream drags it out to
- *     a timeout, which looked exactly like a button that had not registered
- *     the first click.
- *   - exactly ONE toast, the shared "Request failed with status code N", which
- *     quotes the API's own sentence. A second toast from the save path said the
- *     same thing under a vaguer title.
- *   - the toast is styled as a failure. notify() renders green with a check
- *     mark unless told otherwise, so a refusal announced itself as a success.
- *   - the modal stays open with the typed values intact. The API never returns
- *     an API key, so closing the form loses it with nowhere to retype it.
- *
- * The refusal is mocked rather than provoked: the backend check ships with a
- * management build these tests do not pin, and what is under test here is the
- * dashboard's handling of the response, not the vendor call that produces it.
- *
- * Like the other agent-network specs, this one builds its own context rather
- * than taking the shared dashboardAsOwner fixture: the Agent Network menu is
- * deployment-gated behind a localStorage override that has to be in place
- * before the first navigation, which addInitScript on an own context is the
- * way to do. The route interception below is a second reason — the shared page
- * is worker-scoped, and a 422 left on it would follow every later test.
- */
-import { type Browser, expect, type Page, test } from "@playwright/test";
-import { loginToApp, navigateTo } from "../helpers/auth";
-import { generateRandomName } from "../helpers/utils";
-
-const AGENT_NETWORK_CONFIG_KEY = "netbird-test-agent-network";
-const PROVIDERS_ENDPOINT = /\/api\/agent-network\/providers(\?|$)/;
-const PROVIDER_PREFIX = "e2e-refused-";
-const TITLE_TESTID = "notification-title";
-
-// The message a refused save carries: the backend names which of the two
-// fields is at fault, without a status code and without echoing the URL.
-const REFUSAL = "the upstream url could not be reached: no such host";
-
-// Matched case-insensitively on purpose. The backend lowercases its messages
-// (WriteError does, and the copy is written for it) while the toast uppercases
-// the first character before rendering. Asserting either spelling would pin
-// the test to that transform rather than to the sentence the operator reads.
-const REFUSAL_TEXT = new RegExp(
-  REFUSAL.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
-  "i",
-);
-
-async function newAgentNetworkPage(browser: Browser): Promise<{
-  page: Page;
-  close: () => Promise<void>;
-}> {
-  const context = await browser.newContext({
-    storageState: "e2e/fixtures/auth/owner.json",
-  });
-  await context.addInitScript(
-    ([key, value]) => {
-      try {
-        window.localStorage.setItem(key as string, value as string);
-      } catch (e) {}
-    },
-    [AGENT_NETWORK_CONFIG_KEY, "enabled"],
-  );
-  const page = await context.newPage();
-  await loginToApp(page, "owner");
-  return { page, close: () => context.close() };
-}
-
-// How long the mocked create takes to answer. The real check is a vendor round
-// trip, so a save is never instant; holding the response gives the in-flight
-// assertions a window to run in without racing the toast.
-const REFUSAL_DELAY_MS = 1500;
-
-// refuseProviderCreate answers the create with the 422 the credential check
-// produces. Only POST is intercepted: the page still lists providers, and the
-// settings bootstrap that may precede the create is left alone.
-async function refuseProviderCreate(page: Page) {
-  await page.route(PROVIDERS_ENDPOINT, async (route) => {
-    if (route.request().method() !== "POST") return route.continue();
-    const origin = route.request().headers()["origin"] || "*";
-    await new Promise((resolve) => setTimeout(resolve, REFUSAL_DELAY_MS));
-    await route.fulfill({
-      status: 422,
-      headers: {
-        "content-type": "application/json",
-        "access-control-allow-origin": origin,
-      },
-      body: JSON.stringify({ code: 422, message: REFUSAL }),
-    });
-  });
-}
-
-test.describe
-  .serial("Agent Network refused provider save @agent-network", () => {
-  test("reports the refusal once and keeps the form open", async ({
-    browser,
-  }) => {
-    const { page, close } = await newAgentNetworkPage(browser);
-    try {
-      await refuseProviderCreate(page);
-
-      // navigateTo rather than goto: it dismisses the setup modal that greets a
-      // fresh account and clears the scroll lock it leaves behind, either of
-      // which swallows the clicks below.
-      await navigateTo(page, "/agent-network/providers");
-
-      await page
-        .getByRole("button", { name: "Connect Provider" })
-        .first()
-        .click({ force: true });
-
-      const providerName = generateRandomName(PROVIDER_PREFIX);
-      await page
-        .getByTestId("agent-network-provider-name")
-        .fill(providerName);
-      await page
-        .getByTestId("agent-network-provider-api-key")
-        .fill("sk-e2e-refused-key");
-
-      // The submit lives on the Models tab — the Provider tab's primary button
-      // only advances to it.
-      await page.getByRole("tab", { name: "Models" }).click({ force: true });
-      const submit = page.getByTestId("agent-network-provider-submit");
-      await expect(submit).toBeEnabled();
-
-      const refusal = page.waitForResponse(
-        (resp) =>
-          PROVIDERS_ENDPOINT.test(resp.url()) &&
-          resp.request().method() === "POST",
-        { timeout: 30_000 },
-      );
-      await submit.click({ force: true });
-
-      // ---- the wait is visible while it lasts ----
-      // A second create is not idempotent, so the button has to say it is
-      // working and stop taking clicks rather than sit there looking untouched.
-      // Asserted before the response is awaited: the mock holds it open for
-      // exactly this window.
-      await expect(submit).toContainText("Connecting provider");
-      await expect(submit).toBeDisabled();
-
-      expect((await refusal).status()).toBe(422);
-
-      // ---- the toast says what the API said ----
-      const title = page.getByTestId(TITLE_TESTID).first();
-      await expect(title).toContainText("Request failed with status code 422");
-      await expect(
-        page.locator("[data-toast-notification]").first(),
-      ).toContainText(REFUSAL_TEXT);
-
-      // ---- and only that toast ----
-      // The save path used to add its own on top, so the count is the
-      // assertion rather than the presence of the right one.
-      await expect(page.locator("[data-toast-notification]")).toHaveCount(1);
-      await expect(page.getByText("Failed to connect provider")).toHaveCount(0);
-
-      // ---- styled as a failure, not a success ----
-      // notify() paints the icon tile green with a check unless the caller
-      // says otherwise, which is how a refusal once looked like a success.
-      //
-      // A failure reaches the tile two ways — notify()'s own error state, and
-      // a caller passing its own colour and icon, which is what the shared
-      // request-failed toast does — so what has to hold is the negative: this
-      // is not the default success tile.
-      const icon = page.getByTestId("notification-icon");
-      await expect(icon).toBeVisible();
-      await expect(icon).not.toHaveAttribute("data-variant", "success");
-
-      // ---- the form is still there, still holding what was typed ----
-      // The submit only exists while the modal is open, so its presence is the
-      // check that nothing closed underneath the toast. It also has to come
-      // back out of the in-flight state, or the retry the toast asks for is
-      // impossible.
-      await expect(submit).toBeVisible();
-      await expect(submit).toBeEnabled();
-      await expect(submit).toContainText("Connect Provider");
-      await page.getByRole("tab", { name: "Provider" }).click({ force: true });
-      await expect(
-        page.getByTestId("agent-network-provider-name"),
-      ).toHaveValue(providerName);
-      // The key matters most: the API never returns one, so a form that lost
-      // it leaves the operator with nothing to correct.
-      await expect(
-        page.getByTestId("agent-network-provider-api-key"),
-      ).toHaveValue("sk-e2e-refused-key");
-    } finally {
-      await close();
-    }
-  });
-});

e2e/tests/control-center-draft-matrix.spec.ts

@@ -364,17 +364,13 @@ test.describe.serial("Control Center Draft Matrix @control-center", () => {
   }) => {
     const group = await place(page, "group", 0.6, 0.5);
     await expectChangeCount(page, 1);
+    // React Flow ignores delete keys while an input is focused, and the panel's
+    // search takes focus on click, so blur it before pressing Backspace.
     await group.click();
     await expect(group).toHaveClass(/selected/);
-    // React Flow ignores delete keys while an input is focused, and the panel
-    // the click opens takes focus into its search — from an effect, about
-    // 100ms later. Blurring before that lands leaves the input to claim focus
-    // afterwards and swallow the Backspace, so wait for the focus, then drop
-    // it.
-    const panelSearch = page.locator("#cc-group-panel input").first();
-    await expect(panelSearch).toBeFocused();
-    await panelSearch.blur();
-    await expect(panelSearch).not.toBeFocused();
+    await page.evaluate(
+      () => (document.activeElement as HTMLElement | null)?.blur(),
+    );
     await page.keyboard.press("Backspace");
     await expect(canvasNode(page, "group-new-")).toHaveCount(0);
     await expectChangeCount(page, 0);

e2e/tests/control-center-draft-remove.spec.ts

@@ -19,7 +19,6 @@ import {
   dismissBlockingOverlays,
   enterDraft,
   openControlCenter,
-  openGroupView,
   resetDraftState,
   reviewButton,
 } from "../helpers/control-center";
@@ -38,6 +37,7 @@ test.describe
     await deleteGroupsByPrefix(page, PREFIX);
   });
 
+  // Clean-slated so the draft group view's auto-select is deterministic.
   async function seedPolicyGroupView(page: Page) {
     await deletePoliciesBySubstring(page, PREFIX);
     await deleteGroupsByPrefix(page, PREFIX);
@@ -49,9 +49,7 @@ test.describe
       src.id,
       dst.id,
     );
-    // Selected by name: the view's own pick ranks every group in the account,
-    // so a peer-bearing group from another spec on the other worker wins it.
-    await openGroupView(page, src.name);
+    await openControlCenter(page, "groups");
     await enterDraft(page);
     const policyNode = canvasNode(page, `policy-${policy.id}`);
     await expect(policyNode).toBeVisible({ timeout: 15_000 });

e2e/tests/control-center-live.spec.ts

@@ -18,7 +18,6 @@ import {
   clickContextMenuItem,
   dismissBlockingOverlays,
   openControlCenter,
-  openGroupView,
   resetDraftState,
   switchFlowView,
 } from "../helpers/control-center";
@@ -48,6 +47,8 @@ test.describe.serial("Control Center Live Mode @control-center", () => {
   });
 
   async function seedPolicyAndOpenGroupView(page: Page, enabled = true) {
+    // The group view auto-selects a group that HAS a policy, so stale policies
+    // would make the rendered group non-deterministic.
     await deletePoliciesBySubstring(page, PREFIX);
     await deleteGroupsByPrefix(page, PREFIX);
 
@@ -63,10 +64,15 @@ test.describe.serial("Control Center Live Mode @control-center", () => {
     );
 
     const policyNode = canvasNode(page, `policy-${policy.id}`);
-    // Selecting src by name rather than trusting the view's own pick: the
-    // auto-select ranks every group in the account, so a peer-bearing group
-    // another spec seeded on the other worker outranks this one.
-    await openGroupView(page, src.name);
+    // A stale SWR read or a build/fit race can fail to place the node.
+    for (let attempt = 0; attempt < 3; attempt++) {
+      await openControlCenter(page, "groups");
+      const shown = await policyNode
+        .waitFor({ state: "visible", timeout: 10_000 })
+        .then(() => true)
+        .catch(() => false);
+      if (shown) break;
+    }
     await expect(policyNode).toBeVisible({ timeout: 10_000 });
     return { src, dst, policy, policyNode };
   }
@@ -506,6 +512,7 @@ test.describe.serial("Control Center Live Mode @control-center", () => {
   test("Should save group resource membership in live mode (correct payload)", async ({
     dashboardAsOwner: page,
   }) => {
+    // Clean slate so the group view deterministically lands on our group.
     await deletePoliciesBySubstring(page, PREFIX);
     await deleteGroupsByPrefix(page, PREFIX);
 
@@ -522,7 +529,7 @@ test.describe.serial("Control Center Live Mode @control-center", () => {
       [],
     );
 
-    await openGroupView(page, src.name);
+    await openControlCenter(page, "groups");
     const groupNode = canvasNode(page, `group-${dst.id}`);
     await expect(groupNode).toBeVisible({ timeout: 15_000 });
 
@@ -603,7 +610,7 @@ test.describe.serial("Control Center Live Mode @control-center", () => {
     );
     await createPolicy(page, generateRandomName(PREFIX), src.id, d2.id);
 
-    await openGroupView(page, src.name);
+    await openControlCenter(page, "groups");
     const policyNode = canvasNode(page, `policy-${p1.id}`);
     await expect(policyNode).toBeVisible({ timeout: 15_000 });
     await expect(

e2e/tests/login.spec.ts

@@ -102,7 +102,7 @@ async function loginAndSave(
   const skipButton = page.locator("button[name=skip]");
   const appNav = page.getByTestId("left-navigation-item").first();
   const modal = page.getByTestId("setup-netbird-modal");
-  const approval = page.getByTestId("pending-approval");
+  const approval = page.getByText("User Approval Pending");
 
   let after_login: "2fa" | "app" | "modal" | "approval";
   try {