Bump node in the docker-dependencies group across 1 directory

Bumps the docker-dependencies group with 1 update in the / directory: node.


Updates `node` from 24.18.1-alpine to 26.8.1-alpine

---
updated-dependencies:
- dependency-name: node
  dependency-version: 26.8.1-alpine
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: docker-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/cicd.yml

@@ -77,7 +77,7 @@ jobs:
                   fi
 
             - name: Log in to Docker Hub
-              uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
               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@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
               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@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
               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@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
+              uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
               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@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
         with:
           days-before-stale: 14
           days-before-close: 14

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:24.18.1-alpine
+FROM node:26.8.1-alpine
 
 WORKDIR /app
 

README.md

@@ -99,6 +99,19 @@ 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.

package.json

@@ -94,12 +94,12 @@
         "input-otp": "1.4.2",
         "ioredis": "5.11.0",
         "jmespath": "0.16.0",
-        "js-yaml": "4.3.0",
+        "js-yaml": "4.3.1",
         "jsonwebtoken": "9.0.3",
         "lucide-react": "1.17.0",
         "maxmind": "5.0.6",
         "moment": "2.30.1",
-        "next": "16.2.11",
+        "next": "16.3.1",
         "next-intl": "4.13.0",
         "next-themes": "0.4.6",
         "nextjs-toploader": "3.9.17",
@@ -139,7 +139,7 @@
     "devDependencies": {
         "@dotenvx/dotenvx": "1.69.1",
         "@esbuild-plugins/tsconfig-paths": "0.1.2",
-        "@react-email/ui": "^6.5.0",
+        "@react-email/ui": "^6.9.2",
         "@tailwindcss/postcss": "4.3.0",
         "@tanstack/react-query-devtools": "5.100.14",
         "@types/better-sqlite3": "7.6.13",
@@ -170,7 +170,7 @@
         "esbuild-node-externals": "1.22.0",
         "eslint": "10.4.0",
         "eslint-config-next": "16.2.6",
-        "postcss": "8.5.15",
+        "postcss": "8.5.23",
         "prettier": "3.8.3",
         "react-email": "6.5.0",
         "tailwindcss": "4.3.0",
@@ -182,6 +182,6 @@
     "overrides": {
         "esbuild": "0.28.0",
         "dompurify": "3.4.0",
-        "postcss": "8.5.15"
+        "postcss": "8.5.23"
     }
 }

server/db/pg/schema/schema.ts

