✨ delete org

.github/ISSUE_TEMPLATE/1.bug_report.yml

@@ -34,14 +34,6 @@ body:
       validations:
           required: true
 
-    - type: textarea
-      attributes:
-          label: AI Disclosure
-          description: |
-              If you used AI to help write this issue, please disclose it here. This is important for transparency and helps maintain the integrity of the issue tracking process.
-      validations:
-          required: true
-
     - type: textarea
       attributes:
           label: Expected Behavior

.github/workflows/cicd.yml

@@ -77,7 +77,7 @@ jobs:
                   fi
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+              uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
               with:
                   registry: docker.io
                   username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -149,7 +149,7 @@ jobs:
                   fi
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+              uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
               with:
                   registry: docker.io
                   username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -204,7 +204,7 @@ jobs:
               uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+              uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
               with:
                   registry: docker.io
                   username: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -407,7 +407,7 @@ jobs:
               shell: bash
 
             - name: Login to GitHub Container Registry (for cosign)
-              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+              uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
               with:
                 registry: ghcr.io
                 username: ${{ github.actor }}

.github/workflows/stale-bot.yml

@@ -14,7 +14,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
+      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
         with:
           days-before-stale: 14
           days-before-close: 14

README.md

@@ -37,22 +37,11 @@
 
 <p align="center">
     <strong>
-        Get started with Pangolin Cloud at <a href="https://app.pangolin.net/auth/signup">app.pangolin.net</a>
+        Get started with Pangolin at <a href="https://app.pangolin.net/auth/signup">app.pangolin.net</a>
     </strong>
 </p>
 
-Pangolin is an open-source SASE platform, built on WireGuard®, with a simple mission: connect and protect your users, wherever they are. It brings networking and security together as one system including a zero-trust VPN, zero-trust reverse proxy, privileged access management, and an identity-aware AI gateway, all sharing one identity and policy model. It's the same idea behind platforms like Cloudflare One, Zscaler, and Prisma but open, self-hostable, and built to stay light and easy to deploy.
+Pangolin is an open-source, identity-based remote access platform built on WireGuard® that enables secure connectivity to infrastructure anywhere. It combines reverse-proxy and VPN capabilities into one platform, providing browser-based access to web applications and client-based access to private resources with NAT traversal, all with granular access control.
-
-### Networking and security that's unified, open, and simple
-
-Legacy SASE platforms got the idea right: connectivity and security belong together. But they delivered it as a heavyweight, closed, cloud-locked stack assembled from years of patchwork. Pangolin exists to do that unification differently, in the open, self-hostable, and simple enough that administrators actually enjoy running it.
-
-* **Open source, not a black box**: the code is open and auditable, so you can see exactly how your traffic is handled and how access decisions get made, instead of trusting a closed cloud control plane.
-* **Networking and security as one platform**: sites, reverse proxy, client access, RBAC, and the AI gateway share one identity and policy model, so protecting users and connecting them are executed together.
-* **Lightweight by design**: the whole platform is built to stay small and fast: easy to self-host on a small server, with a lightweight, user-space connector that goes in your private networks.
-* **Enjoyable to use**: a clean, modern interface and a setup flow that gets out of your way, so managing access feels simple instead of like fighting a legacy admin console.
-* **Zero trust from day one**: access is granted per resource, not per network, with identity provider integration, role-based access control, and full audit logging.
-* **Run it your way**: self-host the Community Edition for free, step up to the Enterprise Edition for advanced features, or use Pangolin Cloud if you'd rather not manage infrastructure at all.
 
 ## Installation
 
@@ -64,9 +53,9 @@ Legacy SASE platforms got the idea right: connectivity and security belong toget
 
 ## Deployment Options
 
-- **Pangolin Cloud** - Fully managed service with no infrastructure required.
+- **Pangolin Cloud** - Fully managed service - no infrastructure required.
-- **Self-Host: Community Edition** - Free, open-source, and licensed under AGPL-3.
+- **Self-Host: Community Edition** - Free, open source, and licensed under AGPL-3.
-- **Self-Host: Enterprise Edition** - Open-core, and licensed under Fossorial Commercial License. Free for personal and hobbyist use, and for businesses making less than \$100K USD gross annual revenue.
+- **Self-Host: Enterprise Edition** - Licensed under Fossorial Commercial License. Free for personal and hobbyist use, and for businesses making less than \$100K USD gross annual revenue.
 
 ## Key Features
 
@@ -110,19 +99,6 @@ Access private resources like SSH servers, databases, RDP, and entire network ra
 
 <img src="public/screenshots/private-resources.png" alt="Private resources" width="100%" />
 
-### Identity-aware AI gateway
-
-Put an identity-aware proxy in front of public cloud (OpenAI, Anthropic, Gemini, etc.) and self-hosted model servers (Ollama, vLLM, Mistral, etc.) so coding agents and AI clients call a single Pangolin URL. Publish it as a public resource with personal API keys, or keep it private on a client tunnel where the connected client is the credential for keyless access. Budgets, session history, and usage analytics sit in front of every call.
-
-* Access self-hosted models (vLLM, Ollama, etc) alongside cloud models (OpenAI, Anthropic, etc) in one place
-* Keyless access by authenticating users with the Pangolin desktop client
-* Or, provide users with personal API keys
-* Control costs and token usage by setting budgets
-* Audit with detailed session history and analytics
-* Integrate AI clients and coding agents (Claude Code, Codex, OpenCode, etc)
-
-<img src="public/screenshots/expanded-session-logs.png" alt="AI Session Logs" width="100%" />
-
 ### Give users and roles access to resources
 
 Use Pangolin's built-in users or bring your own identity provider and set up role-based access control (RBAC). Grant users access to specific resources, not entire networks. Unlike traditional VPNs that expose full network access, Pangolin's zero-trust model ensures users can only reach the applications, services, and routes you explicitly define.

cli/commands/generateOrgCaKeys.ts