@@ -262,16 +262,20 @@ export const resourceAiModels = pgTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = pgTable("labels", {
+export const labels = pgTable(
-    labelId: serial("labelId").primaryKey(),
+    "labels",
-    name: varchar("name").notNull(),
+    {
-    color: varchar("color").notNull(),
+        labelId: serial("labelId").primaryKey(),
-    orgId: varchar("orgId")
+        name: varchar("name").notNull(),
-        .references(() => orgs.orgId, {
+        color: varchar("color").notNull(),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull()
+                onDelete: "cascade"
-});
+            })
+            .notNull()
+    },
+    (t) => [index("idx_labels_orgid").on(t.orgId)]
+);
 
 export const launcherViews = pgTable("launcherViews", {
     viewId: serial("viewId").primaryKey(),
@@ -693,15 +697,19 @@ export const twoFactorBackupCodes = pgTable("twoFactorBackupCodes", {
     codeHash: varchar("codeHash").notNull()
 });
 
-export const sessions = pgTable("session", {
+export const sessions = pgTable(
-    sessionId: varchar("id").primaryKey(),
+    "session",
-    userId: varchar("userId")
+    {
-        .notNull()
+        sessionId: varchar("id").primaryKey(),
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: varchar("userId")
-    expiresAt: bigint("expiresAt", { mode: "number" }).notNull(),
+            .notNull()
-    issuedAt: bigint("issuedAt", { mode: "number" }),
+            .references(() => users.userId, { onDelete: "cascade" }),
-    deviceAuthUsed: boolean("deviceAuthUsed").notNull().default(false)
+        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(),
@@ -711,19 +719,26 @@ export const newtSessions = pgTable("newtSession", {
     expiresAt: bigint("expiresAt", { mode: "number" }).notNull()
 });
 
-export const userOrgs = pgTable("userOrgs", {
+export const userOrgs = pgTable(
-    userId: varchar("userId")
+    "userOrgs",
-        .notNull()
+    {
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: varchar("userId")
-    orgId: varchar("orgId")
+            .notNull()
-        .references(() => orgs.orgId, {
+            .references(() => users.userId, { onDelete: "cascade" }),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isOwner: boolean("isOwner").notNull().default(false),
+            })
-    autoProvisioned: boolean("autoProvisioned").default(false),
+            .notNull(),
-    pamUsername: varchar("pamUsername") // cleaned username for ssh and such
+        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(),
@@ -751,22 +766,26 @@ export const actions = pgTable("actions", {
     description: varchar("description")
 });
 
-export const roles = pgTable("roles", {
+export const roles = pgTable(
-    roleId: serial("roleId").primaryKey(),
+    "roles",
-    orgId: varchar("orgId")
+    {
-        .references(() => orgs.orgId, {
+        roleId: serial("roleId").primaryKey(),
-            onDelete: "cascade"
+        orgId: varchar("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isAdmin: boolean("isAdmin"),
+            })
-    name: varchar("name").notNull(),
+            .notNull(),
-    description: varchar("description"),
+        isAdmin: boolean("isAdmin"),
-    requireDeviceApproval: boolean("requireDeviceApproval").default(false),
+        name: varchar("name").notNull(),
-    sshSudoMode: varchar("sshSudoMode", { length: 32 }).default("full"), // "none" | "full" | "commands"
+        description: varchar("description"),
-    sshSudoCommands: text("sshSudoCommands").default("[]"),
+        requireDeviceApproval: boolean("requireDeviceApproval").default(false),
-    sshCreateHomeDir: boolean("sshCreateHomeDir").default(true),
+        sshSudoMode: varchar("sshSudoMode", { length: 32 }).default("full"), // "none" | "full" | "commands"
-    sshUnixGroups: text("sshUnixGroups").default("[]")
+        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",
@@ -1409,7 +1428,10 @@ export const olms = pgTable(
         }),
         archived: boolean("archived").notNull().default(false)
     },
-    (t) => [index("idx_olms_clientid").on(t.clientId)]
+    (t) => [
+        index("idx_olms_clientid").on(t.clientId),
+        index("idx_olms_userid").on(t.userId)
+    ]
 );
 
 export const currentFingerprint = pgTable("currentFingerprint", {

server/db/sqlite/schema/schema.ts

@@ -99,131 +99,147 @@ export const orgDomains = sqliteTable("orgDomains", {
         .references(() => domains.domainId, { onDelete: "cascade" })
 });
 
-export const sites = sqliteTable("sites", {
+export const sites = sqliteTable(
-    siteId: integer("siteId").primaryKey({ autoIncrement: true }),
+    "sites",
-    orgId: text("orgId")
+    {
-        .references(() => orgs.orgId, {
+        siteId: integer("siteId").primaryKey({ autoIncrement: true }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    niceId: text("niceId").notNull(),
+            })
-    exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
+            .notNull(),
-        onDelete: "set null"
+        niceId: text("niceId").notNull(),
-    }),
+        exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
-    networkId: integer("networkId").references(() => networks.networkId, {
+            onDelete: "set null"
-        onDelete: "set null"
+        }),
-    }),
+        networkId: integer("networkId").references(() => networks.networkId, {
-    name: text("name").notNull(),
+            onDelete: "set null"
-    pubKey: text("pubKey"),
+        }),
-    exitNodeSubnet: text("exitNodeSubnet"),
+        name: text("name").notNull(),
-    megabytesIn: integer("bytesIn").default(0),
+        pubKey: text("pubKey"),
-    megabytesOut: integer("bytesOut").default(0),
+        exitNodeSubnet: text("exitNodeSubnet"),
-    lastBandwidthUpdate: text("lastBandwidthUpdate"),
+        megabytesIn: integer("bytesIn").default(0),
-    type: text("type").notNull(), // "newt" or "wireguard"
+        megabytesOut: integer("bytesOut").default(0),
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
+        lastBandwidthUpdate: text("lastBandwidthUpdate"),
-    lastPing: integer("lastPing"),
+        type: text("type").notNull(), // "newt" or "wireguard"
+        online: integer("online", { mode: "boolean" }).notNull().default(false),
+        lastPing: integer("lastPing"),
 
-    // exit node stuff that is how to connect to the site when it has a wg server
+        // exit node stuff that is how to connect to the site when it has a wg server
-    address: text("address"), // this is the address of the wireguard interface in newt
+        address: text("address"), // this is the address of the wireguard interface in newt
-    endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
+        endpoint: text("endpoint"), // this is how to reach gerbil externally - gets put into the wireguard config
-    localEndpoints: text("localEndpoints"), // JSON encoded list of string ips on the local machine to try to connect to
+        localEndpoints: text("localEndpoints"), // JSON encoded list of string ips on the local machine to try to connect to
-    publicKey: text("publicKey"), // TODO: Fix typo in publicKey
+        publicKey: text("publicKey"), // TODO: Fix typo in publicKey
-    lastHolePunch: integer("lastHolePunch"),
+        lastHolePunch: integer("lastHolePunch"),
-    listenPort: integer("listenPort"),
+        listenPort: integer("listenPort"),
-    dockerSocketEnabled: integer("dockerSocketEnabled", { mode: "boolean" })
+        dockerSocketEnabled: integer("dockerSocketEnabled", { mode: "boolean" })
-        .notNull()
+            .notNull()
-        .default(true),
+            .default(true),
-    autoUpdateEnabled: integer("autoUpdateEnabled", { mode: "boolean" })
+        autoUpdateEnabled: integer("autoUpdateEnabled", { mode: "boolean" })
-        .notNull()
+            .notNull()
-        .default(false),
+            .default(false),
-    autoUpdateOverrideOrg: integer("autoUpdateOverrideOrg", {
+        autoUpdateOverrideOrg: integer("autoUpdateOverrideOrg", {
-        mode: "boolean"
+            mode: "boolean"
-    })
-        .notNull()
-        .default(false),
-    status: text("status").$type<"pending" | "approved">().default("approved")
-});
-
-export const resources = sqliteTable("resources", {
-    resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
-    resourcePolicyId: integer("resourcePolicyId").references(
-        () => resourcePolicies.resourcePolicyId,
-        { onDelete: "set null" }
-    ),
-    defaultResourcePolicyId: integer("defaultResourcePolicyId").references(
-        () => resourcePolicies.resourcePolicyId,
-        {
-            onDelete: "restrict"
-        }
-    ),
-    resourceGuid: text("resourceGuid", { length: 36 })
-        .unique()
-        .notNull()
-        .$defaultFn(() => randomUUID()),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
-            onDelete: "cascade"
         })
-        .notNull(),
+            .notNull()
-    niceId: text("niceId").notNull(),
+            .default(false),
-    name: text("name").notNull(),
+        status: text("status")
-    subdomain: text("subdomain"),
+            .$type<"pending" | "approved">()
-    fullDomain: text("fullDomain"),
+            .default("approved")
-    domainId: text("domainId").references(() => domains.domainId, {
+    },
-        onDelete: "set null"
+    (table) => [
-    }),
+        index("idx_sites_orgId").on(table.orgId)
-    ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
+    ]
-    blockAccess: integer("blockAccess", { mode: "boolean" })
+);
-        .notNull()
+
-        .default(false),
+export const resources = sqliteTable(
-    proxyPort: integer("proxyPort"),
+    "resources",
-    sso: integer("sso", { mode: "boolean" }),
+    {
-    emailWhitelistEnabled: integer("emailWhitelistEnabled", {
+        resourceId: integer("resourceId").primaryKey({ autoIncrement: true }),
-        mode: "boolean"
+        resourcePolicyId: integer("resourcePolicyId").references(
-    }),
+            () => resourcePolicies.resourcePolicyId,
-    applyRules: integer("applyRules", { mode: "boolean" }),
+            { onDelete: "set null" }
-    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
+        ),
-    stickySession: integer("stickySession", { mode: "boolean" })
+        defaultResourcePolicyId: integer("defaultResourcePolicyId").references(
-        .notNull()
+            () => resourcePolicies.resourcePolicyId,
-        .default(false),
+            {
-    tlsServerName: text("tlsServerName"),
+                onDelete: "restrict"
-    setHostHeader: text("setHostHeader"),
+            }
-    enableProxy: integer("enableProxy", { mode: "boolean" }).default(true),
+        ),
-    skipToIdpId: integer("skipToIdpId").references(() => idp.idpId, {
+        resourceGuid: text("resourceGuid", { length: 36 })
-        onDelete: "set null"
+            .unique()
-    }),
+            .notNull()
-    headers: text("headers"), // comma-separated list of headers to add to the request
+            .$defaultFn(() => randomUUID()),
-    proxyProtocol: integer("proxyProtocol", { mode: "boolean" })
+        orgId: text("orgId")
-        .notNull()
+            .references(() => orgs.orgId, {
-        .default(false),
+                onDelete: "cascade"
-    proxyProtocolVersion: integer("proxyProtocolVersion").default(1),
+            })
-    maintenanceModeEnabled: integer("maintenanceModeEnabled", {
+            .notNull(),
-        mode: "boolean"
+        niceId: text("niceId").notNull(),
-    })
+        name: text("name").notNull(),
-        .notNull()
+        subdomain: text("subdomain"),
-        .default(false),
+        fullDomain: text("fullDomain"),
-    maintenanceModeType: text("maintenanceModeType", {
+        domainId: text("domainId").references(() => domains.domainId, {
-        enum: ["forced", "automatic"]
+            onDelete: "set null"
-    }).default("forced"), // "forced" = always show, "automatic" = only when down
+        }),
-    maintenanceTitle: text("maintenanceTitle"),
+        ssl: integer("ssl", { mode: "boolean" }).notNull().default(false),
-    maintenanceMessage: text("maintenanceMessage"),
+        blockAccess: integer("blockAccess", { mode: "boolean" })
-    maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
+            .notNull()
-    postAuthPath: text("postAuthPath"),
+            .default(false),
-    health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
+        proxyPort: integer("proxyPort"),
-    wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
+        sso: integer("sso", { mode: "boolean" }),
-    mode: text("mode")
+        emailWhitelistEnabled: integer("emailWhitelistEnabled", {
-        .default("http")
+            mode: "boolean"
-        .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
+        }),
-        .notNull(), // rdp, ssh, http, vnc, inference
+        applyRules: integer("applyRules", { mode: "boolean" }),
-    pamMode: text("pamMode")
+        enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-        .$type<"passthrough" | "push">()
+        stickySession: integer("stickySession", { mode: "boolean" })
-        .default("passthrough"),
+            .notNull()
-    authDaemonMode: text("authDaemonMode")
+            .default(false),
-        .$type<"site" | "remote" | "native">()
+        tlsServerName: text("tlsServerName"),
-        .default("site"),
+        setHostHeader: text("setHostHeader"),
-    authDaemonPort: integer("authDaemonPort").default(22123),
+        enableProxy: integer("enableProxy", { mode: "boolean" }).default(true),
-    status: text("status").$type<"pending" | "approved">().default("approved")
+        skipToIdpId: integer("skipToIdpId").references(() => idp.idpId, {
-});
+            onDelete: "set null"
+        }),
+        headers: text("headers"), // comma-separated list of headers to add to the request
+        proxyProtocol: integer("proxyProtocol", { mode: "boolean" })
+            .notNull()
+            .default(false),
+        proxyProtocolVersion: integer("proxyProtocolVersion").default(1),
+        maintenanceModeEnabled: integer("maintenanceModeEnabled", {
+            mode: "boolean"
+        })
+            .notNull()
+            .default(false),
+        maintenanceModeType: text("maintenanceModeType", {
+            enum: ["forced", "automatic"]
+        }).default("forced"), // "forced" = always show, "automatic" = only when down
+        maintenanceTitle: text("maintenanceTitle"),
+        maintenanceMessage: text("maintenanceMessage"),
+        maintenanceEstimatedTime: text("maintenanceEstimatedTime"),
+        postAuthPath: text("postAuthPath"),
+        health: text("health").default("unknown"), // "healthy", "unhealthy", "unknown"
+        wildcard: integer("wildcard", { mode: "boolean" }).notNull().default(false),
+        mode: text("mode")
+            .default("http")
+            .$type<"rdp" | "ssh" | "http" | "vnc" | "inference" | "tcp" | "udp">()
+            .notNull(), // rdp, ssh, http, vnc, inference
+        pamMode: text("pamMode")
+            .$type<"passthrough" | "push">()
+            .default("passthrough"),
+        authDaemonMode: text("authDaemonMode")
+            .$type<"site" | "remote" | "native">()
+            .default("site"),
+        authDaemonPort: integer("authDaemonPort").default(22123),
+        status: text("status")
+            .$type<"pending" | "approved">()
+            .default("approved")
+    },
+    (table) => [
+        index("idx_resources_orgId").on(table.orgId)
+    ]
+);
 
 export const resourceAiProviders = sqliteTable(
     "resourceAiProviders",
@@ -260,16 +276,22 @@ export const resourceAiModels = sqliteTable(
     (t) => [primaryKey({ columns: [t.resourceId, t.modelId] })]
 );
 
-export const labels = sqliteTable("labels", {
+export const labels = sqliteTable(
-    labelId: integer("labelId").primaryKey({ autoIncrement: true }),
+    "labels",
-    name: text("name").notNull(),
+    {
-    color: text("color").notNull(),
+        labelId: integer("labelId").primaryKey({ autoIncrement: true }),
-    orgId: text("orgId")
+        name: text("name").notNull(),
-        .references(() => orgs.orgId, {
+        color: text("color").notNull(),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull()
+                onDelete: "cascade"
-});
+            })
+            .notNull()
+    },
+    (table) => [
+        index("idx_labels_orgId").on(table.orgId)
+    ]
+);
 
 export const launcherViews = sqliteTable("launcherViews", {
     viewId: integer("viewId").primaryKey({ autoIncrement: true }),
@@ -366,35 +388,44 @@ export const clientLabels = sqliteTable(
     (t) => [unique("client_label_uniq").on(t.clientId, t.labelId)]
 );
 
-export const targets = sqliteTable("targets", {
+export const targets = sqliteTable(
-    targetId: integer("targetId").primaryKey({ autoIncrement: true }),
+    "targets",
-    resourceId: integer("resourceId").references(() => resources.resourceId, {
+    {
-        onDelete: "cascade"
+        targetId: integer("targetId").primaryKey({ autoIncrement: true }),
-    }),
+        resourceId: integer("resourceId").references(
-    providerId: integer("providerId").references(() => aiProviders.providerId, {
+            () => resources.resourceId,
-        onDelete: "cascade"
+            { onDelete: "cascade" }
-    }),
+        ),
-    siteId: integer("siteId")
+        providerId: integer("providerId").references(
-        .references(() => sites.siteId, {
+            () => aiProviders.providerId,
-            onDelete: "cascade"
+            { onDelete: "cascade" }
-        })
+        ),
-        .notNull(),
+        siteId: integer("siteId")
-    ip: text("ip").notNull(),
+            .references(() => sites.siteId, {
-    method: text("method"),
+                onDelete: "cascade"
-    port: integer("port").notNull(),
+            })
-    internalPort: integer("internalPort"),
+            .notNull(),
-    enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
+        ip: text("ip").notNull(),
-    path: text("path"),
+        method: text("method"),
-    pathMatchType: text("pathMatchType"), // exact, prefix, regex
+        port: integer("port").notNull(),
-    rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
+        internalPort: integer("internalPort"),
-    rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
+        enabled: integer("enabled", { mode: "boolean" }).notNull().default(true),
-    priority: integer("priority").notNull().default(100),
+        path: text("path"),
-    mode: text("mode")
+        pathMatchType: text("pathMatchType"), // exact, prefix, regex
-        .$type<"http" | "tcp" | "udp" | "ssh" | "rdp" | "vnc">()
+        rewritePath: text("rewritePath"), // if set, rewrites the path to this value before sending to the target
-        .notNull()
+        rewritePathType: text("rewritePathType"), // exact, prefix, regex, stripPrefix
-        .default("http"),
+        priority: integer("priority").notNull().default(100),
-    authToken: text("authToken")
+        mode: text("mode")
-});
+            .$type<"http" | "tcp" | "udp" | "ssh" | "rdp" | "vnc">()
+            .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({
@@ -663,50 +694,63 @@ export const setupTokens = sqliteTable("setupTokens", {
     dateUsed: text("dateUsed")
 });
 
-export const newts = sqliteTable("newt", {
+export const newts = sqliteTable(
-    newtId: text("id").primaryKey(),
+    "newt",
-    secretHash: text("secretHash").notNull(),
+    {
-    dateCreated: text("dateCreated").notNull(),
+        newtId: text("id").primaryKey(),
-    version: text("version"),
+        secretHash: text("secretHash").notNull(),
-    siteId: integer("siteId").references(() => sites.siteId, {
+        dateCreated: text("dateCreated").notNull(),
-        onDelete: "cascade"
+        version: text("version"),
-    })
+        siteId: integer("siteId").references(() => sites.siteId, {
-});
-
-export const clients = sqliteTable("clients", {
-    clientId: integer("clientId").primaryKey({ autoIncrement: true }),
-    orgId: text("orgId")
-        .references(() => orgs.orgId, {
             onDelete: "cascade"
         })
-        .notNull(),
+    },
-    exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
+    (table) => [
-        onDelete: "set null"
+        index("idx_newts_siteId").on(table.siteId)
-    }),
+    ]
-    userId: text("userId").references(() => users.userId, {
+);
-        // optionally tied to a user and in this case delete when the user deletes
+
-        onDelete: "cascade"
+export const clients = sqliteTable(
-    }),
+    "clients",
-    niceId: text("niceId").notNull(),
+    {
-    name: text("name").notNull(),
+        clientId: integer("clientId").primaryKey({ autoIncrement: true }),
-    pubKey: text("pubKey"),
+        orgId: text("orgId")
-    olmId: text("olmId"), // to lock it to a specific olm optionally
+            .references(() => orgs.orgId, {
-    subnet: text("subnet").notNull(),
+                onDelete: "cascade"
-    exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node
+            })
-    megabytesIn: integer("bytesIn"),
+            .notNull(),
-    megabytesOut: integer("bytesOut"),
+        exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
-    lastBandwidthUpdate: text("lastBandwidthUpdate"),
+            onDelete: "set null"
-    lastPing: integer("lastPing"),
+        }),
-    type: text("type").notNull(), // "olm"
+        userId: text("userId").references(() => users.userId, {
-    online: integer("online", { mode: "boolean" }).notNull().default(false),
+            // optionally tied to a user and in this case delete when the user deletes
-    // endpoint: text("endpoint"),
+            onDelete: "cascade"
-    lastHolePunch: integer("lastHolePunch"),
+        }),
-    archived: integer("archived", { mode: "boolean" }).notNull().default(false),
+        niceId: text("niceId").notNull(),
-    blocked: integer("blocked", { mode: "boolean" }).notNull().default(false),
+        name: text("name").notNull(),
-    approvalState: text("approvalState").$type<
+        pubKey: text("pubKey"),
-        "pending" | "approved" | "denied"
+        olmId: text("olmId"), // to lock it to a specific olm optionally
-    >()
+        subnet: text("subnet").notNull(),
-});
+        exitNodeSubnet: text("exitNodeSubnet"), // this is the subnet when connecting to an exit node
+        megabytesIn: integer("bytesIn"),
+        megabytesOut: integer("bytesOut"),
+        lastBandwidthUpdate: text("lastBandwidthUpdate"),
+        lastPing: integer("lastPing"),
+        type: text("type").notNull(), // "olm"
+        online: integer("online", { mode: "boolean" }).notNull().default(false),
+        // endpoint: text("endpoint"),
+        lastHolePunch: integer("lastHolePunch"),
+        archived: integer("archived", { mode: "boolean" }).notNull().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",
@@ -734,23 +778,29 @@ export const clientSiteResourcesAssociationsCache = sqliteTable(
     }
 );
 
-export const olms = sqliteTable("olms", {
+export const olms = sqliteTable(
-    olmId: text("id").primaryKey(),
+    "olms",
-    secretHash: text("secretHash").notNull(),
+    {
-    dateCreated: text("dateCreated").notNull(),
+        olmId: text("id").primaryKey(),
-    version: text("version"),
+        secretHash: text("secretHash").notNull(),
-    agent: text("agent"),
+        dateCreated: text("dateCreated").notNull(),
-    name: text("name"),
+        version: text("version"),
-    clientId: integer("clientId").references(() => clients.clientId, {
+        agent: text("agent"),
-        // we will switch this depending on the current org it wants to connect to
+        name: text("name"),
-        onDelete: "set null"
+        clientId: integer("clientId").references(() => clients.clientId, {
-    }),
+            // we will switch this depending on the current org it wants to connect to
-    userId: text("userId").references(() => users.userId, {
+            onDelete: "set null"
-        // optionally tied to a user and in this case delete when the user deletes
+        }),
-        onDelete: "cascade"
+        userId: text("userId").references(() => users.userId, {
-    }),
+            // optionally tied to a user and in this case delete when the user deletes
-    archived: integer("archived", { mode: "boolean" }).notNull().default(false)
+            onDelete: "cascade"
-});
+        }),
+        archived: integer("archived", { mode: "boolean" }).notNull().default(false)
+    },
+    (table) => [
+        index("idx_olms_userId").on(table.userId)
+    ]
+);
 
 export const currentFingerprint = sqliteTable("currentFingerprint", {
     fingerprintId: integer("id").primaryKey({ autoIncrement: true }),
@@ -912,17 +962,23 @@ export const twoFactorBackupCodes = sqliteTable("twoFactorBackupCodes", {
     codeHash: text("codeHash").notNull()
 });
 
-export const sessions = sqliteTable("session", {
+export const sessions = sqliteTable(
-    sessionId: text("id").primaryKey(),
+    "session",
-    userId: text("userId")
+    {
-        .notNull()
+        sessionId: text("id").primaryKey(),
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: text("userId")
-    expiresAt: integer("expiresAt").notNull(),
+            .notNull()
-    issuedAt: integer("issuedAt"),
+            .references(() => users.userId, { onDelete: "cascade" }),
-    deviceAuthUsed: integer("deviceAuthUsed", { mode: "boolean" })
+        expiresAt: integer("expiresAt").notNull(),
-        .notNull()
+        issuedAt: integer("issuedAt"),
-        .default(false)
+        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(),
@@ -940,21 +996,28 @@ export const olmSessions = sqliteTable("clientSession", {
     expiresAt: integer("expiresAt").notNull()
 });
 
-export const userOrgs = sqliteTable("userOrgs", {
+export const userOrgs = sqliteTable(
-    userId: text("userId")
+    "userOrgs",
-        .notNull()
+    {
-        .references(() => users.userId, { onDelete: "cascade" }),
+        userId: text("userId")
-    orgId: text("orgId")
+            .notNull()
-        .references(() => orgs.orgId, {
+            .references(() => users.userId, { onDelete: "cascade" }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
+            })
-    autoProvisioned: integer("autoProvisioned", {
+            .notNull(),
-        mode: "boolean"
+        isOwner: integer("isOwner", { mode: "boolean" }).notNull().default(false),
-    }).default(false),
+        autoProvisioned: integer("autoProvisioned", {
-    pamUsername: text("pamUsername") // cleaned username for ssh and such
+            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 }),
@@ -982,26 +1045,32 @@ export const actions = sqliteTable("actions", {
     description: text("description")
 });
 
-export const roles = sqliteTable("roles", {
+export const roles = sqliteTable(
-    roleId: integer("roleId").primaryKey({ autoIncrement: true }),
+    "roles",
-    orgId: text("orgId")
+    {
-        .references(() => orgs.orgId, {
+        roleId: integer("roleId").primaryKey({ autoIncrement: true }),
-            onDelete: "cascade"
+        orgId: text("orgId")
-        })
+            .references(() => orgs.orgId, {
-        .notNull(),
+                onDelete: "cascade"
-    isAdmin: integer("isAdmin", { mode: "boolean" }),
+            })
-    name: text("name").notNull(),
+            .notNull(),
-    description: text("description"),
+        isAdmin: integer("isAdmin", { mode: "boolean" }),
-    requireDeviceApproval: integer("requireDeviceApproval", {
+        name: text("name").notNull(),
-        mode: "boolean"
+        description: text("description"),
-    }).default(false),
+        requireDeviceApproval: integer("requireDeviceApproval", {
-    sshSudoMode: text("sshSudoMode").default("full"), // "none" | "full" | "commands"
+            mode: "boolean"
-    sshSudoCommands: text("sshSudoCommands").default("[]"),
+        }).default(false),
-    sshCreateHomeDir: integer("sshCreateHomeDir", { mode: "boolean" }).default(
+        sshSudoMode: text("sshSudoMode").default("full"), // "none" | "full" | "commands"
-        true
+        sshSudoCommands: text("sshSudoCommands").default("[]"),
-    ),
+        sshCreateHomeDir: integer("sshCreateHomeDir", { mode: "boolean" }).default(
-    sshUnixGroups: text("sshUnixGroups").default("[]")
+            true
-});
+        ),
+        sshUnixGroups: text("sshUnixGroups").default("[]")
+    },
+    (table) => [
+        index("idx_roles_orgId").on(table.orgId)
+    ]
+);
 
 export const userOrgRoles = sqliteTable(
     "userOrgRoles",

server/lib/blueprints/types.ts

@@ -101,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", "asn", "region"]),
+        match: z.enum(["cidr", "path", "ip", "country", "country_is_not", "asn", "region"]),
         value: z.coerce.string(),
         priority: z.int().optional(),
         enabled: z.boolean().optional().default(true)
@@ -136,7 +136,7 @@ export const RuleSchema = z
     )
     .refine(
         (rule) => {
-            if (rule.match === "country") {
+            if (rule.match === "country" || rule.match === "country_is_not") {
                 if (!hasMaxmindCountryDb) {
                     return false;
                 }

server/lib/domainUtils.ts

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

server/lib/telemetry.ts

@@ -3,6 +3,8 @@ import config from "./config";
 import { getHostMeta } from "./hostMeta";
 import logger from "@server/logger";
 import {
+    aiProviders,
+    aiUsageRecords,
     alertRules,
     apiKeys,
     blueprints,
@@ -11,7 +13,16 @@ import {
     siteResources
 } from "@server/db";
 import { sites, users, orgs, resources, clients, idp } from "@server/db";
-import { eq, count, notInArray, and, isNotNull, isNull } from "drizzle-orm";
+import {
+    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";
@@ -172,6 +183,25 @@ 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);
@@ -182,6 +212,7 @@ 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;
@@ -191,6 +222,8 @@ class TelemetryClient {
                     numPrivResourceHttp += 1;
                 } else if (res.mode === "ssh") {
                     numPrivResourceSsh += 1;
+                } else if (res.mode === "inference") {
+                    numPrivResourceInference += 1;
                 }
 
                 if (res.alias) {
@@ -211,6 +244,11 @@ 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,
@@ -323,6 +361,17 @@ 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,6 +68,11 @@ 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/license/license.ts

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

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

server/setup/scriptsPg/1.22.0.ts

@@ -454,14 +454,14 @@ export default async function migration() {
             throw new Error(fromZodError(parsedConfig.error).toString());
         }
 
-        traefikConfig.experimental.plugins.badger.version = "v1.6.1";
+        traefikConfig.experimental.plugins.badger.version = "v1.7.0";
 
         const updatedTraefikYaml = yaml.dump(traefikConfig);
 
         fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
 
         console.log(
-            "Updated the version of Badger in your Traefik configuration to v1.6.1"
+            "Updated the version of Badger in your Traefik configuration to v1.7.0"
         );
     } catch (e) {
         console.log(

server/setup/scriptsSqlite/1.22.0.ts

@@ -459,14 +459,14 @@ export default async function migration() {
             throw new Error(fromZodError(parsedConfig.error).toString());
         }
 
-        traefikConfig.experimental.plugins.badger.version = "v1.6.1";
+        traefikConfig.experimental.plugins.badger.version = "v1.7.0";
 
         const updatedTraefikYaml = yaml.dump(traefikConfig);
 
         fs.writeFileSync(traefikPath, updatedTraefikYaml, "utf8");
 
         console.log(
-            "Updated the version of Badger in your Traefik configuration to v1.6.1"
+            "Updated the version of Badger in your Traefik configuration to v1.7.0"
         );
     } catch (e) {
         console.log(

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

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

src/app/[orgId]/settings/resources/public/create/page.tsx

@@ -50,8 +50,6 @@ import {
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
 import { toast } from "@app/hooks/useToast";
-import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
-import { tierMatrix, TierFeature } from "@server/lib/billing/tierMatrix";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
 import {
     createBrowserGatewayTargetFormSchema,
@@ -59,7 +57,6 @@ import {
     selectedSiteSchema,
     type SshSettingsFormValues
 } from "@app/lib/browserGatewayTargetFormSchema";
-import { DockerManager, DockerState } from "@app/lib/docker";
 import { orgQueries } from "@app/lib/queries";
 import { finalizeSubdomainSanitize } from "@app/lib/subdomain-utils";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -328,19 +325,20 @@ export default function Page() {
     const rawResourcesAllowed =
         env.flags.allowRawResources &&
         (build !== "saas" || remoteExitNodes.length > 0);
-    const enterpriseModesAllowed =
-        !env.flags.disableEnterpriseFeatures;
 
     const availableTypes = useMemo((): NewResourceType[] => {
-        const base: NewResourceType[] = ["http", "inference"];
+        const base: NewResourceType[] = [
-        if (enterpriseModesAllowed) {
+            "http",
-            base.push("ssh", "rdp", "vnc");
+            "inference",
-        }
+            "ssh",
+            "rdp",
+            "vnc"
+        ];
         if (rawResourcesAllowed) {
             base.push("tcp", "udp");
         }
         return base;
-    }, [enterpriseModesAllowed, rawResourcesAllowed]);
+    }, [rawResourcesAllowed]);
 
     useEffect(() => {
         if (!availableTypes.includes(resourceType)) {

src/i18n/detectLocale.test.ts

@@ -0,0 +1,74 @@
+import { assertEquals } from "@test/assert";
+import { detectLocale } from "./detectLocale";
+
+function runTests() {
+    assertEquals(
+        detectLocale("zh-TW,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja;q=0.6"),
+        "zh-TW",
+        "An exact regional match should take precedence over a language fallback"
+    );
+    assertEquals(
+        detectLocale("ZH-tw"),
+        "zh-TW",
+        "Locale matching should be case-insensitive"
+    );
+    assertEquals(
+        detectLocale("  zh-TW ; q=1 , zh-CN;q=0.8 "),
+        "zh-TW",
+        "Whitespace and quality parameters should not prevent an exact match"
+    );
+    assertEquals(
+        detectLocale("zh-CN,zh-TW;q=0.9"),
+        "zh-CN",
+        "Simplified Chinese should still match exactly"
+    );
+    assertEquals(
+        detectLocale("zh"),
+        "zh-CN",
+        "A generic Chinese preference should retain the existing fallback"
+    );
+    assertEquals(
+        detectLocale("en-GB,en;q=0.9"),
+        "en-US",
+        "An unsupported region should fall back to a supported locale for the language"
+    );
+    assertEquals(
+        detectLocale("ja-JP,zh-TW;q=0.9"),
+        "zh-TW",
+        "The next preference should be used when a language is unsupported"
+    );
+    assertEquals(
+        detectLocale("zh-CN;q=0.5,zh-TW;q=0.9"),
+        "zh-TW",
+        "Preferences should be evaluated by quality"
+    );
+    assertEquals(
+        detectLocale("zh-TW;q=0,fr-FR;q=0.8"),
+        "fr-FR",
+        "Locales with zero quality should be excluded"
+    );
+    assertEquals(
+        detectLocale("*,de-DE;q=0.8"),
+        "de-DE",
+        "A wildcard should not obscure a supported preference"
+    );
+    assertEquals(
+        detectLocale("ja-JP"),
+        undefined,
+        "An unsupported language should not match"
+    );
+    assertEquals(
+        detectLocale(""),
+        undefined,
+        "An empty Accept-Language header should not match"
+    );
+
+    console.log("All locale detection tests passed!");
+}
+
+try {
+    runTests();
+} catch (error) {
+    console.error("Locale detection test failed:", error);
+    process.exit(1);
+}

src/i18n/detectLocale.ts

@@ -0,0 +1,48 @@
+import { Locale, locales } from "./config";
+
+export function detectLocale(acceptLanguage: string): Locale | undefined {
+    const browserLocales = acceptLanguage
+        .split(",")
+        .map((entry, index) => {
+            const [locale, ...parameters] = entry.trim().split(";");
+            const qualityParameter = parameters.find((parameter) =>
+                parameter.trim().toLowerCase().startsWith("q=")
+            );
+            const quality = qualityParameter
+                ? Number(qualityParameter.trim().slice(2))
+                : 1;
+
+            return {
+                locale: locale.trim().toLowerCase(),
+                quality,
+                index
+            };
+        })
+        .filter(
+            ({ locale, quality }) =>
+                locale && locale !== "*" && quality > 0 && quality <= 1
+        )
+        .sort(
+            (left, right) =>
+                right.quality - left.quality || left.index - right.index
+        );
+
+    for (const { locale: browserLocale } of browserLocales) {
+        const exactMatch = locales.find(
+            (locale) => locale.toLowerCase() === browserLocale
+        );
+        if (exactMatch) {
+            return exactMatch;
+        }
+
+        const browserLanguage = browserLocale.split("-")[0];
+        const languageMatch = locales.find(
+            (locale) => locale.split("-")[0].toLowerCase() === browserLanguage
+        );
+        if (languageMatch) {
+            return languageMatch;
+        }
+    }
+
+    return undefined;
+}

src/services/locale.ts

@@ -2,6 +2,7 @@
 
 import { cookies, headers } from "next/headers";
 import { Locale, defaultLocale, locales } from "@/i18n/config";
+import { detectLocale } from "@/i18n/detectLocale";
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
 
@@ -47,12 +48,7 @@ export async function getUserLocale(): Promise<Locale> {
     const acceptLang = headerList.get("accept-language");
 
     if (acceptLang) {
-        const browserLang = acceptLang.split(",")[0];
+        const matched = detectLocale(acceptLang);
-        const matched = locales.find((locale) =>
-            browserLang
-                .toLowerCase()
-                .startsWith(locale.split("-")[0].toLowerCase())
-        );
         if (matched) {
             return matched;
         }