@@ -5,7 +5,7 @@ import { encrypt } from "@server/lib/crypto";
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { generateCA } from "@server/lib/sshCA";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 type GenerateOrgCaKeysArgs = {
     orgId: string;

cli/commands/rotateServerSecret.ts

@@ -4,7 +4,7 @@ import { encrypt, decrypt } from "@server/lib/crypto";
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { eq } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 type RotateServerSecretArgs = {
     "old-secret": string;

install/config/crowdsec/traefik_config.yml

@@ -16,7 +16,7 @@ experimental:
       version: "{{.BadgerVersion}}"
     crowdsec: # CrowdSec plugin configuration added
       moduleName: "github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin"
-      version: "v1.7.1"
+      version: "v1.4.4"
 
 log:
   level: "INFO"

messages/bg-BG.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Научете повече за JMESPath",
     "idpJmespathLabel": "Идентификатор на пътя",
     "idpJmespathLabelDescription": "Пътят към идентификатора на потребителя в ID токена",
-    "idpIdentifierChangeTitle": "Предупреждение за промяна на пътя на идентификатора",
-    "idpIdentifierChangeDescription": "Ще промените пътя на идентификатора. Това ще повлияе на начина, по който съществуващите потребители са разпределени. Потребители, които преди са влизали чрез този доставчик на идентичности, може вече да не бъдат разпознавани като същите потребители.",
-    "idpIdentifierChangeConfirmMessage": "Потвърждавам",
-    "idpIdentifierChangeWarningText": "Това ще повлияе на начина, по който съществуващите потребители са разпределени",
     "idpJmespathEmailPathOptional": "Път за имейл (по избор)",
     "idpJmespathEmailPathOptionalDescription": "Пътят до имейла на потребителя в ID токена",
     "idpJmespathNamePathOptional": "Път (по избор) на име",
@@ -1577,8 +1573,6 @@
     "search": "Търси…",
     "searchPlaceholder": "Търсене...",
     "emptySearchOptions": "Няма намерени опции",
-    "ipFilterSearchPlaceholder": "Въведете IP адрес…",
-    "ipFilterEmptyMessage": "Въведете IP адрес, за да филтрирате по него",
     "create": "Създаване",
     "orgs": "Организации",
     "loginError": "Възникна неочаквана грешка. Моля, опитайте отново.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Тип:",
     "createDomainName": "Име:",
     "createDomainValue": "Стойност:",
-    "multiSelectFilterCount": "{count} избрани",
     "createDomainCnameRecords": "CNAME записи",
     "createDomainARecords": "A записи",
     "createDomainRecordNumber": "Запис {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Метод",
     "healthSelectScheme": "Избор на метод",
     "healthCheckPortInvalid": "Портът трябва да бъде между 1 и 65535",
-    "healthCheckHostnameInvalid": "Името на хоста не трябва да съдържа празни символи",
     "healthCheckPath": "Път",
     "healthHostname": "IP / Хост",
     "healthPort": "Порт",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Добавете CIDR диапазон (напр. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Неуспешно зареждане на подмрежи",
     "remoteExitNodeNetworkingLabelsTitle": "Етикети за Предпочитания",
-    "remoteExitNodeNetworkingLabelsDescription": "Сайтовете с тези етикети ще предпочетат да се свържат чрез този отдалечен изходен възел.",
+    "remoteExitNodeNetworkingLabelsDescription": "Сайтове с тези етикети ще бъдат принудени да се свържат чрез този отдалечен край.",
     "remoteExitNodeNetworkingLabelsButtonText": "Изберете етикети...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Търсене на етикети...",
     "remoteExitNodeNetworkingLabelsLoadError": "Неуспешно зареждане на етикети",

messages/cs-CZ.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Další informace o cestě JMESPath",
     "idpJmespathLabel": "Cesta identifikátoru",
     "idpJmespathLabelDescription": "Cesta k identifikátoru uživatele v tokenu ID",
-    "idpIdentifierChangeTitle": "Varování o změně cesty identifikátoru",
-    "idpIdentifierChangeDescription": "Chystáte se změnit cestu identifikátoru. Tímto se změní způsob mapování stávajících uživatelů. Uživatelé, kteří se dříve přihlásili přes tohoto poskytovatele identity, již nemusí být rozpoznáni jako stejní uživatelé.",
-    "idpIdentifierChangeConfirmMessage": "Potvrzuji",
-    "idpIdentifierChangeWarningText": "Toto ovlivní, jak budou mapováni stávající uživatelé",
     "idpJmespathEmailPathOptional": "Cesta e-mailu (volitelné)",
     "idpJmespathEmailPathOptionalDescription": "Cesta k e-mailu uživatele v ID tokenu",
     "idpJmespathNamePathOptional": "Cesta k názvu (volitelné)",
@@ -1577,8 +1573,6 @@
     "search": "Vyhledávání…",
     "searchPlaceholder": "Hledat...",
     "emptySearchOptions": "Nebyly nalezeny žádné možnosti",
-    "ipFilterSearchPlaceholder": "Zadejte IP adresu…",
-    "ipFilterEmptyMessage": "Zadejte IP adresu pro filtrování",
     "create": "Vytvořit",
     "orgs": "Organizace",
     "loginError": "Došlo k neočekávané chybě. Zkuste to prosím znovu.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Typ:",
     "createDomainName": "Jméno:",
     "createDomainValue": "Hodnota:",
-    "multiSelectFilterCount": "{count} vybráno",
     "createDomainCnameRecords": "Záznamy CNAME",
     "createDomainARecords": "Záznamy",
     "createDomainRecordNumber": "Nahrát {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Způsob",
     "healthSelectScheme": "Vybrat metodu",
     "healthCheckPortInvalid": "Port musí být mezi 1 a 65535",
-    "healthCheckHostnameInvalid": "Název hostitele nesmí obsahovat mezery",
     "healthCheckPath": "Cesta",
     "healthHostname": "IP / Hostitel",
     "healthPort": "Přístav",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Přidejte rozsah CIDR (např. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Nepodařilo se načíst podsítě",
     "remoteExitNodeNetworkingLabelsTitle": "Názvy preferencí",
-    "remoteExitNodeNetworkingLabelsDescription": "Stránky s těmito štítky preferují spojení přes tento vzdálený výstupní uzel.",
+    "remoteExitNodeNetworkingLabelsDescription": "Weby s těmito názvy budou nuceny připojit se tímto vzdáleným výstupním uzlem.",
     "remoteExitNodeNetworkingLabelsButtonText": "Vyberte názvy...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Hledat názvy...",
     "remoteExitNodeNetworkingLabelsLoadError": "Nepodařilo se načíst názvy",

messages/da-DK.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Læs mere om JMESPath",
     "idpJmespathLabel": "Identifikatorsti",
     "idpJmespathLabelDescription": "Stien til brugeridentifikatoren i ID-tokenet",
-    "idpIdentifierChangeTitle": "Advarsel om ændring af identifikatorsti",
-    "idpIdentifierChangeDescription": "Du er ved at ændre identifikatorstien. Dette vil påvirke, hvordan eksisterende brugere bliver kortlagt. Brugere, der tidligere har logget ind gennem denne identitetsudbyder, genkendes muligvis ikke længere som de samme brugere.",
-    "idpIdentifierChangeConfirmMessage": "Jeg bekræfter",
-    "idpIdentifierChangeWarningText": "Dette vil påvirke, hvordan eksisterende brugere bliver kortlagt",
     "idpJmespathEmailPathOptional": "E-mailsti (Valgfrit)",
     "idpJmespathEmailPathOptionalDescription": "Stien til brugerens e-mailadresse i ID-tokenet",
     "idpJmespathNamePathOptional": "Navn Sti (Valgfrit)",
@@ -1577,8 +1573,6 @@
     "search": "Søg…",
     "searchPlaceholder": "Søg...",
     "emptySearchOptions": "Ingen valg fundet",
-    "ipFilterSearchPlaceholder": "Indtast en IP-adresse…",
-    "ipFilterEmptyMessage": "Indtast en IP-adresse for at filtrere efter",
     "create": "Opret",
     "orgs": "Organisationer",
     "loginError": "Der opstod en uventet fejl. Prøv venligst igen.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Type:",
     "createDomainName": "Navn:",
     "createDomainValue": "Værdi:",
-    "multiSelectFilterCount": "{count} valgt",
     "createDomainCnameRecords": "CNAME-poster",
     "createDomainARecords": "A-poster",
     "createDomainRecordNumber": "Post {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Metode",
     "healthSelectScheme": "Vælg metode",
     "healthCheckPortInvalid": "Porten skal være mellem 1 og 65535",
-    "healthCheckHostnameInvalid": "Værtsnavnet må ikke indeholde mellemrum",
     "healthCheckPath": "Sti",
     "healthHostname": "IP / Vært",
     "healthPort": "Port",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Tilføj et CIDR-område (f.eks. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Kunne ikke indlæse subnets",
     "remoteExitNodeNetworkingLabelsTitle": "Præference Etiketter",
-    "remoteExitNodeNetworkingLabelsDescription": "Sider med disse etiketter vil foretrække at forbinde gennem denne fjernudgarnknude.",
+    "remoteExitNodeNetworkingLabelsDescription": "Sites med disse etiketter vil blive tvunget til at oprette forbindelse gennem denne fjerne exit-node.",
     "remoteExitNodeNetworkingLabelsButtonText": "Vælg etiketter...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Søg efter etiketter...",
     "remoteExitNodeNetworkingLabelsLoadError": "Kunne ikke indlæse etiketter",

messages/de-DE.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Mehr über JMESPath erfahren",
     "idpJmespathLabel": "Identifikationspfad",
     "idpJmespathLabelDescription": "Der JMESPath zum Benutzeridentifikator im ID-Token",
-    "idpIdentifierChangeTitle": "Warnung zur Änderung des Identifikatorpfads",
-    "idpIdentifierChangeDescription": "Sie stehen kurz davor, den Identifikatorpfad zu ändern. Dies wird beeinflussen, wie bestehende Benutzer zugeordnet werden. Benutzer, die sich zuvor über diesen Identitätsanbieter angemeldet haben, werden möglicherweise nicht mehr als dieselben Benutzer erkannt.",
-    "idpIdentifierChangeConfirmMessage": "Ich bestätige",
-    "idpIdentifierChangeWarningText": "Dies wird beeinflussen, wie bestehende Benutzer zugeordnet werden",
     "idpJmespathEmailPathOptional": "E-Mail-Pfad (Optional)",
     "idpJmespathEmailPathOptionalDescription": "Der JMESPath zur E-Mail-Adresse des Benutzers im ID-Token",
     "idpJmespathNamePathOptional": "Namenspfad (Optional)",
@@ -1577,8 +1573,6 @@
     "search": "Suche…",
     "searchPlaceholder": "Suche...",
     "emptySearchOptions": "Keine Optionen gefunden",
-    "ipFilterSearchPlaceholder": "Geben Sie eine IP-Adresse ein…",
-    "ipFilterEmptyMessage": "Geben Sie eine IP-Adresse zur Filterung ein",
     "create": "Erstellen",
     "orgs": "Organisationen",
     "loginError": "Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Typ:",
     "createDomainName": "Name:",
     "createDomainValue": "Wert:",
-    "multiSelectFilterCount": "{count} ausgewählt",
     "createDomainCnameRecords": "CNAME-Einträge",
     "createDomainARecords": "A-Aufzeichnungen",
     "createDomainRecordNumber": "Eintrag {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Methode",
     "healthSelectScheme": "Methode auswählen",
     "healthCheckPortInvalid": "Der Port muss zwischen 1 und 65535 liegen",
-    "healthCheckHostnameInvalid": "Der Hostname darf keinen Leerraum enthalten",
     "healthCheckPath": "Pfad",
     "healthHostname": "IP / Host",
     "healthPort": "Port",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Fügen Sie einen CIDR-Bereich hinzu (z.B. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Fehler beim Laden der Subnetze",
     "remoteExitNodeNetworkingLabelsTitle": "Präferenzetiketten",
-    "remoteExitNodeNetworkingLabelsDescription": "Standorte mit diesen Labels bevorzugen die Verbindung über diesen Remote-Exit-Knoten.",
+    "remoteExitNodeNetworkingLabelsDescription": "Standorte mit diesen Etiketten werden gezwungen, über diesen Remote Exit Node zu verbinden.",
     "remoteExitNodeNetworkingLabelsButtonText": "Etiketten auswählen...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Etiketten suchen...",
     "remoteExitNodeNetworkingLabelsLoadError": "Fehler beim Laden der Etiketten",

messages/en-US.json

@@ -465,6 +465,8 @@
     "apiKeysDelete": "Delete API Key",
     "apiKeysManage": "Manage API Keys",
     "apiKeysDescription": "API keys are used to authenticate with the integration API",
+    "orgsManage": "Manage Organizations",
+    "orgsDescription": "View and manage all organizations on this instance",
     "provisioningKeysTitle": "Provisioning Key",
     "provisioningKeysManage": "Manage Provisioning Keys",
     "provisioningKeysDescription": "Provisioning keys are used to authenticate automated site provisioning for your organization.",
@@ -1176,10 +1178,6 @@
     "idpJmespathAboutDescriptionLink": "Learn more about JMESPath",
     "idpJmespathLabel": "Identifier Path",
     "idpJmespathLabelDescription": "The path to the user identifier in the ID token",
-    "idpIdentifierChangeTitle": "Identifier Path Change Warning",
-    "idpIdentifierChangeDescription": "You are about to change the identifier path. This will affect how existing users are mapped. Users who previously signed in through this identity provider may no longer be recognized as the same users.",
-    "idpIdentifierChangeConfirmMessage": "I confirm",
-    "idpIdentifierChangeWarningText": "This will affect how existing users are mapped",
     "idpJmespathEmailPathOptional": "Email Path (Optional)",
     "idpJmespathEmailPathOptionalDescription": "The path to the user's email in the ID token",
     "idpJmespathNamePathOptional": "Name Path (Optional)",
@@ -1577,8 +1575,6 @@
     "search": "Search…",
     "searchPlaceholder": "Search...",
     "emptySearchOptions": "No options found",
-    "ipFilterSearchPlaceholder": "Enter an IP address…",
-    "ipFilterEmptyMessage": "Enter an IP address to filter by",
     "create": "Create",
     "orgs": "Organizations",
     "loginError": "An unexpected error occurred. Please try again.",
@@ -2095,6 +2091,7 @@
     "resourceBudgetSettings": "Budget",
     "resourceBudgetSettingsDescription": "Configure how this AI gateway restricts usage based on spending or token limits",
     "sidebarApiKeys": "API Keys",
+    "sidebarOrgs": "Organizations",
     "sidebarProvisioning": "Provisioning",
     "sidebarSettings": "Settings",
     "sidebarAllUsers": "All Users",
@@ -2602,7 +2599,6 @@
     "createDomainType": "Type:",
     "createDomainName": "Name:",
     "createDomainValue": "Value:",
-    "multiSelectFilterCount": "{count} selected",
     "createDomainCnameRecords": "CNAME Records",
     "createDomainARecords": "A Records",
     "createDomainRecordNumber": "Record {number}",
@@ -2717,7 +2713,6 @@
     "healthScheme": "Method",
     "healthSelectScheme": "Select Method",
     "healthCheckPortInvalid": "Port must be between 1 and 65535",
-    "healthCheckHostnameInvalid": "Hostname must not contain whitespace",
     "healthCheckPath": "Path",
     "healthHostname": "IP / Host",
     "healthPort": "Port",
@@ -3001,7 +2996,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Add a CIDR range (e.g. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Failed to load subnets",
     "remoteExitNodeNetworkingLabelsTitle": "Preference Labels",
-    "remoteExitNodeNetworkingLabelsDescription": "Sites with these labels will prefer to connect through this remote exit node.",
+    "remoteExitNodeNetworkingLabelsDescription": "Sites with these labels will be enforced to connect through this remote exit node.",
     "remoteExitNodeNetworkingLabelsButtonText": "Select labels...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Search labels...",
     "remoteExitNodeNetworkingLabelsLoadError": "Failed to load labels",

messages/es-ES.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Más información sobre JMESPath",
     "idpJmespathLabel": "Ruta del identificador",
     "idpJmespathLabelDescription": "La ruta al identificador de usuario en el token de ID",
-    "idpIdentifierChangeTitle": "Advertencia de Cambio de Ruta de Identificador",
-    "idpIdentifierChangeDescription": "Está a punto de cambiar la ruta del identificador. Esto afectará cómo se asignan los usuarios existentes. Los usuarios que anteriormente iniciaron sesión a través de este proveedor de identidad pueden ya no ser reconocidos como los mismos usuarios.",
-    "idpIdentifierChangeConfirmMessage": "Confirmo",
-    "idpIdentifierChangeWarningText": "Esto afectará cómo se asignan los usuarios existentes",
     "idpJmespathEmailPathOptional": "Ruta de correo (opcional)",
     "idpJmespathEmailPathOptionalDescription": "La ruta al correo electrónico del usuario en el token de ID",
     "idpJmespathNamePathOptional": "Ruta del nombre (opcional)",
@@ -1577,8 +1573,6 @@
     "search": "Buscar…",
     "searchPlaceholder": "Buscar...",
     "emptySearchOptions": "No se encontraron opciones",
-    "ipFilterSearchPlaceholder": "Introduzca una dirección IP…",
-    "ipFilterEmptyMessage": "Introduzca una dirección IP para filtrar por",
     "create": "Crear",
     "orgs": "Organizaciones",
     "loginError": "Ocurrió un error inesperado. Por favor, inténtelo de nuevo.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nombre:",
     "createDomainValue": "Valor:",
-    "multiSelectFilterCount": "{count} seleccionado",
     "createDomainCnameRecords": "Registros CNAME",
     "createDomainARecords": "Registros A",
     "createDomainRecordNumber": "Registro {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Método",
     "healthSelectScheme": "Seleccionar método",
     "healthCheckPortInvalid": "El puerto debe estar entre 1 y 65535",
-    "healthCheckHostnameInvalid": "El nombre de host no debe contener espacios en blanco",
     "healthCheckPath": "Ruta",
     "healthHostname": "IP / Nombre del host",
     "healthPort": "Puerto",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Añadir un rango CIDR (e.g. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Error al cargar las subredes",
     "remoteExitNodeNetworkingLabelsTitle": "Etiquetas de Preferencias",
-    "remoteExitNodeNetworkingLabelsDescription": "Los sitios con estas etiquetas preferirán conectarse a través de este nodo de salida remoto.",
+    "remoteExitNodeNetworkingLabelsDescription": "Los sitios con estas etiquetas se verán obligados a conectarse a través de este nodo de salida remoto.",
     "remoteExitNodeNetworkingLabelsButtonText": "Seleccionar etiquetas...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Buscar etiquetas...",
     "remoteExitNodeNetworkingLabelsLoadError": "Error al cargar las etiquetas",

messages/fr-FR.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "En savoir plus sur JMESPath",
     "idpJmespathLabel": "Chemin d'identification",
     "idpJmespathLabelDescription": "Le JMESPath vers l'identifiant de l'utilisateur dans le jeton ID",
-    "idpIdentifierChangeTitle": "Avertissement de changement de chemin d'identification",
-    "idpIdentifierChangeDescription": "Vous êtes sur le point de modifier le chemin d'identification. Cela affectera la manière dont les utilisateurs existants sont mappés. Les utilisateurs qui se sont connectés via ce fournisseur d'identité peuvent ne plus être reconnus comme les mêmes utilisateurs.",
-    "idpIdentifierChangeConfirmMessage": "Je confirme",
-    "idpIdentifierChangeWarningText": "Cela affectera la manière dont les utilisateurs existants sont mappés",
     "idpJmespathEmailPathOptional": "Chemin de l'email (Optionnel)",
     "idpJmespathEmailPathOptionalDescription": "Le JMESPath vers l'email de l'utilisateur dans le jeton ID",
     "idpJmespathNamePathOptional": "Chemin du nom (Optionnel)",
@@ -1577,8 +1573,6 @@
     "search": "Rechercher…",
     "searchPlaceholder": "Recherche...",
     "emptySearchOptions": "Aucune option trouvée",
-    "ipFilterSearchPlaceholder": "Entrez une adresse IP…",
-    "ipFilterEmptyMessage": "Entrez une adresse IP pour filtrer",
     "create": "Créer",
     "orgs": "Organisations",
     "loginError": "Une erreur inattendue s'est produite. Veuillez réessayer.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Type :",
     "createDomainName": "Nom :",
     "createDomainValue": "Valeur :",
-    "multiSelectFilterCount": "{count} sélectionné",
     "createDomainCnameRecords": "Enregistrements CNAME",
     "createDomainARecords": "Enregistrements A",
     "createDomainRecordNumber": "Enregistrement {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Méthode",
     "healthSelectScheme": "Sélectionnez la méthode",
     "healthCheckPortInvalid": "Le port doit être compris entre 1 et 65535",
-    "healthCheckHostnameInvalid": "Le nom d'hôte ne doit pas contenir d'espaces blancs",
     "healthCheckPath": "Chemin d'accès",
     "healthHostname": "IP / Hôte",
     "healthPort": "Port",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Ajouter une plage CIDR (par exemple 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Échec du chargement des sous-réseaux",
     "remoteExitNodeNetworkingLabelsTitle": "Étiquettes de préférences",
-    "remoteExitNodeNetworkingLabelsDescription": "Les sites dotés de ces étiquettes préféreront se connecter via ce nœud de sortie distant.",
+    "remoteExitNodeNetworkingLabelsDescription": "Les sites avec ces étiquettes devront se connecter via ce nœud de sortie distant.",
     "remoteExitNodeNetworkingLabelsButtonText": "Sélectionner des étiquettes...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Chercher des étiquettes...",
     "remoteExitNodeNetworkingLabelsLoadError": "Échec du chargement des étiquettes",

messages/it-IT.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Scopri di più su JMESPath",
     "idpJmespathLabel": "Percorso Identificativo",
     "idpJmespathLabelDescription": "Il JMESPath per l'identificatore dell'utente nel token ID",
-    "idpIdentifierChangeTitle": "Avviso di cambio percorso identificatore",
-    "idpIdentifierChangeDescription": "Stai per cambiare il percorso identificativo. Questo influirà su come gli utenti esistenti sono mappati. Gli utenti che in precedenza hanno effettuato l'accesso attraverso questo provider di identità potrebbero non essere più riconosciuti come gli stessi utenti.",
-    "idpIdentifierChangeConfirmMessage": "Confermo",
-    "idpIdentifierChangeWarningText": "Questo influirà su come gli utenti esistenti sono mappati",
     "idpJmespathEmailPathOptional": "Percorso Email (Opzionale)",
     "idpJmespathEmailPathOptionalDescription": "Il JMESPath per l'email dell'utente nel token ID",
     "idpJmespathNamePathOptional": "Percorso Nome (Opzionale)",
@@ -1577,8 +1573,6 @@
     "search": "Cerca…",
     "searchPlaceholder": "Cerca...",
     "emptySearchOptions": "Nessuna opzione trovata",
-    "ipFilterSearchPlaceholder": "Inserisci un indirizzo IP…",
-    "ipFilterEmptyMessage": "Inserisci un indirizzo IP per filtrare",
     "create": "Crea",
     "orgs": "Organizzazioni",
     "loginError": "Si è verificato un errore imprevisto. Riprova.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nome:",
     "createDomainValue": "Valore:",
-    "multiSelectFilterCount": "{count} selezionato",
     "createDomainCnameRecords": "Record CNAME",
     "createDomainARecords": "Record A",
     "createDomainRecordNumber": "Record {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Metodo",
     "healthSelectScheme": "Seleziona Metodo",
     "healthCheckPortInvalid": "La porta deve essere compresa tra 1 e 65535",
-    "healthCheckHostnameInvalid": "Il nome dell'host non deve contenere spazi",
     "healthCheckPath": "Percorso",
     "healthHostname": "IP / Nome host",
     "healthPort": "Porta",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Aggiungi un intervallo CIDR (ad esempio 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Caricamento sottoreti fallito",
     "remoteExitNodeNetworkingLabelsTitle": "Etichette Preferenze",
-    "remoteExitNodeNetworkingLabelsDescription": "I siti con queste etichette preferiranno connettersi tramite questo nodo di uscita remoto.",
+    "remoteExitNodeNetworkingLabelsDescription": "I siti con queste etichette saranno collegati attraverso questo nodo di uscita remoto.",
     "remoteExitNodeNetworkingLabelsButtonText": "Seleziona etichette...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Cerca etichette...",
     "remoteExitNodeNetworkingLabelsLoadError": "Caricamento etichette fallito",

messages/ko-KR.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "JMESPath에 대해 더 알아보기",
     "idpJmespathLabel": "식별자 경로",
     "idpJmespathLabelDescription": "ID 토큰에서 사용자 식별자에 대한 경로",
-    "idpIdentifierChangeTitle": "식별자 경로 변경 경고",
-    "idpIdentifierChangeDescription": "식별자 경로를 변경하려고 합니다. 이는 기존 사용자의 매핑 방법에 영향을 미칩니다. 이전에 이 ID 공급자를 통해 로그인한 사용자는 더 이상 동일한 사용자로 인식되지 않을 수 있습니다. ",
-    "idpIdentifierChangeConfirmMessage": "확인합니다",
-    "idpIdentifierChangeWarningText": "이는 기존 사용자의 매핑 방법에 영향을 미칩니다",
     "idpJmespathEmailPathOptional": "이메일 경로 (선택 사항)",
     "idpJmespathEmailPathOptionalDescription": "ID 토큰에서 사용자의 이메일 경로",
     "idpJmespathNamePathOptional": "이름 경로 (선택 사항)",
@@ -1577,8 +1573,6 @@
     "search": "검색…",
     "searchPlaceholder": "검색...",
     "emptySearchOptions": "옵션이 없습니다",
-    "ipFilterSearchPlaceholder": "IP 주소를 입력하세요…",
-    "ipFilterEmptyMessage": "필터링할 IP 주소를 입력하세요",
     "create": "생성",
     "orgs": "조직",
     "loginError": "예기치 않은 오류가 발생했습니다. 다시 시도해주세요.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "유형:",
     "createDomainName": "이름:",
     "createDomainValue": "값:",
-    "multiSelectFilterCount": "{count} 선택됨",
     "createDomainCnameRecords": "CNAME 레코드",
     "createDomainARecords": "A 레코드",
     "createDomainRecordNumber": "레코드 {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "방법",
     "healthSelectScheme": "방법 선택",
     "healthCheckPortInvalid": "포트는 1에서 65535 사이여야 합니다",
-    "healthCheckHostnameInvalid": "호스트 이름에는 공백이 포함될 수 없습니다",
     "healthCheckPath": "경로",
     "healthHostname": "IP / 호스트",
     "healthPort": "포트",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "CIDR 범위 추가 (예: 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "서브넷 로드 실패",
     "remoteExitNodeNetworkingLabelsTitle": "우선순위 레이블",
-    "remoteExitNodeNetworkingLabelsDescription": "이 레이블이 있는 사이트는 이 원격 종료 노드를 통해 연결하는 것을 선호합니다.",
+    "remoteExitNodeNetworkingLabelsDescription": "이 레이블이 있는 사이트는 이 원격 출구 노드를 통해 연결됩니다.",
     "remoteExitNodeNetworkingLabelsButtonText": "레이블 선택...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "레이블 검색...",
     "remoteExitNodeNetworkingLabelsLoadError": "레이블 로드 실패",

messages/nb-NO.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Lær mer om JMESPath",
     "idpJmespathLabel": "Identifikatorsti",
     "idpJmespathLabelDescription": "Stien til brukeridentifikatoren i ID-tokenet",
-    "idpIdentifierChangeTitle": "Advarsel om identifikatorbanendring",
-    "idpIdentifierChangeDescription": "Du er i ferd med å endre identifikatorbanen. Dette vil påvirke hvordan eksisterende brukere kartlegges. Brukere som tidligere logget inn gjennom denne identitetsleverandøren kan ikke lenger bli gjenkjent som de samme brukerne.",
-    "idpIdentifierChangeConfirmMessage": "Jeg bekrefter",
-    "idpIdentifierChangeWarningText": "Dette vil påvirke hvordan eksisterende brukere kartlegges",
     "idpJmespathEmailPathOptional": "E-poststi (Valgfritt)",
     "idpJmespathEmailPathOptionalDescription": "Stien til brukerens e-postadresse i ID-tokenet",
     "idpJmespathNamePathOptional": "Navn Sti (Valgfritt)",
@@ -1577,8 +1573,6 @@
     "search": "Søk…",
     "searchPlaceholder": "Søk...",
     "emptySearchOptions": "Ingen valg funnet",
-    "ipFilterSearchPlaceholder": "Angi en IP-adresse…",
-    "ipFilterEmptyMessage": "Angi en IP-adresse å filtrere etter",
     "create": "Opprett",
     "orgs": "Organisasjoner",
     "loginError": "En uventet feil oppstod. Vennligst prøv igjen.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Type:",
     "createDomainName": "Navn:",
     "createDomainValue": "Verdi:",
-    "multiSelectFilterCount": "{count} valgt",
     "createDomainCnameRecords": "CNAME-oppføringer",
     "createDomainARecords": "A-oppføringer",
     "createDomainRecordNumber": "Oppføring {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Metode",
     "healthSelectScheme": "Velg metode",
     "healthCheckPortInvalid": "Porten må være mellom 1 og 65535",
-    "healthCheckHostnameInvalid": "Vertsnavnet må ikke inneholde mellomrom",
     "healthCheckPath": "Sti",
     "healthHostname": "IP / Vert",
     "healthPort": "Port",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Legg til et CIDR-område (f.eks. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Feil ved lasting av subnett",
     "remoteExitNodeNetworkingLabelsTitle": "Preferanseetiketter",
-    "remoteExitNodeNetworkingLabelsDescription": "Nettsteder med disse etikettene vil foretrekke å koble til gjennom denne eksterne utgangsnoden.",
+    "remoteExitNodeNetworkingLabelsDescription": "Områder med disse etikettene vil bli tvunget til å koble gjennom denne fjerne utgangsnoden.",
     "remoteExitNodeNetworkingLabelsButtonText": "Velg etiketter...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Søk etiketter...",
     "remoteExitNodeNetworkingLabelsLoadError": "Feil ved lasting av etiketter",

messages/nl-NL.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Meer informatie over JMESPath",
     "idpJmespathLabel": "ID pad",
     "idpJmespathLabelDescription": "Het pad naar het gebruiker-id in het ID-token",
-    "idpIdentifierChangeTitle": "Waarschuwing voor Wijziging van ID-pad",
-    "idpIdentifierChangeDescription": "U staat op het punt om het ID-pad te wijzigen. Dit zal invloed hebben op hoe bestaande gebruikers worden gemapt. Gebruikers die voorheen via deze identiteitsprovider inlogden, worden mogelijk niet meer als dezelfde gebruikers herkend.",
-    "idpIdentifierChangeConfirmMessage": "Ik bevestig",
-    "idpIdentifierChangeWarningText": "Dit beïnvloedt hoe bestaande gebruikers worden gemapt",
     "idpJmespathEmailPathOptional": "E-mail pad (optioneel)",
     "idpJmespathEmailPathOptionalDescription": "Het pad naar het e-mailadres van de gebruiker in het ID-token",
     "idpJmespathNamePathOptional": "Naam pad (optioneel)",
@@ -1577,8 +1573,6 @@
     "search": "Zoeken…",
     "searchPlaceholder": "Zoeken...",
     "emptySearchOptions": "Geen opties gevonden",
-    "ipFilterSearchPlaceholder": "Voer een IP-adres in…",
-    "ipFilterEmptyMessage": "Voer een IP-adres in om op te filteren",
     "create": "Aanmaken",
     "orgs": "Organisaties",
     "loginError": "Er is een onverwachte fout opgetreden. Probeer het opnieuw.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Type:",
     "createDomainName": "Naam:",
     "createDomainValue": "Waarde:",
-    "multiSelectFilterCount": "{count} geselecteerd",
     "createDomainCnameRecords": "CNAME-records",
     "createDomainARecords": "A Records",
     "createDomainRecordNumber": "Record {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Methode",
     "healthSelectScheme": "Selecteer methode",
     "healthCheckPortInvalid": "Poort moet tussen 1 en 65535 zijn",
-    "healthCheckHostnameInvalid": "De hostnaam mag geen witruimtes bevatten",
     "healthCheckPath": "Pad",
     "healthHostname": "IP / Hostnaam",
     "healthPort": "Poort",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Voeg een CIDR-bereik toe (bijv. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Kon subnets niet laden",
     "remoteExitNodeNetworkingLabelsTitle": "Voorkeurslabels",
-    "remoteExitNodeNetworkingLabelsDescription": "Sites met deze labels zullen bij voorkeur verbinding maken via deze externe exitnode.",
+    "remoteExitNodeNetworkingLabelsDescription": "Sites met deze labels worden verplicht om verbinding te maken via dit externe exit-knooppunt.",
     "remoteExitNodeNetworkingLabelsButtonText": "Selecteer labels...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Labels zoeken...",
     "remoteExitNodeNetworkingLabelsLoadError": "Kon labels niet laden",

messages/pl-PL.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Dowiedz się więcej o JMESPath",
     "idpJmespathLabel": "Ścieżka identyfikatora",
     "idpJmespathLabelDescription": "JMESPath do identyfikatora użytkownika w tokenie ID",
-    "idpIdentifierChangeTitle": "Ostrzeżenie o zmianie ścieżki identyfikatora",
-    "idpIdentifierChangeDescription": "Zaraz zmienisz ścieżkę identyfikatora. To wpłynie na sposób mapowania istniejących użytkowników. Użytkownicy, którzy wcześniej logowali się przez tego dostawcę tożsamości, mogą nie być już rozpoznawani jako ci sami użytkownicy.",
-    "idpIdentifierChangeConfirmMessage": "Potwierdzam",
-    "idpIdentifierChangeWarningText": "To wpłynie na sposób mapowania istniejących użytkowników",
     "idpJmespathEmailPathOptional": "Ścieżka email (Opcjonalnie)",
     "idpJmespathEmailPathOptionalDescription": "JMESPath do emaila użytkownika w tokenie ID",
     "idpJmespathNamePathOptional": "Ścieżka nazwy (Opcjonalnie)",
@@ -1577,8 +1573,6 @@
     "search": "Szukaj…",
     "searchPlaceholder": "Szukaj...",
     "emptySearchOptions": "Nie znaleziono opcji",
-    "ipFilterSearchPlaceholder": "Wprowadź adres IP…",
-    "ipFilterEmptyMessage": "Wprowadź adres IP, aby filtrować",
     "create": "Utwórz",
     "orgs": "Organizacje",
     "loginError": "Wystąpił nieoczekiwany błąd. Spróbuj ponownie.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Typ:",
     "createDomainName": "Nazwa:",
     "createDomainValue": "Wartość:",
-    "multiSelectFilterCount": "{count, plural, one {# wybrany} few {# wybrane} many {# wybranych} other {# wybranych}}",
     "createDomainCnameRecords": "Rekordy CNAME",
     "createDomainARecords": "Rekordy A",
     "createDomainRecordNumber": "Rekord {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Metoda",
     "healthSelectScheme": "Wybierz metodę",
     "healthCheckPortInvalid": "Port musi być pomiędzy 1 a 65535",
-    "healthCheckHostnameInvalid": "Nazwa hosta nie może zawierać spacji",
     "healthCheckPath": "Ścieżka",
     "healthHostname": "IP / Nazwa hosta",
     "healthPort": "Port",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Dodaj zakres CIDR (np. 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Nie udało się załadować podsieci",
     "remoteExitNodeNetworkingLabelsTitle": "Etykiety preferencji",
-    "remoteExitNodeNetworkingLabelsDescription": "Strony z tymi etykietami będą preferować połączenie przez ten zdalny węzeł wyjściowy.",
+    "remoteExitNodeNetworkingLabelsDescription": "Strony z tymi etykietami będą zmuszone do połączenia się przez ten zdalny węzeł wyjściowy.",
     "remoteExitNodeNetworkingLabelsButtonText": "Wybierz etykiety...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Szukaj etykiet...",
     "remoteExitNodeNetworkingLabelsLoadError": "Nie udało się załadować etykiet",

messages/pt-PT.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Saiba mais sobre JMESPath",
     "idpJmespathLabel": "Caminho do Identificador",
     "idpJmespathLabelDescription": "O JMESPath para o identificador do utilizador no token ID",
-    "idpIdentifierChangeTitle": "Aviso de Mudança no Caminho do Identificador",
-    "idpIdentifierChangeDescription": "Você está prestes a mudar o caminho do identificador. Isso afetará como os usuários existentes são mapeados. Usuários que anteriormente fizeram login através deste provedor de identidade podem não ser mais reconhecidos como os mesmos usuários.",
-    "idpIdentifierChangeConfirmMessage": "Eu confirmo",
-    "idpIdentifierChangeWarningText": "Isto afetará como os usuários existentes são mapeados",
     "idpJmespathEmailPathOptional": "Caminho do Email (Opcional)",
     "idpJmespathEmailPathOptionalDescription": "O JMESPath para o email do utilizador no token ID",
     "idpJmespathNamePathOptional": "Caminho do Nome (Opcional)",
@@ -1577,8 +1573,6 @@
     "search": "Pesquisar…",
     "searchPlaceholder": "Buscar...",
     "emptySearchOptions": "Nenhuma opção encontrada",
-    "ipFilterSearchPlaceholder": "Insira um endereço IP…",
-    "ipFilterEmptyMessage": "Insira um endereço IP para filtrar",
     "create": "Criar",
     "orgs": "Organizações",
     "loginError": "Ocorreu um erro inesperado. Por favor, tente novamente.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Tipo:",
     "createDomainName": "Nome:",
     "createDomainValue": "Valor:",
-    "multiSelectFilterCount": "{count} selecionado",
     "createDomainCnameRecords": "Registros CNAME",
     "createDomainARecords": "Registros A",
     "createDomainRecordNumber": "Registrar {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Método",
     "healthSelectScheme": "Selecione o Método",
     "healthCheckPortInvalid": "A porta deve estar entre 1 e 65535",
-    "healthCheckHostnameInvalid": "O nome do host não deve conter espaços em branco",
     "healthCheckPath": "Caminho",
     "healthHostname": "IP / Nome do Host",
     "healthPort": "Porta",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Adicione um intervalo de CIDR (por exemplo, 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Falha ao carregar sub-redes",
     "remoteExitNodeNetworkingLabelsTitle": "Etiquetas de Preferência",
-    "remoteExitNodeNetworkingLabelsDescription": "Sites com estas etiquetas preferirão conectar-se por meio deste nó de saída remoto.",
+    "remoteExitNodeNetworkingLabelsDescription": "Os sites com essas etiquetas serão forçados a se conectar através deste nó de saída remoto.",
     "remoteExitNodeNetworkingLabelsButtonText": "Selecionar etiquetas...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Pesquisar etiquetas...",
     "remoteExitNodeNetworkingLabelsLoadError": "Falha ao carregar etiquetas",

messages/ru-RU.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "Узнать больше о JMESPath",
     "idpJmespathLabel": "Путь идентификатора",
     "idpJmespathLabelDescription": "Путь к идентификатору пользователя в ID токене",
-    "idpIdentifierChangeTitle": "Предупреждение о изменении пути идентификатора",
-    "idpIdentifierChangeDescription": "Вы собираетесь изменить путь идентификатора. Это повлияет на то, как отображаются существующие пользователи. Пользователи, которые ранее входили через этого поставщика идентификации, могут больше не распознаваться как те же пользователи.",
-    "idpIdentifierChangeConfirmMessage": "Я подтверждаю",
-    "idpIdentifierChangeWarningText": "Это повлияет на то, как отображаются существующие пользователи",
     "idpJmespathEmailPathOptional": "Путь к email (необязательно)",
     "idpJmespathEmailPathOptionalDescription": "Путь к email пользователя в ID токене",
     "idpJmespathNamePathOptional": "Путь к имени (необязательно)",
@@ -1577,8 +1573,6 @@
     "search": "Поиск…",
     "searchPlaceholder": "Поиск...",
     "emptySearchOptions": "Опции не найдены",
-    "ipFilterSearchPlaceholder": "Введите IP адрес…",
-    "ipFilterEmptyMessage": "Введите IP адрес для фильтрации",
     "create": "Создать",
     "orgs": "Организации",
     "loginError": "Произошла непредвиденная ошибка. Пожалуйста, попробуйте еще раз.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Тип:",
     "createDomainName": "Имя:",
     "createDomainValue": "Значение:",
-    "multiSelectFilterCount": "Выбрано: {count}",
     "createDomainCnameRecords": "CNAME Записи",
     "createDomainARecords": "A Записи",
     "createDomainRecordNumber": "Запись {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Метод",
     "healthSelectScheme": "Выберите метод",
     "healthCheckPortInvalid": "Порт должен быть в диапазоне от 1 до 65535",
-    "healthCheckHostnameInvalid": "Имя хоста не должно содержать пробелов",
     "healthCheckPath": "Путь",
     "healthHostname": "IP / хост",
     "healthPort": "Порт",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Добавить диапазон CIDR (например, 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Не удалось загрузить подсети",
     "remoteExitNodeNetworkingLabelsTitle": "Этикетки предпочтений",
-    "remoteExitNodeNetworkingLabelsDescription": "Сайты с такими метками предпочтут соединяться через этот удаленный узел выхода.",
+    "remoteExitNodeNetworkingLabelsDescription": "Сайты с этими метками будут обязаны подключаться через этот удаленный узел выхода.",
     "remoteExitNodeNetworkingLabelsButtonText": "Выберите метки...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Поиск меток...",
     "remoteExitNodeNetworkingLabelsLoadError": "Не удалось загрузить метки",

messages/tr-TR.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "JMESPath hakkında daha fazla bilgi edinin",
     "idpJmespathLabel": "Tanımlayıcı Yolu",
     "idpJmespathLabelDescription": "The JMESPath to the user identifier in the ID token",
-    "idpIdentifierChangeTitle": "Tanımlayıcı Yol Değişikliği Uyarısı",
-    "idpIdentifierChangeDescription": "Tanımlayıcı yolu değiştirmek üzeresiniz. Bu, mevcut kullanıcıların nasıl eşleneceğini etkileyecektir. Bu kimlik sağlayıcı üzerinden daha önce oturum açmış olan kullanıcılar artık aynı kullanıcılar olarak tanınmayabilir.",
-    "idpIdentifierChangeConfirmMessage": "Onaylıyorum",
-    "idpIdentifierChangeWarningText": "Bu, mevcut kullanıcıların nasıl eşleneceğini etkileyecek",
     "idpJmespathEmailPathOptional": "E-posta Yolu (İsteğe Bağlı)",
     "idpJmespathEmailPathOptionalDescription": "The JMESPath to the user's email in the ID token",
     "idpJmespathNamePathOptional": "Ad Yolu (İsteğe Bağlı)",
@@ -1577,8 +1573,6 @@
     "search": "Ara…",
     "searchPlaceholder": "Ara...",
     "emptySearchOptions": "Seçenek bulunamadı",
-    "ipFilterSearchPlaceholder": "Bir IP adresi girin…",
-    "ipFilterEmptyMessage": "Filtrelemek için bir IP adresi girin",
     "create": "Oluştur",
     "orgs": "Organizasyonlar",
     "loginError": "Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.",
@@ -2602,7 +2596,6 @@
     "createDomainType": "Tür:",
     "createDomainName": "Ad:",
     "createDomainValue": "Değer:",
-    "multiSelectFilterCount": "{count} seçildi",
     "createDomainCnameRecords": "CNAME Kayıtları",
     "createDomainARecords": "A Kayıtları",
     "createDomainRecordNumber": "Kayıt {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "Yöntem",
     "healthSelectScheme": "Yöntem Seç",
     "healthCheckPortInvalid": "Bağlantı noktası 1 ile 65535 arasında olmalıdır",
-    "healthCheckHostnameInvalid": "Ana bilgisayar adı boşluk içermemelidir",
     "healthCheckPath": "Yol",
     "healthHostname": "IP / Hostname",
     "healthPort": "Bağlantı Noktası",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "Bir CIDR aralığı ekle (örneğin, 10.0.0.0/8)",
     "remoteExitNodeNetworkingSubnetsLoadError": "Alt ağlar yüklenemedi",
     "remoteExitNodeNetworkingLabelsTitle": "Tercih Etiketleri",
-    "remoteExitNodeNetworkingLabelsDescription": "Bu etiketlere sahip siteler, bağlantıyı bu uzak çıkış düğümü üzerinden tercih edecektir.",
+    "remoteExitNodeNetworkingLabelsDescription": "Bu etiketlere sahip siteler, bu uzak çıkış düğümü üzerinden bağlantı kurmaya zorlanacaktır.",
     "remoteExitNodeNetworkingLabelsButtonText": "Etiketleri seç...",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "Etiketleri ara...",
     "remoteExitNodeNetworkingLabelsLoadError": "Etiketler yüklenemedi",

messages/zh-CN.json

@@ -1176,10 +1176,6 @@
     "idpJmespathAboutDescriptionLink": "了解更多 JMESPath 信息",
     "idpJmespathLabel": "标识符路径",
     "idpJmespathLabelDescription": "ID 令牌中用户标识符的路径",
-    "idpIdentifierChangeTitle": "标识符路径更改警告",
-    "idpIdentifierChangeDescription": "您即将更改标识符路径。这将影响现有用户的映射方式。以前通过此身份提供者登录的用户可能将不再被识别为相同用户。",
-    "idpIdentifierChangeConfirmMessage": "我确认",
-    "idpIdentifierChangeWarningText": "这将影响现有用户的映射方式",
     "idpJmespathEmailPathOptional": "邮箱路径（可选）",
     "idpJmespathEmailPathOptionalDescription": "ID 令牌中用户邮箱的路径",
     "idpJmespathNamePathOptional": "用户名路径（可选）",
@@ -1577,8 +1573,6 @@
     "search": "搜索…",
     "searchPlaceholder": "搜索...",
     "emptySearchOptions": "未找到选项",
-    "ipFilterSearchPlaceholder": "输入IP地址…",
-    "ipFilterEmptyMessage": "输入要筛选的IP地址",
     "create": "创建",
     "orgs": "组织",
     "loginError": "发生意外错误。请重试。",
@@ -2602,7 +2596,6 @@
     "createDomainType": "类型:",
     "createDomainName": "名称:",
     "createDomainValue": "值:",
-    "multiSelectFilterCount": "{count} 已选择",
     "createDomainCnameRecords": "CNAME 记录",
     "createDomainARecords": "A记录",
     "createDomainRecordNumber": "记录 {number}",
@@ -2717,7 +2710,6 @@
     "healthScheme": "方法",
     "healthSelectScheme": "选择方法",
     "healthCheckPortInvalid": "端口必须在 1 和 65535 之间",
-    "healthCheckHostnameInvalid": "主机名不得包含空格",
     "healthCheckPath": "路径",
     "healthHostname": "IP / 主机",
     "healthPort": "端口",
@@ -3001,7 +2993,7 @@
     "remoteExitNodeNetworkingSubnetsPlaceholder": "添加CIDR范围（例如10.0.0.0/8）",
     "remoteExitNodeNetworkingSubnetsLoadError": "无法加载子网",
     "remoteExitNodeNetworkingLabelsTitle": "首选标签",
-    "remoteExitNodeNetworkingLabelsDescription": "带有这些标签的站点将优先通过此远程出口节点进行连接。",
+    "remoteExitNodeNetworkingLabelsDescription": "拥有这些标签的站点将强制通过此远程出口节点连接。",
     "remoteExitNodeNetworkingLabelsButtonText": "选择标签……",
     "remoteExitNodeNetworkingLabelsSearchPlaceholder": "搜索标签……",
     "remoteExitNodeNetworkingLabelsLoadError": "无法加载标签",

package.json

@@ -32,49 +32,49 @@
         "format": "prettier --write ."
     },
     "dependencies": {
-        "@asteasolutions/zod-to-openapi": "9.1.0",
+        "@asteasolutions/zod-to-openapi": "8.5.0",
-        "@aws-sdk/client-s3": "3.1121.0",
+        "@aws-sdk/client-s3": "3.1056.0",
         "@devolutions/iron-remote-desktop": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-0.0.0.tgz",
         "@devolutions/iron-remote-desktop-rdp": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-rdp-0.0.1.tgz",
         "@headlessui/react": "2.2.10",
-        "@hookform/resolvers": "5.9.1",
+        "@hookform/resolvers": "5.4.0",
         "@monaco-editor/react": "4.7.0",
-        "@node-rs/argon2": "2.2.0",
+        "@node-rs/argon2": "2.0.2",
         "@novnc/novnc": "^1.7.0",
         "@oslojs/crypto": "1.0.1",
         "@oslojs/encoding": "1.1.0",
-        "@radix-ui/react-avatar": "1.2.6",
+        "@radix-ui/react-avatar": "1.1.11",
-        "@radix-ui/react-checkbox": "1.3.11",
+        "@radix-ui/react-checkbox": "1.3.3",
-        "@radix-ui/react-collapsible": "1.1.20",
+        "@radix-ui/react-collapsible": "1.1.12",
-        "@radix-ui/react-dialog": "1.1.23",
+        "@radix-ui/react-dialog": "1.1.15",
-        "@radix-ui/react-dropdown-menu": "2.1.24",
+        "@radix-ui/react-dropdown-menu": "2.1.16",
         "@radix-ui/react-icons": "1.3.2",
-        "@radix-ui/react-label": "2.1.15",
+        "@radix-ui/react-label": "2.1.8",
-        "@radix-ui/react-popover": "1.1.23",
+        "@radix-ui/react-popover": "1.1.15",
-        "@radix-ui/react-progress": "1.1.16",
+        "@radix-ui/react-progress": "1.1.8",
-        "@radix-ui/react-radio-group": "1.4.7",
+        "@radix-ui/react-radio-group": "1.3.8",
-        "@radix-ui/react-scroll-area": "1.2.18",
+        "@radix-ui/react-scroll-area": "1.2.10",
-        "@radix-ui/react-select": "2.3.7",
+        "@radix-ui/react-select": "2.2.6",
-        "@radix-ui/react-separator": "1.1.15",
+        "@radix-ui/react-separator": "1.1.8",
-        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-slot": "1.2.4",
-        "@radix-ui/react-switch": "1.3.7",
+        "@radix-ui/react-switch": "1.2.6",
-        "@radix-ui/react-tabs": "1.1.21",
+        "@radix-ui/react-tabs": "1.1.13",
-        "@radix-ui/react-toast": "1.2.23",
+        "@radix-ui/react-toast": "1.2.15",
-        "@radix-ui/react-tooltip": "1.2.16",
+        "@radix-ui/react-tooltip": "1.2.8",
         "@react-email/body": "0.3.0",
         "@react-email/components": "1.0.12",
-        "@react-email/render": "2.1.0",
+        "@react-email/render": "2.0.8",
         "@react-email/tailwind": "2.0.7",
         "@simplewebauthn/browser": "13.3.0",
-        "@simplewebauthn/server": "13.3.3",
+        "@simplewebauthn/server": "13.3.1",
         "@tailwindcss/forms": "0.5.11",
-        "@tanstack/react-query": "5.102.8",
+        "@tanstack/react-query": "5.100.14",
         "@tanstack/react-table": "8.21.3",
         "@xterm/addon-fit": "^0.11.0",
         "@xterm/addon-web-links": "^0.12.0",
         "@xterm/xterm": "^6.0.0",
         "arctic": "3.7.0",
-        "axios": "1.20.0",
+        "axios": "1.18.0",
         "better-sqlite3": "11.9.1",
         "canvas-confetti": "1.9.4",
         "class-variance-authority": "0.7.1",
@@ -86,62 +86,62 @@
         "d3": "7.9.0",
         "drizzle-orm": "0.45.2",
         "express": "5.2.1",
-        "express-rate-limit": "8.7.0",
+        "express-rate-limit": "8.5.2",
         "glob": "13.0.6",
-        "gpt-tokenizer": "^4.0.0",
+        "gpt-tokenizer": "^3.4.0",
-        "helmet": "8.3.0",
+        "helmet": "8.2.0",
         "http-errors": "2.0.1",
-        "input-otp": "1.5.0",
+        "input-otp": "1.4.2",
-        "ioredis": "6.0.0",
+        "ioredis": "5.11.0",
         "jmespath": "0.16.0",
-        "js-yaml": "5.4.1",
+        "js-yaml": "4.3.0",
         "jsonwebtoken": "9.0.3",
-        "lucide-react": "1.38.0",
+        "lucide-react": "1.17.0",
-        "maxmind": "5.0.7",
+        "maxmind": "5.0.6",
         "moment": "2.30.1",
-        "next": "16.3.3",
+        "next": "16.2.11",
-        "next-intl": "4.14.1",
+        "next-intl": "4.13.0",
         "next-themes": "0.4.6",
         "nextjs-toploader": "3.9.17",
         "node-cache": "5.1.2",
-        "nodemailer": "9.1.0",
+        "nodemailer": "9.0.1",
         "oslo": "1.2.1",
-        "pg": "8.23.0",
+        "pg": "8.21.0",
-        "posthog-node": "5.51.4",
+        "posthog-node": "5.35.6",
         "qrcode.react": "4.2.0",
-        "react": "19.2.8",
+        "react": "19.2.6",
         "react-day-picker": "9.14.0",
-        "react-dom": "19.2.8",
+        "react-dom": "19.2.6",
         "react-easy-sort": "1.8.0",
-        "react-hook-form": "7.87.0",
+        "react-hook-form": "7.76.1",
-        "react-icons": "5.7.0",
+        "react-icons": "5.6.0",
-        "recharts": "3.10.1",
+        "recharts": "3.8.1",
         "reodotdev": "1.1.0",
-        "semver": "7.8.5",
+        "semver": "7.8.1",
         "sshpk": "1.18.0",
-        "stripe": "22.6.0",
+        "stripe": "22.2.0",
         "swagger-ui-express": "5.0.1",
         "tailwind-merge": "3.6.0",
         "topojson-client": "3.1.0",
         "tw-animate-css": "1.4.0",
         "use-debounce": "10.1.1",
-        "uuid": "14.0.2",
+        "uuid": "14.0.0",
         "vaul": "1.1.2",
         "visionscarto-world-atlas": "1.0.0",
         "winston": "3.19.0",
         "winston-daily-rotate-file": "5.0.0",
-        "ws": "8.21.3",
+        "ws": "8.21.0",
         "yaml": "2.9.0",
-        "yargs": "18.1.0",
+        "yargs": "18.0.0",
-        "zod": "4.5.4",
+        "zod": "4.4.3",
         "zod-validation-error": "5.0.0"
     },
     "devDependencies": {
-        "@dotenvx/dotenvx": "2.23.0",
+        "@dotenvx/dotenvx": "1.69.1",
         "@esbuild-plugins/tsconfig-paths": "0.1.2",
-        "@react-email/ui": "^6.9.3",
+        "@react-email/ui": "^6.5.0",
-        "@tailwindcss/postcss": "4.3.3",
+        "@tailwindcss/postcss": "4.3.0",
-        "@tanstack/react-query-devtools": "5.102.8",
+        "@tanstack/react-query-devtools": "5.100.14",
         "@types/better-sqlite3": "7.6.13",
         "@types/cookie-parser": "1.4.10",
         "@types/cors": "2.8.19",
@@ -152,36 +152,36 @@
         "@types/jmespath": "0.15.2",
         "@types/js-yaml": "4.0.9",
         "@types/jsonwebtoken": "9.0.10",
-        "@types/node": "26.4.0",
+        "@types/node": "25.9.1",
-        "@types/nodemailer": "8.0.1",
+        "@types/nodemailer": "8.0.0",
         "@types/nprogress": "0.2.3",
-        "@types/pg": "8.23.1",
+        "@types/pg": "8.20.0",
-        "@types/react": "19.2.18",
+        "@types/react": "19.2.15",
-        "@types/react-dom": "19.2.5",
+        "@types/react-dom": "19.2.3",
-        "@types/semver": "7.8.0",
+        "@types/semver": "7.7.1",
-        "@types/sshpk": "1.17.5",
+        "@types/sshpk": "1.17.4",
         "@types/swagger-ui-express": "4.1.8",
         "@types/topojson-client": "3.1.5",
         "@types/ws": "8.18.1",
         "@types/yargs": "17.0.35",
         "babel-plugin-react-compiler": "1.0.0",
         "drizzle-kit": "0.31.10",
-        "esbuild": "0.28.2",
+        "esbuild": "0.28.0",
-        "esbuild-node-externals": "2.0.0",
+        "esbuild-node-externals": "1.22.0",
-        "eslint": "10.9.1",
+        "eslint": "10.4.0",
-        "eslint-config-next": "16.3.3",
+        "eslint-config-next": "16.2.6",
-        "postcss": "8.5.26",
+        "postcss": "8.5.15",
-        "prettier": "3.9.6",
+        "prettier": "3.8.3",
-        "react-email": "6.9.3",
+        "react-email": "6.5.0",
-        "tailwindcss": "4.3.3",
+        "tailwindcss": "4.3.0",
-        "tsc-alias": "1.9.2",
+        "tsc-alias": "1.8.17",
-        "tsx": "4.23.13",
+        "tsx": "4.22.3",
         "typescript": "6.0.3",
-        "typescript-eslint": "8.68.0"
+        "typescript-eslint": "8.60.0"
     },
     "overrides": {
-        "esbuild": "0.28.2",
+        "esbuild": "0.28.0",
         "dompurify": "3.4.0",
-        "postcss": "8.5.26"
+        "postcss": "8.5.15"
     }
 }

server/db/pg/schema/privateSchema.ts

@@ -26,9 +26,7 @@ import {
     sites,
     clients,
     sessions,
-    labels,
+    labels
-    aiProviders,
-    virtualApiKeys
 } from "./schema";
 
 export const dnsChallenge = pgTable("dnsChallenges", {
@@ -616,87 +614,6 @@ export const trialNotifications = pgTable("trialNotifications", {
     sentAt: bigint("sentAt", { mode: "number" }).notNull()
 });
 
-// Logs the aggregated prompt + response for a single AI gateway request, for
-// session replay. One row per request (not per streaming chunk). `sessionId`
-// is a fresh random id per row for now - no cross-request correlation yet,
-// but the column exists so a future pass can link multiple rows into a real
-// multi-turn session.
-export const aiSessionLog = pgTable(
-    "aiSessionLog",
-    {
-        id: serial("id").primaryKey(),
-        sessionId: varchar("sessionId").notNull(),
-        orgId: varchar("orgId").references(() => orgs.orgId, {
-            onDelete: "cascade"
-        }),
-        providerId: integer("providerId").references(
-            () => aiProviders.providerId,
-            { onDelete: "set null" }
-        ),
-        capability: varchar("capability").notNull(),
-        resourceId: integer("resourceId").references(
-            () => resources.resourceId,
-            { onDelete: "set null" }
-        ),
-        siteResourceId: integer("siteResourceId").references(
-            () => siteResources.siteResourceId,
-            { onDelete: "set null" }
-        ),
-        userId: varchar("userId").references(() => users.userId, {
-            onDelete: "set null"
-        }),
-        virtualApiKeyId: varchar("virtualApiKeyId").references(
-            () => virtualApiKeys.virtualApiKeyId,
-            { onDelete: "set null" }
-        ),
-        requestedModel: varchar("requestedModel"),
-        isStream: boolean("isStream").notNull().default(false),
-        requestBody: text("requestBody"),
-        responseBody: text("responseBody"),
-        // Capability-agnostic message transcript (JSON-encoded
-        // NormalizedAiMessage[] from server/lib/aiMessageNormalization.ts),
-        // computed at write time so search/display never need per-capability
-        // parsing logic. Null when normalization couldn't recognize the
-        // shape - callers fall back to requestBody/responseBody.
-        normalizedRequest: text("normalizedRequest"),
-        normalizedResponse: text("normalizedResponse"),
-        // True if any of the request/response (raw or normalized) fields
-        // were cut short at AI_SESSION_LOG_MAX_BODY_CHARS before storage.
-        truncated: boolean("truncated").notNull().default(false),
-        statusCode: integer("statusCode"),
-        createdAt: bigint("createdAt", { mode: "number" }).notNull() // epoch seconds
-    },
-    (t) => [
-        index("idx_ai_session_log_org_created").on(t.orgId, t.createdAt),
-        index("idx_ai_session_log_org_provider_created").on(
-            t.orgId,
-            t.providerId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_resource_created").on(
-            t.orgId,
-            t.resourceId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_site_resource_created").on(
-            t.orgId,
-            t.siteResourceId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_user_created").on(
-            t.orgId,
-            t.userId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_virtual_api_key_created").on(
-            t.orgId,
-            t.virtualApiKeyId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_session").on(t.sessionId)
-    ]
-);
-
 export type Approval = InferSelectModel<typeof approvals>;
 export type Limit = InferSelectModel<typeof limits>;
 export type Account = InferSelectModel<typeof account>;
@@ -743,4 +660,3 @@ export type AlertEmailRecipients = InferSelectModel<
 >;
 export type AlertWebhookActions = InferSelectModel<typeof alertWebhookActions>;
 export type TrialNotification = InferSelectModel<typeof trialNotifications>;
-export type AiSessionLog = InferSelectModel<typeof aiSessionLog>;

server/db/pg/schema/schema.ts

@@ -262,9 +262,7 @@ export const resourceAiModels = pgTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = pgTable(
+export const labels = pgTable("labels", {
-    "labels",
-    {
     labelId: serial("labelId").primaryKey(),
     name: varchar("name").notNull(),
     color: varchar("color").notNull(),
@@ -273,9 +271,7 @@ export const labels = pgTable(
             onDelete: "cascade"
         })
         .notNull()
-    },
+});
-    (t) => [index("idx_labels_orgid").on(t.orgId)]
-);
 
 export const launcherViews = pgTable("launcherViews", {
     viewId: serial("viewId").primaryKey(),
@@ -697,9 +693,7 @@ export const twoFactorBackupCodes = pgTable("twoFactorBackupCodes", {
     codeHash: varchar("codeHash").notNull()
 });
 
-export const sessions = pgTable(
+export const sessions = pgTable("session", {
-    "session",
-    {
     sessionId: varchar("id").primaryKey(),
     userId: varchar("userId")
         .notNull()
@@ -707,9 +701,7 @@ export const sessions = pgTable(
     expiresAt: bigint("expiresAt", { mode: "number" }).notNull(),
     issuedAt: bigint("issuedAt", { mode: "number" }),
     deviceAuthUsed: boolean("deviceAuthUsed").notNull().default(false)
-    },
+});
-    (t) => [index("idx_sessions_userid").on(t.userId)]
-);
 
 export const newtSessions = pgTable("newtSession", {
     sessionId: varchar("id").primaryKey(),
@@ -719,9 +711,7 @@ export const newtSessions = pgTable("newtSession", {
     expiresAt: bigint("expiresAt", { mode: "number" }).notNull()
 });
 
-export const userOrgs = pgTable(
+export const userOrgs = pgTable("userOrgs", {
-    "userOrgs",
-    {
     userId: varchar("userId")
         .notNull()
         .references(() => users.userId, { onDelete: "cascade" }),
@@ -733,12 +723,7 @@ export const userOrgs = pgTable(
     isOwner: boolean("isOwner").notNull().default(false),
     autoProvisioned: boolean("autoProvisioned").default(false),
     pamUsername: varchar("pamUsername") // cleaned username for ssh and such
-    },
+});
-    (t) => [
-        index("idx_userOrgs_userid").on(t.userId),
-        index("idx_userOrgs_orgid").on(t.orgId)
-    ]
-);
 
 export const emailVerificationCodes = pgTable("emailVerificationCodes", {
     codeId: serial("id").primaryKey(),
@@ -766,9 +751,7 @@ export const actions = pgTable("actions", {
     description: varchar("description")
 });
 
-export const roles = pgTable(
+export const roles = pgTable("roles", {
-    "roles",
-    {
     roleId: serial("roleId").primaryKey(),
     orgId: varchar("orgId")
         .references(() => orgs.orgId, {
@@ -783,9 +766,7 @@ export const roles = pgTable(
     sshSudoCommands: text("sshSudoCommands").default("[]"),
     sshCreateHomeDir: boolean("sshCreateHomeDir").default(true),
     sshUnixGroups: text("sshUnixGroups").default("[]")
-    },
+});
-    (t) => [index("idx_roles_orgid").on(t.orgId)]
-);
 
 export const userOrgRoles = pgTable(
     "userOrgRoles",
@@ -1428,10 +1409,7 @@ export const olms = pgTable(
         }),
         archived: boolean("archived").notNull().default(false)
     },
-    (t) => [
+    (t) => [index("idx_olms_clientid").on(t.clientId)]
-        index("idx_olms_clientid").on(t.clientId),
-        index("idx_olms_userid").on(t.userId)
-    ]
 );
 
 export const currentFingerprint = pgTable("currentFingerprint", {
@@ -1958,6 +1936,87 @@ export const aiBudgetBreachEvents = pgTable(
     ]
 );
 
+// Logs the aggregated prompt + response for a single AI gateway request, for
+// session replay. One row per request (not per streaming chunk). `sessionId`
+// is a fresh random id per row for now - no cross-request correlation yet,
+// but the column exists so a future pass can link multiple rows into a real
+// multi-turn session.
+export const aiSessionLog = pgTable(
+    "aiSessionLog",
+    {
+        id: serial("id").primaryKey(),
+        sessionId: varchar("sessionId").notNull(),
+        orgId: varchar("orgId").references(() => orgs.orgId, {
+            onDelete: "cascade"
+        }),
+        providerId: integer("providerId").references(
+            () => aiProviders.providerId,
+            { onDelete: "set null" }
+        ),
+        capability: varchar("capability").notNull(),
+        resourceId: integer("resourceId").references(
+            () => resources.resourceId,
+            { onDelete: "set null" }
+        ),
+        siteResourceId: integer("siteResourceId").references(
+            () => siteResources.siteResourceId,
+            { onDelete: "set null" }
+        ),
+        userId: varchar("userId").references(() => users.userId, {
+            onDelete: "set null"
+        }),
+        virtualApiKeyId: varchar("virtualApiKeyId").references(
+            () => virtualApiKeys.virtualApiKeyId,
+            { onDelete: "set null" }
+        ),
+        requestedModel: varchar("requestedModel"),
+        isStream: boolean("isStream").notNull().default(false),
+        requestBody: text("requestBody"),
+        responseBody: text("responseBody"),
+        // Capability-agnostic message transcript (JSON-encoded
+        // NormalizedAiMessage[] from server/lib/aiMessageNormalization.ts),
+        // computed at write time so search/display never need per-capability
+        // parsing logic. Null when normalization couldn't recognize the
+        // shape - callers fall back to requestBody/responseBody.
+        normalizedRequest: text("normalizedRequest"),
+        normalizedResponse: text("normalizedResponse"),
+        // True if any of the request/response (raw or normalized) fields
+        // were cut short at AI_SESSION_LOG_MAX_BODY_CHARS before storage.
+        truncated: boolean("truncated").notNull().default(false),
+        statusCode: integer("statusCode"),
+        createdAt: bigint("createdAt", { mode: "number" }).notNull() // epoch seconds
+    },
+    (t) => [
+        index("idx_ai_session_log_org_created").on(t.orgId, t.createdAt),
+        index("idx_ai_session_log_org_provider_created").on(
+            t.orgId,
+            t.providerId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_resource_created").on(
+            t.orgId,
+            t.resourceId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_site_resource_created").on(
+            t.orgId,
+            t.siteResourceId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_user_created").on(
+            t.orgId,
+            t.userId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_virtual_api_key_created").on(
+            t.orgId,
+            t.virtualApiKeyId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_session").on(t.sessionId)
+    ]
+);
+
 export const certificates = pgTable("certificates", {
     certId: serial("certId").primaryKey(),
     domain: varchar("domain", { length: 255 }).notNull().unique(),
@@ -2070,6 +2129,7 @@ export type AiModel = InferSelectModel<typeof aiModels>;
 export type AiBudget = InferSelectModel<typeof aiBudgets>;
 export type AiUsageRecord = InferSelectModel<typeof aiUsageRecords>;
 export type AiBudgetBreachEvent = InferSelectModel<typeof aiBudgetBreachEvents>;
+export type AiSessionLog = InferSelectModel<typeof aiSessionLog>;
 export type ResourceAiProvider = InferSelectModel<typeof resourceAiProviders>;
 export type SiteResourceAiProvider = InferSelectModel<
     typeof siteResourceAiProviders

server/db/sqlite/schema/privateSchema.ts

@@ -9,7 +9,6 @@ import {
     uniqueIndex
 } from "drizzle-orm/sqlite-core";
 import {
-    aiProviders,
     clients,
     domains,
     exitNodes,
@@ -21,8 +20,7 @@ import {
     siteResources,
     sites,
     targetHealthCheck,
-    users,
+    users
-    virtualApiKeys
 } from "./schema";
 
 export const dnsChallenge = sqliteTable("dnsChallenges", {
@@ -611,91 +609,6 @@ export const trialNotifications = sqliteTable("trialNotifications", {
     sentAt: integer("sentAt").notNull()
 });
 
-// Logs the aggregated prompt + response for a single AI gateway request, for
-// session replay. One row per request (not per streaming chunk). `sessionId`
-// is a fresh random id per row for now - no cross-request correlation yet,
-// but the column exists so a future pass can link multiple rows into a real
-// multi-turn session.
-export const aiSessionLog = sqliteTable(
-    "aiSessionLog",
-    {
-        id: integer("id").primaryKey({ autoIncrement: true }),
-        sessionId: text("sessionId").notNull(),
-        orgId: text("orgId").references(() => orgs.orgId, {
-            onDelete: "cascade"
-        }),
-        providerId: integer("providerId").references(
-            () => aiProviders.providerId,
-            { onDelete: "set null" }
-        ),
-        capability: text("capability").notNull(),
-        resourceId: integer("resourceId").references(
-            () => resources.resourceId,
-            { onDelete: "set null" }
-        ),
-        siteResourceId: integer("siteResourceId").references(
-            () => siteResources.siteResourceId,
-            { onDelete: "set null" }
-        ),
-        userId: text("userId").references(() => users.userId, {
-            onDelete: "set null"
-        }),
-        virtualApiKeyId: text("virtualApiKeyId").references(
-            () => virtualApiKeys.virtualApiKeyId,
-            { onDelete: "set null" }
-        ),
-        requestedModel: text("requestedModel"),
-        isStream: integer("isStream", { mode: "boolean" })
-            .notNull()
-            .default(false),
-        requestBody: text("requestBody"),
-        responseBody: text("responseBody"),
-        // Capability-agnostic message transcript (JSON-encoded
-        // NormalizedAiMessage[] from server/lib/aiMessageNormalization.ts),
-        // computed at write time so search/display never need per-capability
-        // parsing logic. Null when normalization couldn't recognize the
-        // shape - callers fall back to requestBody/responseBody.
-        normalizedRequest: text("normalizedRequest"),
-        normalizedResponse: text("normalizedResponse"),
-        // True if any of the request/response (raw or normalized) fields
-        // were cut short at AI_SESSION_LOG_MAX_BODY_CHARS before storage.
-        truncated: integer("truncated", { mode: "boolean" })
-            .notNull()
-            .default(false),
-        statusCode: integer("statusCode"),
-        createdAt: integer("createdAt").notNull() // epoch seconds
-    },
-    (t) => [
-        index("idx_ai_session_log_org_created").on(t.orgId, t.createdAt),
-        index("idx_ai_session_log_org_provider_created").on(
-            t.orgId,
-            t.providerId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_resource_created").on(
-            t.orgId,
-            t.resourceId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_site_resource_created").on(
-            t.orgId,
-            t.siteResourceId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_user_created").on(
-            t.orgId,
-            t.userId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_org_virtual_api_key_created").on(
-            t.orgId,
-            t.virtualApiKeyId,
-            t.createdAt
-        ),
-        index("idx_ai_session_log_session").on(t.sessionId)
-    ]
-);
-
 export type Approval = InferSelectModel<typeof approvals>;
 export type Limit = InferSelectModel<typeof limits>;
 export type Account = InferSelectModel<typeof account>;
@@ -734,4 +647,3 @@ export type AlertEmailAction = InferSelectModel<typeof alertEmailActions>;
 export type AlertEmailRecipient = InferSelectModel<typeof alertEmailRecipients>;
 export type AlertWebhookAction = InferSelectModel<typeof alertWebhookActions>;
 export type TrialNotification = InferSelectModel<typeof trialNotifications>;
-export type AiSessionLog = InferSelectModel<typeof aiSessionLog>;

server/db/sqlite/schema/schema.ts

@@ -99,9 +99,7 @@ export const orgDomains = sqliteTable("orgDomains", {
         .references(() => domains.domainId, { onDelete: "cascade" })
 });
 
-export const sites = sqliteTable(
+export const sites = sqliteTable("sites", {
-    "sites",
-    {
     siteId: integer("siteId").primaryKey({ autoIncrement: true }),
     orgId: text("orgId")
         .references(() => orgs.orgId, {
@@ -143,16 +141,10 @@ export const sites = sqliteTable(
     })
         .notNull()
         .default(false),
-        status: text("status")
+    status: text("status").$type<"pending" | "approved">().default("approved")
-            .$type<"pending" | "approved">()
+});
-            .default("approved")
-    },
-    (table) => [index("idx_sites_orgId").on(table.orgId)]
-);
 
-export const resources = sqliteTable(
+export const resources = sqliteTable("resources", {
-    "resources",
-    {
     resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
     resourcePolicyId: integer("resourcePolicyId").references(
         () => resourcePolicies.resourcePolicyId,
@@ -190,9 +182,7 @@ export const resources = sqliteTable(
         mode: "boolean"
     }),
     applyRules: integer("applyRules", { mode: "boolean" }),
-        enabled: integer("enabled", { mode: "boolean" })
+    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-            .notNull()
-            .default(true),
     stickySession: integer("stickySession", { mode: "boolean" })
         .notNull()
         .default(false),
@@ -220,14 +210,10 @@ export const resources = sqliteTable(
     maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
     postAuthPath: text("postAuthPath"),
     health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
-        wildcard: integer("wildcard", { mode: "boolean" })
+    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
-            .notNull()
-            .default(false),
     mode: text("mode")
         .default("http")
-            .$type<
+        .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
-                "rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp"
-            >()
         .notNull(), // rdp, ssh, http, vnc, inference
     pamMode: text("pamMode")
         .$type<"passthrough" | "push">()
@@ -236,12 +222,8 @@ export const resources = sqliteTable(
         .$type<"site" | "remote" | "native">()
         .default("site"),
     authDaemonPort: integer("authDaemonPort").default(22123),
-        status: text("status")
+    status: text("status").$type<"pending" | "approved">().default("approved")
-            .$type<"pending" | "approved">()
+});
-            .default("approved")
-    },
-    (table) => [index("idx_resources_orgId").on(table.orgId)]
-);
 
 export const resourceAiProviders = sqliteTable(
     "resourceAiProviders",
@@ -278,9 +260,7 @@ export const resourceAiModels = sqliteTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = sqliteTable(
+export const labels = sqliteTable("labels", {
-    "labels",
-    {
     labelId: integer("labelId").primaryKey({ autoIncrement: true }),
     name: text("name").notNull(),
     color: text("color").notNull(),
@@ -289,9 +269,7 @@ export const labels = sqliteTable(
             onDelete: "cascade"
         })
         .notNull()
-    },
+});
-    (table) => [index("idx_labels_orgId").on(table.orgId)]
-);
 
 export const launcherViews = sqliteTable("launcherViews", {
     viewId: integer("viewId").primaryKey({ autoIncrement: true }),
@@ -388,18 +366,14 @@ export const clientLabels = sqliteTable(
     (t) => [unique("client_label_uniq").on(t.clientId, t.labelId)]
 );
 
-export const targets = sqliteTable(
+export const targets = sqliteTable("targets", {
-    "targets",
-    {
     targetId: integer("targetId").primaryKey({ autoIncrement: true }),
-        resourceId: integer("resourceId").references(
+    resourceId: integer("resourceId").references(() => resources.resourceId, {
-            () => resources.resourceId,
+        onDelete: "cascade"
-            { onDelete: "cascade" }
+    }),
-        ),
+    providerId: integer("providerId").references(() => aiProviders.providerId, {
-        providerId: integer("providerId").references(
+        onDelete: "cascade"
-            () => aiProviders.providerId,
+    }),
-            { onDelete: "cascade" }
-        ),
     siteId: integer("siteId")
         .references(() => sites.siteId, {
             onDelete: "cascade"
@@ -409,9 +383,7 @@ export const targets = sqliteTable(
     method: text("method"),
     port: integer("port").notNull(),
     internalPort: integer("internalPort"),
-        enabled: integer("enabled", { mode: "boolean" })
+    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-            .notNull()
-            .default(true),
     path: text("path"),
     pathMatchType: text("pathMatchType"), // exact, prefix, regex
     rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
@@ -422,12 +394,7 @@ export const targets = sqliteTable(
         .notNull()
         .default("http"),
     authToken: text("authToken")
-    },
+});
-    (table) => [
-        index("idx_targets_resourceId").on(table.resourceId),
-        index("idx_targets_siteId").on(table.siteId)
-    ]
-);
 
 export const targetHealthCheck = sqliteTable("targetHealthCheck", {
     targetHealthCheckId: integer("targetHealthCheckId").primaryKey({
@@ -696,9 +663,7 @@ export const setupTokens = sqliteTable("setupTokens", {
     dateUsed: text("dateUsed")
 });
 
-export const newts = sqliteTable(
+export const newts = sqliteTable("newt", {
-    "newt",
-    {
     newtId: text("id").primaryKey(),
     secretHash: text("secretHash").notNull(),
     dateCreated: text("dateCreated").notNull(),
@@ -706,13 +671,9 @@ export const newts = sqliteTable(
     siteId: integer("siteId").references(() => sites.siteId, {
         onDelete: "cascade"
     })
-    },
+});
-    (table) => [index("idx_newts_siteId").on(table.siteId)]
-);
 
-export const clients = sqliteTable(
+export const clients = sqliteTable("clients", {
-    "clients",
-    {
     clientId: integer("clientId").primaryKey({ autoIncrement: true }),
     orgId: text("orgId")
         .references(() => orgs.orgId, {
@@ -740,21 +701,12 @@ export const clients = sqliteTable(
     online: integer("online", { mode: "boolean" }).notNull().default(false),
     // endpoint: text("endpoint"),
     lastHolePunch: integer("lastHolePunch"),
-        archived: integer("archived", { mode: "boolean" })
+    archived: integer("archived", { mode: "boolean" }).notNull().default(false),
-            .notNull()
+    blocked: integer("blocked", { mode: "boolean" }).notNull().default(false),
-            .default(false),
-        blocked: integer("blocked", { mode: "boolean" })
-            .notNull()
-            .default(false),
     approvalState: text("approvalState").$type<
         "pending" | "approved" | "denied"
     >()
-    },
+});
-    (table) => [
-        index("idx_clients_orgId").on(table.orgId),
-        index("idx_clients_userId").on(table.userId)
-    ]
-);
 
 export const clientSitesAssociationsCache = sqliteTable(
     "clientSitesAssociationsCache",
@@ -782,9 +734,7 @@ export const clientSiteResourcesAssociationsCache = sqliteTable(
     }
 );
 
-export const olms = sqliteTable(
+export const olms = sqliteTable("olms", {
-    "olms",
-    {
     olmId: text("id").primaryKey(),
     secretHash: text("secretHash").notNull(),
     dateCreated: text("dateCreated").notNull(),
@@ -799,12 +749,8 @@ export const olms = sqliteTable(
         // optionally tied to a user and in this case delete when the user deletes
         onDelete: "cascade"
     }),
-        archived: integer("archived", { mode: "boolean" })
+    archived: integer("archived", { mode: "boolean" }).notNull().default(false)
-            .notNull()
+});
-            .default(false)
-    },
-    (table) => [index("idx_olms_userId").on(table.userId)]
-);
 
 export const currentFingerprint = sqliteTable("currentFingerprint", {
     fingerprintId: integer("id").primaryKey({ autoIncrement: true }),
@@ -966,9 +912,7 @@ export const twoFactorBackupCodes = sqliteTable("twoFactorBackupCodes", {
     codeHash: text("codeHash").notNull()
 });
 
-export const sessions = sqliteTable(
+export const sessions = sqliteTable("session", {
-    "session",
-    {
     sessionId: text("id").primaryKey(),
     userId: text("userId")
         .notNull()
@@ -978,9 +922,7 @@ export const sessions = sqliteTable(
     deviceAuthUsed: integer("deviceAuthUsed", { mode: "boolean" })
         .notNull()
         .default(false)
-    },
+});
-    (table) => [index("idx_sessions_userId").on(table.userId)]
-);
 
 export const newtSessions = sqliteTable("newtSession", {
     sessionId: text("id").primaryKey(),
@@ -998,9 +940,7 @@ export const olmSessions = sqliteTable("clientSession", {
     expiresAt: integer("expiresAt").notNull()
 });
 
-export const userOrgs = sqliteTable(
+export const userOrgs = sqliteTable("userOrgs", {
-    "userOrgs",
-    {
     userId: text("userId")
         .notNull()
         .references(() => users.userId, { onDelete: "cascade" }),
@@ -1009,19 +949,12 @@ export const userOrgs = sqliteTable(
             onDelete: "cascade"
         })
         .notNull(),
-        isOwner: integer("isOwner", { mode: "boolean" })
+    isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
-            .notNull()
-            .default(false),
     autoProvisioned: integer("autoProvisioned", {
         mode: "boolean"
     }).default(false),
     pamUsername: text("pamUsername") // cleaned username for ssh and such
-    },
+});
-    (table) => [
-        index("idx_userOrgs_userId").on(table.userId),
-        index("idx_userOrgs_orgId").on(table.orgId)
-    ]
-);
 
 export const emailVerificationCodes = sqliteTable("emailVerificationCodes", {
     codeId: integer("id").primaryKey({ autoIncrement: true }),
@@ -1049,9 +982,7 @@ export const actions = sqliteTable("actions", {
     description: text("description")
 });
 
-export const roles = sqliteTable(
+export const roles = sqliteTable("roles", {
-    "roles",
-    {
     roleId: integer("roleId").primaryKey({ autoIncrement: true }),
     orgId: text("orgId")
         .references(() => orgs.orgId, {
@@ -1066,13 +997,11 @@ export const roles = sqliteTable(
     }).default(false),
     sshSudoMode: text("sshSudoMode").default("full"), // "none" | "full" | "commands"
     sshSudoCommands: text("sshSudoCommands").default("[]"),
-        sshCreateHomeDir: integer("sshCreateHomeDir", {
+    sshCreateHomeDir: integer("sshCreateHomeDir", { mode: "boolean" }).default(
-            mode: "boolean"
+        true
-        }).default(true),
+    ),
     sshUnixGroups: text("sshUnixGroups").default("[]")
-    },
+});
-    (table) => [index("idx_roles_orgId").on(table.orgId)]
-);
 
 export const userOrgRoles = sqliteTable(
     "userOrgRoles",
@@ -1999,6 +1928,91 @@ export const aiBudgetBreachEvents = sqliteTable(
     ]
 );
 
+// Logs the aggregated prompt + response for a single AI gateway request, for
+// session replay. One row per request (not per streaming chunk). `sessionId`
+// is a fresh random id per row for now - no cross-request correlation yet,
+// but the column exists so a future pass can link multiple rows into a real
+// multi-turn session.
+export const aiSessionLog = sqliteTable(
+    "aiSessionLog",
+    {
+        id: integer("id").primaryKey({ autoIncrement: true }),
+        sessionId: text("sessionId").notNull(),
+        orgId: text("orgId").references(() => orgs.orgId, {
+            onDelete: "cascade"
+        }),
+        providerId: integer("providerId").references(
+            () => aiProviders.providerId,
+            { onDelete: "set null" }
+        ),
+        capability: text("capability").notNull(),
+        resourceId: integer("resourceId").references(
+            () => resources.resourceId,
+            { onDelete: "set null" }
+        ),
+        siteResourceId: integer("siteResourceId").references(
+            () => siteResources.siteResourceId,
+            { onDelete: "set null" }
+        ),
+        userId: text("userId").references(() => users.userId, {
+            onDelete: "set null"
+        }),
+        virtualApiKeyId: text("virtualApiKeyId").references(
+            () => virtualApiKeys.virtualApiKeyId,
+            { onDelete: "set null" }
+        ),
+        requestedModel: text("requestedModel"),
+        isStream: integer("isStream", { mode: "boolean" })
+            .notNull()
+            .default(false),
+        requestBody: text("requestBody"),
+        responseBody: text("responseBody"),
+        // Capability-agnostic message transcript (JSON-encoded
+        // NormalizedAiMessage[] from server/lib/aiMessageNormalization.ts),
+        // computed at write time so search/display never need per-capability
+        // parsing logic. Null when normalization couldn't recognize the
+        // shape - callers fall back to requestBody/responseBody.
+        normalizedRequest: text("normalizedRequest"),
+        normalizedResponse: text("normalizedResponse"),
+        // True if any of the request/response (raw or normalized) fields
+        // were cut short at AI_SESSION_LOG_MAX_BODY_CHARS before storage.
+        truncated: integer("truncated", { mode: "boolean" })
+            .notNull()
+            .default(false),
+        statusCode: integer("statusCode"),
+        createdAt: integer("createdAt").notNull() // epoch seconds
+    },
+    (t) => [
+        index("idx_ai_session_log_org_created").on(t.orgId, t.createdAt),
+        index("idx_ai_session_log_org_provider_created").on(
+            t.orgId,
+            t.providerId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_resource_created").on(
+            t.orgId,
+            t.resourceId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_site_resource_created").on(
+            t.orgId,
+            t.siteResourceId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_user_created").on(
+            t.orgId,
+            t.userId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_org_virtual_api_key_created").on(
+            t.orgId,
+            t.virtualApiKeyId,
+            t.createdAt
+        ),
+        index("idx_ai_session_log_session").on(t.sessionId)
+    ]
+);
+
 export const certificates = sqliteTable("certificates", {
     certId: integer("certId").primaryKey({ autoIncrement: true }),
     domain: text("domain").notNull().unique(),
@@ -2109,6 +2123,7 @@ export type AiModel = InferSelectModel<typeof aiModels>;
 export type AiBudget = InferSelectModel<typeof aiBudgets>;
 export type AiUsageRecord = InferSelectModel<typeof aiUsageRecords>;
 export type AiBudgetBreachEvent = InferSelectModel<typeof aiBudgetBreachEvents>;
+export type AiSessionLog = InferSelectModel<typeof aiSessionLog>;
 export type ResourceAiProvider = InferSelectModel<typeof resourceAiProviders>;
 export type SiteResourceAiProvider = InferSelectModel<
     typeof siteResourceAiProviders

server/integrationApiServer.ts

@@ -16,7 +16,7 @@ import { registry, openApiTags } from "./openApi";
 import fs from "fs";
 import path from "path";
 import { APP_PATH } from "./lib/consts";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import { z } from "zod";
 
 const dev = process.env.ENVIRONMENT !== "prod";

server/lib/blueprints/applyBlueprint.ts

@@ -121,13 +121,6 @@ export async function applyBlueprint({
                             (hc) => hc.targetId === target.targetId
                         );
 
-                    // The DB writes for all resources have already committed
-                    // by this point, so a push failure for one target (e.g.
-                    // a newt rejecting a malformed health check) must not
-                    // abort pushing the rest, and must not mark the whole
-                    // blueprint as failed when the config was actually
-                    // persisted successfully.
-                    try {
                     if (["http", "tcp", "udp"].includes(target.mode)) {
                         await addProxyTargets(
                             site.newt.newtId,
@@ -149,11 +142,6 @@ export async function applyBlueprint({
                             site.newt.version
                         );
                     }
-                    } catch (e) {
-                        logger.error(
-                            `Failed to push target ${target.targetId} to newt on site ${site.sites.siteId}. Error: ${e}`
-                        );
-                    }
                 }
             }
         }

server/lib/blueprints/findOrgUser.ts

@@ -1,41 +0,0 @@
-import { and, asc, eq, or } from "drizzle-orm";
-import { Transaction, User, userOrgs, users } from "@server/db";
-
-export async function findOrgUsersByIdentifier(
-    trx: Transaction,
-    orgId: string,
-    identifier: string
-): Promise<User[]> {
-    const matches = await trx
-        .select()
-        .from(users)
-        .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-        .where(
-            and(
-                or(eq(users.username, identifier), eq(users.email, identifier)),
-                eq(userOrgs.orgId, orgId)
-            )
-        )
-        .orderBy(asc(users.dateCreated), asc(users.userId));
-
-    return matches.map((match) => match.user);
-}
-
-export async function resolveOrgUserIds(
-    trx: Transaction,
-    orgId: string,
-    identifiers: string[]
-): Promise<string[]> {
-    const userIds = new Set<string>();
-    for (const identifier of identifiers) {
-        const matchedUsers = await findOrgUsersByIdentifier(
-            trx,
-            orgId,
-            identifier
-        );
-        for (const user of matchedUsers) {
-            userIds.add(user.userId);
-        }
-    }
-    return [...userIds];
-}

server/lib/blueprints/privateResources.ts

@@ -11,14 +11,15 @@ import {
     siteNetworks,
     siteResources,
     Transaction,
+    userOrgs,
+    users,
     userSiteResources,
     networks
 } from "@server/db";
 import { sites } from "@server/db";
-import { eq, and, ne, inArray, isNotNull } from "drizzle-orm";
+import { eq, and, ne, inArray, or, isNotNull } from "drizzle-orm";
 import { Config } from "./types";
 import { getOrCreateLabelIds, syncSiteResourceLabels } from "./labels";
-import { resolveOrgUserIds } from "./findOrgUser";
 import logger from "@server/logger";
 import { defaultRoleAllowedActions } from "@server/routers/role/createRole";
 import { getNextAvailableAliasAddress } from "../ip";
@@ -388,23 +389,29 @@ export async function updatePrivateResources(
                 .where(eq(userSiteResources.siteResourceId, siteResourceId));
 
             if (resourceData.users.length > 0) {
-                const userIds = await resolveOrgUserIds(
+                // get userIds from username
-                    trx,
+                const usersToUpdate = await trx
-                    orgId,
+                    .select()
-                    resourceData.users
+                    .from(users)
+                    .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
+                    .where(
+                        and(
+                            or(
+                                inArray(users.username, resourceData.users),
+                                inArray(users.email, resourceData.users)
+                            ),
+                            eq(userOrgs.orgId, orgId)
+                        )
                     );
 
-                if (userIds.length > 0) {
+                const userIds = usersToUpdate.map((user) => user.user.userId);
+
                 await trx
                     .insert(userSiteResources)
                     .values(
-                            userIds.map((userId) => ({
+                        userIds.map((userId) => ({ userId, siteResourceId }))
-                                userId,
-                                siteResourceId
-                            }))
                     );
             }
-            }
 
             // Get all admin role IDs for this org to exclude from deletion
             const adminRoles = await trx
@@ -714,23 +721,29 @@ export async function updatePrivateResources(
             }
 
             if (resourceData.users.length > 0) {
-                const userIds = await resolveOrgUserIds(
+                // get userIds from username
-                    trx,
+                const usersToUpdate = await trx
-                    orgId,
+                    .select()
-                    resourceData.users
+                    .from(users)
+                    .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
+                    .where(
+                        and(
+                            or(
+                                inArray(users.username, resourceData.users),
+                                inArray(users.email, resourceData.users)
+                            ),
+                            eq(userOrgs.orgId, orgId)
+                        )
                     );
 
-                if (userIds.length > 0) {
+                const userIds = usersToUpdate.map((user) => user.user.userId);
+
                 await trx
                     .insert(userSiteResources)
                     .values(
-                            userIds.map((userId) => ({
+                        userIds.map((userId) => ({ userId, siteResourceId }))
-                                userId,
-                                siteResourceId
-                            }))
                     );
             }
-            }
 
             if (resourceData.machines.length > 0) {
                 // get clientIds from niceIds

server/lib/blueprints/publicResources.ts

@@ -46,12 +46,11 @@ import { encrypt } from "@server/lib/crypto";
 import logger from "@server/logger";
 import { defaultRoleAllowedActions } from "@server/routers/role/createRole";
 import { pickPort } from "@server/routers/target/helpers";
-import { and, asc, eq, isNotNull, ne } from "drizzle-orm";
+import { and, asc, eq, isNotNull, ne, or } from "drizzle-orm";
 import { tierMatrix } from "../billing/tierMatrix";
 import { isValidCIDR, isValidIP, isValidUrlGlobPattern } from "../validators";
 import { Config, isTargetsOnlyResource, TargetData } from "./types";
 import { getOrCreateLabelIds, syncResourceLabels } from "./labels";
-import { findOrgUsersByIdentifier } from "./findOrgUser";
 import { LimitId } from "../billing";
 import { usageService } from "../billing/usageService";
 import { syncInferenceAiConfig } from "./aiProviders";
@@ -1564,29 +1563,33 @@ async function syncUserResources(
         .where(eq(userResources.resourceId, resourceId));
 
     for (const username of ssoUsers) {
-        const matchedUsers = await findOrgUsersByIdentifier(
+        const [user] = await trx
-            trx,
+            .select()
-            orgId,
+            .from(users)
-            username
+            .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-        );
+            .where(
+                and(
+                    or(eq(users.username, username), eq(users.email, username)),
+                    eq(userOrgs.orgId, orgId)
+                )
+            )
+            .limit(1);
 
-        if (matchedUsers.length === 0) {
+        if (!user) {
             throw new Error(`User not found: ${username} in org ${orgId}`);
         }
 
-        for (const user of matchedUsers) {
         const existingUserResource = existingUserResources.find(
-                (rr) => rr.userId === user.userId
+            (rr) => rr.userId === user.user.userId
         );
 
         if (!existingUserResource) {
             await trx.insert(userResources).values({
-                    userId: user.userId,
+                userId: user.user.userId,
                 resourceId: resourceId
             });
         }
     }
-    }
 
     for (const existingUserResource of existingUserResources) {
         const [user] = await trx
@@ -1952,29 +1955,33 @@ async function syncUserPolicies(
         .where(eq(userPolicies.resourcePolicyId, policyId));
 
     for (const username of ssoUsers) {
-        const matchedUsers = await findOrgUsersByIdentifier(
+        const [user] = await trx
-            trx,
+            .select()
-            orgId,
+            .from(users)
-            username
+            .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-        );
+            .where(
+                and(
+                    or(eq(users.username, username), eq(users.email, username)),
+                    eq(userOrgs.orgId, orgId)
+                )
+            )
+            .limit(1);
 
-        if (matchedUsers.length === 0) {
+        if (!user) {
             throw new Error(`User not found: ${username} in org ${orgId}`);
         }
 
-        for (const user of matchedUsers) {
         const existingUserPolicy = existingUserPoliciesList.find(
-                (up) => up.userId === user.userId
+            (up) => up.userId === user.user.userId
         );
 
         if (!existingUserPolicy) {
             await trx.insert(userPolicies).values({
-                    userId: user.userId,
+                userId: user.user.userId,
                 resourcePolicyId: policyId
             });
         }
     }
-    }
 
     for (const existingUserPolicy of existingUserPoliciesList) {
         const [user] = await trx

server/lib/blueprints/resourcePolicies.ts

@@ -13,7 +13,7 @@ import {
     userPolicies,
     users
 } from "@server/db";
-import { eq, and } from "drizzle-orm";
+import { eq, and, or } from "drizzle-orm";
 import { Config, ResourcePolicyData } from "./types";
 import logger from "@server/logger";
 import { getUniqueResourcePolicyName } from "@server/db/names";
@@ -22,7 +22,6 @@ import { idpExistsForOrg } from "@server/lib/idp/idpExistsForOrg";
 import { isValidCIDR, isValidIP, isValidUrlGlobPattern } from "../validators";
 import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
 import { tierMatrix } from "../billing/tierMatrix";
-import { findOrgUsersByIdentifier } from "./findOrgUser";
 
 export type ResourcePoliciesResults = {
     resourcePolicyId: number;
@@ -467,32 +466,36 @@ async function syncUserPolicies(
         .where(eq(userPolicies.resourcePolicyId, policyId));
 
     for (const username of ssoUsers) {
-        const matchedUsers = await findOrgUsersByIdentifier(
+        const [user] = await trx
-            trx,
+            .select()
-            orgId,
+            .from(users)
-            username
+            .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-        );
+            .where(
+                and(
+                    or(eq(users.username, username), eq(users.email, username)),
+                    eq(userOrgs.orgId, orgId)
+                )
+            )
+            .limit(1);
 
-        if (matchedUsers.length === 0) {
+        if (!user) {
             logger.warn(
                 `User '${username}' not found in org '${orgId}', skipping`
             );
             continue;
         }
 
-        for (const user of matchedUsers) {
         const alreadyExists = existingUserPolicies.some(
-                (up) => up.userId === user.userId
+            (up) => up.userId === user.user.userId
         );
 
         if (!alreadyExists) {
             await trx.insert(userPolicies).values({
-                    userId: user.userId,
+                userId: user.user.userId,
                 resourcePolicyId: policyId
             });
         }
     }
-    }
 
     // Remove users no longer in the list
     for (const existingUserPolicy of existingUserPolicies) {
@@ -533,27 +536,31 @@ async function addUserPolicies(
     trx: Transaction
 ) {
     for (const username of ssoUsers) {
-        const matchedUsers = await findOrgUsersByIdentifier(
+        const [user] = await trx
-            trx,
+            .select()
-            orgId,
+            .from(users)
-            username
+            .innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
-        );
+            .where(
+                and(
+                    or(eq(users.username, username), eq(users.email, username)),
+                    eq(userOrgs.orgId, orgId)
+                )
+            )
+            .limit(1);
 
-        if (matchedUsers.length === 0) {
+        if (!user) {
             logger.warn(
                 `User '${username}' not found in org '${orgId}', skipping`
             );
             continue;
         }
 
-        for (const user of matchedUsers) {
         await trx.insert(userPolicies).values({
-                userId: user.userId,
+            userId: user.user.userId,
             resourcePolicyId: policyId
         });
     }
 }
-}
 
 async function syncWhitelistPolicyUsers(
     policyId: number,

server/lib/blueprints/types.ts

@@ -29,34 +29,8 @@ export const SiteSchema = z.object({
     "docker-socket-enabled": z.boolean().optional().default(true)
 });
 
-// A malformed hostname (e.g. stray whitespace) is silently accepted here but
-// fails to parse as a URL when newt builds the health check request, which
-// takes the target out of the routing pool and breaks the resource entirely
-// (see #3677). Validate eagerly so blueprints reject it up front instead.
-const healthCheckHostnameSchema = z
-    .string()
-    .trim()
-    .min(1)
-    .refine((val) => !/\s/.test(val), {
-        message: "Hostname must not contain whitespace"
-    })
-    .refine(
-        (val) => {
-            if (z.union([z.ipv4(), z.ipv6()]).safeParse(val).success) {
-                return true;
-            }
-            const hostnameRegex =
-                /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
-            return hostnameRegex.test(val);
-        },
-        {
-            message:
-                "Hostname must be a valid IP address or hostname (no spaces or invalid characters)"
-        }
-    );
-
 export const TargetHealthCheckSchema = z.object({
-    hostname: healthCheckHostnameSchema,
+    hostname: z.string(),
     port: z.int().min(1).max(65535),
     enabled: z.boolean().optional().default(true),
     path: z.string().optional().default("/"),
@@ -127,7 +101,7 @@ export const AuthSchema = z.object({
 export const RuleSchema = z
     .object({
         action: z.enum(["allow", "deny", "pass"]),
-        match: z.enum(["cidr", "path", "ip", "country", "country_is_not", "asn", "region"]),
+        match: z.enum(["cidr", "path", "ip", "country", "asn", "region"]),
         value: z.coerce.string(),
         priority: z.int().optional(),
         enabled: z.boolean().optional().default(true)
@@ -162,7 +136,7 @@ export const RuleSchema = z
     )
     .refine(
         (rule) => {
-            if (rule.match === "country" || rule.match === "country_is_not") {
+            if (rule.match === "country") {
                 if (!hasMaxmindCountryDb) {
                     return false;
                 }

server/lib/config.ts

@@ -112,11 +112,6 @@ export class Config {
             ? "true"
             : "false";
 
-        process.env.FLAGS_DISABLE_VIRTUAL_API_KEYS_UI = parsedConfig.flags
-            ?.disable_virtual_api_keys_ui
-            ? "true"
-            : "false";
-
         this.rawConfig = parsedConfig;
     }
 

server/lib/domainUtils.ts

@@ -31,6 +31,7 @@ export async function validateAndConstructDomain(
     subdomain?: string | null
 ): Promise<DomainValidationResult> {
     try {
+        // Query domain with organization access check
         const [domainRes] = await db
             .select()
             .from(domains)
@@ -41,10 +42,6 @@ export async function validateAndConstructDomain(
                     eq(orgDomains.orgId, orgId),
                     eq(orgDomains.domainId, domainId)
                 )
-            )
-            .leftJoin(
-                domainNamespaces,
-                eq(domainNamespaces.domainId, domainId)
             );
 
         // Check if domain exists
@@ -55,7 +52,7 @@ export async function validateAndConstructDomain(
             };
         }
 
-        if (!domainRes.orgDomains && !domainRes.domainNamespaces) {
+        if (!domainRes.orgDomains) {
             return {
                 success: false,
                 error: `Organization does not have access to domain with ID ${domainId}`
@@ -86,12 +83,20 @@ export async function validateAndConstructDomain(
         }
 
         // Wildcard subdomains are not allowed on namespace (provided/free) domains
-        if (isWildcard && domainRes.domainNamespaces) {
+        if (isWildcard) {
+            const [namespaceDomain] = await db
+                .select()
+                .from(domainNamespaces)
+                .where(eq(domainNamespaces.domainId, domainId))
+                .limit(1);
+
+            if (namespaceDomain) {
                 return {
                     success: false,
                     error: "Wildcard subdomains are not supported for provided or free domains. Use a specific subdomain instead."
                 };
             }
+        }
 
         if (
             isWildcard &&

server/lib/readConfigFile.ts

@@ -1,5 +1,5 @@
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import { configFilePath1, configFilePath2 } from "./consts";
 import { z } from "zod";
 import stoi from "./stoi";
@@ -442,7 +442,6 @@ export const configSchema = z
                 disable_config_managed_domains: z.boolean().optional(),
                 disable_product_help_banners: z.boolean().optional(),
                 disable_enterprise_features: z.boolean().optional(),
-                disable_virtual_api_keys_ui: z.boolean().optional(),
                 enable_acme_cert_sync: z.boolean().optional().default(true),
                 disable_private_http_placeholder: z
                     .boolean()

server/lib/telemetry.ts

@@ -3,8 +3,6 @@ import config from "./config";
 import { getHostMeta } from "./hostMeta";
 import logger from "@server/logger";
 import {
-    aiProviders,
-    aiUsageRecords,
     alertRules,
     apiKeys,
     blueprints,
@@ -13,16 +11,7 @@ import {
     siteResources
 } from "@server/db";
 import { sites, users, orgs, resources, clients, idp } from "@server/db";
-import {
+import { eq, count, notInArray, and, isNotNull, isNull } from "drizzle-orm";
-    eq,
-    count,
-    countDistinct,
-    notInArray,
-    and,
-    isNotNull,
-    isNull,
-    gte
-} from "drizzle-orm";
 import { APP_VERSION } from "./consts";
 import crypto from "crypto";
 import { UserType } from "@server/types/UserTypes";
@@ -183,25 +172,6 @@ class TelemetryClient {
                 .select({ count: count() })
                 .from(blueprints);
 
-            const [aiProvidersCount] = await db
-                .select({ count: count() })
-                .from(aiProviders);
-            const [orgsWithAiProviders] = await db
-                .select({ count: countDistinct(aiProviders.orgId) })
-                .from(aiProviders);
-
-            const usageWindowStart =
-                Math.floor(Date.now() / 1000) -
-                this.collectionIntervalDays * 24 * 60 * 60;
-            const [aiUsageRecordsRecent] = await db
-                .select({ count: count() })
-                .from(aiUsageRecords)
-                .where(gte(aiUsageRecords.createdAt, usageWindowStart));
-            const [orgsWithRecentAiUsage] = await db
-                .select({ count: countDistinct(aiUsageRecords.orgId) })
-                .from(aiUsageRecords)
-                .where(gte(aiUsageRecords.createdAt, usageWindowStart));
-
             const supporterKey = config.getSupporterData();
 
             const allPrivateResources = await db.select().from(siteResources);
@@ -212,7 +182,6 @@ class TelemetryClient {
             let numPrivResourceCidr = 0;
             let numPrivResourceHttp = 0;
             let numPrivResourceSsh = 0;
-            let numPrivResourceInference = 0;
             for (const res of allPrivateResources) {
                 if (res.mode === "host") {
                     numPrivResourceHosts += 1;
@@ -222,8 +191,6 @@ class TelemetryClient {
                     numPrivResourceHttp += 1;
                 } else if (res.mode === "ssh") {
                     numPrivResourceSsh += 1;
-                } else if (res.mode === "inference") {
-                    numPrivResourceInference += 1;
                 }
 
                 if (res.alias) {
@@ -244,11 +211,6 @@ class TelemetryClient {
                 numPrivateResourceCidr: numPrivResourceCidr,
                 numPrivateResourceHttp: numPrivResourceHttp,
                 numPrivateResourceSsh: numPrivResourceSsh,
-                numPrivateResourceInference: numPrivResourceInference,
-                numAiProviders: aiProvidersCount.count,
-                numOrgsWithAiProviders: orgsWithAiProviders.count,
-                numAiUsageRecordsRecent: aiUsageRecordsRecent.count,
-                numOrgsWithRecentAiUsage: orgsWithRecentAiUsage.count,
                 numAlertRules: numAlertRules.count,
                 numUserDevices: userDevicesCount.count,
                 numMachineClients: machineClients.count,
@@ -361,17 +323,6 @@ class TelemetryClient {
                     num_resources_non_http: stats.resources.filter(
                         (r) => r.mode !== "http"
                     ).length,
-                    num_resources_ai_gateway: stats.resources.filter(
-                        (r) => r.mode === "inference"
-                    ).length,
-                    num_private_resources_ai_gateway:
-                        stats.numPrivateResourceInference,
-                    num_ai_providers: stats.numAiProviders,
-                    num_orgs_with_ai_providers: stats.numOrgsWithAiProviders,
-                    num_ai_usage_records_recent:
-                        stats.numAiUsageRecordsRecent,
-                    num_orgs_with_recent_ai_usage:
-                        stats.numOrgsWithRecentAiUsage,
                     num_newt_sites: stats.sites.filter((s) => s.type === "newt")
                         .length,
                     num_local_sites: stats.sites.filter(

server/middlewares/integration/verifyAccessTokenAccess.ts

@@ -68,11 +68,6 @@ export async function verifyApiKeyAccessTokenAccess(
             );
         }
 
-        if (apiKey.isRoot) {
-            // Root keys can access any access token in any org
-            return next();
-        }
-
         if (!resource.orgId) {
             return next(
                 createHttpError(

server/private/lib/readConfigFile.ts

@@ -12,7 +12,7 @@
  */
 
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import { privateConfigFilePath1 } from "@server/lib/consts";
 import { z } from "zod";
 import { colorsSchema } from "@server/lib/colorsSchema";

server/private/lib/redis.ts

@@ -158,7 +158,7 @@ class RedisManager {
             this.writeClient = new Redis({
                 ...masterConfig,
                 enableReadyCheck: false,
-                maxRetriesPerRequest: 50,
+                maxRetriesPerRequest: 3,
                 keepAlive: 30000,
                 connectTimeout: this.connectionTimeout,
                 commandTimeout: this.commandTimeout
@@ -169,7 +169,7 @@ class RedisManager {
                 this.readClient = new Redis({
                     ...replicaConfig!,
                     enableReadyCheck: false,
-                    maxRetriesPerRequest: 50,
+                    maxRetriesPerRequest: 3,
                     keepAlive: 30000,
                     connectTimeout: this.connectionTimeout,
                     commandTimeout: this.commandTimeout
@@ -186,7 +186,7 @@ class RedisManager {
             this.publisher = new Redis({
                 ...masterConfig,
                 enableReadyCheck: false,
-                maxRetriesPerRequest: 50,
+                maxRetriesPerRequest: 3,
                 keepAlive: 30000,
                 connectTimeout: this.connectionTimeout,
                 commandTimeout: this.commandTimeout
@@ -196,7 +196,7 @@ class RedisManager {
             this.subscriber = new Redis({
                 ...(this.hasReplicas ? replicaConfig! : masterConfig),
                 enableReadyCheck: false,
-                maxRetriesPerRequest: 50,
+                maxRetriesPerRequest: 3,
                 keepAlive: 30000,
                 connectTimeout: this.connectionTimeout,
                 commandTimeout: this.commandTimeout
@@ -901,9 +901,7 @@ class RegionalRedisManager {
     // if the configured host doesn't match that pattern (e.g. local dev),
     // in which case callers should fall back to the primary for reads.
     private getReplicaHost(primaryHost: string): string | null {
-        const match = primaryHost.match(
+        const match = primaryHost.match(/^redis\.([^.]+)\.svc\.cluster\.local$/);
-            /^redis\.([^.]+)\.svc\.cluster\.local$/
-        );
         if (!match) return null;
         const namespace = match[1];
         return `redis-1.redis-headless.${namespace}.svc.cluster.local`;
@@ -914,7 +912,7 @@ class RegionalRedisManager {
         const baseOpts = {
             ...cfg,
             enableReadyCheck: false,
-            maxRetriesPerRequest: 50,
+            maxRetriesPerRequest: 3,
             keepAlive: 10000,
             connectTimeout: this.connectionTimeout,
             commandTimeout: this.commandTimeout

server/private/license/license.ts

@@ -149,8 +149,12 @@ LQIDAQAB
         }
 
         // Count used sites and users for license comparison
-        const [siteCountRes] = await db.select({ value: count() }).from(sites);
+        const [siteCountRes] = await db
-        const [userCountRes] = await db.select({ value: count() }).from(users);
+            .select({ value: count() })
+            .from(sites);
+        const [userCountRes] = await db
+            .select({ value: count() })
+            .from(users);
 
         const status: LicenseStatus = {
             hostId: this.hostMeta.hostMetaId,
@@ -272,13 +276,10 @@ LQIDAQAB
                         logger.error(
                             `Allowing failure. Will retry one more time at next run interval.`
                         );
-                        // Fall back to last known good status if we have
+                        // return last known good status
-                        // one cached; otherwise return the freshly built
+                        return this.statusCache.get(
-                        // status (with defaults) rather than undefined.
-                        const lastKnownStatus = this.statusCache.get(
                             this.statusKey
-                        ) as LicenseStatus | undefined;
+                        ) as LicenseStatus;
-                        return lastKnownStatus ?? status;
                     } else {
                         // Subsequent failures: fail abruptly
                         throw e;
@@ -367,7 +368,10 @@ LQIDAQAB
                 }
 
                 // Only consider quantity if defined and >= 0 (quantity = users, quantity_2 = sites)
-                if (cached.quantity_2 !== undefined && cached.quantity_2 >= 0) {
+                if (
+                    cached.quantity_2 !== undefined &&
+                    cached.quantity_2 >= 0
+                ) {
                     status.maxSites =
                         (status.maxSites ?? 0) + cached.quantity_2;
                 }

server/private/routers/auditLogs/queryAccessAuditLog.ts

@@ -88,27 +88,7 @@ export const queryAccessAuditLogsQuery = z.object({
         .optional()
         .default("0")
         .transform(Number)
-        .pipe(z.int().nonnegative()),
+        .pipe(z.int().nonnegative())
-    ip: z
-        .preprocess((val) => {
-            if (val === undefined || val === null || val === "") {
-                return undefined;
-            }
-            if (Array.isArray(val)) {
-                return val;
-            }
-            // the array is returned as this
-            if (typeof val === "string") {
-                return val.split(",");
-            }
-            return undefined;
-        }, z.array(z.string()))
-        .optional()
-        .catch([])
-        .openapi({
-            type: "array",
-            description: "Filter by IP adresses"
-        })
 });
 
 export const queryAccessAuditLogsParams = z.object({
@@ -154,9 +134,6 @@ function getWhere(data: Q) {
         data.type ? eq(accessAuditLog.type, data.type) : undefined,
         data.action !== undefined
             ? eq(accessAuditLog.action, data.action)
-            : undefined,
-        data.ip && data.ip.length > 0
-            ? inArray(accessAuditLog.ip, data.ip)
             : undefined
     );
 }

server/private/routers/ws/messageHandlers.ts

@@ -16,10 +16,12 @@ import {
     handleRemoteExitNodePingMessage
 } from "#private/routers/remoteExitNode";
 import { MessageHandler } from "@server/routers/ws";
-import { handleConnectionLogMessage } from "#private/routers/newt";
+import {
+    handleConnectionLogMessage,
+} from "#private/routers/newt";
 
 export const messageHandlers: Record<string, MessageHandler> = {
     "remoteExitNode/register": handleRemoteExitNodeRegisterMessage,
     "remoteExitNode/ping": handleRemoteExitNodePingMessage,
-    "newt/access-log": handleConnectionLogMessage
+    "newt/access-log": handleConnectionLogMessage,
 };

server/private/routers/ws/ws.ts

@@ -104,8 +104,7 @@ const processMessage = async (
 
         const handler = messageHandlers[message.type];
         if (!handler) {
-            logger.debug(`No handler found for message type: ${message.type}`);
+            throw new Error(`Unsupported message type: ${message.type}`);
-            return;
         }
 
         const response = await handler({

server/routers/auditLogs/queryRequestAuditLog.ts

@@ -81,27 +81,7 @@ export const queryAccessAuditLogsQuery = z.strictObject({
         .optional()
         .default("0")
         .transform(Number)
-        .pipe(z.int().nonnegative()),
+        .pipe(z.int().nonnegative())
-    ip: z
-        .preprocess((val) => {
-            if (val === undefined || val === null || val === "") {
-                return undefined;
-            }
-            if (Array.isArray(val)) {
-                return val;
-            }
-            // the array is returned as this
-            if (typeof val === "string") {
-                return val.split(",");
-            }
-            return undefined;
-        }, z.array(z.string()))
-        .optional()
-        .catch([])
-        .openapi({
-            type: "array",
-            description: "Filter by IP adresses"
-        })
 });
 
 export const queryRequestAuditLogsParams = z.object({
@@ -146,9 +126,6 @@ function getWhere(data: Q) {
         data.path ? eq(requestAuditLog.path, data.path) : undefined,
         data.action !== undefined
             ? eq(requestAuditLog.action, data.action)
-            : undefined,
-        data.ip && data.ip.length > 0
-            ? inArray(requestAuditLog.ip, data.ip)
             : undefined
     );
 }

server/routers/auth/requestPasswordReset.ts

@@ -6,7 +6,7 @@ import HttpCode from "@server/types/HttpCode";
 import { response } from "@server/lib/response";
 import { db } from "@server/db";
 import { passwordResetTokens, users } from "@server/db";
-import { eq, and } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import { alphabet, generateRandomString, sha256 } from "oslo/crypto";
 import { createDate } from "oslo";
 import logger from "@server/logger";
@@ -49,12 +49,7 @@ export async function requestPasswordReset(
         const existingUser = await db
             .select()
             .from(users)
-            .where(
+            .where(eq(users.email, email));
-                and(
-                    eq(users.email, email),
-                    eq(users.type, UserType.Internal)
-                )
-            );
 
         if (!existingUser || !existingUser.length) {
             await randomDelay(2000);

server/routers/auth/securityKey.ts

@@ -533,23 +533,18 @@ export async function startAuthentication(
 
         // If email is provided, get security keys for that specific user
         if (email) {
-            const matchingUsers = await db
+            const [user] = await db
                 .select()
                 .from(users)
-                .where(
+                .where(eq(users.email, email))
-                    and(
+                .limit(1);
-                        eq(users.email, email.toLowerCase()),
-                        eq(users.type, UserType.Internal)
-                    )
-                );
 
-            if (matchingUsers.length !== 1) {
+            if (!user || user.type !== UserType.Internal) {
                 return next(
                     createHttpError(HttpCode.BAD_REQUEST, "Invalid credentials")
                 );
             }
 
-            const user = matchingUsers[0];
             userId = user.userId;
 
             const userSecurityKeys = await db

server/routers/auth/setServerAdmin.ts

@@ -42,62 +42,54 @@ export async function setServerAdmin(
 
         const { email, password, setupToken } = parsedBody.data;
 
-        const passwordHash = await hashPassword(password);
+        // Validate setup token
-        const userId = generateId(15);
+        const [validToken] = await db
-
+            .select()
-        await db.transaction(async (trx) => {
+            .from(setupTokens)
-            const consumed = await trx
-                .update(setupTokens)
-                .set({
-                    used: true,
-                    dateUsed: moment().toISOString()
-                })
             .where(
                 and(
                     eq(setupTokens.token, setupToken),
                     eq(setupTokens.used, false)
                 )
-                )
+            );
-                .returning({ tokenId: setupTokens.tokenId });
 
-            if (!consumed.length) {
+        if (!validToken) {
-                throw createHttpError(
+            return next(
+                createHttpError(
                     HttpCode.BAD_REQUEST,
-                    "Invalid setup token"
+                    "Invalid or expired setup token"
+                )
             );
         }
 
-            const [existingAdmin] = await trx
+        const [existing] = await db
-                .select({ userId: users.userId })
+            .select()
             .from(users)
-                .where(eq(users.serverAdmin, true))
+            .where(eq(users.serverAdmin, true));
-                .limit(1);
 
-            if (existingAdmin) {
+        if (existing) {
-                throw createHttpError(
+            return next(
+                createHttpError(
                     HttpCode.BAD_REQUEST,
                     "Server admin already exists"
+                )
             );
         }
 
-            const [existingUser] = await trx
+        const passwordHash = await hashPassword(password);
-                .select({ userId: users.userId })
+        const userId = generateId(15);
-                .from(users)
-                .where(
-                    and(
-                        eq(users.email, email),
-                        eq(users.type, UserType.Internal)
-                    )
-                )
-                .limit(1);
 
-            if (existingUser) {
+        await db.transaction(async (trx) => {
-                throw createHttpError(
+            // Mark the token as used
-                    HttpCode.BAD_REQUEST,
+            await trx
-                    "A user with that email address already exists"
+                .update(setupTokens)
-                );
+                .set({
-            }
+                    used: true,
+                    dateUsed: moment().toISOString()
+                })
+                .where(eq(setupTokens.tokenId, validToken.tokenId));
 
+            // Create the server admin user
             await trx.insert(users).values({
                 userId: userId,
                 email: email,
@@ -119,9 +111,6 @@ export async function setServerAdmin(
             status: HttpCode.OK
         });
     } catch (e) {
-        if (createHttpError.isHttpError(e)) {
-            return next(e);
-        }
         logger.error(e);
         return next(
             createHttpError(

server/routers/auth/validateSetupToken.ts

@@ -48,7 +48,7 @@ export async function validateSetupToken(
             return response<ValidateSetupTokenResponse>(res, {
                 data: {
                     valid: false,
-                    message: "Invalid setup token"
+                    message: "Invalid or expired setup token"
                 },
                 success: true,
                 error: false,

server/routers/external.ts

@@ -87,6 +87,12 @@ authenticated.get("/org/checkId", org.checkId);
 authenticated.put("/org", getUserOrgs, org.createOrg);
 
 authenticated.get("/orgs", verifyUserIsServerAdmin, org.listOrgs);
+authenticated.get("/admin/orgs", verifyUserIsServerAdmin, org.adminListOrgs);
+authenticated.delete(
+    "/admin/org/:orgId",
+    verifyUserIsServerAdmin,
+    org.adminDeleteOrg
+);
 authenticated.get("/user/:userId/orgs", verifyIsLoggedInUser, org.listUserOrgs);
 
 authenticated.get(

server/routers/launcher/launcherResourceAccess.ts

@@ -984,7 +984,7 @@ async function listLabelGroups(
         ).length;
     }
 
-    const groups: LauncherGroup[] = Array.from(labelCountMap.values()).map(
+    let groups: LauncherGroup[] = Array.from(labelCountMap.values()).map(
         (row) => ({
             groupKey: String(row.labelId),
             name: row.name,

server/routers/olm/buildConfiguration.ts

@@ -80,7 +80,7 @@ export async function buildSiteConfigurationForOlmClient(
         );
 
     const siteResourcesBySiteId = new Map<number, SiteResource[]>();
-    const siteResourcesForExitNode = [];
+    let siteResourcesForExitNode = [];
     for (const row of allClientSiteResources) {
         if (row.siteResource.requiresExitNodeConnection) {
             siteResourcesForExitNode.push(row.siteResource);

server/routers/olm/dnsConfig.ts

@@ -1,20 +0,0 @@
-import config from "@server/lib/config";
-
-// Mirrors the optional fields on the olm client's TunnelConfig - any field
-// present here overrides the value the olm client is otherwise locally
-// configured with; an absent field leaves the client's own config alone.
-export type OlmDnsConfig = {
-    upstreamDns?: string[];
-    overrideDns?: boolean;
-    tunnelDns?: boolean;
-    matchDomains?: string[];
-};
-
-export function buildOlmDnsConfig(): OlmDnsConfig | undefined {
-    return {
-        upstreamDns: undefined,
-        overrideDns: undefined,
-        tunnelDns: undefined,
-        matchDomains: undefined
-    };
-}

server/routers/olm/handleOlmRegisterMessage.ts

@@ -15,7 +15,6 @@ import { encodeHexLowerCase } from "@oslojs/encoding";
 import { sha256 } from "@oslojs/crypto/sha2";
 import { getUserDeviceName } from "@server/db/names";
 import { buildSiteConfigurationForOlmClient } from "./buildConfiguration";
-import { buildOlmDnsConfig } from "./dnsConfig";
 import { OlmErrorCodes, sendOlmError } from "./error";
 import { handleFingerprintInsertion } from "./fingerprintingUtils";
 import { build } from "@server/build";
@@ -513,7 +512,6 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
                               tunnelIP: `${clientSubnet.split("/")[0]}/${exitNode.address.split("/")[1]}` // we need to use the exit node's subnet mask here because the client will be using the exit node's subnet mask for its routing table so we can address it
                           }
                         : undefined,
-                dnsConfig: buildOlmDnsConfig(),
                 chainId: chainId
             }
         },

server/routers/org/adminDeleteOrg.ts

@@ -0,0 +1,98 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import { deleteOrgById, sendTerminationMessages } from "@server/lib/deleteOrg";
+import { db, orgs } from "@server/db";
+import { eq } from "drizzle-orm";
+
+const adminDeleteOrgSchema = z.strictObject({
+    orgId: z.string()
+});
+
+export type AdminDeleteOrgResponse = {};
+
+registry.registerPath({
+    method: "delete",
+    path: "/admin/org/{orgId}",
+    description: "Delete any organization in the system (server admin).",
+    tags: [OpenAPITags.Org],
+    request: {
+        params: adminDeleteOrgSchema
+    },
+    responses: {
+        200: {
+            description: "Successful response",
+            content: {
+                "application/json": {
+                    schema: z.object({
+                        data: z.record(z.string(), z.any()).nullable(),
+                        success: z.boolean(),
+                        error: z.boolean(),
+                        message: z.string(),
+                        status: z.number()
+                    })
+                }
+            }
+        }
+    }
+});
+
+export async function adminDeleteOrg(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = adminDeleteOrgSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+        const { orgId } = parsedParams.data;
+
+        const [org] = await db
+            .select()
+            .from(orgs)
+            .where(eq(orgs.orgId, orgId))
+            .limit(1);
+
+        if (!org) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `Organization with ID ${orgId} not found`
+                )
+            );
+        }
+
+        const result = await deleteOrgById(orgId);
+        sendTerminationMessages(result);
+        return response(res, {
+            data: null,
+            success: true,
+            error: false,
+            message: "Organization deleted successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        if (createHttpError.isHttpError(error)) {
+            return next(error);
+        }
+        logger.error(error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "An error occurred..."
+            )
+        );
+    }
+}

server/routers/org/adminListOrgs.ts

@@ -0,0 +1,241 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db, users } from "@server/db";
+import { orgs, resources, sites, userOrgs } from "@server/db";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import { and, asc, desc, eq, like, or, sql, type SQL } from "drizzle-orm";
+import logger from "@server/logger";
+import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import { createApiResponseSchema } from "@server/lib/openapi/createApiResponseSchema";
+import type { PaginatedResponse } from "@server/types/Pagination";
+
+const adminListOrgsSchema = z.strictObject({
+    pageSize: z.coerce
+        .number<string>()
+        .int()
+        .positive()
+        .optional()
+        .catch(20)
+        .default(20)
+        .openapi({
+            type: "integer",
+            default: 20,
+            description: "Number of items per page"
+        }),
+    page: z.coerce
+        .number<string>()
+        .int()
+        .positive()
+        .optional()
+        .catch(1)
+        .default(1)
+        .openapi({
+            type: "integer",
+            default: 1,
+            description: "Page number to retrieve"
+        }),
+    query: z.string().optional(),
+    sort_by: z
+        .enum(["name", "createdAt"])
+        .optional()
+        .catch(undefined)
+        .openapi({
+            type: "string",
+            enum: ["name", "createdAt"],
+            description: "Field to sort by"
+        }),
+    order: z
+        .enum(["asc", "desc"])
+        .optional()
+        .default("asc")
+        .catch("asc")
+        .openapi({
+            type: "string",
+            enum: ["asc", "desc"],
+            default: "asc",
+            description: "Sort order"
+        })
+});
+
+export type AdminOrgRow = {
+    orgId: string;
+    name: string;
+    subnet: string | null;
+    utilitySubnet: string | null;
+    createdAt: string | null;
+    userCount: number;
+    siteCount: number;
+    resourceCount: number;
+    owner: {
+        userId: string;
+        username: string;
+    } | null;
+};
+
+export type AdminListOrgsResponse = PaginatedResponse<{
+    orgs: AdminOrgRow[];
+}>;
+
+const AdminListOrgsResponseDataSchema = z.object({
+    orgs: z.array(
+        z.object({
+            orgId: z.string(),
+            name: z.string(),
+            subnet: z.string().nullable(),
+            createdAt: z.string().nullable(),
+            userCount: z.number(),
+            siteCount: z.number(),
+            resourceCount: z.number()
+        })
+    ),
+    pagination: z.object({
+        total: z.number(),
+        page: z.number(),
+        pageSize: z.number()
+    })
+});
+
+registry.registerPath({
+    method: "get",
+    path: "/admin/orgs",
+    description:
+        "List all organizations in the system with usage counts (server admin).",
+    tags: [OpenAPITags.Org],
+    request: {
+        query: adminListOrgsSchema
+    },
+    responses: {
+        200: {
+            description: "Successful response",
+            content: {
+                "application/json": {
+                    schema: createApiResponseSchema(
+                        AdminListOrgsResponseDataSchema
+                    )
+                }
+            }
+        }
+    }
+});
+
+export async function adminListOrgs(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedQuery = adminListOrgsSchema.safeParse(req.query);
+        if (!parsedQuery.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedQuery.error)
+                )
+            );
+        }
+
+        const { pageSize, page, query, sort_by, order } = parsedQuery.data;
+
+        let conditions: (SQL<unknown> | undefined)[] = [];
+        if (query) {
+            const q = "%" + query.toLowerCase() + "%";
+            conditions.push(
+                or(
+                    like(sql`LOWER(${orgs.name})`, q),
+                    like(sql`LOWER(${orgs.orgId})`, q),
+                    like(sql`LOWER(${orgs.subnet})`, q)
+                )
+            );
+        }
+
+        const sortColumns = {
+            name: orgs.name,
+            createdAt: orgs.createdAt
+        } as const;
+
+        const orderBy = sort_by
+            ? order === "asc"
+                ? asc(sortColumns[sort_by])
+                : desc(sortColumns[sort_by])
+            : asc(orgs.name);
+
+        // Drizzle renders bare column references in the select list without their
+        // table prefix, which would make a correlated subquery compare a column to
+        // itself, so the outer `orgs` side is qualified explicitly.
+        const orgIdRef = sql`${sql.identifier("orgs")}.${sql.identifier("orgId")}`;
+
+        const [countRows, rows] = await Promise.all([
+            db
+                .select({ count: sql<number>`count(*)` })
+                .from(orgs)
+                .where(and(...conditions)),
+            db
+                .selectDistinct({
+                    orgId: orgs.orgId,
+                    name: orgs.name,
+                    subnet: orgs.subnet,
+                    utilitySubnet: orgs.utilitySubnet,
+                    createdAt: orgs.createdAt,
+                    userCount: sql<number>`(
+                        SELECT COUNT(*)
+                        FROM ${userOrgs}
+                        WHERE ${userOrgs.orgId} = ${orgIdRef}
+                    )`.as("userCount"),
+                    siteCount: sql<number>`(
+                        SELECT COUNT(*)
+                        FROM ${sites}
+                        WHERE ${sites.orgId} = ${orgIdRef}
+                    )`.as("siteCount"),
+                    resourceCount: sql<number>`(
+                        SELECT COUNT(*)
+                        FROM ${resources}
+                        WHERE ${resources.orgId} = ${orgIdRef}
+                    )`.as("resourceCount"),
+                    owner: {
+                        userId: users.userId,
+                        username: users.username
+                    }
+                })
+                .from(orgs)
+                .where(and(...conditions, eq(userOrgs.isOwner, true)))
+                .leftJoin(userOrgs, eq(userOrgs.orgId, orgs.orgId))
+                .leftJoin(users, eq(userOrgs.userId, users.userId))
+                .limit(pageSize)
+                .offset(pageSize * (page - 1))
+                .orderBy(orderBy)
+        ]);
+
+        const totalCount = Number(countRows[0]?.count ?? 0);
+
+        return response<AdminListOrgsResponse>(res, {
+            data: {
+                orgs: rows.map((row) => ({
+                    ...row,
+                    userCount: Number(row.userCount ?? 0),
+                    siteCount: Number(row.siteCount ?? 0),
+                    resourceCount: Number(row.resourceCount ?? 0)
+                })),
+                pagination: {
+                    total: totalCount,
+                    page,
+                    pageSize
+                }
+            },
+            success: true,
+            error: false,
+            message: "Organizations retrieved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "An error occurred..."
+            )
+        );
+    }
+}

server/routers/org/index.ts

@@ -9,3 +9,5 @@ export * from "./listOrgs";
 export * from "./pickOrgDefaults";
 export * from "./checkOrgUserAccess";
 export * from "./resetOrgBandwidth";
+export * from "./adminListOrgs";
+export * from "./adminDeleteOrg";

server/routers/ws/ws.ts

@@ -353,10 +353,7 @@ const setupConnection = async (
 
             const handler = messageHandlers[message.type];
             if (!handler) {
-                logger.debug(
+                throw new Error(`Unsupported message type: ${message.type}`);
-                    `No handler found for message type: ${message.type}`
-                );
-                return;
             }
 
             const response = await handler({

server/setup/scriptsPg/1.16.0.ts

@@ -4,7 +4,7 @@ import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { encrypt } from "@server/lib/crypto";
 import { generateCA } from "@server/lib/sshCA";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 const version = "1.16.0";
 

server/setup/scriptsPg/1.19.0.ts

@@ -2,7 +2,7 @@ import { db } from "@server/db/pg/driver";
 import { APP_PATH, __DIRNAME } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path, { join } from "path";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsPg/1.21.0.ts

@@ -2,7 +2,7 @@ import { db } from "@server/db/pg/driver";
 import { APP_PATH } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsPg/1.22.0.ts

@@ -3,7 +3,7 @@ import { db } from "@server/db/pg/driver";
 import { APP_PATH } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";
@@ -454,14 +454,14 @@ export default async function migration() {
             throw new Error(fromZodError(parsedConfig.error).toString());
         }
 
-        traefikConfig.experimental.plugins.badger.version = "v1.7.0";
+        traefikConfig.experimental.plugins.badger.version = "v1.6.1";
 
         const updatedTraefikYaml = yaml.dump(traefikConfig);
 
         fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
 
         console.log(
-            "Updated the version of Badger in your Traefik configuration to v1.7.0"
+            "Updated the version of Badger in your Traefik configuration to v1.6.1"
         );
     } catch (e) {
         console.log(

server/setup/scriptsPg/1.6.0.ts

@@ -2,7 +2,7 @@ import { db } from "@server/db/pg/driver";
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 const version = "1.6.0";
 

server/setup/scriptsSqlite/1.0.0-beta10.ts

@@ -1,6 +1,6 @@
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 export default async function migration() {
     console.log("Running setup script 1.0.0-beta.10...");

server/setup/scriptsSqlite/1.0.0-beta12.ts

@@ -2,7 +2,7 @@ import { db } from "../../db/sqlite";
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 export default async function migration() {
     console.log("Running setup script 1.0.0-beta.12...");

server/setup/scriptsSqlite/1.0.0-beta15.ts

@@ -1,7 +1,7 @@
 import { db } from "../../db/sqlite";
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import { sql } from "drizzle-orm";
 import { domains, orgDomains, resources } from "@server/db";
 

server/setup/scriptsSqlite/1.0.0-beta2.ts

@@ -1,6 +1,6 @@
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 export default async function migration() {
     console.log("Running setup script 1.0.0-beta.2...");

server/setup/scriptsSqlite/1.0.0-beta3.ts

@@ -1,6 +1,6 @@
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 export default async function migration() {
     console.log("Running setup script 1.0.0-beta.3...");

server/setup/scriptsSqlite/1.0.0-beta5.ts

@@ -1,6 +1,6 @@
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import { z } from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsSqlite/1.0.0-beta6.ts

@@ -1,6 +1,6 @@
 import { configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 export default async function migration() {
     console.log("Running setup script 1.0.0-beta.6...");

server/setup/scriptsSqlite/1.0.0-beta9.ts

@@ -12,7 +12,7 @@ import {
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { eq, sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import { z } from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsSqlite/1.0.0.ts

@@ -1,6 +1,6 @@
 import { APP_PATH } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import { z } from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsSqlite/1.16.0.ts

@@ -4,7 +4,7 @@ import { generateCA } from "@server/lib/sshCA";
 import Database from "better-sqlite3";
 import fs from "fs";
 import path from "path";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 const version = "1.16.0";
 

server/setup/scriptsSqlite/1.19.0.ts

@@ -3,7 +3,7 @@ import Database from "better-sqlite3";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path, { join } from "path";
 
 const version = "1.19.0";

server/setup/scriptsSqlite/1.2.0.ts

@@ -2,7 +2,7 @@ import { db } from "../../db/sqlite";
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 import { sql } from "drizzle-orm";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import { z } from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsSqlite/1.21.0.ts

@@ -1,7 +1,7 @@
 import { APP_PATH } from "@server/lib/consts";
 import Database from "better-sqlite3";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";

server/setup/scriptsSqlite/1.22.0.ts

@@ -2,7 +2,7 @@ import { build } from "@server/build";
 import { APP_PATH } from "@server/lib/consts";
 import Database from "better-sqlite3";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 import z from "zod";
 import { fromZodError } from "zod-validation-error";
@@ -459,14 +459,14 @@ export default async function migration() {
             throw new Error(fromZodError(parsedConfig.error).toString());
         }
 
-        traefikConfig.experimental.plugins.badger.version = "v1.7.0";
+        traefikConfig.experimental.plugins.badger.version = "v1.6.1";
 
         const updatedTraefikYaml = yaml.dump(traefikConfig);
 
         fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
 
         console.log(
-            "Updated the version of Badger in your Traefik configuration to v1.7.0"
+            "Updated the version of Badger in your Traefik configuration to v1.6.1"
         );
     } catch (e) {
         console.log(

server/setup/scriptsSqlite/1.3.0.ts

@@ -1,7 +1,7 @@
 import Database from "better-sqlite3";
 import path from "path";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import { encodeBase32LowerCaseNoPadding } from "@oslojs/encoding";
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 

server/setup/scriptsSqlite/1.5.0.ts

@@ -2,7 +2,7 @@ import Database from "better-sqlite3";
 import path from "path";
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 
 const version = "1.5.0";
 const location = path.join(APP_PATH, "db", "db.sqlite");

server/setup/scriptsSqlite/1.6.0.ts

@@ -1,7 +1,7 @@
 import { APP_PATH, configFilePath1, configFilePath2 } from "@server/lib/consts";
 import Database from "better-sqlite3";
 import fs from "fs";
-import * as yaml from "js-yaml";
+import yaml from "js-yaml";
 import path from "path";
 
 const version = "1.6.0";

src/app/[orgId]/keys/page.tsx

@@ -76,11 +76,6 @@ export default async function KeysPage(props: KeysPageProps) {
         redirect("/");
     }
 
-    const env = pullEnv();
-    if (env.flags.disableVirtualApiKeysUi) {
-        redirect(`/${orgId}`);
-    }
-
     let keysData: ListMyVirtualApiKeysResponse | null = null;
     try {
         const res = await internal.get<
@@ -95,6 +90,7 @@ export default async function KeysPage(props: KeysPageProps) {
         redirect(`/${orgId}`);
     }
 
+    const env = pullEnv();
     const primaryOrg = orgs.find((o) => o.orgId === orgId)?.isPrimaryOrg;
     const isAdminOrOwner = Boolean(overview?.isAdmin || overview?.isOwner);
 
@@ -110,7 +106,6 @@ export default async function KeysPage(props: KeysPageProps) {
                 showSidebar={false}
                 launcherMode
                 showViewAsAdmin={isAdminOrOwner}
-                env={env}
             >
                 <UserVirtualApiKeys orgId={orgId} initialData={keysData} />
             </Layout>

src/app/[orgId]/page.tsx

@@ -83,7 +83,6 @@ export default async function OrgPage(props: OrgPageProps) {
                 showSidebar={false}
                 launcherMode
                 showViewAsAdmin={isAdminOrOwner}
-                env={env}
             >
                 {overview && launcherData ? (
                     <ResourceLauncher

src/app/[orgId]/settings/(private)/idp/[idpId]/general/page.tsx

@@ -46,7 +46,6 @@ import { AxiosResponse } from "axios";
 import { ListRolesResponse } from "@server/routers/role";
 import AutoProvisionConfigWidget from "@app/components/AutoProvisionConfigWidget";
 import IdpAutoProvisionUsersDescription from "@app/components/IdpAutoProvisionUsersDescription";
-import IdpIdentifierChangeDialog from "@app/components/IdpIdentifierChangeDialog";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import {
@@ -76,12 +75,6 @@ export default function GeneralPage() {
     >([createMappingBuilderRule()]);
     const [rawRoleExpression, setRawRoleExpression] = useState("");
     const [variant, setVariant] = useState<"oidc" | "google" | "azure">("oidc");
-    const [originalIdentifierPath, setOriginalIdentifierPath] = useState("");
-    const [identifierConfirmOpen, setIdentifierConfirmOpen] = useState(false);
-    const [pendingPayload, setPendingPayload] = useState<Record<
-        string,
-        unknown
-    > | null>(null);
 
     const dashboardRedirectUrl = `${env.app.dashboardUrl}/auth/idp/${idpId}/oidc/callback`;
     const [redirectUrl, setRedirectUrl] = useState(
@@ -191,9 +184,6 @@ export default function GeneralPage() {
                     const data = res.data.data;
                     const roleMapping = data.idpOrg.roleMapping;
                     const idpVariant = data.idpOidcConfig?.variant || "oidc";
-                    setOriginalIdentifierPath(
-                        data.idpOidcConfig?.identifierPath ?? "sub"
-                    );
                     setRedirectUrl(res.data.data.redirectUrl);
 
                     // Set the variant
@@ -388,56 +378,18 @@ export default function GeneralPage() {
                 };
             }
 
-            const nextIdentifierPath =
+            const res = await api.post(
-                variant === "oidc"
+                `/org/${orgId}/idp/${idpId}/oidc`,
-                    ? (data as OidcFormValues).identifierPath
+                payload
-                    : undefined;
+            );
-
-            if (
-                typeof nextIdentifierPath === "string" &&
-                nextIdentifierPath !== originalIdentifierPath
-            ) {
-                setPendingPayload(payload);
-                setIdentifierConfirmOpen(true);
-                return;
-            }
-
-            await persistIdp(payload);
-        } catch (e) {
-            toast({
-                title: t("error"),
-                description: formatAxiosError(e),
-                variant: "destructive"
-            });
-        } finally {
-            setLoading(false);
-        }
-    }
-
-    async function persistIdp(payload: Record<string, unknown>) {
-        const res = await api.post(`/org/${orgId}/idp/${idpId}/oidc`, payload);
 
             if (res.status === 200) {
-            if (typeof payload.identifierPath === "string") {
-                setOriginalIdentifierPath(payload.identifierPath);
-            }
                 toast({
                     title: t("success"),
                     description: t("idpUpdatedDescription")
                 });
                 router.refresh();
             }
-    }
-
-    async function confirmIdentifierChange() {
-        if (!pendingPayload) {
-            return;
-        }
-
-        setLoading(true);
-        try {
-            await persistIdp(pendingPayload);
-            setPendingPayload(null);
         } catch (e) {
             toast({
                 title: t("error"),
@@ -455,16 +407,6 @@ export default function GeneralPage() {
 
     return (
         <>
-            <IdpIdentifierChangeDialog
-                open={identifierConfirmOpen}
-                setOpen={(open) => {
-                    setIdentifierConfirmOpen(open);
-                    if (!open) {
-                        setPendingPayload(null);
-                    }
-                }}
-                onConfirm={confirmIdentifierChange}
-            />
             <SettingsContainer>
                 <SettingsSection>
                     <SettingsSectionHeader>

src/app/[orgId]/settings/access/users/create/page.tsx

@@ -13,12 +13,7 @@ import { StrategyOption, StrategySelect } from "@app/components/StrategySelect";
 import HeaderTitle from "@app/components/SettingsSectionTitle";
 import { Button } from "@app/components/ui/button";
 import { useParams, useRouter } from "next/navigation";
-import {
+import { useActionState, useRef, useState } from "react";
-    useActionState,
-    useRef,
-    useState,
-    startTransition
-} from "react";
 import {
     Form,
     FormControl,
@@ -523,12 +518,9 @@ export default function Page() {
                                         <SettingsSectionForm>
                                             <Form {...internalForm}>
                                                 <form
-                                                    onSubmit={(e) => {
+                                                    action={
-                                                        e.preventDefault();
+                                                        submitInternalAction
-                                                        startTransition(() => {
+                                                    }
-                                                            submitInternalAction();
-                                                        });
-                                                    }}
                                                     className="space-y-4"
                                                     id="create-user-form"
                                                 >

src/app/[orgId]/settings/general/page.tsx

@@ -3,12 +3,7 @@ import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Button } from "@app/components/ui/button";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { toast } from "@app/hooks/useToast";
-import {
+import { useState, useTransition, useActionState } from "react";
-    useState,
-    useTransition,
-    useActionState,
-    startTransition
-} from "react";
 import {
     Form,
     FormControl,
@@ -248,12 +243,7 @@ function GeneralSectionForm({ org }: SectionFormProps) {
                 <SettingsSectionForm>
                     <Form {...form}>
                         <form
-                            onSubmit={(e) => {
+                            action={formAction}
-                                e.preventDefault();
-                                startTransition(() => {
-                                    formAction();
-                                });
-                            }}
                             className="grid gap-4"
                             id="org-general-settings-form"
                         >

src/app/[orgId]/settings/general/security/page.tsx

@@ -3,13 +3,7 @@ import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Button } from "@app/components/ui/button";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { toast } from "@app/hooks/useToast";
-import {
+import { useState, useRef, useActionState, type ComponentRef } from "react";
-    useState,
-    useRef,
-    useActionState,
-    startTransition,
-    type ComponentRef
-} from "react";
 import {
     Form,
     FormControl,
@@ -123,7 +117,6 @@ export default function SecurityPage() {
 }
 
 function LogRetentionSectionForm({ org }: SectionFormProps) {
-    const { updateOrg } = useOrgContext();
     const form = useForm({
         resolver: zodResolver(
             SecurityFormSchema.pick({
@@ -180,11 +173,6 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
             // Update organization
             await api.post(`/org/${org.orgId}`, reqData);
 
-            // Update the org context immediately so the dropdowns reflect
-            // the saved values without waiting on a re-fetch that could
-            // race a lagging read replica
-            updateOrg(reqData);
-
             toast({
                 title: t("orgUpdated"),
                 description: t("orgUpdatedDescription")
@@ -211,12 +199,7 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
                 <SettingsSectionForm>
                     <Form {...form}>
                         <form
-                            onSubmit={(e) => {
+                            action={formAction}
-                                e.preventDefault();
-                                startTransition(() => {
-                                    formAction();
-                                });
-                            }}
                             className="grid gap-4"
                             id="org-log-retention-settings-form"
                         >
@@ -844,7 +827,6 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
 
 function SecuritySettingsSectionForm({ org }: SectionFormProps) {
     const router = useRouter();
-    const { updateOrg } = useOrgContext();
     const form = useForm({
         resolver: zodResolver(
             SecurityFormSchema.pick({
@@ -917,11 +899,6 @@ function SecuritySettingsSectionForm({ org }: SectionFormProps) {
             // Update organization
             await api.post(`/org/${org.orgId}`, reqData);
 
-            // Update the org context immediately so the dropdowns reflect
-            // the saved values without waiting on a re-fetch that could
-            // race a lagging read replica
-            updateOrg(reqData);
-
             toast({
                 title: t("orgUpdated"),
                 description: t("orgUpdatedDescription")
@@ -965,12 +942,7 @@ function SecuritySettingsSectionForm({ org }: SectionFormProps) {
                     <SettingsSectionForm>
                         <Form {...form}>
                             <form
-                                onSubmit={(e) => {
+                                action={formAction}
-                                    e.preventDefault();
-                                    startTransition(() => {
-                                        formAction();
-                                    });
-                                }}
                                 ref={formRef}
                                 id="security-settings-section-form"
                                 className="space-y-4"

src/app/[orgId]/settings/logs/access/page.tsx

@@ -12,7 +12,6 @@ import { DateTimeValue } from "@app/components/DateTimePicker";
 import { ArrowUpRight, Key, User } from "lucide-react";
 import Link from "next/link";
 import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
-import { ColumnMultiFilterButton } from "@app/components/ColumnMultiFilterButton";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { build } from "@server/build";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
@@ -27,7 +26,6 @@ import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import { logQueries } from "@app/lib/queries";
 import { useQuery } from "@tanstack/react-query";
 import type { QueryAccessAuditLogResponse } from "@server/routers/auditLogs/types";
-import { countryCodeToFlagEmoji } from "@app/lib/countryCodeToFlagEmoji";
 
 export default function GeneralPage() {
     const router = useRouter();
@@ -47,14 +45,12 @@ export default function GeneralPage() {
         resourceId?: string;
         location?: string;
         actor?: string;
-        ip?: string[];
     }>({
         action: searchParams.get("action") || undefined,
         type: searchParams.get("type") || undefined,
         resourceId: searchParams.get("resourceId") || undefined,
         location: searchParams.get("location") || undefined,
-        actor: searchParams.get("actor") || undefined,
+        actor: searchParams.get("actor") || undefined
-        ip: searchParams.getAll("ip") || undefined
     });
 
     const [currentPage, setCurrentPage] = useState<number>(0);
@@ -180,7 +176,7 @@ export default function GeneralPage() {
 
     const handleFilterChange = (
         filterType: keyof typeof filters,
-        value: string | string[] | undefined
+        value: string | undefined
     ) => {
         const newFilters = { ...filters, [filterType]: value };
         setFilters(newFilters);
@@ -198,13 +194,10 @@ export default function GeneralPage() {
     ) => {
         const params = new URLSearchParams(searchParams);
         Object.entries(newFilters).forEach(([key, value]) => {
-            params.delete(key);
+            if (value) {
-            if (typeof value === "string") {
                 params.set(key, value);
-            } else if (typeof value !== "undefined" && "length" in value) {
+            } else {
-                for (const element of value) {
+                params.delete(key);
-                    params.append(key, element);
-                }
             }
         });
         router.replace(`?${params.toString()}`, { scroll: false });
@@ -212,7 +205,6 @@ export default function GeneralPage() {
 
     const exportData = async () => {
         try {
-            const { ip, ...restFilters } = filters;
             const params: any = {
                 timeStart: dateRange.startDate?.date
                     ? new Date(dateRange.startDate.date).toISOString()
@@ -220,20 +212,13 @@ export default function GeneralPage() {
                 timeEnd: dateRange.endDate?.date
                     ? new Date(dateRange.endDate.date).toISOString()
                     : undefined,
-                ...restFilters
+                ...filters
             };
 
-            // axios serializes arrays as `ip[]=…`, which express's query
+            const response = await api.get(`/org/${orgId}/logs/access/export`, {
-            // parser does not read back as `ip`, so pass them in the URL
-            const sp = new URLSearchParams((ip ?? []).map((ip) => ["ip", ip]));
-
-            const response = await api.get(
-                `/org/${orgId}/logs/access/export?${sp.toString()}`,
-                {
                 responseType: "blob",
                 params
-                }
+            });
-            );
 
             const url = window.URL.createObjectURL(new Blob([response.data]));
             const link = document.createElement("a");
@@ -312,24 +297,7 @@ export default function GeneralPage() {
         },
         {
             accessorKey: "ip",
-            header: () => (
+            header: () => <span className="px-2">{t("ip")}</span>,
-                <span className="px-2">
-                    <ColumnMultiFilterButton
-                        options={(filters.ip ?? []).map((ip) => ({
-                            label: ip,
-                            value: ip
-                        }))}
-                        label={t("ip")}
-                        allowArbitraryValues
-                        searchPlaceholder={t("ipFilterSearchPlaceholder")}
-                        emptyMessage={t("ipFilterEmptyMessage")}
-                        selectedValues={filters.ip ?? []}
-                        onSelectedValuesChange={(value) =>
-                            handleFilterChange("ip", value)
-                        }
-                    />
-                </span>
-            ),
             cell: ({ row }) => {
                 return row.original.ip ? (
                     row.original.ip
@@ -347,7 +315,7 @@ export default function GeneralPage() {
                             options={filterAttributes.locations.map(
                                 (location) => ({
                                     value: location,
-                                    label: `${location} ${countryCodeToFlagEmoji(location)}`
+                                    label: location
                                 })
                             )}
                             label={t("location")}
@@ -366,8 +334,7 @@ export default function GeneralPage() {
                     <span className="flex items-center gap-1">
                         {row.original.location ? (
                             <span className="text-muted-foreground text-xs">
-                                {row.original.location}{" "}
+                                {row.original.location}
-                                {countryCodeToFlagEmoji(row.original.location)}
                             </span>
                         ) : (
                             <span className="text-muted-foreground text-xs">

src/app/[orgId]/settings/logs/ai/page.tsx

@@ -276,9 +276,7 @@ export default function AiSessionLogsPage() {
             cell: ({ row }) => {
                 return (
                     <div className="whitespace-nowrap">
-                        {new Date(
+                        {new Date(row.original.createdAt).toLocaleString()}
-                            row.original.createdAt * 1000
-                        ).toLocaleString()}
                     </div>
                 );
             }
@@ -717,8 +715,8 @@ function generateSampleAiSessionLogs(): QueryAiSessionLogResponse["log"] {
         null
     ];
 
-    const now = Math.floor(Date.now() / 1000);
+    const now = Date.now();
-    const sevenDaysAgoMs = now - 7 * 24 * 60 * 60;
+    const sevenDaysAgoMs = now - 7 * 24 * 60 * 60 * 1000;
 
     return Array.from({ length: 10 }, (_, i) => {
         const provider =

src/app/[orgId]/settings/logs/request/page.tsx

@@ -23,8 +23,6 @@ import { useMemo, useState, useTransition } from "react";
 import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
 import type { QueryRequestAuditLogResponse } from "@server/routers/auditLogs/types";
 import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
-import { countryCodeToFlagEmoji } from "@app/lib/countryCodeToFlagEmoji";
-import { ColumnMultiFilterButton } from "@app/components/ColumnMultiFilterButton";
 
 export default function GeneralPage() {
     const router = useRouter();
@@ -49,7 +47,6 @@ export default function GeneralPage() {
         method?: string;
         reason?: string;
         path?: string;
-        ip?: string[];
     }>({
         action: searchParams.get("action") || undefined,
         host: searchParams.get("host") || undefined,
@@ -58,8 +55,7 @@ export default function GeneralPage() {
         actor: searchParams.get("actor") || undefined,
         method: searchParams.get("method") || undefined,
         reason: searchParams.get("reason") || undefined,
-        path: searchParams.get("path") || undefined,
+        path: searchParams.get("path") || undefined
-        ip: searchParams.getAll("ip") || undefined
     });
 
     const getDefaultDateRange = () => {
@@ -183,7 +179,7 @@ export default function GeneralPage() {
 
     const handleFilterChange = (
         filterType: keyof typeof filters,
-        value: string | string[] | undefined
+        value: string | undefined
     ) => {
         const newFilters = { ...filters, [filterType]: value };
         setFilters(newFilters);
@@ -201,13 +197,10 @@ export default function GeneralPage() {
     ) => {
         const params = new URLSearchParams(searchParams);
         Object.entries(newFilters).forEach(([key, value]) => {
-            params.delete(key);
+            if (value) {
-            if (typeof value === "string") {
                 params.set(key, value);
-            } else if (typeof value !== "undefined" && "length" in value) {
+            } else {
-                for (const element of value) {
+                params.delete(key);
-                    params.append(key, element);
-                }
             }
         });
         router.replace(`?${params.toString()}`, { scroll: false });
@@ -216,7 +209,6 @@ export default function GeneralPage() {
     const exportData = async () => {
         try {
             // Prepare query params for export
-            const { ip, ...restFilters } = filters;
             const params: any = {
                 timeStart: dateRange.startDate?.date
                     ? new Date(dateRange.startDate.date).toISOString()
@@ -224,15 +216,11 @@ export default function GeneralPage() {
                 timeEnd: dateRange.endDate?.date
                     ? new Date(dateRange.endDate.date).toISOString()
                     : undefined,
-                ...restFilters
+                ...filters
             };
 
-            // axios serializes arrays as `ip[]=…`, which express's query
-            // parser does not read back as `ip`, so pass them in the URL
-            const sp = new URLSearchParams((ip ?? []).map((ip) => ["ip", ip]));
-
             const response = await api.get(
-                `/org/${orgId}/logs/request/export?${sp.toString()}`,
+                `/org/${orgId}/logs/request/export`,
                 {
                     responseType: "blob",
                     params
@@ -363,24 +351,7 @@ export default function GeneralPage() {
         },
         {
             accessorKey: "ip",
-            header: ({ column }) => (
+            header: ({ column }) => <span className="px-2">{t("ip")}</span>,
-                <span className="px-2">
-                    <ColumnMultiFilterButton
-                        options={(filters.ip ?? []).map((ip) => ({
-                            label: ip,
-                            value: ip
-                        }))}
-                        label={t("ip")}
-                        allowArbitraryValues
-                        searchPlaceholder={t("ipFilterSearchPlaceholder")}
-                        emptyMessage={t("ipFilterEmptyMessage")}
-                        selectedValues={filters.ip ?? []}
-                        onSelectedValuesChange={(value) =>
-                            handleFilterChange("ip", value)
-                        }
-                    />
-                </span>
-            ),
             cell: ({ row }) => {
                 return row.original.ip ? (
                     row.original.ip
@@ -398,7 +369,7 @@ export default function GeneralPage() {
                             options={filterAttributes.locations.map(
                                 (location) => ({
                                     value: location,
-                                    label: `${location} ${countryCodeToFlagEmoji(location)}`
+                                    label: location
                                 })
                             )}
                             selectedValue={filters.location}
@@ -418,8 +389,7 @@ export default function GeneralPage() {
                     <span className="flex items-center gap-1">
                         {row.original.location ? (
                             <span className="text-muted-foreground text-xs">
-                                {row.original.location}{" "}
+                                {row.original.location}
-                                {countryCodeToFlagEmoji(row.original.location)}
                             </span>
                         ) : (
                             <span className="text-muted-foreground text-xs">