chore: upgrade dev to 0.28

chore: update flake.lock

.dockerignore

@@ -1,7 +1,11 @@
-node_modules
-.dockerignore
-Dockerfile
-
 /.cache
+/.github
+/.react-router
+/node_modules
 /build
+/docs
+/nix
+
+.dockerignore
 .env
+Dockerfile

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,31 +1,31 @@
 name: Bug Report
 description: Report an issue with Headplane
 assignees: [tale]
-labels: [bug, triage]
+labels: ["Bug", "Needs Triage"]
 body:
-    - type: textarea
-      attributes:
-          label: Description
-          description: |
-              A detailed description of the issue and steps to reproduce it.
-              If applicable, include any error messages or screenshots.
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A detailed description of the issue and steps to reproduce it.
+        If applicable, include any error messages or screenshots.
 
-              If this is not an issue with Headplane, but an issue with your
-              environment, please consider opening a discussion instead.
-          placeholder: e.g. "When I try to upload a file, I get an error message."
-      validations:
-          required: true
-    - type: input
-      attributes:
-          label: Headplane Version
-          description: What version of Headplane are you using?
-          placeholder: e.g. "v0.5.5"
-      validations:
-          required: true
-    - type: input
-      attributes:
-          label: Headscale Version
-          description: What version of Headscale are you using?
-          placeholder: e.g. "v0.25.1"
-      validations:
-          required: true
+        If this is not an issue with Headplane, but an issue with your
+        environment, please consider opening a discussion instead.
+      placeholder: e.g. "When I try to upload a file, I get an error message."
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Headplane Version
+      description: What version of Headplane are you using?
+      placeholder: e.g. "v0.6.2"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Headscale Version
+      description: What version of Headscale are you using?
+      placeholder: e.g. "v0.27.1"
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -1,15 +1,15 @@
 name: Feature Request
 description: Request a new feature or enhancement for Headplane
 assignees: [tale]
-labels: [enhancement, triage]
+labels: ["Feature", "Needs Triage"]
 body:
-    - type: textarea
-      attributes:
-          label: Description
-          description: |
-              A detailed description of the feature you would like to see added.
-              Please include any relevant context, such as why this feature is
-              important and how it would benefit other users beyond yourself.
-          placeholder: e.g. "I would like to see support for custom themes in Headplane so that I can personalize the interface to my liking."
-      validations:
-          required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A detailed description of the feature you would like to see added.
+        Please include any relevant context, such as why this feature is
+        important and how it would benefit other users beyond yourself.
+      placeholder: e.g. "I would like to see support for custom themes in Headplane so that I can personalize the interface to my liking."
+    validations:
+      required: true

.github/workflows/build.yaml

@@ -2,14 +2,12 @@ name: Build
 on:
   push:
     paths-ignore:
-      - ".zed/**"
       - "assets/**"
       - "docs/**"
       - "CHANGELOG.md"
       - "README.md"
     branches:
       - "main"
-      - "next"
   pull_request:
 
 concurrency:
@@ -21,41 +19,37 @@ permissions:
   contents: read # Read access to the repository
 
 jobs:
-  native:
-    name: native
+  ci:
+    name: Build and Test
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Setup Mise
-        uses: jdx/mise-action@v2
-
-      - name: Set caching paths
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-          echo "GO_CACHE=$(go env GOCACHE)" >> $GITHUB_ENV
-          echo "GO_MODCACHE=$(go env GOMODCACHE)" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          run_install: false
 
-      - name: Setup Go cache
-        uses: actions/cache@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
         with:
-          path: |
-            ${{ env.GO_CACHE }}
-            ${{ env.GO_MODCACHE }}
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.mod', '**/go.sum') }}
+          node-version-file: package.json
+          cache: pnpm
+
+      - name: Setup Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
 
       - name: CI pipeline
-        run: mise run ci
+        run: ./build.sh --skip-pnpm-prune
+
+      - name: Run unit tests
+        run: pnpm run test:unit
+
+      - name: Run integration tests
+        run: pnpm run test:integration
 
   nix:
     name: nix

.gitignore

@@ -4,9 +4,12 @@ node_modules
 /build
 /test
 .env
-app/hp_ssh.wasm
-app/wasm_exec.js
+/app/hp_ssh.wasm
+/app/wasm_exec.js
+
+/public/hp_ssh.wasm
+/public/wasm_exec.js
+
 /docs/.vitepress/dist/
 /docs/.vitepress/cache/
-
 /.direnv

.oxfmtrc.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "endOfLine": "lf",
+  "experimentalSortImports": {},
+  "experimentalTailwindcss": {},
+  "ignorePatterns": [],
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false
+}

.oxlintrc.json

@@ -0,0 +1,144 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": ["unicorn", "typescript", "oxc"],
+  "categories": {},
+  "rules": {
+    "constructor-super": "warn",
+    "for-direction": "warn",
+    "no-async-promise-executor": "warn",
+    "no-caller": "warn",
+    "no-class-assign": "warn",
+    "no-compare-neg-zero": "warn",
+    "no-cond-assign": "warn",
+    "no-const-assign": "warn",
+    "no-constant-binary-expression": "warn",
+    "no-constant-condition": "warn",
+    "no-control-regex": "warn",
+    "no-debugger": "warn",
+    "no-delete-var": "warn",
+    "no-dupe-class-members": "warn",
+    "no-dupe-else-if": "warn",
+    "no-dupe-keys": "warn",
+    "no-duplicate-case": "warn",
+    "no-empty-character-class": "warn",
+    "no-empty-pattern": "warn",
+    "no-empty-static-block": "warn",
+    "no-eval": "warn",
+    "no-ex-assign": "warn",
+    "no-extra-boolean-cast": "warn",
+    "no-func-assign": "warn",
+    "no-global-assign": "warn",
+    "no-import-assign": "warn",
+    "no-invalid-regexp": "warn",
+    "no-irregular-whitespace": "warn",
+    "no-loss-of-precision": "warn",
+    "no-new-native-nonconstructor": "warn",
+    "no-nonoctal-decimal-escape": "warn",
+    "no-obj-calls": "warn",
+    "no-self-assign": "warn",
+    "no-setter-return": "warn",
+    "no-shadow-restricted-names": "warn",
+    "no-sparse-arrays": "warn",
+    "no-this-before-super": "warn",
+    "no-unassigned-vars": "warn",
+    "no-unsafe-finally": "warn",
+    "no-unsafe-negation": "warn",
+    "no-unsafe-optional-chaining": "warn",
+    "no-unused-expressions": "warn",
+    "no-unused-labels": "warn",
+    "no-unused-private-class-members": "warn",
+    "no-unused-vars": "warn",
+    "no-useless-backreference": "warn",
+    "no-useless-catch": "warn",
+    "no-useless-escape": "warn",
+    "no-useless-rename": "warn",
+    "no-with": "warn",
+    "require-yield": "warn",
+    "use-isnan": "warn",
+    "valid-typeof": "warn",
+    "oxc/bad-array-method-on-arguments": "warn",
+    "oxc/bad-char-at-comparison": "warn",
+    "oxc/bad-comparison-sequence": "warn",
+    "oxc/bad-min-max-func": "warn",
+    "oxc/bad-object-literal-comparison": "warn",
+    "oxc/bad-replace-all-arg": "warn",
+    "oxc/const-comparisons": "warn",
+    "oxc/double-comparisons": "warn",
+    "oxc/erasing-op": "warn",
+    "oxc/missing-throw": "warn",
+    "oxc/number-arg-out-of-range": "warn",
+    "oxc/only-used-in-recursion": "warn",
+    "oxc/uninvoked-array-callback": "warn",
+    "typescript/await-thenable": "warn",
+    "typescript/no-array-delete": "warn",
+    "typescript/no-base-to-string": "warn",
+    "typescript/no-duplicate-enum-values": "warn",
+    "typescript/no-duplicate-type-constituents": "warn",
+    "typescript/no-extra-non-null-assertion": "warn",
+    "typescript/no-floating-promises": "warn",
+    "typescript/no-for-in-array": "warn",
+    "typescript/no-implied-eval": "warn",
+    "typescript/no-meaningless-void-operator": "warn",
+    "typescript/no-misused-new": "warn",
+    "typescript/no-misused-spread": "warn",
+    "typescript/no-non-null-asserted-optional-chain": "warn",
+    "typescript/no-redundant-type-constituents": "warn",
+    "typescript/no-this-alias": "warn",
+    "typescript/no-unnecessary-parameter-property-assignment": "warn",
+    "typescript/no-unsafe-declaration-merging": "warn",
+    "typescript/no-unsafe-unary-minus": "warn",
+    "typescript/no-useless-empty-export": "warn",
+    "typescript/no-wrapper-object-types": "warn",
+    "typescript/prefer-as-const": "warn",
+    "typescript/require-array-sort-compare": "warn",
+    "typescript/restrict-template-expressions": "warn",
+    "typescript/triple-slash-reference": "warn",
+    "typescript/unbound-method": "warn",
+    "unicorn/no-await-in-promise-methods": "warn",
+    "unicorn/no-empty-file": "warn",
+    "unicorn/no-invalid-fetch-options": "warn",
+    "unicorn/no-invalid-remove-event-listener": "warn",
+    "unicorn/no-new-array": "warn",
+    "unicorn/no-single-promise-in-promise-methods": "warn",
+    "unicorn/no-thenable": "warn",
+    "unicorn/no-unnecessary-await": "warn",
+    "unicorn/no-useless-fallback-in-spread": "warn",
+    "unicorn/no-useless-length-check": "warn",
+    "unicorn/no-useless-spread": "warn",
+    "unicorn/prefer-set-size": "warn",
+    "unicorn/prefer-string-starts-ends-with": "warn"
+  },
+  "settings": {
+    "jsx-a11y": {
+      "polymorphicPropName": null,
+      "components": {},
+      "attributes": {}
+    },
+    "next": {
+      "rootDir": []
+    },
+    "react": {
+      "formComponents": [],
+      "linkComponents": [],
+      "version": null
+    },
+    "jsdoc": {
+      "ignorePrivate": false,
+      "ignoreInternal": false,
+      "ignoreReplacesDocs": true,
+      "overrideReplacesDocs": true,
+      "augmentsExtendsReplacesDocs": false,
+      "implementsReplacesDocs": false,
+      "exemptDestructuredRootsFromChecks": false,
+      "tagNamePreference": {}
+    },
+    "vitest": {
+      "typecheck": false
+    }
+  },
+  "env": {
+    "builtin": true
+  },
+  "globals": {},
+  "ignorePatterns": []
+}

.zed/settings.json

@@ -1,25 +0,0 @@
-{
-	"formatter": {
-		"language_server": {
-			"name": "biome"
-		}
-	},
-	"code_actions_on_format": {
-		"source.fixAll.biome": true,
-		"source.organizeImports.biome": true,
-		"source.organizeImports": true
-	},
-	"languages": {
-		"YAML": {
-			"tab_size": 2,
-			"hard_tabs": false
-		},
-		"Go": {
-			"formatter": {
-				"language_server": {
-					"name": "gopls"
-				}
-			}
-		}
-	}
-}

CHANGELOG.md

@@ -1,13 +1,49 @@
-### 0.6.1 (October 12, 2025)
+# 0.6.2 (Next)
+
+- Added search and sortable columns to the machines list page (closes [#351](https://github.com/tale/headplane/issues/351)).
+- Added support for Headscale 0.27.0 and 0.27.1
+- Bundle all `node_modules` aside from native ones to reduce bundle and container size (closes [#331](https://github.com/tale/headplane/issues/331)).
+- Allow conditionally compiling the SSH WASM integration when building (closes [#337](https://github.com/tale/headplane/issues/337)).
+- Implemented the ability to customize the build with a custom script (see `./build.sh --help` for more information).
+- Attempt to warn against misconfigured cookie settings on the login page.
+- Made `server.cookie_max_age` and `server.cookie_domain` configurable (closes [#348](https://github.com/tale/headplane/issues/348)).
+- Re-worked the configuration loading system with several enhancements:
+  - It is now possible to skip a configuration file and only use environment variables (closes [#150](https://github.com/tale/headplane/issues/150)).
+  - Secret path loading has been reworked from the ground up to be more reliable (closes [#334](https://github.com/tale/headplane/issues/334)).
+  - Added better testing and validation for configuration loading
+- Re-worked the OIDC integration to adhere to the correct standards and surface more errors to the user.
+  - Deprecated `oidc.redirect_uri` and automated callback URL detection in favor of setting `server.base_url` correctly.
+  - Explicitly added `oidc.use_pkce` to correctly determine PKCE configuration.
+  - `oidc.token_endpoint_auth_method` is now optional and will attempt to be auto-detected, defaulting to `client_secret_basic` if unavailable (closes [#410](https://github.com/tale/headplane/issues/410)).
+- Removed several unnecessarily verbose or spammy log messages.
+- Updated the minimum Docker API used to support the latest Docker versions (via [#370](https://github.com/tale/headplane/pull/370)).
+- Enhanced the node tag dialog to show a dropdown of assignable tags (via [#362](https://github.com/tale/headplane/pull/362)).
+- Fixed an issue where the website favicon would not load correctly (closes [#323](https://github.com/tale/headplane/issues/323)).
+- Correctly handle invalid ACL policy inserts on Headscale 0.27+ (closes [#383](https://github.com/tale/headplane/issues/383)).
+- Prevent a machine from changing its owner to itself (closes [#373](https://github.com/tale/headplane/issues/373)).
+- Added an `/admin/api/info` route that can expose sensitive information if `server.info_secret` is set in the configuration (closes [#324](https://github.com/tale/headplane/issues/324)).
+- Correctly apply Gravatar profile pictures on the user page if applicable (closes [#405](https://github.com/tale/headplane/issues/405)).
+- Machine key registration no longer works if the key isn't 24 characters long (closes [#415](https://github.com/tale/headplane/issues/415)).
+- Fixed some mobile CSS issues across the application (closes [#401](https://github.com/tale/headplane/issues/401)).
+- Added a Docker healthcheck to the container (closes [#411](https://github.com/tale/headplane/issues/411)).
+- Strengthened the validation for the `/proc` integration to correctly discover the Headscale PID.
+- Added lazy retry logic for OIDC providers if they initially fail to respond (closes [#423](https://github.com/tale/headplane/issues/423)).
+- Fixed API key login on Headcale 0.28.0-beta.1+ (closes [#429](https://github.com/tale/headplane/issues/429)).
+- Fixed an issue that prevented the pre-auth-key UI from being usable on Headscale 0.28 and later.
+
+---
+
+# 0.6.1 (October 12, 2025)
+
 - **Headplane now supports connecting to machines via SSH in the web browser.**
-	- This is an experimental feature and requires the `integration.agent` section to be set up in the config file.
-	- This is built on top of a Go binary that runs in WebAssembly, using Xterm.js for the terminal interface.
+  - This is an experimental feature and requires the `integration.agent` section to be set up in the config file.
+  - This is built on top of a Go binary that runs in WebAssembly, using Xterm.js for the terminal interface.
 - Begin using a new SQLite database file in `/var/lib/headplane/hp_persist.db`.
-	- The database is created automatically if it does not exist.
-	- It currently stores SSH connection details and HostInfo for the agent.
-	- User information is automatically migrated from the previous database.
+  - The database is created automatically if it does not exist.
+  - It currently stores SSH connection details and HostInfo for the agent.
+  - User information is automatically migrated from the previous database.
 - The docker container now runs in a distroless image (closes [#255](https://github.com/tale/headplane/issues/255)).
-	- A debug version of the container that runs as root and has a shell is available as `ghcr.io/tale/headplane:<version>-shell`.
+  - A debug version of the container that runs as root and has a shell is available as `ghcr.io/tale/headplane:<version>-shell`.
 - Removing a Split DNS record will no longer make the split domain unresolvable by clients (closes [#231](https://github.com/tale/headplane/issues/231)).
 - Reintroduce the toggle for overriding local DNS settings in the Headscale config (closes [#236](https://github.com/tale/headplane/issues/236)).
 - Prefer cross-compiling in the Dockerfile to speed up builds while still supporting multiple architectures.
@@ -15,30 +51,33 @@
 - Implement more accurate guessing on the PID with the `/proc` integration (via [#219](https://github.com/tale/headplane/pull/219)).
 - Usernames will now correctly fall back to emails if not provided (via [#257](https://github.com/tale/headplane/pull/257)).
 - Configuration loading via paths is now supported for sensitive values (via [#283](https://github.com/tale/headplane/pulls/283))
-    - Options like `server.cookie_secret_path` can override `server.cookie_secret`
-    - Environment variables are interpolatable into these paths
-    - See the full reference in the [docs](https://github.com/tale/headplane/blob/main/docs/Configuration.md#sensitive-values)
+  - Options like `server.cookie_secret_path` can override `server.cookie_secret`
+  - Environment variables are interpolatable into these paths
+  - See the full reference in the [docs](https://github.com/tale/headplane/blob/main/docs/Configuration.md#sensitive-values)
 - The nix overlay build is fixed for the SSH module (via [#282](https://github.com/tale/headplane/pull/282))
 - Switch our build processes to use TypeScript Go and Rolldown Vite for better build and type-check performance.
-- Cookies are now encrypted JWTs, preserving API key secrets (*GHSA-wrqq-v7qw-r5w7*)
+- Cookies are now encrypted JWTs, preserving API key secrets (_GHSA-wrqq-v7qw-r5w7_)
 - OIDC profile pictures are now available from Gravatar by setting `oidc.profile_picture_source` to `gravatar` (closes [#232](https://github.com/tale/headplane/issues/232)).
 - OIDC now allows passing many custom parameters:
-	- `oidc.authorization_endpoint`, `oidc.token_endpoint`, and `oidc.userinfo_endpoint` can be overridden to support non-standard providers or scenarios without discovery (closes [#117](https://github.com/tale/headplane/issues/117)).
-	- `oidc.scope` can be set to specify custom scopes (defaults to `openid email profile`).
-	- `oidc.extra_params` can be set to pass arbitrary query parameters to the authorization endpoint (closes [#197](https://github.com/tale/headplane/issues/197)).
+  - `oidc.authorization_endpoint`, `oidc.token_endpoint`, and `oidc.userinfo_endpoint` can be overridden to support non-standard providers or scenarios without discovery (closes [#117](https://github.com/tale/headplane/issues/117)).
+  - `oidc.scope` can be set to specify custom scopes (defaults to `openid email profile`).
+  - `oidc.extra_params` can be set to pass arbitrary query parameters to the authorization endpoint (closes [#197](https://github.com/tale/headplane/issues/197)).
+
+---
+
+# 0.6.0 (May 25, 2025)
 
-### 0.6.0 (May 25, 2025)
 - Headplane 0.6.0 now requires **Headscale 0.26.0** or newer.
-    - Breaking API changes with routes and pre auth keys are now supported (closes [#204](https://github.com/tale/headplane/issues/204)).
-    - Older versions of Headscale will not work with Headplane.
+  - Breaking API changes with routes and pre auth keys are now supported (closes [#204](https://github.com/tale/headplane/issues/204)).
+  - Older versions of Headscale will not work with Headplane.
 
 - OIDC authorization restrictions can now be controlled from the settings UI. (closes [#102](https://github.com/tale/headplane/issues/102))
-	- The required permission role for this is **IT Admin** or **Admin/Owner** and require the Headscale configuration.
-	- Changes made will modify the `oidc.allowed_{domains,groups,users}` fields in the Headscale config file.
+  - The required permission role for this is **IT Admin** or **Admin/Owner** and require the Headscale configuration.
+  - Changes made will modify the `oidc.allowed_{domains,groups,users}` fields in the Headscale config file.
 - The Pre-Auth keys page has been fully reworked (closes [#179](https://github.com/tale/headplane/issues/179), [#143](https://github.com/tale/headplane/issues/143)).
 - The Headplane agent is now available as an integration (closes [#65](https://github.com/tale/headplane/issues/65)).
-	- The agent runs as an embedded process alongside the Headplane server and reports host information and system metrics.
-	- Refer to the `integrations.agent` section of the config file for more information and how to enable it.
+  - The agent runs as an embedded process alongside the Headplane server and reports host information and system metrics.
+  - Refer to the `integrations.agent` section of the config file for more information and how to enable it.
 - Requests to `/admin` will now be redirected to `/admin/` to prevent issues with the React Router (works with custom prefixes, closes [#173](https://github.com/tale/headplane/issues/173)).
 - The Login page has been simplified and separately reports errors versus incorrect API keys (closes [#186](https://github.com/tale/headplane/issues/186)).
 - The machine actions backend has been reworked to better handle errors and provide more information to the user (closes [#185](https://github.com/tale/headplane/issues/185)).
@@ -52,15 +91,24 @@
 - Tighten `proc` integration logic by checking for the `headscale serve` command (via #[195](https://github.com/tale/headplane/pull/195)).
 - Strip newlines in the OIDC `client_secret_path` file if provided (closes [#199](https://github.com/tale/headplane/issues/199)).
 
-### 0.5.10 (April 4, 2025)
+---
+
+# 0.5.10 (April 4, 2025)
+
 - Fix an issue where other preferences to skip onboarding affected every user.
 
-### 0.5.9 (April 3, 2025)
+---
+
+# 0.5.9 (April 3, 2025)
+
 - Filter out empty users from the pre-auth keys page which could possibly cause a crash with unmigrated users.
 - OIDC users cannot be renamed, so that functionality has been disabled in the menu options.
 - Suppress hydration errors for any fields with a date in it.
 
-### 0.5.8 (April 3, 2025)
+---
+
+# 0.5.8 (April 3, 2025)
+
 - You can now skip the onboarding page if desired.
 - Added the UI to change user roles in the dashboard.
 - Fixed an issue where integrations would throw instead of loading properly.
@@ -68,15 +116,21 @@
 - Automatically create `/var/lib/headplane` in the Docker container (fixes [#166](https://github.com/tale/headplane/issues/166))
 - OIDC logout with `disable_api_key_login` set to true will not automatically login again (fixes [#149](https://github.com/tale/headplane/issues/149))
 
-### 0.5.7 (April 2, 2025)
+---
+
+# 0.5.7 (April 2, 2025)
+
 - Hotfix an issue where assets aren't served under `/admin` or the prefix.
 
-### 0.5.6 (April 2, 2025)
+---
+
+# 0.5.6 (April 2, 2025)
 
 ### IMPORTANT
-> **PLEASE** update to this ASAP if you were using Google OIDC. This is because previously *ANY* accounts have admin access to your Tailnet if they discover the URL that Headplane is being hosted on. This new change enforces that new logins by default are not given any permissions. You will need to re-login to Headplane to generate an owner account and prevent unauthorized access.
 
-Implemented *proper* authentication methods for OIDC.
+> **PLEASE** update to this ASAP if you were using Google OIDC. This is because previously _ANY_ accounts have admin access to your Tailnet if they discover the URL that Headplane is being hosted on. This new change enforces that new logins by default are not given any permissions. You will need to re-login to Headplane to generate an owner account and prevent unauthorized access.
+
+Implemented _proper_ authentication methods for OIDC.
 This is a large update and copies the permission system from Tailscale.
 Permissions are not automatically derived from OIDC, but they can be configured via the UI.
 Additionally, certain roles give certain capabilities, limiting access to parts of the dashboard.
@@ -84,6 +138,7 @@ By default, new users will have a `member` role which forbids access to the UI.
 If there are no users, the first user will be given an `owner` role which cannot be removed.
 
 **Changes**:
+
 - Switched the internal server to use `hono` for better performance.
 - Fixed an issue that caused dialogs to randomly refocus every 3 seconds.
 - Headplane will not send API requests when the tab is not focused.
@@ -91,10 +146,16 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Unknown values in the Headplane config no longer cause a crash.
 - Fixed an issue that caused copied commands to have a random space (fixes [#161](https://github.com/tale/headplane/issues/161))
 
-### 0.5.5 (March 18, 2025)
+---
+
+# 0.5.5 (March 18, 2025)
+
 - Hotfix an issue that caused Headplane to crash if no agents are available
 
-### 0.5.4 (March 18, 2025)
+---
+
+# 0.5.4 (March 18, 2025)
+
 - Fixed a typo in the Kubernetes documentation
 - Handle split and global DNS records not being set in the Headscale config (via [#129](https://github.com/tale/headplane/pull/129))
 - Stop checking for the `mkey:` prefix on machine registration (via [#131](https://github.com/tale/headplane/pull/131))
@@ -108,20 +169,32 @@ If there are no users, the first user will be given an `owner` role which cannot
 - You can now pass in an OIDC client secret through `oidc.client_secret_path` in the config (fixes [#126](https://github.com/tale/headplane/issues/126))
 - Correctly handle differently localized number inputs (fixes [#125](https://github.com/tale/headplane/issues/125))
 
-### 0.5.3 (March 1, 2025)
+---
+
+# 0.5.3 (March 1, 2025)
+
 - Fixed an issue where Headplane expected the incorrect config value for OIDC scope (fixes [#111](https://github.com/tale/headplane/issues/111))
 - Added an ARIA indicator for when an input is required and fixed the confirm buttons (fixed [#116](https://github.com/tale/headplane/issues/116))
 - Fixed a typo in the docs that defaulted to `/var/run/docker.dock` for the Docker socket (via [#112](https://github.com/tale/headplane/pull/112))
 
-### 0.5.2 (February 28, 2025)
+---
+
+# 0.5.2 (February 28, 2025)
+
 - Hotfixed an issue where the server bundle got reloaded on each request
 
-### 0.5.1 (February 28, 2025)
+---
+
+# 0.5.1 (February 28, 2025)
+
 - Fixed an issue that caused the entire server to crash on start
 - Fixed the published semver tags from Docker
 - Fixed the Kubernetes integration not reading the config
 
-### 0.5 (February 27, 2025)
+---
+
+# 0.5 (February 27, 2025)
+
 > This release is a major overhaul and contains a significant breaking change.
 > We now use a config file for all settings instead of environment variables.
 > Please see [config.example.yaml](/config.example.yaml) for the new format.
@@ -136,10 +209,16 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Settings that were previously shared like `public_url` or `oidc` are now separate within Headplane/Headscale. This is a rather large breaking change but fixes cases where a user may choose to utilize Headscale OIDC for Tailscale but not for the Headplane UI.
 - Deprecate the `latest` tag in Docker for explicit versioning and `edge` for nightly builds.
 
-### 0.4.1 (January 18, 2025)
+---
+
+# 0.4.1 (January 18, 2025)
+
 - Fixed an urgent issue where the OIDC redirect URI would mismatch.
 
-### 0.4.0 (January 18, 2025)
+---
+
+# 0.4.0 (January 18, 2025)
+
 - Switched from Remix.run to React-Router
 - Fixed an issue where some config fields were marked as required even if they weren't (fixes [#66](https://github.com/tale/headplane/issues/66))
 - Fixed an issue where the toasts would be obscured by the footer (fixes [#68](https://github.com/tale/headplane/issues/68))
@@ -152,29 +231,47 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Reusable Pre-Auth Keys no longer show expired when used (PR [#88](https://github.com/tale/headplane/pull/88))
 - Tweaked some CSS issues in the UI
 
-### 0.3.9 (December 6, 2024)
+---
+
+# 0.3.9 (December 6, 2024)
+
 - Fixed a race condition bug in the OIDC validation code
 
-### 0.3.8 (December 6, 2024)
+---
+
+# 0.3.8 (December 6, 2024)
+
 - Added a little HTML footer to show the login page and link to a donation page.
 - Allow creating pre-auth keys that expire past 90 days (fixes [#58](https://github.com/tale/headplane/issues/58))
 - Validates OIDC config and ignores validation if specified via variables or Headscale config (fixes [#63](https://github.com/tale/headplane/issues/63))
 
-### 0.3.7 (November 30, 2024)
+---
+
+# 0.3.7 (November 30, 2024)
+
 - Allow customizing the OIDC token endpoint auth method via `OIDC_CLIENT_SECRET_METHOD` (fixes [#57](https://github.com/tale/headplane/issues/57))
 - Added a `/healthz` endpoint for Kubernetes and other health checks (fixes [#59](https://github.com/tale/headplane/issues/59))
 - Allow `HEADSCALE_PUBLIC_URL` to be set if `HEADSCALE_URL` points to a different internal address (fixes [#60](https://github.com/tale/headplane/issues/60))
 - Fixed an issue where the copy machine registration command had a typo.
 
-### 0.3.6 (November 20, 2024)
+---
+
+# 0.3.6 (November 20, 2024)
+
 - Fixed an issue where select dropdowns would not scroll (fixes [#53](https://github.com/tale/headplane/issues/53))
 - Added a button to copy the machine registration command to the clipboard (fixes [#52](https://github.com/tale/headplane/issues/52))
 
-### 0.3.5 (November 8, 2024)
+---
+
+# 0.3.5 (November 8, 2024)
+
 - Quickfix a bug where environment variables are ignored on the server.
 - Remove a nagging error about missing cookie since that happens when signed out.
 
-### 0.3.4 (November 7, 2024)
+---
+
+# 0.3.4 (November 7, 2024)
+
 - Clicking on the machine name in the users page now takes you to the machine overview page.
 - Completely rebuilt the production server to work better outside of Docker and be lighter. More specifically, we've switched from the `@remix-run/serve` package to our own custom built server.
 - Fixed a bunch of silly issues introduced by me not typechecking the codebase.
@@ -184,70 +281,106 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Added full support for Exit Nodes in the UI and redesigned the machines page (fixes [#36](https://github.com/tale/headplane/issues/36))
 - Added a basic check to see if the API keys passed via cookies are invalid.
 
-### 0.3.3 (October 28, 2024)
+---
+
+# 0.3.3 (October 28, 2024)
+
 - Added the ability to load a `.env` file from the PWD when `LOAD_ENV_FILE=true` is set as an environment variable.
 - Fixed an issue where non-English languages could not create Pre-auth keys due to a localization error
 - Improved ACL editor performance by switching back to CodeMirror 6
 - Fixed an issue where editing the ACL policy would cause it to revert on the UI (fixes [#34](https://github.com/tale/headplane/issues/34))
 - Updated to the next stable beta of the React 19 Compiler ([See More](https://react.dev/learn/react-compiler))
 
-### 0.3.2 (October 11, 2024)
+---
+
+# 0.3.2 (October 11, 2024)
+
 - Implement the ability to create and expire pre-auth keys (fixes [#22](https://github.com/tale/headplane/issues/22))
 - Fix machine registration not working as expected (fixes [#27](https://github.com/tale/headplane/issues/27))
 - Removed more references to usernames in MagicDNS hostnames (fixes [#35](https://github.com/tale/headplane/issues/35))
 - Handle `null` values on machine expiry when using a database like PostgreSQL.
 - Use `X-Forwarded-Proto` and `Host` headers for building the OIDC callback URL.
 
-### 0.3.1 (October 3, 2024)
+---
+
+# 0.3.1 (October 3, 2024)
+
 - Fixed the Docker integration to properly support custom socket paths. This regressed at some point previously.
 - Allow you to register a machine using machine keys (`nodekey:...`) on the machines page.
 - Added the option for debug logs with the `DEBUG=true` environment variable.
 
-### 0.3.0 (September 25, 2024)
+---
+
+# 0.3.0 (September 25, 2024)
+
 - Bumped the minimum supported version of Headscale to 0.23.
 - Updated the UI to respect `dns.use_username_in_magic_dns`.
 
-### 0.2.4 (August 24, 2024)
+---
+
+# 0.2.4 (August 24, 2024)
+
 - Removed ACL management from the integration since Headscale 0.23-beta2 now supports it natively.
 - Removed the `ACL_FILE` environment variable since it's no longer needed.
 - Introduce a `COOKIE_SECURE=false` environment variable to disable HTTPS requirements for cookies.
 - Fixed a bug where removing Split DNS configurations would crash the UI.
 
-### 0.2.3 (August 23, 2024)
+---
+
+# 0.2.3 (August 23, 2024)
+
 - Change the minimum required version of Headscale to 0.23-beta2
 - Support the new API policy mode for Headscale 0.23-beta1
 - Switch to the new DNS configuration in Headscale 0.23-beta2 (fixes [#29](https://github.com/tale/headplane/issues/29))
 - If OIDC environment variables are defined, don't use configuration file values (fixes [#24](https://github.com/tale/headplane/issues/24))
 
-### 0.2.2 (August 2, 2024)
+---
+
+# 0.2.2 (August 2, 2024)
+
 - Added a proper Kubernetes integration which utilizes `shareProcessNamespace` for PIDs.
 - Added a new logger utility that shows categories, levels, and timestamps.
 - Reimplemented the integration system to be more resilient and log more information.
 - Fixed an issue where the /proc integration found `undefined` PIDs.
 
-### 0.2.1 (July 7, 2024)
+---
+
+# 0.2.1 (July 7, 2024)
+
 - Added the ability to manage custom DNS records on your Tailnet.
 - ACL tags for machines are now able to be changed via the machine menu.
 - Fixed a bug where the ACL editor did not show the diffs correctly.
 - Fixed an issue that stopped the "Discard changes" button in the ACL editor from working.
 
-### 0.2.0 (June 23, 2024)
+---
+
+# 0.2.0 (June 23, 2024)
+
 - Fix the dropdown options for machines not working on the machines page.
 - Add an option to change the machine owner in the dropdown (aside from the users page).
 
-### 0.1.9 (June 2, 2024)
+---
+
+# 0.1.9 (June 2, 2024)
+
 - Switch to Monaco editor with proper HuJSON and YAML syntax highlighting.
 - Utilize magic DNS hostnames for the machine overview page.
 - Fixed the expiry issue once and for all.
 - Add a nightly build with the `ghcr.io/tale/headplane:edge` tag
 
-### 0.1.8 (June 2, 2024)
+---
+
+# 0.1.8 (June 2, 2024)
+
 - Built basic functionality for the machine overview page (by machine ID).
 - Possibly fixed an issue where expiry disabled machines' timestamps weren't handled correctly.
 - Prevent users from being deleted if they still have ownership of machines.
 - Fixed some type issues where `Date` was being used instead of `string` for timestamps.
 
-### 0.1.7 (May 30, 2024)
+---
+
+# 0.1.7 (May 30, 2024)
+
 - Added support for the `HEADSCALE_INTEGRATION` variable to allow for advanced integration without Docker.
 - Fixed a bug where the `expiry` field on the Headscale configuration could cause crashes.
 - Made the strict configuration loader more lenient to allow for more flexibility.
@@ -255,19 +388,27 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Headplane's context now only loads once at start instead of being lazy-loaded.
 - Improved logging and error propagation so that it's easier to debug issues.
 
-### 0.1.6 (May 22, 2024)
+---
+
+# 0.1.6 (May 22, 2024)
+
 - Added experimental support for advanced integration without Docker.
 - Fixed a crash where the Docker integration tried to use `process.env.API_KEY` instead of context.
 - Fixed a crash where `ROOT_API_KEY` was not respected in the OIDC flow.
 
-### 0.1.5 (May 20, 2024)
+---
+
+# 0.1.5 (May 20, 2024)
+
 - Robust configuration handling with fallbacks based on the headscale source.
 - Support for `client_secret_path` on configuration file based OIDC.
 - `DISABLE_API_KEY_LOGIN` now works as expected (non 'true' values work).
 - `API_KEY` is renamed to `ROOT_API_KEY` for better clarity (old variable still works).
 - Fixed button responders not actually being invoked (should fix the ACL page).
 
-### 0.1.4 (May 15, 2024)
+---
+
+# 0.1.4 (May 15, 2024)
 
 - Users can now be created, renamed, and deleted on the users page.
 - Machines can be dragged between users to change their ownership.
@@ -276,13 +417,17 @@ If there are no users, the first user will be given an `owner` role which cannot
 - Upgrade to React 19 beta to take advantage of the compiler (may revert if it causes issues).
 - Upgrade other dependencies
 
-### 0.1.3 (May 4, 2024)
+---
+
+# 0.1.3 (May 4, 2024)
 
 - Switched to a better icon set for the UI.
 - Support stable scrollbar gutter if supported by the browser.
 - Cleaned up the header which fixed a bug that could crash the entire application on fetch errors.
 
-### 0.1.2 (May 1, 2024)
+---
+
+# 0.1.2 (May 1, 2024)
 
 - Added support for renaming, expiring, removing, and managing the routes of a machine.
 - Implemented an expiry check for machines which now reflect on the machine table.

Dockerfile

@@ -1,11 +1,7 @@
-FROM --platform=$BUILDPLATFORM jdxcode/mise:latest AS mise-context
-COPY mise.toml ./
-RUN --mount=type=secret,id=gh_token,env=MISE_GITHUB_TOKEN mise install
+FROM --platform=$BUILDPLATFORM golang:1.25.1 AS go-base
+WORKDIR /run
 
-FROM --platform=$BUILDPLATFORM mise-context AS go-build
-WORKDIR /build/
-
-COPY go.mod go.sum ./
+COPY go.mod go.sum build.sh ./
 RUN go mod download
 
 COPY cmd/ ./cmd/
@@ -14,50 +10,67 @@ COPY internal/ ./internal/
 ARG TARGETOS
 ARG TARGETARCH
 ARG IMAGE_TAG
-RUN mkdir -p /build/app/ && \
-	GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 IMAGE_TAG=$IMAGE_TAG \
-	mise run wasm ::: agent ::: fake-shell
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 IMAGE_TAG=$IMAGE_TAG \
+	./build.sh --wasm --agent --fake-shell --healthcheck \
+		--wasm-output /bin/hp_ssh.wasm \
+		--agent-output /bin/hp_agent \
+		--fake-shell-output /bin/fake-sh \
+		--healthcheck-output /bin/hp_healthcheck
 
-RUN chmod +x /build/build/hp_agent
-RUN chmod +x /build/build/sh
+RUN chmod +x /bin/hp_ssh.wasm
+RUN chmod +x /bin/hp_agent
+RUN chmod +x /bin/fake-sh
+RUN chmod +x /bin/hp_healthcheck
 
-FROM --platform=$BUILDPLATFORM mise-context AS js-build
-WORKDIR /build
-COPY patches ./patches
-COPY package.json pnpm-lock.yaml ./
-RUN pnpm install --frozen-lockfile
-
-COPY . .
-RUN mise trust
-COPY --from=go-build /build/app/hp_ssh.wasm /build/app/hp_ssh.wasm
-COPY --from=go-build /build/app/wasm_exec.js /build/app/wasm_exec.js
-
-ARG IMAGE_TAG
-RUN IMAGE_TAG=$IMAGE_TAG pnpm run build
+# Folder needs to exist for later stages
 RUN mkdir -p /var/lib/headplane/agent
 
+FROM --platform=$BUILDPLATFORM node:22.16-slim AS js-base
+WORKDIR /run
+
+RUN corepack enable
+COPY patches ./patches
+COPY package.json pnpm-lock.yaml build.sh ./
+
+COPY --from=go-base /bin/hp_ssh.wasm /run/app/hp_ssh.wasm
+COPY --from=go-base /bin/wasm_exec.js /run/app/wasm_exec.js
+RUN ./build.sh --app --app-install-only
+
+COPY . .
+RUN ./build.sh --app
+
 FROM gcr.io/distroless/nodejs22-debian12:latest AS final
-COPY --from=js-build /build/build/ /app/build/
-COPY --from=js-build /build/drizzle /app/drizzle/
-COPY --from=js-build /var/lib/headplane /var/lib/headplane
-COPY --from=js-build /build/node_modules/ /app/node_modules/
-COPY --from=go-build /build/build/hp_agent /usr/libexec/headplane/agent
+COPY --from=js-base /run/build /app/build
+COPY --from=js-base /run/drizzle /app/drizzle
+COPY --from=js-base /run/node_modules /app/node_modules
+
+COPY --from=go-base /bin/hp_agent /usr/libexec/headplane/agent
+COPY --from=go-base /var/lib/headplane /var/lib/headplane
 
 # Fake shell to inform the user that they should use the debug image
-COPY --from=go-build /build/build/sh /bin/sh
-COPY --from=go-build /build/build/sh /bin/bash
+COPY --from=go-base /bin/fake-sh /bin/sh
+COPY --from=go-base /bin/fake-sh /bin/bash
+
+COPY --from=go-base /bin/hp_healthcheck /bin/hp_healthcheck
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
+	CMD ["/bin/hp_healthcheck"]
 
 WORKDIR /app
 CMD [ "/app/build/server/index.js" ]
 
 FROM node:22-alpine AS debug-shell
-RUN apk add --no-cache bash curl git
+RUN apk add --no-cache bash curl
 
-COPY --from=js-build /build/build/ /app/build/
-COPY --from=js-build /build/drizzle /app/drizzle/
-COPY --from=js-build /var/lib/headplane /var/lib/headplane
-COPY --from=js-build /build/node_modules/ /app/node_modules/
-COPY --from=go-build /build/build/hp_agent /usr/libexec/headplane/agent
+COPY --from=js-base /run/build /app/build
+COPY --from=js-base /run/drizzle /app/drizzle
+COPY --from=js-base /run/node_modules /app/node_modules
+
+COPY --from=go-base /bin/hp_agent /usr/libexec/headplane/agent
+COPY --from=go-base /var/lib/headplane /var/lib/headplane
+COPY --from=go-base /bin/hp_healthcheck /bin/hp_healthcheck
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
+	CMD ["/bin/hp_healthcheck"]
 
 WORKDIR /app
 CMD [ "node", "/app/build/server/index.js" ]

README.md

@@ -32,17 +32,7 @@ These are some of the features that Headplane offers:
 - Configurability for Headscale's settings
 
 ## Deployment
-Headplane runs as a server-based web-application, meaning you'll need a server to run it.
-It's available as a Docker image (recommended) or through a manual installation.
-There are 2 ways to deploy Headplane:
-
-- ### [Integrated Mode (Recommended)](/docs/Integrated-Mode.md)
-  Integrated mode unlocks all the features of Headplane and is the most
-  feature-complete deployment method. It communicates with Headscale directly.
-
-- ### [Simple Mode](/docs/Simple-Mode.md)
-  Simple mode does not include the automatic management of DNS and Headplane
-  settings, requiring manual editing and reloading when making changes.
+Refer to the [website](https://headplane.net) for detailed installation instructions.
 
 ## Versioning
 Headplane uses [semantic versioning](https://semver.org/) for its releases (since v0.6.0).

agent.Dockerfile

@@ -1,15 +0,0 @@
-FROM golang:1.23 AS builder
-WORKDIR /app
-
-COPY go.mod go.sum ./
-RUN go mod download
-
-COPY agent/ ./agent
-RUN CGO_ENABLED=0 GOOS=linux go build \
-	-trimpath \
-	-ldflags "-s -w" \
-	-o /app/hp_agent ./agent/cmd/hp_agent
-
-FROM scratch
-COPY --from=builder /app/hp_agent /hp_agent
-ENTRYPOINT ["/hp_agent"]

app/components/Code.tsx

@@ -5,7 +5,7 @@ import toast from '~/utils/toast';
 
 export interface CodeProps extends HTMLProps<HTMLSpanElement> {
 	isCopyable?: boolean;
-	children: string | string[];
+	children: string | string[] | number;
 }
 
 export default function Code({ isCopyable, children, className }: CodeProps) {

app/components/Dialog.tsx

@@ -107,6 +107,11 @@ function Panel(props: DialogPanelProps) {
 	return (
 		<Form
 			{...dialogProps}
+			className={cn(
+				'outline-hidden rounded-3xl w-full max-w-lg',
+				'bg-white dark:bg-headplane-900',
+			)}
+			method={method ?? 'POST'}
 			onSubmit={(event) => {
 				if (onSubmit) {
 					onSubmit(event);
@@ -114,12 +119,7 @@ function Panel(props: DialogPanelProps) {
 
 				close?.();
 			}}
-			method={method ?? 'POST'}
 			ref={ref}
-			className={cn(
-				'outline-hidden rounded-3xl w-full max-w-lg',
-				'bg-white dark:bg-headplane-900',
-			)}
 		>
 			<Card className="w-full max-w-lg" variant="flat">
 				{children}
@@ -130,9 +130,9 @@ function Panel(props: DialogPanelProps) {
 						<>
 							<Button onPress={close}>Cancel</Button>
 							<Button
+								isDisabled={isDisabled}
 								type="submit"
 								variant={variant === 'destructive' ? 'danger' : 'heavy'}
-								isDisabled={isDisabled}
 							>
 								Confirm
 							</Button>

app/components/Error.tsx

@@ -1,89 +0,0 @@
-import { AlertCircle } from 'lucide-react';
-import { isRouteErrorResponse, useRouteError } from 'react-router';
-import ResponseError from '~/server/headscale/api-error';
-import cn from '~/utils/cn';
-import Card from './Card';
-import Code from './Code';
-
-interface Props {
-	type?: 'full' | 'embedded';
-}
-
-export function getErrorMessage(error: Error | unknown): {
-	title: string;
-	message: string;
-} {
-	if (error instanceof ResponseError) {
-		if (error.responseObject?.message) {
-			return {
-				title: 'Headscale Error',
-				message: String(error.responseObject.message),
-			};
-		}
-
-		return {
-			title: 'Headscale Error',
-			message: error.response,
-		};
-	}
-
-	if (!(error instanceof Error)) {
-		return {
-			title: 'Unknown Error',
-			message: String(error),
-		};
-	}
-
-	let rootError = error;
-
-	// Traverse the error chain to find the root cause
-	if (error.cause) {
-		rootError = error.cause as Error;
-		while (rootError.cause) {
-			rootError = rootError.cause as Error;
-		}
-	}
-
-	// If we are aggregate, concat into a single message
-	if (rootError instanceof AggregateError) {
-		throw new Error('Unhandled AggregateError');
-	}
-
-	return {
-		title: 'Error',
-		message: rootError.message,
-	};
-}
-
-export function ErrorPopup({ type = 'full' }: Props) {
-	const error = useRouteError();
-	const routing = isRouteErrorResponse(error);
-	const { title, message } = getErrorMessage(error);
-
-	return (
-		<div
-			className={cn(
-				'flex items-center justify-center',
-				type === 'embedded'
-					? 'pointer-events-none mt-24'
-					: 'fixed inset-0 h-screen w-screen z-50',
-			)}
-		>
-			<Card>
-				<div className="flex items-center gap-4">
-					<AlertCircle className="w-8 h-8 text-red-500" />
-					<div className="flex justify-between items-center gap-2 w-full">
-						<Card.Title className="text-3xl mb-0">{title}</Card.Title>
-						{routing && <Code className="text-2xl">{`${error.status}`}</Code>}
-					</div>
-				</div>
-				<hr className="my-4 text-headplane-100 dark:text-headplane-800" />
-				<Card.Text
-					className={cn('py-4 text-lg', routing ? 'font-normal' : 'font-mono')}
-				>
-					{routing ? error.data : message}
-				</Card.Text>
-			</Card>
-		</div>
-	);
-}

app/components/Input.tsx

@@ -8,11 +8,18 @@ export interface InputProps extends AriaTextFieldProps<HTMLInputElement> {
 	labelHidden?: boolean;
 	isRequired?: boolean;
 	className?: string;
+	isInvalid?: boolean;
+	errorMessage?: string;
 }
 
-// TODO: Custom isInvalid logic for custom error messages
 export default function Input(props: InputProps) {
-	const { label, labelHidden, className } = props;
+	const {
+		label,
+		labelHidden,
+		className,
+		isInvalid: customIsInvalid,
+		errorMessage,
+	} = props;
 	const ref = useRef<HTMLInputElement | null>(null);
 	const id = useId(props.id);
 
@@ -21,7 +28,7 @@ export default function Input(props: InputProps) {
 		inputProps,
 		descriptionProps,
 		errorMessageProps,
-		isInvalid,
+		isInvalid: ariaIsInvalid,
 		validationErrors,
 	} = useTextField(
 		{
@@ -32,16 +39,18 @@ export default function Input(props: InputProps) {
 		ref,
 	);
 
+	const isInvalid = customIsInvalid ?? ariaIsInvalid;
+
 	return (
-		<div className="flex flex-col w-full" aria-label={label}>
+		<div className="flex flex-col w-full">
 			<label
 				{...labelProps}
-				htmlFor={id}
 				className={cn(
 					'text-xs font-medium px-3 mb-0.5',
 					'text-headplane-700 dark:text-headplane-100',
 					labelHidden && 'sr-only',
 				)}
+				htmlFor={id}
 			>
 				{label}
 				{props.isRequired && (
@@ -50,8 +59,6 @@ export default function Input(props: InputProps) {
 			</label>
 			<input
 				{...inputProps}
-				required={props.isRequired}
-				ref={ref}
 				className={cn(
 					'rounded-xl px-3 py-2',
 					'focus:outline-hidden focus:ring-3',
@@ -59,6 +66,8 @@ export default function Input(props: InputProps) {
 					'border border-headplane-100 dark:border-headplane-800',
 					className,
 				)}
+				ref={ref}
+				required={props.isRequired}
 			/>
 			{props.description && (
 				<div
@@ -76,7 +85,7 @@ export default function Input(props: InputProps) {
 					{...errorMessageProps}
 					className={cn('text-xs px-3 mt-1', 'text-red-500 dark:text-red-400')}
 				>
-					{validationErrors.join(' ')}
+					{errorMessage ?? validationErrors.join(' ')}
 				</div>
 			) : null}
 		</div>

app/components/Select.tsx

@@ -50,11 +50,11 @@ function Select(props: SelectProps) {
 		<div className={cn('flex flex-col', props.className)}>
 			<label
 				{...labelProps}
-				htmlFor={id}
 				className={cn(
 					'text-xs font-medium px-3 mb-0.5',
 					'text-headplane-700 dark:text-headplane-100',
 				)}
+				htmlFor={id}
 			>
 				{props.label}
 			</label>
@@ -63,18 +63,18 @@ function Select(props: SelectProps) {
 					'flex rounded-xl focus:outline-hidden focus-within:ring-3',
 					'bg-white dark:bg-headplane-900',
 					'border border-headplane-100 dark:border-headplane-800',
+					props.isInvalid && 'ring-red-400',
 				)}
 			>
 				<input
 					{...inputProps}
-					ref={inputRef}
-					id={id}
 					className="outline-hidden px-3 py-2 rounded-l-xl w-full bg-transparent"
 					data-1p-ignore
+					id={id}
+					ref={inputRef}
 				/>
 				<button
 					{...buttonProps}
-					ref={buttonRef}
 					className={cn(
 						'flex items-center justify-center p-1 rounded-lg m-1',
 						'bg-headplane-100 dark:bg-headplane-700/30 font-medium',
@@ -82,6 +82,7 @@ function Select(props: SelectProps) {
 							? 'opacity-50 cursor-not-allowed'
 							: 'hover:bg-headplane-200/90 dark:hover:bg-headplane-800/30',
 					)}
+					ref={buttonRef}
 				>
 					<ChevronDown className="p-0.5" />
 				</button>
@@ -99,12 +100,12 @@ function Select(props: SelectProps) {
 			)}
 			{state.isOpen && (
 				<Popover
-					popoverRef={popoverRef}
-					triggerRef={inputRef}
-					state={state}
+					className="w-full max-w-xs"
 					isNonModal
 					placement="bottom start"
-					className="w-full max-w-xs"
+					popoverRef={popoverRef}
+					state={state}
+					triggerRef={inputRef}
 				>
 					<ListBox {...listBoxProps} listBoxRef={listBoxRef} state={state} />
 				</Popover>
@@ -114,23 +115,22 @@ function Select(props: SelectProps) {
 }
 
 interface ListBoxProps extends AriaListBoxOptions<object> {
-	listBoxRef?: React.RefObject<HTMLUListElement | null>;
+	listBoxRef: React.RefObject<HTMLUListElement | null>;
 	state: ListState<object>;
 }
 
 function ListBox(props: ListBoxProps) {
 	const { listBoxRef, state } = props;
-	const ref = listBoxRef ?? useRef<HTMLUListElement | null>(null);
-	const { listBoxProps } = useListBox(props, state, ref);
+	const { listBoxProps } = useListBox(props, state, listBoxRef);
 
 	return (
 		<ul
 			{...listBoxProps}
-			ref={listBoxRef}
 			className="w-full max-h-72 overflow-auto outline-hidden pt-1"
+			ref={listBoxRef}
 		>
 			{[...state.collection].map((item) => (
-				<Option key={item.key} item={item} state={state} />
+				<Option item={item} key={item.key} state={state} />
 			))}
 		</ul>
 	);
@@ -154,7 +154,6 @@ function Option({ item, state }: OptionProps) {
 	return (
 		<li
 			{...optionProps}
-			ref={ref}
 			className={cn(
 				'flex items-center justify-between',
 				'py-2 px-3 mx-1 rounded-lg mb-1',
@@ -164,6 +163,7 @@ function Option({ item, state }: OptionProps) {
 					: 'hover:bg-headplane-100/50 dark:hover:bg-headplane-800',
 				isDisabled && 'text-headplane-300 dark:text-headplane-600',
 			)}
+			ref={ref}
 		>
 			{item.rendered}
 			{isSelected && <Check className="p-0.5" />}

app/components/Tabs.tsx

@@ -23,15 +23,15 @@ function Tabs({ label, className, ...props }: TabsProps) {
 		<div className={cn('flex flex-col', className)}>
 			<div
 				{...tabListProps}
-				ref={ref}
 				className={cn(
-					'flex items-center rounded-t-xl w-fit',
+					'flex items-center rounded-t-xl w-fit max-w-full overflow-x-auto',
 					'border-headplane-100 dark:border-headplane-800',
 					'border-t border-x',
 				)}
+				ref={ref}
 			>
 				{[...state.collection].map((item) => (
-					<Tab key={item.key} item={item} state={state} />
+					<Tab item={item} key={item.key} state={state} />
 				))}
 			</div>
 			<TabsPanel key={state.selectedItem?.key} state={state} />
@@ -52,7 +52,6 @@ function Tab({ item, state }: TabsTabProps) {
 	return (
 		<div
 			{...tabProps}
-			ref={ref}
 			className={cn(
 				'pl-2 pr-3 py-2.5',
 				'aria-selected:bg-headplane-100 dark:aria-selected:bg-headplane-950',
@@ -60,6 +59,7 @@ function Tab({ item, state }: TabsTabProps) {
 				'border-r border-headplane-100 dark:border-headplane-800',
 				'first:rounded-tl-xl last:rounded-tr-xl last:border-r-0',
 			)}
+			ref={ref}
 		>
 			{rendered}
 		</div>
@@ -76,11 +76,11 @@ function TabsPanel({ state, ...props }: TabsPanelProps) {
 	return (
 		<div
 			{...tabPanelProps}
-			ref={ref}
 			className={cn(
 				'w-full overflow-clip rounded-b-xl rounded-r-xl',
 				'border border-headplane-100 dark:border-headplane-800',
 			)}
+			ref={ref}
 		>
 			{state.selectedItem?.props.children}
 		</div>

app/components/error-banner.tsx

@@ -0,0 +1,211 @@
+import { AlertCircle } from 'lucide-react';
+import { isRouteErrorResponse } from 'react-router';
+import {
+	isApiError,
+	isConnectionError,
+} from '~/server/headscale/api/error-client';
+import cn from '~/utils/cn';
+import Card from './Card';
+import Code from './Code';
+import Link from './Link';
+
+export function getErrorMessage(error: Error | unknown): {
+	title: string;
+	jsxMessage: React.ReactNode;
+} {
+	if (isRouteErrorResponse(error)) {
+		if (isApiError(error.data)) {
+			const { statusCode, rawData, data, requestUrl } = error.data;
+			if (statusCode >= 500) {
+				return {
+					title: 'Headscale API Error',
+					jsxMessage: (
+						<>
+							<Card.Text>
+								There was an error communicating with the Headscale API.
+								<br />
+								The server responded with a status code of{' '}
+								<strong>{statusCode}</strong>, indicating a server-side issue.
+								Please check the Headscale server status and try again later.
+							</Card.Text>
+							{(error.data.data != null || error.data.rawData != null) && (
+								<pre className="mt-2 p-2 bg-headplane-100 dark:bg-headplane-800 rounded-lg overflow-x-auto">
+									{error.data.data != null ? (
+										<code>{JSON.stringify(error.data.data, null, 2)}</code>
+									) : (
+										<code>{error.data.rawData}</code>
+									)}
+								</pre>
+							)}
+						</>
+					),
+				};
+			}
+
+			const authError =
+				error.data.statusCode === 401 || error.data.statusCode === 403;
+
+			return {
+				title: 'Invalid response from Headscale API',
+				jsxMessage: (
+					<>
+						<Card.Text className="leading-snug">
+							The Headscale API returned an unexpected response.
+							{authError ? (
+								<>
+									{' '}
+									The status code indicates an authentication error. Please
+									verify your API key and Headplane configuration.
+								</>
+							) : (
+								<>
+									{' '}
+									You may be using an unsupported version of Headscale or this
+									may be a bug.
+								</>
+							)}
+						</Card.Text>
+						<ul className="list-disc list-inside mt-2">
+							<li>
+								Request URL: <Code>{requestUrl}</Code>
+							</li>
+							<li>
+								Status Code:{' '}
+								<Code>
+									{/* @ts-expect-error */}
+									{data === null ? (
+										<>
+											{statusCode} {rawData}
+										</>
+									) : (
+										<>
+											{statusCode} {error.statusText}
+										</>
+									)}
+								</Code>
+							</li>
+						</ul>
+						<Card.Text className="text-lg font-semibold mt-4">
+							Error Details
+						</Card.Text>
+						<pre className="mt-2 p-2 bg-headplane-100 dark:bg-headplane-800 rounded-lg overflow-x-auto">
+							<code>{JSON.stringify(error.data, null, 2)}</code>
+						</pre>
+					</>
+				),
+			};
+		}
+
+		if (isConnectionError(error.data)) {
+			const { requestUrl, errorCode, errorMessage, extraData } = error.data;
+			return {
+				title: 'Cannot connect to Headscale API',
+				jsxMessage: (
+					<>
+						<Card.Text className="leading-snug">
+							Headplane was unable to reach the Headscale API. Please check your
+							network setup and configuration to ensure Headplane is able to
+							connect.
+						</Card.Text>
+						<Card.Text className="text-lg font-semibold mt-4">
+							Error Details
+						</Card.Text>
+						<pre className="mt-2 p-2 bg-headplane-100 dark:bg-headplane-800 rounded-lg overflow-x-auto">
+							{requestUrl}
+							<br />
+							{errorCode}: {errorMessage}
+							{extraData != null && (
+								<>
+									<br />
+									<br />
+									<code>{JSON.stringify(extraData, null, 2)}</code>
+								</>
+							)}
+						</pre>
+					</>
+				),
+			};
+		}
+
+		return {
+			title: `Error ${error.status}`,
+			jsxMessage: (
+				<>
+					There was an error processing your request.
+					<br />
+					Status Code: <strong>{error.status}</strong>
+					<br />
+					Status Text: <strong>{error.data}</strong>
+				</>
+			),
+		};
+	}
+
+	if (!(error instanceof Error)) {
+		return {
+			title: 'Unexpected Error',
+			jsxMessage: (
+				<>
+					<Card.Text>
+						An unexpected error occurred which is most likely a bug. Please
+						consider reporting filing an issue on the{' '}
+						<Link
+							name="Headplane GitHub"
+							to="https://github.com/tale/headplane/issues"
+						>
+							Headplane GitHub
+						</Link>{' '}
+						repository with the details below.
+					</Card.Text>
+					<Card.Text className="text-lg font-semibold mt-4">
+						Error Details
+					</Card.Text>
+					<pre className="mt-2 p-2 bg-headplane-100 dark:bg-headplane-800 rounded-lg overflow-x-auto">
+						<code>{JSON.stringify(error, null, 2)}</code>
+					</pre>
+				</>
+			),
+		};
+	}
+
+	// Traverse the error chain to find the root cause
+	let rootError = error;
+	if (error.cause != null) {
+		rootError = error.cause as Error;
+		while (rootError.cause != null) {
+			rootError = rootError.cause as Error;
+		}
+	}
+
+	// TODO: If we are aggregate, concat into a single message
+	if (rootError instanceof AggregateError) {
+		throw new Error('AggregateError handling not implemented yet');
+	}
+
+	return {
+		title:
+			rootError.name.length > 0 && rootError.name !== 'Error'
+				? `Error: ${rootError.name}`
+				: 'Error',
+		jsxMessage: rootError.message,
+	};
+}
+
+interface ErrorBannerProps {
+	error: unknown;
+	className?: string;
+}
+
+export function ErrorBanner({ error, className }: ErrorBannerProps) {
+	const { title, jsxMessage } = getErrorMessage(error);
+
+	return (
+		<Card className={cn('w-screen', className)} variant="flat">
+			<div className="flex items-center justify-between gap-4">
+				<Card.Title>{title}</Card.Title>
+				<AlertCircle className="w-6 h-6 mb-2 text-red-500" />
+			</div>
+			{jsxMessage}
+		</Card>
+	);
+}

app/entry.client.tsx

@@ -2,12 +2,6 @@ import { StrictMode, startTransition } from 'react';
 import { hydrateRoot } from 'react-dom/client';
 import { HydratedRouter } from 'react-router/dom';
 
-if (import.meta.env.DEV) {
-	import('react-scan').then(({ scan }) => {
-		scan({ enabled: true });
-	});
-}
-
 startTransition(() => {
 	hydrateRoot(
 		document,

app/entry.server.tsx

@@ -1,66 +1,65 @@
-import { PassThrough } from 'node:stream';
-import { createReadableStreamFromReadable } from '@react-router/node';
-import { isbot } from 'isbot';
-import type { RenderToPipeableStreamOptions } from 'react-dom/server';
-import { renderToPipeableStream } from 'react-dom/server';
-import { AppLoadContext, EntryContext, ServerRouter } from 'react-router';
+import type { RenderToPipeableStreamOptions } from "react-dom/server";
+import type { AppLoadContext, EntryContext } from "react-router";
+
+import { createReadableStreamFromReadable } from "@react-router/node";
+import { isbot } from "isbot";
+import { PassThrough } from "node:stream";
+import { renderToPipeableStream } from "react-dom/server";
+import { ServerRouter } from "react-router";
 
 export const streamTimeout = 5_000;
 export default function handleRequest(
-	request: Request,
-	responseStatusCode: number,
-	responseHeaders: Headers,
-	routerContext: EntryContext,
-	loadContext: AppLoadContext,
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  routerContext: EntryContext,
+  _loadContext: AppLoadContext,
 ) {
-	return new Promise((resolve, reject) => {
-		let shellRendered = false;
-		const userAgent = request.headers.get('user-agent');
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const userAgent = request.headers.get("user-agent");
 
-		// Ensure requests from bots and SPA Mode renders wait for all content to load before responding
-		// https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
-		const readyOption: keyof RenderToPipeableStreamOptions =
-			(userAgent && isbot(userAgent)) || routerContext.isSpaMode
-				? 'onAllReady'
-				: 'onShellReady';
+    // Ensure requests from bots and SPA Mode renders wait for all content to load before responding
+    // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
+    const readyOption: keyof RenderToPipeableStreamOptions =
+      (userAgent && isbot(userAgent)) || routerContext.isSpaMode ? "onAllReady" : "onShellReady";
 
-		const { pipe, abort } = renderToPipeableStream(
-			<ServerRouter context={routerContext} url={request.url} />,
-			{
-				[readyOption]() {
-					shellRendered = true;
-					const body = new PassThrough();
-					const stream = createReadableStreamFromReadable(body);
+    const { pipe, abort } = renderToPipeableStream(
+      <ServerRouter context={routerContext} url={request.url} />,
+      {
+        [readyOption]() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
 
-					responseHeaders.set('Content-Type', 'text/html');
+          responseHeaders.set("Content-Type", "text/html");
 
-					resolve(
-						new Response(stream, {
-							headers: responseHeaders,
-							status: responseStatusCode,
-						}),
-					);
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            }),
+          );
 
-					pipe(body);
-				},
-				onShellError(error: unknown) {
-					reject(error);
-				},
-				onError(error: unknown) {
-					// biome-ignore lint/style/noParameterAssign: Lazy
-					responseStatusCode = 500;
-					// Log streaming rendering errors from inside the shell.  Don't log
-					// errors encountered during initial shell rendering since they'll
-					// reject and get logged in handleDocumentRequest.
-					if (shellRendered) {
-						console.error(error);
-					}
-				},
-			},
-		);
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      },
+    );
 
-		// Abort the rendering stream after the `streamTimeout` so it has tine to
-		// flush down the rejected boundaries
-		setTimeout(abort, streamTimeout + 1000);
-	});
+    // Abort the rendering stream after the `streamTimeout` so it has tine to
+    // flush down the rejected boundaries
+    setTimeout(abort, streamTimeout + 1000);
+  });
 }

app/layouts/dashboard.tsx

@@ -1,27 +1,27 @@
-import { type LoaderFunctionArgs, Outlet, redirect } from 'react-router';
-import { ErrorPopup } from '~/components/Error';
-import type { LoadContext } from '~/server';
+import { Outlet, redirect } from 'react-router';
+import { ErrorBanner } from '~/components/error-banner';
 import { pruneEphemeralNodes } from '~/server/db/pruner';
-import ResponseError from '~/server/headscale/api-error';
+import { isDataUnauthorizedError } from '~/server/headscale/api/error-client';
 import log from '~/utils/log';
+import type { Route } from './+types/dashboard';
 
-export async function loader({
-	request,
-	context,
-	...rest
-}: LoaderFunctionArgs<LoadContext>) {
-	const healthy = await context.client.healthcheck();
+export async function loader({ request, context, ...rest }: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
-	await pruneEphemeralNodes({ context, request, ...rest });
+	const api = context.hsApi.getRuntimeClient(session.api_key);
 
-	// We shouldn't session invalidate if Headscale is down
-	// TODO: Notify in the logs or the UI that OIDC auth key is wrong if enabled
+	// MARK: The session should stay valid if Headscale isn't healthy
+	const healthy = await api.isHealthy();
 	if (healthy) {
 		try {
-			await context.client.get('v1/apikey', session.api_key);
+			await api.getApiKeys();
+			await pruneEphemeralNodes({ context, request, ...rest });
 		} catch (error) {
-			if (error instanceof ResponseError) {
-				log.debug('api', 'API Key validation failed %o', error);
+			if (isDataUnauthorizedError(error)) {
+				log.warn(
+					'auth',
+					'Logging out %s due to expired API key',
+					session.user.name,
+				);
 				return redirect('/login', {
 					headers: {
 						'Set-Cookie': await context.sessions.destroySession(),
@@ -44,6 +44,10 @@ export default function Layout() {
 	);
 }
 
-export function ErrorBoundary() {
-	return <ErrorPopup type="embedded" />;
+export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
+	return (
+		<div className="w-fit mx-auto overscroll-contain my-24">
+			<ErrorBanner className="max-w-2xl" error={error} />
+		</div>
+	);
 }

app/layouts/shell.tsx

@@ -1,30 +1,22 @@
 import { eq } from 'drizzle-orm';
 import { CircleCheckIcon } from 'lucide-react';
-import {
-	LoaderFunctionArgs,
-	Outlet,
-	redirect,
-	useLoaderData,
-} from 'react-router';
+import { Outlet, redirect } from 'react-router';
 import Button from '~/components/Button';
 import Card from '~/components/Card';
 import Footer from '~/components/Footer';
 import Header from '~/components/Header';
-import type { LoadContext } from '~/server';
 import { users } from '~/server/db/schema';
 import { Capabilities } from '~/server/web/roles';
 import toast from '~/utils/toast';
+import { Route } from './+types/shell';
 
 // This loads the bare minimum for the application to function
 // So we know that if context fails to load then well, oops?
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	try {
 		const session = await context.sessions.auth(request);
 		if (
-			context.oidc &&
+			typeof context.oidc === 'object' &&
 			session.user.subject !== 'unknown-non-oauth' &&
 			!request.url.endsWith('/onboarding')
 		) {
@@ -39,6 +31,7 @@ export async function loader({
 			}
 		}
 
+		const api = context.hsApi.getRuntimeClient(session.api_key);
 		const check = await context.sessions.check(request, Capabilities.ui_access);
 		return {
 			config: context.hs.c,
@@ -62,7 +55,7 @@ export async function loader({
 				),
 			},
 			onboarding: request.url.endsWith('/onboarding'),
-			healthy: await context.client.healthcheck(),
+			healthy: await api.isHealthy(),
 		};
 	} catch {
 		return redirect('/login', {
@@ -73,14 +66,12 @@ export async function loader({
 	}
 }
 
-export default function Shell() {
-	const data = useLoaderData<typeof loader>();
-
+export default function Shell({ loaderData }: Route.ComponentProps) {
 	return (
 		<>
-			<Header {...data} />
+			<Header {...loaderData} />
 			{/* Always show the outlet if we are onboarding */}
-			{(data.onboarding ? true : data.uiAccess) ? (
+			{(loaderData.onboarding ? true : loaderData.uiAccess) ? (
 				<Outlet />
 			) : (
 				<Card className="mx-auto w-fit mt-24">
@@ -96,13 +87,13 @@ export default function Shell() {
 						className="flex text-md font-mono"
 						onPress={async () => {
 							await navigator.clipboard.writeText(
-								`tailscale up --login-server=${data.url}`,
+								`tailscale up --login-server=${loaderData.url}`,
 							);
 
 							toast('Copied to clipboard');
 						}}
 					>
-						tailscale up --login-server={data.url}
+						tailscale up --login-server={loaderData.url}
 					</Button>
 					<p className="text-xs mt-1 opacity-50 text-center">
 						Click this button to copy the command.
@@ -113,7 +104,7 @@ export default function Shell() {
 					</p>
 				</Card>
 			)}
-			<Footer {...data} />
+			<Footer {...loaderData} />
 		</>
 	);
 }

app/openapi-canonical-families.json

@@ -0,0 +1,6 @@
+{
+  "0.26.1": ["0.26.0", "0.26.1"],
+  "0.27.0": ["0.27.0"],
+  "0.27.1": ["0.27.1"],
+  "0.28.0": ["0.28.0"]
+}

app/openapi-operation-hashes.json

@@ -0,0 +1,135 @@
+{
+  "0.26.0": {
+    "GET /api/v1/apikey": "efe31b6dc980e158",
+    "POST /api/v1/apikey": "39953a96c1da5312",
+    "POST /api/v1/apikey/expire": "ca56add866802f17",
+    "DELETE /api/v1/apikey/{prefix}": "3f0125f7abe7abb1",
+    "POST /api/v1/debug/node": "204f9ae3f9f738c6",
+    "GET /api/v1/node": "8bb18b8c7cfb4f20",
+    "POST /api/v1/node/backfillips": "6da4d1d3922a8001",
+    "POST /api/v1/node/register": "539f7cb3a84d43d4",
+    "GET /api/v1/node/{nodeId}": "8a7da3d24dc82c37",
+    "DELETE /api/v1/node/{nodeId}": "f832f33d84fd3724",
+    "POST /api/v1/node/{nodeId}/approve_routes": "e6c22e46ad44903d",
+    "POST /api/v1/node/{nodeId}/expire": "ac9ffcd6243a9784",
+    "POST /api/v1/node/{nodeId}/rename/{newName}": "d355388ac934dc90",
+    "POST /api/v1/node/{nodeId}/tags": "b6a8296dcc2939b5",
+    "POST /api/v1/node/{nodeId}/user": "ae3a30b43ffd1922",
+    "GET /api/v1/policy": "d6c639be304cd3c0",
+    "PUT /api/v1/policy": "6cbe80bde771a388",
+    "GET /api/v1/preauthkey": "14db6a04f90d7a7e",
+    "POST /api/v1/preauthkey": "0b4308e049d4eb58",
+    "POST /api/v1/preauthkey/expire": "31f377a66d3a5c4f",
+    "GET /api/v1/user": "228831b58ccc5a17",
+    "POST /api/v1/user": "a4e1d889d7962da5",
+    "DELETE /api/v1/user/{id}": "3d553e4b74296884",
+    "POST /api/v1/user/{oldId}/rename/{newName}": "996c03ebf81576d7"
+  },
+  "0.26.1": {
+    "GET /api/v1/apikey": "efe31b6dc980e158",
+    "POST /api/v1/apikey": "39953a96c1da5312",
+    "POST /api/v1/apikey/expire": "ca56add866802f17",
+    "DELETE /api/v1/apikey/{prefix}": "3f0125f7abe7abb1",
+    "POST /api/v1/debug/node": "204f9ae3f9f738c6",
+    "GET /api/v1/node": "8bb18b8c7cfb4f20",
+    "POST /api/v1/node/backfillips": "6da4d1d3922a8001",
+    "POST /api/v1/node/register": "539f7cb3a84d43d4",
+    "GET /api/v1/node/{nodeId}": "8a7da3d24dc82c37",
+    "DELETE /api/v1/node/{nodeId}": "f832f33d84fd3724",
+    "POST /api/v1/node/{nodeId}/approve_routes": "e6c22e46ad44903d",
+    "POST /api/v1/node/{nodeId}/expire": "ac9ffcd6243a9784",
+    "POST /api/v1/node/{nodeId}/rename/{newName}": "d355388ac934dc90",
+    "POST /api/v1/node/{nodeId}/tags": "b6a8296dcc2939b5",
+    "POST /api/v1/node/{nodeId}/user": "ae3a30b43ffd1922",
+    "GET /api/v1/policy": "d6c639be304cd3c0",
+    "PUT /api/v1/policy": "6cbe80bde771a388",
+    "GET /api/v1/preauthkey": "14db6a04f90d7a7e",
+    "POST /api/v1/preauthkey": "0b4308e049d4eb58",
+    "POST /api/v1/preauthkey/expire": "31f377a66d3a5c4f",
+    "GET /api/v1/user": "228831b58ccc5a17",
+    "POST /api/v1/user": "a4e1d889d7962da5",
+    "DELETE /api/v1/user/{id}": "3d553e4b74296884",
+    "POST /api/v1/user/{oldId}/rename/{newName}": "996c03ebf81576d7"
+  },
+  "0.27.0": {
+    "GET /api/v1/apikey": "efe31b6dc980e158",
+    "POST /api/v1/apikey": "39953a96c1da5312",
+    "POST /api/v1/apikey/expire": "ca56add866802f17",
+    "DELETE /api/v1/apikey/{prefix}": "3f0125f7abe7abb1",
+    "POST /api/v1/debug/node": "204f9ae3f9f738c6",
+    "GET /api/v1/health": "5e447272e72b2e5f",
+    "GET /api/v1/node": "8bb18b8c7cfb4f20",
+    "POST /api/v1/node/backfillips": "6da4d1d3922a8001",
+    "POST /api/v1/node/register": "539f7cb3a84d43d4",
+    "GET /api/v1/node/{nodeId}": "8a7da3d24dc82c37",
+    "DELETE /api/v1/node/{nodeId}": "f832f33d84fd3724",
+    "POST /api/v1/node/{nodeId}/approve_routes": "e6c22e46ad44903d",
+    "POST /api/v1/node/{nodeId}/expire": "ac9ffcd6243a9784",
+    "POST /api/v1/node/{nodeId}/rename/{newName}": "d355388ac934dc90",
+    "POST /api/v1/node/{nodeId}/tags": "b6a8296dcc2939b5",
+    "POST /api/v1/node/{nodeId}/user": "ae3a30b43ffd1922",
+    "GET /api/v1/policy": "d6c639be304cd3c0",
+    "PUT /api/v1/policy": "6cbe80bde771a388",
+    "GET /api/v1/preauthkey": "14db6a04f90d7a7e",
+    "POST /api/v1/preauthkey": "0b4308e049d4eb58",
+    "POST /api/v1/preauthkey/expire": "31f377a66d3a5c4f",
+    "GET /api/v1/user": "228831b58ccc5a17",
+    "POST /api/v1/user": "a4e1d889d7962da5",
+    "DELETE /api/v1/user/{id}": "3d553e4b74296884",
+    "POST /api/v1/user/{oldId}/rename/{newName}": "996c03ebf81576d7"
+  },
+  "0.27.1": {
+    "GET /api/v1/apikey": "efe31b6dc980e158",
+    "POST /api/v1/apikey": "39953a96c1da5312",
+    "POST /api/v1/apikey/expire": "ca56add866802f17",
+    "DELETE /api/v1/apikey/{prefix}": "3f0125f7abe7abb1",
+    "POST /api/v1/debug/node": "204f9ae3f9f738c6",
+    "GET /api/v1/health": "5e447272e72b2e5f",
+    "GET /api/v1/node": "8bb18b8c7cfb4f20",
+    "POST /api/v1/node/backfillips": "6da4d1d3922a8001",
+    "POST /api/v1/node/register": "539f7cb3a84d43d4",
+    "GET /api/v1/node/{nodeId}": "8a7da3d24dc82c37",
+    "DELETE /api/v1/node/{nodeId}": "f832f33d84fd3724",
+    "POST /api/v1/node/{nodeId}/approve_routes": "e6c22e46ad44903d",
+    "POST /api/v1/node/{nodeId}/expire": "53efc8e2017c16ae",
+    "POST /api/v1/node/{nodeId}/rename/{newName}": "d355388ac934dc90",
+    "POST /api/v1/node/{nodeId}/tags": "b6a8296dcc2939b5",
+    "POST /api/v1/node/{nodeId}/user": "ae3a30b43ffd1922",
+    "GET /api/v1/policy": "d6c639be304cd3c0",
+    "PUT /api/v1/policy": "6cbe80bde771a388",
+    "GET /api/v1/preauthkey": "14db6a04f90d7a7e",
+    "POST /api/v1/preauthkey": "0b4308e049d4eb58",
+    "POST /api/v1/preauthkey/expire": "31f377a66d3a5c4f",
+    "GET /api/v1/user": "228831b58ccc5a17",
+    "POST /api/v1/user": "a4e1d889d7962da5",
+    "DELETE /api/v1/user/{id}": "3d553e4b74296884",
+    "POST /api/v1/user/{oldId}/rename/{newName}": "996c03ebf81576d7"
+  },
+  "0.28.0": {
+    "GET /api/v1/apikey": "efe31b6dc980e158",
+    "POST /api/v1/apikey": "39953a96c1da5312",
+    "POST /api/v1/apikey/expire": "ca56add866802f17",
+    "DELETE /api/v1/apikey/{prefix}": "b10ca7d2750405b2",
+    "POST /api/v1/debug/node": "204f9ae3f9f738c6",
+    "GET /api/v1/health": "5e447272e72b2e5f",
+    "GET /api/v1/node": "8bb18b8c7cfb4f20",
+    "POST /api/v1/node/backfillips": "6da4d1d3922a8001",
+    "POST /api/v1/node/register": "539f7cb3a84d43d4",
+    "GET /api/v1/node/{nodeId}": "8a7da3d24dc82c37",
+    "DELETE /api/v1/node/{nodeId}": "f832f33d84fd3724",
+    "POST /api/v1/node/{nodeId}/approve_routes": "e6c22e46ad44903d",
+    "POST /api/v1/node/{nodeId}/expire": "53efc8e2017c16ae",
+    "POST /api/v1/node/{nodeId}/rename/{newName}": "d355388ac934dc90",
+    "POST /api/v1/node/{nodeId}/tags": "b6a8296dcc2939b5",
+    "GET /api/v1/policy": "d6c639be304cd3c0",
+    "PUT /api/v1/policy": "6cbe80bde771a388",
+    "GET /api/v1/preauthkey": "8428b44e3a821e9e",
+    "DELETE /api/v1/preauthkey": "f05ea1bc8ad89a09",
+    "POST /api/v1/preauthkey": "0b4308e049d4eb58",
+    "POST /api/v1/preauthkey/expire": "31f377a66d3a5c4f",
+    "GET /api/v1/user": "228831b58ccc5a17",
+    "POST /api/v1/user": "a4e1d889d7962da5",
+    "DELETE /api/v1/user/{id}": "3d553e4b74296884",
+    "POST /api/v1/user/{oldId}/rename/{newName}": "996c03ebf81576d7"
+  }
+}

app/root.tsx

@@ -8,12 +8,14 @@ import {
 	useNavigation,
 } from 'react-router';
 import '@fontsource-variable/inter';
-import { ErrorPopup } from '~/components/Error';
+import { ExternalScripts } from 'remix-utils/external-scripts';
 import ProgressBar from '~/components/ProgressBar';
 import ToastProvider from '~/components/ToastProvider';
 import stylesheet from '~/tailwind.css?url';
 import { LiveDataProvider } from '~/utils/live-data';
 import { useToastQueue } from '~/utils/toast';
+import type { Route } from './+types/root';
+import { ErrorBanner } from './components/error-banner';
 
 export const meta: MetaFunction = () => [
 	{ title: 'Headplane' },
@@ -38,24 +40,29 @@ export function Layout({ children }: { readonly children: React.ReactNode }) {
 			<html lang="en">
 				<head>
 					<meta charSet="utf-8" />
-					<meta name="viewport" content="width=device-width, initial-scale=1" />
+					<meta content="width=device-width, initial-scale=1" name="viewport" />
 					<Meta />
 					<Links />
-					<link rel="icon" href="favicon.ico" />
+					<link href="favicon.ico" rel="icon" />
 				</head>
-				<body className="overscroll-none dark:bg-headplane-900 dark:text-headplane-50">
+				<body className="overscroll-none overflow-x-hidden dark:bg-headplane-900 dark:text-headplane-50">
 					{children}
 					<ToastProvider queue={toastQueue} />
 					<ScrollRestoration />
 					<Scripts />
+					<ExternalScripts />
 				</body>
 			</html>
 		</LiveDataProvider>
 	);
 }
 
-export function ErrorBoundary() {
-	return <ErrorPopup />;
+export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
+	return (
+		<div className="w-screen h-screen flex items-center justify-center p-4">
+			<ErrorBanner className="max-w-2xl" error={error} />
+		</div>
+	);
 }
 
 export default function App() {

app/routes.ts

@@ -5,6 +5,9 @@ export default [
 	index('routes/util/redirect.ts'),
 	route('/healthz', 'routes/util/healthz.ts'),
 
+	// API Routes
+	...prefix('/api', [route('/info', 'routes/util/info.ts')]),
+
 	// Authentication Routes
 	route('/login', 'routes/auth/login/page.tsx'),
 	route('/logout', 'routes/auth/logout.ts'),

app/routes/acls/acl-action.ts

@@ -1,40 +1,35 @@
-import { ActionFunctionArgs, data } from 'react-router';
-import { LoadContext } from '~/server';
-import ResponseError from '~/server/headscale/api-error';
+import { data } from 'react-router';
+import { isDataWithApiError } from '~/server/headscale/api/error-client';
 import { Capabilities } from '~/server/web/roles';
-import { data400, data403 } from '~/utils/res';
+import type { Route } from './+types/overview';
 
 // We only check capabilities here and assume it is writable
 // If it isn't, it'll gracefully error anyways, since this means some
 // fishy client manipulation is happening.
-export async function aclAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
+export async function aclAction({ request, context }: Route.ActionArgs) {
 	const session = await context.sessions.auth(request);
 	const check = await context.sessions.check(
 		request,
 		Capabilities.write_policy,
 	);
 	if (!check) {
-		throw data403('You do not have permission to write to the ACL policy');
+		throw data('You do not have permission to write to the ACL policy', {
+			status: 403,
+		});
 	}
 
 	// Try to write to the ACL policy via the API or via config file (TODO).
 	const formData = await request.formData();
 	const policyData = formData.get('policy')?.toString();
 	if (!policyData) {
-		throw data400('Missing `policy` in the form data.');
+		throw data('Missing `policy` in the form data.', {
+			status: 400,
+		});
 	}
 
+	const api = context.hsApi.getRuntimeClient(session.api_key);
 	try {
-		const { policy, updatedAt } = await context.client.put<{
-			policy: string;
-			updatedAt: string;
-		}>('v1/policy', session.api_key, {
-			policy: policyData,
-		});
-
+		const { policy, updatedAt } = await api.setPolicy(policyData);
 		return data({
 			success: true,
 			error: undefined,
@@ -42,68 +37,99 @@ export async function aclAction({
 			updatedAt,
 		});
 	} catch (error) {
-		// This means Headscale returned a protobuf error to us
-		// It also means we 100% know this is in database mode
-		if (error instanceof ResponseError && error.responseObject?.message) {
-			const message = error.responseObject.message as string;
-			// This is stupid, refer to the link
-			// https://github.com/juanfont/headscale/blob/main/hscontrol/types/policy.go
-			if (message.includes('update is disabled')) {
-				// This means the policy is not writable
-				throw data403('Policy is not writable');
+		if (isDataWithApiError(error)) {
+			const rawData = error.data.rawData;
+			// https://github.com/juanfont/headscale/blob/c4600346f9c29b514dc9725ac103efb9d0381f23/hscontrol/types/policy.go#L11
+			if (rawData.includes('update is disabled')) {
+				throw data('Policy is not writable', { status: 403 });
 			}
 
-			// https://github.com/juanfont/headscale/blob/main/hscontrol/policy/v1/acls.go#L81
-			if (message.includes('parsing hujson')) {
-				// This means the policy was invalid, return a 400
-				// with the actual error message from Headscale
-				const cutIndex = message.indexOf('err: hujson:');
-				const trimmed =
-					cutIndex > -1
-						? `Syntax error: ${message.slice(cutIndex + 12)}`
-						: message;
+			const message =
+				error.data.data != null &&
+				'message' in error.data.data &&
+				typeof error.data.data.message === 'string'
+					? error.data.data.message
+					: undefined;
 
-				return data(
-					{
-						success: false,
-						error: trimmed,
-						policy: undefined,
-						updatedAt: undefined,
-					},
-					400,
-				);
+			if (message == null) {
+				throw error;
 			}
 
-			if (message.includes('unmarshalling policy')) {
-				// This means the policy was invalid, return a 400
-				// with the actual error message from Headscale
-				const cutIndex = message.indexOf('err:');
-				const trimmed =
-					cutIndex > -1
-						? `Syntax error: ${message.slice(cutIndex + 5)}`
-						: message;
+			// Starting in Headscale 0.27.0 the ACLs parsing was changed meaning
+			// we need to reference other error messages based on API version.
+			if (context.hsApi.clientHelpers.isAtleast('0.27.0')) {
+				if (message.includes('parsing HuJSON:')) {
+					const cutIndex = message.indexOf('parsing HuJSON:');
+					const trimmed =
+						cutIndex > -1
+							? `Syntax error: ${message.slice(cutIndex + 16).trim()}`
+							: message;
 
-				return data(
-					{
-						success: false,
-						error: trimmed,
-						policy: undefined,
-						updatedAt: undefined,
-					},
-					400,
-				);
-			}
+					return data(
+						{
+							success: false,
+							error: trimmed,
+							policy: undefined,
+							updatedAt: undefined,
+						},
+						400,
+					);
+				}
 
-			if (message.includes('empty policy')) {
-				return data(
-					{
-						success: false,
-						error: 'Policy error: Supplied policy was empty',
-						policy: undefined,
-						updatedAt: undefined,
-					},
-					400,
-				);
+				if (message.includes('parsing policy from bytes:')) {
+					const cutIndex = message.indexOf('parsing policy from bytes:');
+					const trimmed =
+						cutIndex > -1
+							? `Syntax error: ${message.slice(cutIndex + 26).trim()}`
+							: message;
+
+					return data(
+						{
+							success: false,
+							error: trimmed,
+							policy: undefined,
+							updatedAt: undefined,
+						},
+						400,
+					);
+				}
+			} else {
+				// Pre-0.27.0 error messages
+				if (message.includes('parsing hujson')) {
+					const cutIndex = message.indexOf('err: hujson:');
+					const trimmed =
+						cutIndex > -1
+							? `Syntax error: ${message.slice(cutIndex + 12)}`
+							: message;
+
+					return data(
+						{
+							success: false,
+							error: trimmed,
+							policy: undefined,
+							updatedAt: undefined,
+						},
+						400,
+					);
+				}
+
+				if (message.includes('unmarshalling policy')) {
+					const cutIndex = message.indexOf('err:');
+					const trimmed =
+						cutIndex > -1
+							? `Syntax error: ${message.slice(cutIndex + 5)}`
+							: message;
+
+					return data(
+						{
+							success: false,
+							error: trimmed,
+							policy: undefined,
+							updatedAt: undefined,
+						},
+						400,
+					);
+				}
 			}
 		}
 

app/routes/acls/acl-loader.ts

@@ -1,8 +1,7 @@
-import { LoaderFunctionArgs } from 'react-router';
-import { LoadContext } from '~/server';
-import ResponseError from '~/server/headscale/api-error';
+import { data } from 'react-router';
+import { isDataWithApiError } from '~/server/headscale/api/error-client';
 import { Capabilities } from '~/server/web/roles';
-import { data403 } from '~/utils/res';
+import type { Route } from './+types/overview';
 
 // The logic for deciding policy factors is very complicated because
 // there are so many factors that need to be accounted for:
@@ -11,15 +10,13 @@ import { data403 } from '~/utils/res';
 // 3. Is the Headscale policy in file or database mode?
 //    If database, we can read/write easily via the API.
 //    If in file mode, we can only write if context.config is available.
-// TODO: Consider adding back file editing mode instead of database
-export async function aclLoader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function aclLoader({ request, context }: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
 	const check = await context.sessions.check(request, Capabilities.read_policy);
 	if (!check) {
-		throw data403('You do not have permission to read the ACL policy.');
+		throw data('You do not have permission to read the ACL policy.', {
+			status: 403,
+		});
 	}
 
 	const flags = {
@@ -30,35 +27,22 @@ export async function aclLoader({
 	};
 
 	// Try to load the ACL policy from the API.
+	const api = context.hsApi.getRuntimeClient(session.api_key);
 	try {
-		const { policy, updatedAt } = await context.client.get<{
-			policy: string;
-			updatedAt: string | null;
-		}>('v1/policy', session.api_key);
-
-		// Successfully loaded the policy, mark it as readable
-		// If `updatedAt` is null, it means the policy is in file mode.
+		const { policy, updatedAt } = await api.getPolicy();
 		flags.writable = updatedAt !== null;
 		flags.policy = policy;
 		return flags;
 	} catch (error) {
-		// This means Headscale returned a protobuf error to us
-		// It also means we 100% know this is in database mode
-		if (error instanceof ResponseError && error.responseObject?.message) {
-			const message = error.responseObject.message as string;
-			// This is stupid, refer to the link
-			// https://github.com/juanfont/headscale/blob/main/hscontrol/types/policy.go
-			if (message.includes('acl policy not found')) {
-				// This means the policy has never been initiated, and we can
-				// write to it to get it started or ignore it.
-				flags.policy = ''; // Start with an empty policy
+		if (isDataWithApiError(error)) {
+			// https://github.com/juanfont/headscale/blob/c4600346f9c29b514dc9725ac103efb9d0381f23/hscontrol/types/policy.go#L10
+			if (error.data.rawData.includes('acl policy not found')) {
+				flags.policy = '';
 				flags.writable = true;
+				return flags;
 			}
-
-			return flags;
 		}
 
-		// Otherwise, this is a Headscale error that we can just propagate.
 		throw error;
 	}
 }

app/routes/acls/components/cm.client.tsx

@@ -38,14 +38,14 @@ export function Editor(props: EditorProps) {
 				<ClientOnly fallback={<Fallback acl={props.value} />}>
 					{() => (
 						<CodeMirror
-							value={props.value}
-							editable={!props.isDisabled} // Allow editing unless disabled
-							readOnly={props.isDisabled} // Use readOnly if disabled
-							height="100%"
-							extensions={[shopify.jsonc()]}
+							editable={!props.isDisabled}
+							extensions={[shopify.jsonc()]} // Allow editing unless disabled
+							height="100%" // Use readOnly if disabled
+							onChange={(value) => props.onChange(value)}
+							readOnly={props.isDisabled}
 							style={{ height: '100%' }}
 							theme={light ? xcodeLight : xcodeDark}
-							onChange={(value) => props.onChange(value)}
+							value={props.value}
 						/>
 					)}
 				</ClientOnly>
@@ -92,14 +92,14 @@ export function Differ(props: DifferProps) {
 							{() => (
 								<Merge orientation="a-b" theme={light ? xcodeLight : xcodeDark}>
 									<Merge.Original
+										extensions={[shopify.jsonc()]}
 										readOnly
 										value={props.left}
-										extensions={[shopify.jsonc()]}
 									/>
 									<Merge.Modified
+										extensions={[shopify.jsonc()]}
 										readOnly
 										value={props.right}
-										extensions={[shopify.jsonc()]}
 									/>
 								</Merge>
 							)}

app/routes/acls/components/fallback.tsx

@@ -23,12 +23,12 @@ export default function Fallback({ acl }: Props) {
 				/>
 			</div>
 			<textarea
-				readOnly
 				className={cn(
 					'w-full h-editor font-mono resize-none text-sm',
 					'bg-headplane-50 dark:bg-headplane-950 opacity-60',
 					'pl-1 pt-1 leading-snug',
 				)}
+				readOnly
 				value={acl}
 			/>
 		</div>

app/routes/acls/overview.tsx

@@ -1,34 +1,31 @@
-import { Construction, Eye, FlaskConical, Pencil } from 'lucide-react';
-import { useEffect, useState } from 'react';
 import {
-	ActionFunctionArgs,
-	LoaderFunctionArgs,
-	useFetcher,
-	useLoaderData,
-	useRevalidator,
-} from 'react-router';
+	AlertCircle,
+	Construction,
+	Eye,
+	FlaskConical,
+	Pencil,
+} from 'lucide-react';
+import { useEffect, useState } from 'react';
+import { isRouteErrorResponse, useFetcher, useRevalidator } from 'react-router';
 import Button from '~/components/Button';
+import Card from '~/components/Card';
 import Code from '~/components/Code';
 import Link from '~/components/Link';
 import Notice from '~/components/Notice';
 import Tabs from '~/components/Tabs';
-import type { LoadContext } from '~/server';
+import { isApiError } from '~/server/headscale/api/error-client';
 import toast from '~/utils/toast';
+import type { Route } from './+types/overview';
 import { aclAction } from './acl-action';
 import { aclLoader } from './acl-loader';
 import { Differ, Editor } from './components/cm.client';
 
-export async function loader(request: LoaderFunctionArgs<LoadContext>) {
-	return aclLoader(request);
-}
+export const loader = aclLoader;
+export const action = aclAction;
 
-export async function action(request: ActionFunctionArgs<LoadContext>) {
-	return aclAction(request);
-}
-
-export default function Page() {
-	// Access is a write check here, we already check read in aclLoader
-	const { access, writable, policy } = useLoaderData<typeof loader>();
+export default function Page({
+	loaderData: { access, writable, policy },
+}: Route.ComponentProps) {
 	const [codePolicy, setCodePolicy] = useState(policy);
 	const fetcher = useFetcher<typeof action>();
 	const { revalidate } = useRevalidator();
@@ -75,15 +72,15 @@ export default function Page() {
 				The ACL file is used to define the access control rules for your
 				network. You can find more information about the ACL file in the{' '}
 				<Link
-					to="https://tailscale.com/kb/1018/acls"
 					name="Tailscale ACL documentation"
+					to="https://tailscale.com/kb/1018/acls"
 				>
 					Tailscale ACL guide
 				</Link>{' '}
 				and the{' '}
 				<Link
-					to="https://headscale.net/stable/ref/acls/"
 					name="Headscale ACL documentation"
+					to="https://headscale.net/stable/ref/acls/"
 				>
 					Headscale docs
 				</Link>
@@ -91,14 +88,14 @@ export default function Page() {
 			</p>
 			{fetcher.data?.error !== undefined ? (
 				<Notice
-					variant="error"
 					title={fetcher.data.error.split(':')[0] ?? 'Error'}
+					variant="error"
 				>
 					{fetcher.data.error.split(':').slice(1).join(': ') ??
 						'An unknown error occurred while trying to update the ACL policy.'}
 				</Notice>
 			) : undefined}
-			<Tabs label="ACL Editor" className="mb-4">
+			<Tabs className="mb-4" label="ACL Editor">
 				<Tabs.Item
 					key="edit"
 					title={
@@ -110,8 +107,8 @@ export default function Page() {
 				>
 					<Editor
 						isDisabled={disabled}
-						value={codePolicy}
 						onChange={setCodePolicy}
+						value={codePolicy}
 					/>
 				</Tabs.Item>
 				<Tabs.Item
@@ -145,7 +142,6 @@ export default function Page() {
 				</Tabs.Item>
 			</Tabs>
 			<Button
-				variant="heavy"
 				className="mr-2"
 				isDisabled={
 					disabled ||
@@ -158,6 +154,7 @@ export default function Page() {
 					formData.append('policy', codePolicy);
 					fetcher.submit(formData, { method: 'PATCH' });
 				}}
+				variant="heavy"
 			>
 				Save
 			</Button>
@@ -175,3 +172,49 @@ export default function Page() {
 		</div>
 	);
 }
+
+export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
+	if (
+		isRouteErrorResponse(error) &&
+		isApiError(error.data) &&
+		error.data.rawData.includes('reading policy from path') &&
+		error.data.rawData.includes('no such file or directory')
+	) {
+		return (
+			<div className="flex flex-col gap-4">
+				<Card className="max-w-2xl" variant="flat">
+					<div className="flex items-center justify-between gap-4">
+						<Card.Title>ACL Policy Unavailable</Card.Title>
+						<AlertCircle className="w-6 h-6 mb-2 text-red-500" />
+					</div>
+					<Card.Text>
+						The ACL policy is currently unavailable because the policy file does
+						not exist on the server. This usually indicates that Headscale is
+						running in <Code>file</Code> mode for ACLs, and the specified policy
+						file is missing.
+					</Card.Text>
+				</Card>
+				<Card className="max-w-2xl" variant="flat">
+					<Card.Text>
+						In order to resolve this issue, there are two possible actions you
+						can take:
+					</Card.Text>
+					<ul className="list-disc list-outside mt-2 ml-4 space-y-1 text-sm">
+						<li>
+							Create the ACL policy file at the specified path in your Headscale
+							configuration.
+						</li>
+						<li>
+							Alternatively, you can switch Headscale to use{' '}
+							<Code>database</Code> mode for ACLs by updating your Headscale
+							configuration. This will allow Headplane to manage the ACL policy
+							directly through the web interface.
+						</li>
+					</ul>
+				</Card>
+			</div>
+		);
+	}
+
+	throw error;
+}

app/routes/auth/login/action.ts

@@ -1,104 +1,102 @@
-import { ActionFunctionArgs, data, redirect } from 'react-router';
-import { LoadContext } from '~/server';
-import ResponseError from '~/server/headscale/api-error';
-import { Key } from '~/types';
-import log from '~/utils/log';
+import { data, redirect } from "react-router";
 
-export async function loginAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
-	const formData = await request.formData();
-	const apiKey = formData.has('api_key')
-		? String(formData.get('api_key'))
-		: undefined;
+import { isDataWithApiError } from "~/server/headscale/api/error-client";
+import log from "~/utils/log";
 
-	if (apiKey === undefined) {
-		log.warn('auth', 'Request made without API key');
-		log.warn(
-			'auth',
-			'If this is unexpected, ensure your reverse proxy (if applicable) is configured correctly',
-		);
-		throw data('Missing `api_key`', { status: 400 });
-	}
+import type { Route } from "./+types/page";
 
-	if (apiKey.length === 0) {
-		log.warn('auth', 'Request made with empty API key');
-		log.warn(
-			'auth',
-			'If this is unexpected, ensure your reverse proxy (if applicable) is configured correctly',
-		);
-		throw data('Received an empty `api_key`', { status: 400 });
-	}
+export async function loginAction({ request, context }: Route.LoaderArgs) {
+  const formData = await request.formData();
+  const apiKey = formData.has("api_key") ? String(formData.get("api_key")) : undefined;
 
-	try {
-		const { apiKeys } = await context.client.get<{ apiKeys: Key[] }>(
-			'v1/apikey',
-			apiKey,
-		);
+  if (apiKey === undefined) {
+    log.warn("auth", "Request made without API key");
+    log.warn(
+      "auth",
+      "If this is unexpected, ensure your reverse proxy (if applicable) is configured correctly",
+    );
+    throw data("Missing `api_key`", { status: 400 });
+  }
 
-		// We don't need to check for 0 API keys because this request cannot
-		// be authenticated correctly without an API key
-		const lookup = apiKeys.find((key) => apiKey.startsWith(key.prefix));
-		if (!lookup) {
-			return {
-				success: false,
-				message: 'API key was not found in the Headscale database',
-			};
-		}
+  if (apiKey.length === 0) {
+    log.warn("auth", "Request made with empty API key");
+    log.warn(
+      "auth",
+      "If this is unexpected, ensure your reverse proxy (if applicable) is configured correctly",
+    );
+    throw data("Received an empty `api_key`", { status: 400 });
+  }
 
-		if (lookup.expiration === null || lookup.expiration === undefined) {
-			log.error('auth', 'Got an API key without an expiration');
-			throw data('API key is malformed', { status: 500 });
-		}
+  const api = context.hsApi.getRuntimeClient(apiKey);
+  try {
+    const apiKeys = await api.getApiKeys();
+    console.log(apiKeys);
 
-		const expiry = new Date(lookup.expiration);
-		if (expiry.getTime() < Date.now()) {
-			return {
-				success: false,
-				message: 'API key has expired',
-			};
-		}
+    // We don't need to check for 0 API keys because this request cannot
+    // be authenticated correctly without an API key
+    //
+    // 0.28.0 pointlessly added asterisks to the prefixes of API keys, which is
+    // the dumbest thing I've ever seen.
+    const lookup = apiKeys.find((key) => apiKey.startsWith(key.prefix.replaceAll("*", "")));
+    if (!lookup) {
+      return {
+        success: false,
+        message: "API key was not found in the Headscale database",
+      };
+    }
 
-		const expiresDays = Math.round(
-			(expiry.getTime() - Date.now()) / 1000 / 60 / 60 / 24,
-		);
+    if (lookup.expiration === null || lookup.expiration === undefined) {
+      log.error("auth", "Got an API key without an expiration");
+      throw data("API key is malformed", { status: 500 });
+    }
 
-		return redirect('/machines', {
-			headers: {
-				'Set-Cookie': await context.sessions.createSession(
-					{
-						api_key: apiKey,
-						user: {
-							subject: 'unknown-non-oauth',
-							name: `${lookup.prefix}...`,
-							email: `expires@${expiresDays.toString()}-days`,
-						},
-					},
-					expiry.getTime() - Date.now(),
-				),
-			},
-		});
-	} catch (error) {
-		if (error instanceof ResponseError) {
-			// TODO: What in gods name is wrong with the headscale API?
-			if (
-				error.status === 401 ||
-				error.status === 403 ||
-				(error.status === 500 && error.response.trim() === 'Unauthorized')
-			) {
-				return {
-					success: false,
-					message: 'API key is invalid (it may be incorrect or expired)',
-				};
-			}
-		}
+    const expiry = new Date(lookup.expiration);
+    if (expiry.getTime() < Date.now()) {
+      return {
+        success: false,
+        message: "API key has expired",
+      };
+    }
 
-		log.error('auth', 'Error while validating API key: %s', error);
-		log.debug('auth', 'Error details: %o', error);
-		return {
-			success: false,
-			message: 'Error while validating API key (see logs for details)',
-		};
-	}
+    const expiresDays = Math.round((expiry.getTime() - Date.now()) / 1000 / 60 / 60 / 24);
+
+    return redirect("/machines", {
+      headers: {
+        "Set-Cookie": await context.sessions.createSession(
+          {
+            api_key: apiKey,
+            user: {
+              subject: "unknown-non-oauth",
+              name: `${lookup.prefix}...`,
+              email: `expires@${expiresDays.toString()}-days`,
+            },
+          },
+          expiry.getTime() - Date.now(),
+        ),
+      },
+    });
+  } catch (error) {
+    // Check if this is a React Router DataWithResponseInit wrapping a Headscale API error
+    if (isDataWithApiError(error)) {
+      const apiError = error.data;
+      // TODO: What in gods name is wrong with the headscale API?
+      if (
+        apiError.statusCode === 401 ||
+        apiError.statusCode === 403 ||
+        (apiError.statusCode === 500 && apiError.rawData.trim() === "Unauthorized")
+      ) {
+        return {
+          success: false,
+          message: "API key is invalid (it may be incorrect or expired)",
+        };
+      }
+    }
+
+    log.error("auth", "Error while validating API key: %s", error);
+    log.debug("auth", "Error details: %o", error);
+    return {
+      success: false,
+      message: "Error while validating API key (see logs for details)",
+    };
+  }
 }

app/routes/auth/login/config-error.tsx

@@ -0,0 +1,131 @@
+import { AlertCircle, CloudOff } from "lucide-react";
+
+import Card from "~/components/Card";
+import Code from "~/components/Code";
+import Link from "~/components/Link";
+import { OidcConnectorError } from "~/server/web/oidc-connector";
+
+export function OidcDiscoveryFailedNotice() {
+  return (
+    <Card className="m-4 mb-4 max-w-md border border-yellow-500 sm:m-0 sm:mb-4">
+      <div className="flex items-center justify-between gap-4">
+        <Card.Title className="text-yellow-500">SSO Temporarily Unavailable</Card.Title>
+        <CloudOff className="mb-2 h-6 w-6 text-yellow-500" />
+      </div>
+      <Card.Text className="text-sm">
+        Unable to reach the identity provider. Single Sign-On will be available once the provider is
+        reachable again. You can still sign in with an API key.
+      </Card.Text>
+    </Card>
+  );
+}
+
+export function OidcConfigErrorNotice({ errors }: { errors: OidcConnectorError[] }) {
+  return (
+    <Card className="m-4 mb-4 max-w-md border border-red-500 sm:m-0 sm:mb-4">
+      <div className="flex items-center justify-between gap-4">
+        <Card.Title className="text-red-500">Authentication Error</Card.Title>
+        <AlertCircle className="mb-2 h-6 w-6 text-red-500" />
+      </div>
+      <Card.Text className="text-sm">
+        The OpenID Connect (OIDC) Single Sign-On (SSO) configuration has issues:{" "}
+        <ul className="mt-2 mb-1 list-inside list-disc">
+          {mapOidcErrorsToMessages(errors).map((code) => (
+            <li key={code.key}>{code.node}</li>
+          ))}
+        </ul>{" "}
+        <Link
+          name="Headplane OIDC Issues"
+          to="https://headplane.net/configuration/sso#troubleshooting"
+        >
+          Learn more
+        </Link>
+      </Card.Text>
+    </Card>
+  );
+}
+
+function mapOidcErrorsToMessages(errors: OidcConnectorError[]) {
+  const messages: {
+    key: string;
+    node: React.ReactNode;
+  }[] = [];
+
+  for (const error of errors) {
+    switch (error) {
+      case "INVALID_API_KEY":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              The provided API key for OIDC authentication is invalid. Ensure that{" "}
+              <Code>oidc.headscale_api_key</Code> is a valid API key.
+            </Card.Text>
+          ),
+        });
+        break;
+
+      case "MISSING_AUTHORIZATION_ENDPOINT":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              The OIDC provided does not have a configured <Code>authorization_endpoint</Code>.
+              Ensure discovery URL or manual configuration is correct.
+            </Card.Text>
+          ),
+        });
+        break;
+
+      case "MISSING_TOKEN_ENDPOINT":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              The OIDC provided does not have a configured <Code>token_endpoint</Code>. Ensure
+              discovery URL or manual configuration is correct.
+            </Card.Text>
+          ),
+        });
+        break;
+
+      case "MISSING_USERINFO_ENDPOINT":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              The OIDC provided does not have a configured <Code>user_endpoint</Code>. Ensure
+              discovery URL or manual configuration is correct.
+            </Card.Text>
+          ),
+        });
+        break;
+
+      case "MISSING_REQUIRED_CLAIMS":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              The OIDC provider does not support the <Code>sub</Code> claim, which is required for
+              authentication. Your OIDC provider may be misconfigured.
+            </Card.Text>
+          ),
+        });
+        break;
+
+      case "UNKNOWN_ERROR":
+        messages.push({
+          key: error,
+          node: (
+            <Card.Text className="inline">
+              An unknown error occurred during OIDC configuration. Please check the Headplane logs
+              for more information.
+            </Card.Text>
+          ),
+        });
+        break;
+    }
+  }
+
+  return messages;
+}

app/routes/auth/login/oidc-error.tsx

@@ -0,0 +1,63 @@
+import { AlertCircle } from 'lucide-react';
+import Card from '~/components/Card';
+import Code from '~/components/Code';
+
+export function OidcErrorNotice({ code }: { code: string }) {
+	return (
+		<Card className="max-w-md m-4 sm:m-0 mb-4 sm:mb-4 border border-red-500">
+			<div className="flex items-center justify-between gap-4">
+				<Card.Title className="text-red-500">Configuration Issue(s)</Card.Title>
+				<AlertCircle className="w-6 h-6 mb-2 text-red-500" />
+			</div>
+			{getErrorMessage(code)}
+		</Card>
+	);
+}
+
+function getErrorMessage(code: string) {
+	switch (code) {
+		case 'error_no_query':
+			return (
+				<Card.Text>
+					The SSO provider did not correctly redirect back to Headplane with the
+					required parameters. Please ensure your SSO provider is configured
+					correctly.
+				</Card.Text>
+			);
+
+		case 'error_no_session':
+		case 'error_invalid_session':
+			return (
+				<Card.Text>
+					Unable to complete SSO login due to missing or invalid session data.
+					Ensure that your Headplane cookie configuration is correct and that
+					your browser is accepting cookies.
+				</Card.Text>
+			);
+
+		case 'error_no_sub':
+			return (
+				<Card.Text>
+					The SSO provider did not return a valid user identifier. Please ensure
+					your SSO provider is correctly configured to provide the{' '}
+					<Code>sub</Code> claim.
+				</Card.Text>
+			);
+
+		case 'error_auth_failed':
+			return (
+				<Card.Text>
+					Authentication with the SSO provider failed. Please try again later.
+					Headplane logs may provide more information.
+				</Card.Text>
+			);
+
+		default:
+			return (
+				<Card.Text>
+					An unknown error occurred during OIDC authentication. Please try again
+					later.
+				</Card.Text>
+			);
+	}
+}

app/routes/auth/login/page.tsx

@@ -1,132 +1,156 @@
-import { useEffect } from 'react';
-import {
-	ActionFunctionArgs,
-	data,
-	Form,
-	LoaderFunctionArgs,
-	Link as RemixLink,
-	redirect,
-	useActionData,
-	useLoaderData,
-	useSearchParams,
-} from 'react-router';
-import Button from '~/components/Button';
-import Card from '~/components/Card';
-import Code from '~/components/Code';
-import Input from '~/components/Input';
-import type { LoadContext } from '~/server';
-import { useLiveData } from '~/utils/live-data';
-import { loginAction } from './action';
-import Logout from './logout';
+import { AlertCircle } from "lucide-react";
+import { useEffect, useState } from "react";
+import { Form, Link as RemixLink, redirect, useSearchParams } from "react-router";
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	try {
-		await context.sessions.auth(request);
-		return redirect('/machines');
-	} catch {}
+import Button from "~/components/Button";
+import Card from "~/components/Card";
+import Code from "~/components/Code";
+import Input from "~/components/Input";
+import Link from "~/components/Link";
+import { useLiveData } from "~/utils/live-data";
 
-	const qp = new URL(request.url).searchParams;
-	const state = qp.get('s') ?? undefined;
+import type { Route } from "./+types/page";
 
-	// OIDC config cannot be undefined if an OIDC client is set
-	// Also check if we are in a logout state and skip redirect if we are
-	const ssoOnly = context.config.oidc?.disable_api_key_login;
-	if (state !== 'logout' && ssoOnly) {
-		// This shouldn't be possible, but still a safe sanity check
-		if (!context.oidc) {
-			throw data(
-				'`oidc.disable_api_key_login` was set without a valid OIDC configuration',
-				{
-					status: 400,
-				},
-			);
-		}
+import { loginAction } from "./action";
+import { OidcConfigErrorNotice, OidcDiscoveryFailedNotice } from "./config-error";
+import Logout from "./logout";
+import { OidcErrorNotice } from "./oidc-error";
 
-		return redirect('/oidc/start');
-	}
+export async function loader({ request, context }: Route.LoaderArgs) {
+  try {
+    await context.sessions.auth(request);
+    return redirect("/machines");
+  } catch {}
 
-	return {
-		oidc: context.oidc,
-		state,
-	};
+  const qp = new URL(request.url).searchParams;
+  const urlState = qp.get("s") ?? undefined;
+
+  const oidcConnector = await context.oidcConnector?.get();
+
+  // MARK: This works because the OIDC connector will always return false
+  // for `isExclusive` if the OIDC config isn't usable.
+  if (oidcConnector?.isExclusive && urlState !== "logout") {
+    return redirect("/oidc/start");
+  }
+
+  const isOidcConnectorEnabled = oidcConnector?.isValid;
+  const oidcErrorCodes = !isOidcConnectorEnabled ? (oidcConnector?.errors ?? []) : [];
+
+  return {
+    isCookieSecureEnabled: context.config.server.cookie_secure,
+    isOidcConnectorEnabled,
+    oidcErrorCodes,
+    urlState,
+  };
 }
 
-export async function action(request: ActionFunctionArgs<LoadContext>) {
-	return loginAction(request);
-}
-
-export default function Page() {
-	const { state, oidc } = useLoaderData<typeof loader>();
-	const formData = useActionData<typeof action>();
-	const [params] = useSearchParams();
-	const { pause } = useLiveData();
-
-	useEffect(() => {
-		// This page does NOT need stale while revalidate logic
-		pause();
-	});
-
-	useEffect(() => {
-		// State is a one time thing, we need to remove it after it has
-		// been consumed to prevent logic loops.
-		if (state !== null) {
-			const searchParams = new URLSearchParams(params);
-			searchParams.delete('s');
-
-			// Replacing because it's not a navigation, just a cleanup of the URL
-			// We can't use the useSearchParams method since it revalidates
-			// which will trigger a full reload
-			const newUrl = searchParams.toString()
-				? `{${window.location.pathname}?${searchParams.toString()}`
-				: window.location.pathname;
-
-			window.history.replaceState(null, '', newUrl);
-		}
-	}, [state, params]);
-
-	if (state === 'logout') {
-		return <Logout />;
-	}
-
-	return (
-		<div className="flex w-screen h-screen items-center justify-center">
-			<Card className="max-w-md m-4 sm:m-0">
-				<Card.Title>Welcome to Headplane</Card.Title>
-				<Form method="POST">
-					<Card.Text>
-						Enter an API key to authenticate with Headplane. You can generate
-						one by running <Code>headscale apikeys create</Code> in your
-						terminal.
-					</Card.Text>
-					<Input
-						className="mt-8 mb-2"
-						isRequired
-						label="API Key"
-						labelHidden
-						name="api_key"
-						placeholder="API Key"
-						type="password"
-					/>
-					{formData?.success === false ? (
-						<Card.Text className="text-sm mb-2 text-red-600 dark:text-red-300">
-							{formData.message}
-						</Card.Text>
-					) : undefined}
-					<Button className="w-full" type="submit" variant="heavy">
-						Sign In
-					</Button>
-				</Form>
-				{oidc ? (
-					<RemixLink to="/oidc/start">
-						<Button className="w-full mt-2" variant="light">
-							Single Sign-On
-						</Button>
-					</RemixLink>
-				) : undefined}
-			</Card>
-		</div>
-	);
+export const action = loginAction;
+
+export default function Page({ loaderData, actionData }: Route.ComponentProps) {
+  const { isCookieSecureEnabled, isOidcConnectorEnabled, oidcErrorCodes, urlState } = loaderData;
+
+  const [showCookieWarning, setShowCookieWarning] = useState(false);
+  const [params] = useSearchParams();
+  const { pause } = useLiveData();
+
+  useEffect(() => {
+    // This page does NOT need stale while revalidate logic
+    pause();
+
+    if (isCookieSecureEnabled && window.location.protocol !== "https:") {
+      setShowCookieWarning(true);
+    }
+  });
+
+  useEffect(() => {
+    // State is a one time thing, we need to remove it after it has
+    // been consumed to prevent logic loops.
+    if (urlState !== null) {
+      const searchParams = new URLSearchParams(params);
+      searchParams.delete("s");
+
+      // Replacing because it's not a navigation, just a cleanup of the URL
+      // We can't use the useSearchParams method since it revalidates
+      // which will trigger a full reload
+      const newUrl = searchParams.toString()
+        ? `{${window.location.pathname}?${searchParams.toString()}`
+        : window.location.pathname;
+
+      window.history.replaceState(null, "", newUrl);
+    }
+  }, [urlState, params]);
+
+  if (urlState === "logout") {
+    return <Logout />;
+  }
+
+  return (
+    <div className="flex h-screen w-screen items-center justify-center">
+      <div>
+        {urlState?.startsWith("error_") ? (
+          <OidcErrorNotice code={urlState} />
+        ) : oidcErrorCodes.includes("DISCOVERY_FAILED") ? (
+          <OidcDiscoveryFailedNotice />
+        ) : oidcErrorCodes.length > 0 ? (
+          <OidcConfigErrorNotice errors={oidcErrorCodes} />
+        ) : showCookieWarning ? (
+          <Card className="m-4 mb-4 max-w-md border border-red-500 sm:m-0 sm:mb-4">
+            <div className="flex items-center justify-between gap-4">
+              <Card.Title className="text-red-500">Configuration Issue</Card.Title>
+              <AlertCircle className="mb-2 h-6 w-6 text-red-500" />
+            </div>
+            {showCookieWarning ? (
+              <Card.Text className="text-sm">
+                Headplane is configured to use secure cookies, but this site is being served over an
+                insecure connection and login will not work correctly.{" "}
+                <Link
+                  name="Headplane Common Issues"
+                  to="https://headplane.net/configuration/common-issues#issue-logging-in-does-not-do-anything"
+                >
+                  Learn more.
+                </Link>
+              </Card.Text>
+            ) : undefined}
+          </Card>
+        ) : undefined}
+        <Card className="m-4 max-w-md sm:m-0">
+          <Card.Title>Welcome to Headplane</Card.Title>
+          <Form method="POST">
+            <Card.Text>
+              Enter an API key to authenticate with Headplane. You can generate one by running{" "}
+              <Code>headscale apikeys create</Code> in your terminal.
+            </Card.Text>
+            <Input
+              className="mt-8 mb-2"
+              isRequired
+              label="API Key"
+              labelHidden
+              name="api_key"
+              placeholder="API Key"
+              type="password"
+            />
+            {actionData?.success === false ? (
+              <Card.Text className="mb-2 text-sm text-red-600 dark:text-red-300">
+                {actionData.message}
+              </Card.Text>
+            ) : undefined}
+            <Button className="w-full" type="submit" variant="heavy">
+              Sign In
+            </Button>
+          </Form>
+          {isOidcConnectorEnabled ? (
+            <RemixLink to="/oidc/start">
+              <Button
+                className="mt-2 w-full"
+                isDisabled={oidcErrorCodes.length > 0}
+                variant="light"
+              >
+                Single Sign-On
+              </Button>
+            </RemixLink>
+          ) : undefined}
+        </Card>
+      </div>
+    </div>
+  );
 }

app/routes/auth/oidc-callback.ts

@@ -1,131 +1,155 @@
-import { createHash } from 'node:crypto';
-import { count, eq } from 'drizzle-orm';
-import { createCookie, type LoaderFunctionArgs, redirect } from 'react-router';
-import { ulid } from 'ulidx';
-import type { LoadContext } from '~/server';
-import { HeadplaneConfig } from '~/server/config/schema';
-import { users } from '~/server/db/schema';
-import { Roles } from '~/server/web/roles';
-import { FlowUser, finishAuthFlow, formatError } from '~/utils/oidc';
-import { send } from '~/utils/res';
+import { count, eq } from "drizzle-orm";
+import { createHash } from "node:crypto";
+import * as oidc from "openid-client";
+import { data, redirect } from "react-router";
+import { ulid } from "ulidx";
 
-interface OidcFlowSession {
-	state: string;
-	nonce: string;
-	code_verifier: string;
-	redirect_uri: string;
-}
-
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	if (!context.oidc) {
-		throw new Error('OIDC is not enabled');
-	}
-
-	// Check if we have 0 query parameters
-	const url = new URL(request.url);
-	if (url.searchParams.toString().length === 0) {
-		return redirect('/login');
-	}
-
-	const cookie = createCookie('__oidc_auth_flow', {
-		httpOnly: true,
-		maxAge: 300, // 5 minutes
-	});
-
-	const data: OidcFlowSession | null = await cookie.parse(
-		request.headers.get('Cookie'),
-	);
-
-	if (data === null) {
-		console.warn('OIDC flow session not found');
-		return redirect('/login');
-	}
-
-	const { code_verifier, state, nonce, redirect_uri } = data;
-	if (!code_verifier || !state || !nonce || !redirect_uri) {
-		return send({ error: 'Missing OIDC state' }, { status: 400 });
-	}
-
-	// Reconstruct the redirect URI using the query parameters
-	// and the one we saved in the session
-	const flowRedirectUri = new URL(redirect_uri);
-	flowRedirectUri.search = url.search;
-
-	const flowOptions = {
-		redirect_uri: flowRedirectUri.toString(),
-		code_verifier,
-		state,
-		nonce: nonce === '<none>' ? undefined : nonce,
-	};
-
-	try {
-		let user = await finishAuthFlow(context.oidc, flowOptions);
-		user = {
-			...user,
-			picture: setOidcPictureForSource(
-				user,
-				context.config.oidc?.profile_picture_source ?? 'oidc',
-			),
-		};
-
-		const [{ count: userCount }] = await context.db
-			.select({ count: count() })
-			.from(users)
-			.where(eq(users.caps, Roles.owner));
-
-		await context.db
-			.insert(users)
-			.values({
-				id: ulid(),
-				sub: user.subject,
-				caps: userCount === 0 ? Roles.owner : Roles.member,
-			})
-			.onConflictDoNothing();
-
-		return redirect('/machines', {
-			headers: {
-				'Set-Cookie': await context.sessions.createSession({
-					// TODO: This is breaking, to stop the "over-generation" of API
-					// keys because they are currently non-deletable in the headscale
-					// database. Look at this in the future once we have a solution
-					// or we have permissioned API keys.
-					api_key: context.config.oidc?.headscale_api_key!,
-					user,
-				}),
-			},
-		});
-	} catch (error) {
-		return new Response(JSON.stringify(formatError(error)), {
-			status: 500,
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
-	}
-}
-
-type PictureSource = NonNullable<
-	HeadplaneConfig['oidc']
->['profile_picture_source'];
-
-function setOidcPictureForSource(user: FlowUser, source: PictureSource) {
-	// Already set by default in the callback, so we can just return it
-	if (source === 'oidc') {
-		return user.picture;
-	}
-
-	if (source === 'gravatar') {
-		if (!user.email) {
-			return undefined;
-		}
-
-		const emailHash = user.email.trim().toLowerCase();
-		const hash = createHash('sha256').update(emailHash).digest('hex');
-		return `https://www.gravatar.com/avatar/${hash}?s=200&d=identicon&r=x`;
-	}
-
-	return undefined;
+import { users } from "~/server/db/schema";
+import { Roles } from "~/server/web/roles";
+import log from "~/utils/log";
+import { createOidcStateCookie } from "~/utils/oidc-state";
+
+import type { Route } from "./+types/oidc-callback";
+
+export async function loader({ request, context }: Route.LoaderArgs) {
+  const oidcConnector = await context.oidcConnector?.get();
+  if (!oidcConnector?.isValid) {
+    throw data("OIDC is not enabled or misconfigured", { status: 501 });
+  }
+
+  const url = new URL(request.url);
+  if (url.searchParams.toString().length === 0) {
+    return redirect("/login?s=error_no_query");
+  }
+
+  const cookie = createOidcStateCookie(context.config);
+  const oidcCookieState = await cookie.parse(request.headers.get("Cookie"));
+
+  if (oidcCookieState == null) {
+    log.warn("auth", "Called OIDC callback without session cookie");
+    return redirect("/login?s=error_no_session");
+  }
+
+  const { state, nonce, redirect_uri, verifier } = oidcCookieState;
+  if (!state || !nonce || !redirect_uri || !verifier) {
+    log.warn("auth", "OIDC session cookie is missing required fields");
+    return redirect("/login?s=error_invalid_session");
+  }
+
+  try {
+    const callbackUrl = new URL(redirect_uri);
+    const currentUrl = new URL(request.url);
+    callbackUrl.search = currentUrl.search;
+
+    const tokens = await oidc.authorizationCodeGrant(oidcConnector.client, callbackUrl, {
+      expectedState: state,
+      expectedNonce: nonce,
+      ...(oidcConnector.usePKCE ? { pkceCodeVerifier: verifier } : {}),
+    });
+
+    const claims = tokens.claims();
+    if (claims?.sub == null) {
+      log.warn("auth", "No subject found in OIDC claims");
+      return redirect("/login?s=error_no_sub");
+    }
+
+    const userInfo = await oidc.fetchUserInfo(
+      oidcConnector.client,
+      tokens.access_token,
+      claims.sub,
+    );
+
+    // We have defaults that closely follow what Headscale uses, maybe we
+    // can make it configurable in the future, but for now we only need the
+    // `sub` claim.
+    const username = userInfo.preferred_username ?? userInfo.email?.split("@")[0] ?? "user";
+    const name =
+      userInfo.name ??
+      (userInfo.given_name && userInfo.family_name
+        ? `${userInfo.given_name} ${userInfo.family_name}`
+        : (userInfo.preferred_username ?? "SSO User"));
+
+    const picture =
+      context.config.oidc?.profile_picture_source === "gravatar"
+        ? (() => {
+            if (!userInfo.email) {
+              return undefined;
+            }
+
+            const emailHash = userInfo.email.trim().toLowerCase();
+            const hash = createHash("sha256").update(emailHash).digest("hex");
+            return `https://www.gravatar.com/avatar/${hash}?s=200&d=identicon&r=x`;
+          })()
+        : userInfo.picture;
+
+    const [{ count: userCount }] = await context.db
+      .select({ count: count() })
+      .from(users)
+      .where(eq(users.caps, Roles.owner));
+
+    await context.db
+      .insert(users)
+      .values({
+        id: ulid(),
+        sub: claims.sub,
+        caps: userCount === 0 ? Roles.owner : Roles.member,
+      })
+      .onConflictDoNothing();
+
+    return redirect("/", {
+      headers: {
+        "Set-Cookie": await context.sessions.createSession({
+          api_key: oidcConnector.apiKey,
+          user: {
+            subject: claims.sub,
+            username,
+            name,
+            email: userInfo.email,
+            picture,
+          },
+        }),
+      },
+    });
+  } catch (error) {
+    if (error instanceof oidc.ResponseBodyError) {
+      log.error("auth", "Got an OIDC response error body: %s", JSON.stringify(error.cause));
+
+      // Check for PKCE-related errors
+      if (
+        error.error.toLowerCase().includes("code_verifier") ||
+        error.error.toLowerCase().includes("code verifier") ||
+        error.error.toLowerCase().includes("pkce")
+      ) {
+        log.error(
+          "auth",
+          "PKCE error detected. Your OIDC provider may require PKCE to be enabled. Current setting: use_pkce=%s",
+          oidcConnector.usePKCE,
+        );
+
+        if (!oidcConnector.usePKCE) {
+          log.error(
+            "auth",
+            "Consider setting oidc.use_pkce=true in your configuration if your provider requires PKCE",
+          );
+        }
+      }
+    } else if (error instanceof oidc.AuthorizationResponseError) {
+      log.error("auth", "Got an OIDC authorization response error: %s", error.error);
+    } else if (error instanceof oidc.WWWAuthenticateChallengeError) {
+      log.error("auth", "Got an OIDC WWW-Authenticate challenge error");
+    } else if (error instanceof oidc.ClientError) {
+      log.error(
+        "auth",
+        "Got an OIDC authorization client error: %s",
+        error.cause instanceof Error ? error.cause.message : String(error.cause),
+      );
+    } else {
+      log.error(
+        "auth",
+        "Got an OIDC error: %s",
+        error instanceof Error && error.cause ? JSON.stringify(error.cause) : String(error),
+      );
+    }
+    return redirect("/login?s=error_auth_failed");
+  }
 }

app/routes/auth/oidc-start.ts

@@ -1,43 +1,81 @@
-import { createCookie, type LoaderFunctionArgs, redirect } from 'react-router';
-import type { LoadContext } from '~/server';
-import { beginAuthFlow, getRedirectUri } from '~/utils/oidc';
+import * as oidc from "openid-client";
+import { data, redirect } from "react-router";
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	try {
-		await context.sessions.auth(request);
-		return redirect('/machines');
-	} catch {}
+import { HeadplaneConfig } from "~/server/config/config-schema";
+import { createOidcStateCookie } from "~/utils/oidc-state";
 
-	if (!context.oidc || !context.config.oidc) {
-		throw new Error('OIDC is not enabled');
-	}
+import type { Route } from "./+types/oidc-start";
 
-	const cookie = createCookie('__oidc_auth_flow', {
-		httpOnly: true,
-		maxAge: 300, // 5 minutes
-	});
+export async function loader({ request, context }: Route.LoaderArgs) {
+  try {
+    await context.sessions.auth(request);
+    return redirect("/");
+  } catch {}
 
-	const redirectUri =
-		context.config.oidc?.redirect_uri ?? getRedirectUri(request);
-	const data = await beginAuthFlow(
-		context.oidc,
-		redirectUri,
-		context.config.oidc.scope,
-		context.config.oidc.extra_params,
-	);
+  const oidcConnector = await context.oidcConnector?.get();
+  if (!oidcConnector?.isValid) {
+    throw data("OIDC is not enabled or misconfigured", { status: 501 });
+  }
 
-	return redirect(data.url, {
-		status: 302,
-		headers: {
-			'Set-Cookie': await cookie.serialize({
-				state: data.state,
-				nonce: data.nonce,
-				code_verifier: data.codeVerifier,
-				redirect_uri: redirectUri,
-			}),
-		},
-	});
+  const cookie = createOidcStateCookie(context.config);
+  const redirect_uri = getRedirectUri(context.config, request);
+
+  const nonce = oidc.randomNonce();
+  const verifier = oidc.randomPKCECodeVerifier();
+  const state = oidc.randomState();
+
+  const url = oidc.buildAuthorizationUrl(oidcConnector.client, {
+    ...oidcConnector.extraParams,
+    scope: oidcConnector.scope,
+    redirect_uri,
+    state,
+    nonce,
+    ...(oidcConnector.usePKCE
+      ? {
+          code_challenge_method: "S256",
+          code_challenge: await oidc.calculatePKCECodeChallenge(verifier),
+        }
+      : {}),
+  });
+
+  return redirect(url.href, {
+    status: 302,
+    headers: {
+      "Set-Cookie": await cookie.serialize({
+        state,
+        nonce,
+        verifier,
+        redirect_uri,
+      }),
+    },
+  });
+}
+
+function getRedirectUri(config: HeadplaneConfig, req: Request): string {
+  if (config.server.base_url != null) {
+    const url = new URL(`${__PREFIX__}/oidc/callback`, config.server.base_url);
+    return url.href;
+  }
+
+  if (config.oidc?.redirect_uri != null) {
+    const url = new URL(`${__PREFIX__}/oidc/callback`, config.oidc.redirect_uri);
+    return url.href;
+  }
+
+  const url = new URL(`${__PREFIX__}/oidc/callback`, req.url);
+  let host = req.headers.get("Host");
+  if (!host) {
+    host = req.headers.get("X-Forwarded-Host");
+  }
+
+  if (!host) {
+    throw data("Cannot determine redirect URI: no Host or X-Forwarded-Host header", {
+      status: 500,
+    });
+  }
+
+  const proto = req.headers.get("X-Forwarded-Proto");
+  url.protocol = proto ?? "http:";
+  url.host = host;
+  return url.href;
 }

app/routes/dns/components/manage-domains.tsx

@@ -1,18 +1,18 @@
-import { DndContext, DragOverlay, closestCorners } from '@dnd-kit/core';
+import { closestCorners, DndContext, DragOverlay } from '@dnd-kit/core';
 import {
 	restrictToParentElement,
 	restrictToVerticalAxis,
 } from '@dnd-kit/modifiers';
 import {
-	SortableContext,
 	arrayMove,
+	SortableContext,
 	useSortable,
 	verticalListSortingStrategy,
 } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { GripVertical, Lock } from 'lucide-react';
 import { useEffect, useState } from 'react';
-import { type FetcherWithComponents, Form, useFetcher } from 'react-router';
+import { Form } from 'react-router';
 import Button from '~/components/Button';
 import Input from '~/components/Input';
 import TableList from '~/components/TableList';
@@ -37,18 +37,15 @@ export default function ManageDomains({
 	}, [searchDomains]);
 
 	return (
-		<div className="flex flex-col w-2/3">
+		<div className="flex flex-col w-full sm:w-2/3">
 			<h1 className="text-2xl font-medium mb-4">Search Domains</h1>
 			<p className="mb-4">
 				Set custom DNS search domains for your Tailnet. When using Magic DNS,
 				your tailnet domain is used as the first search domain.
 			</p>
 			<DndContext
-				modifiers={[restrictToVerticalAxis, restrictToParentElement]}
 				collisionDetection={closestCorners}
-				onDragStart={(event) => {
-					setActiveId(event.active.id);
-				}}
+				modifiers={[restrictToVerticalAxis, restrictToParentElement]}
 				onDragEnd={(event) => {
 					setActiveId(null);
 					const { active, over } = event;
@@ -70,6 +67,9 @@ export default function ManageDomains({
 						setLocalDomains(arrayMove(localDomains, oldIndex, newIndex));
 					}
 				}}
+				onDragStart={(event) => {
+					setActiveId(event.active.id);
+				}}
 			>
 				<TableList>
 					{magic ? (
@@ -91,19 +91,19 @@ export default function ManageDomains({
 					>
 						{localDomains.map((sd, index) => (
 							<Domain
-								key={sd}
 								domain={sd}
 								id={index + 1}
 								isDisabled={isDisabled}
+								key={sd}
 							/>
 						))}
 						<DragOverlay adjustScale>
 							{activeId ? (
 								<Domain
-									isDragging
 									domain={localDomains[(activeId as number) - 1]}
 									id={(activeId as number) - 1}
 									isDisabled={isDisabled}
+									isDragging
 								/>
 							) : undefined}
 						</DragOverlay>
@@ -111,28 +111,28 @@ export default function ManageDomains({
 					{isDisabled ? undefined : (
 						<TableList.Item key="add-sd">
 							<Form
-								method="POST"
 								className="flex items-center justify-between w-full"
+								method="POST"
 							>
-								<input type="hidden" name="action_id" value="add_domain" />
+								<input name="action_id" type="hidden" value="add_domain" />
 								<Input
-									type="text"
 									className={cn(
 										'border-none font-mono p-0 text-sm',
 										'rounded-none focus:ring-0 w-full ml-1',
 									)}
-									placeholder="Search Domain"
-									label="Search Domain"
-									name="domain"
-									labelHidden
 									isRequired
+									label="Search Domain"
+									labelHidden
+									name="domain"
+									placeholder="Search Domain"
+									type="text"
 								/>
 								<Button
-									type="submit"
 									className={cn(
 										'px-2 py-1 rounded-md',
 										'text-blue-500 dark:text-blue-400',
 									)}
+									type="submit"
 								>
 									Add
 								</Button>
@@ -164,11 +164,11 @@ function Domain({ domain, id, isDragging, isDisabled }: DomainProps) {
 
 	return (
 		<TableList.Item
-			ref={setNodeRef}
 			className={cn(
 				isSortableDragging ? 'opacity-50' : '',
 				isDragging ? 'ring-3 bg-white dark:bg-headplane-900' : '',
 			)}
+			ref={setNodeRef}
 			style={{
 				transform: CSS.Transform.toString(transform),
 				transition,
@@ -186,15 +186,15 @@ function Domain({ domain, id, isDragging, isDisabled }: DomainProps) {
 			</p>
 			{isDragging ? undefined : (
 				<Form method="POST">
-					<input type="hidden" name="action_id" value="remove_domain" />
-					<input type="hidden" name="domain" value={domain} />
+					<input name="action_id" type="hidden" value="remove_domain" />
+					<input name="domain" type="hidden" value={domain} />
 					<Button
-						type="submit"
-						isDisabled={isDisabled}
 						className={cn(
 							'px-2 py-1 rounded-md',
 							'text-red-500 dark:text-red-400',
 						)}
+						isDisabled={isDisabled}
+						type="submit"
 					>
 						Remove
 					</Button>

app/routes/dns/components/manage-ns.tsx

@@ -20,14 +20,14 @@ export default function ManageNS({
 	overrideLocalDns,
 }: Props) {
 	return (
-		<div className="flex flex-col w-2/3">
+		<div className="flex flex-col w-full sm:w-2/3">
 			<h1 className="text-2xl font-medium mb-4">Nameservers</h1>
 			<p>
 				Set the nameservers used by devices on the Tailnet to resolve DNS
 				queries.{' '}
 				<Link
-					to="https://tailscale.com/kb/1054/dns"
 					name="Tailscale DNS Documentation"
+					to="https://tailscale.com/kb/1054/dns"
 				>
 					Learn more
 				</Link>
@@ -35,12 +35,12 @@ export default function ManageNS({
 			<div className="mt-4">
 				{Object.keys(nameservers).map((key) => (
 					<NameserverList
-						key={key}
-						isGlobal={key === 'global'}
 						isDisabled={isDisabled}
+						isGlobal={key === 'global'}
+						key={key}
+						name={key}
 						nameservers={nameservers}
 						overrideLocalDns={overrideLocalDns}
-						name={key}
 					/>
 				))}
 
@@ -66,16 +66,17 @@ function NameserverList({
 	name,
 }: ListProps) {
 	const list = isGlobal ? nameservers.global : nameservers[name];
+	const submit = useSubmit();
+
 	if (list.length === 0) {
 		return null;
 	}
 
-	const submit = useSubmit();
 	return (
 		<div className="mb-8">
 			<div className="flex items-center justify-between mb-2">
 				{isGlobal ? (
-					<div className="flex items-center justify-between w-full">
+					<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between w-full gap-2">
 						<h2 className="text-md font-medium opacity-80">
 							Global Nameservers
 						</h2>
@@ -87,8 +88,8 @@ function NameserverList({
 									names outside the tailnet. When disabled (default), devices
 									will prefer their local DNS configuration.
 									<Link
-										to="https://tailscale.com/kb/1054/dns#global-nameservers"
 										name="Tailscale Global Nameservers Documentation"
+										to="https://tailscale.com/kb/1054/dns#global-nameservers"
 									>
 										Learn More
 									</Link>
@@ -96,11 +97,10 @@ function NameserverList({
 							</Tooltip>
 							<p>Override DNS servers</p>
 							<Switch
-								label="Override local DNS settings"
-								className="h-[15px] w-[23px] p-[2px]"
-								switchClassName="h-[9px] w-[9px]"
-								name="override_dns"
+								className="h-[15px] w-[23px] p-0.5"
 								defaultSelected={overrideLocalDns}
+								label="Override local DNS settings"
+								name="override_dns"
 								onChange={(v) => {
 									submit(
 										{
@@ -112,6 +112,7 @@ function NameserverList({
 										},
 									);
 								}}
+								switchClassName="h-[9px] w-[9px]"
 							/>
 						</div>
 					</div>
@@ -125,20 +126,20 @@ function NameserverList({
 							<TableList.Item key={ns}>
 								<p className="font-mono text-sm">{ns}</p>
 								<Form method="POST">
-									<input type="hidden" name="action_id" value="remove_ns" />
-									<input type="hidden" name="ns" value={ns} />
+									<input name="action_id" type="hidden" value="remove_ns" />
+									<input name="ns" type="hidden" value={ns} />
 									<input
-										type="hidden"
 										name="split_name"
+										type="hidden"
 										value={isGlobal ? 'global' : name}
 									/>
 									<Button
-										isDisabled={isDisabled}
-										type="submit"
 										className={cn(
 											'px-2 py-1 rounded-md',
 											'text-red-500 dark:text-red-400',
 										)}
+										isDisabled={isDisabled}
+										type="submit"
 									>
 										Remove
 									</Button>

app/routes/dns/components/manage-records.tsx

@@ -13,14 +13,14 @@ interface Props {
 
 export default function ManageRecords({ records, isDisabled }: Props) {
 	return (
-		<div className="flex flex-col w-2/3">
+		<div className="flex flex-col w-full sm:w-2/3">
 			<h1 className="text-2xl font-medium mb-4">DNS Records</h1>
 			<p>
 				Headscale supports adding custom DNS records to your Tailnet. As of now,
 				only <Code>A</Code> and <Code>AAAA</Code> records are supported.{' '}
 				<Link
-					to="https://headscale.net/stable/ref/dns"
 					name="Headscale DNS Records documentation"
+					to="https://headscale.net/stable/ref/dns"
 				>
 					Learn More
 				</Link>
@@ -32,7 +32,7 @@ export default function ManageRecords({ records, isDisabled }: Props) {
 							<p className="opacity-50 mx-auto">No DNS records found</p>
 						</TableList.Item>
 					) : (
-						records.map((record, index) => (
+						records.map((record) => (
 							<TableList.Item key={`${record.name}-${record.value}`}>
 								<div className="flex gap-2 items-center w-full">
 									<p
@@ -43,22 +43,24 @@ export default function ManageRecords({ records, isDisabled }: Props) {
 									>
 										{record.type}
 									</p>
-									<div className="grid grid-cols-2 gap-2 w-full">
-										<p className="font-mono text-sm">{record.name}</p>
-										<p className="font-mono text-sm">{record.value}</p>
+									<div className="flex flex-col sm:flex-row sm:gap-2 flex-1 min-w-0">
+										<p className="font-mono text-sm truncate">{record.name}</p>
+										<p className="font-mono text-sm truncate opacity-70 sm:opacity-100">
+											{record.value}
+										</p>
 									</div>
 								</div>
 								<Form method="POST">
-									<input type="hidden" name="action_id" value="remove_record" />
-									<input type="hidden" name="record_name" value={record.name} />
-									<input type="hidden" name="record_type" value={record.type} />
+									<input name="action_id" type="hidden" value="remove_record" />
+									<input name="record_name" type="hidden" value={record.name} />
+									<input name="record_type" type="hidden" value={record.type} />
 									<Button
-										type="submit"
-										isDisabled={isDisabled}
 										className={cn(
 											'px-2 py-1 rounded-md',
 											'text-red-500 dark:text-red-400',
 										)}
+										isDisabled={isDisabled}
+										type="submit"
 									>
 										Remove
 									</Button>

app/routes/dns/components/rename-tailnet.tsx

@@ -9,21 +9,21 @@ interface Props {
 
 export default function RenameTailnet({ name, isDisabled }: Props) {
 	return (
-		<div className="flex flex-col w-2/3 gap-y-4">
+		<div className="flex flex-col w-full sm:w-2/3 gap-y-4">
 			<h1 className="text-2xl font-medium mb-2">Tailnet Name</h1>
 			<p>
 				This is the base domain name of your Tailnet. Devices are accessible at{' '}
 				<Code>[device].{name}</Code> when Magic DNS is enabled.
 			</p>
 			<Input
-				isReadOnly
-				labelHidden
 				className="w-3/5 font-medium text-sm"
+				isReadOnly
 				label="Tailnet name"
-				value={name}
+				labelHidden
 				onFocus={(event) => {
 					event.target.select();
 				}}
+				value={name}
 			/>
 			<Dialog>
 				<Dialog.Button isDisabled={isDisabled}>Rename Tailnet</Dialog.Button>
@@ -33,13 +33,13 @@ export default function RenameTailnet({ name, isDisabled }: Props) {
 						Keep in mind that changing this can lead to all sorts of unexpected
 						behavior and may break existing devices in your tailnet.
 					</Dialog.Text>
-					<input type="hidden" name="action_id" value="rename_tailnet" />
+					<input name="action_id" type="hidden" value="rename_tailnet" />
 					<Input
+						defaultValue={name}
 						isRequired
 						label="Tailnet name"
-						placeholder="ts.net"
-						defaultValue={name}
 						name="new_name"
+						placeholder="ts.net"
 					/>
 				</Dialog.Panel>
 			</Dialog>

app/routes/dns/dns-actions.ts

@@ -1,11 +1,8 @@
-import { ActionFunctionArgs, data } from 'react-router';
-import { LoadContext } from '~/server';
+import { data } from 'react-router';
 import { Capabilities } from '~/server/web/roles';
+import type { Route } from './+types/overview';
 
-export async function dnsAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
+export async function dnsAction({ request, context }: Route.ActionArgs) {
 	const check = await context.sessions.check(
 		request,
 		Capabilities.write_network,
@@ -19,6 +16,9 @@ export async function dnsAction({
 		return data({ success: false }, 403);
 	}
 
+	// We only need it for health checks which don't require auth
+	const api = context.hsApi.getRuntimeClient('fake-api-key');
+
 	const formData = await request.formData();
 	const action = formData.get('action_id')?.toString();
 	if (!action) {
@@ -26,226 +26,206 @@ export async function dnsAction({
 	}
 
 	switch (action) {
-		case 'rename_tailnet':
-			return renameTailnet(formData, context);
-		case 'toggle_magic':
-			return toggleMagic(formData, context);
-		case 'remove_ns':
-			return removeNs(formData, context);
-		case 'add_ns':
-			return addNs(formData, context);
-		case 'remove_domain':
-			return removeDomain(formData, context);
-		case 'add_domain':
-			return addDomain(formData, context);
-		case 'remove_record':
-			return removeRecord(formData, context);
-		case 'add_record':
-			return addRecord(formData, context);
-		case 'override_dns':
-			return overrideDns(formData, context);
+		case 'rename_tailnet': {
+			const newName = formData.get('new_name')?.toString();
+			if (!newName) {
+				return data({ success: false }, 400);
+			}
+
+			await context.hs.patch([
+				{
+					path: 'dns.base_domain',
+					value: newName,
+				},
+			]);
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Tailnet renamed successfully' };
+		}
+		case 'toggle_magic': {
+			const newState = formData.get('new_state')?.toString();
+			if (!newState) {
+				return data({ success: false }, 400);
+			}
+
+			await context.hs.patch([
+				{
+					path: 'dns.magic_dns',
+					value: newState === 'enabled',
+				},
+			]);
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Magic DNS state updated successfully' };
+		}
+		case 'remove_ns': {
+			const config = context.hs.c!;
+			const ns = formData.get('ns')?.toString();
+			const splitName = formData.get('split_name')?.toString();
+
+			if (!ns || !splitName) {
+				return data({ success: false }, 400);
+			}
+
+			if (splitName === 'global') {
+				const servers = config.dns.nameservers.global.filter((i) => i !== ns);
+
+				await context.hs.patch([
+					{
+						path: 'dns.nameservers.global',
+						value: servers,
+					},
+				]);
+			} else {
+				const splits = config.dns.nameservers.split;
+				const servers = splits[splitName].filter((i) => i !== ns);
+
+				await context.hs.patch([
+					{
+						path: `dns.nameservers.split."${splitName}"`,
+						value: servers.length > 0 ? servers : null,
+					},
+				]);
+			}
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Nameserver removed successfully' };
+		}
+		case 'add_ns': {
+			const config = context.hs.c!;
+			const ns = formData.get('ns')?.toString();
+			const splitName = formData.get('split_name')?.toString();
+
+			if (!ns || !splitName) {
+				return data({ success: false }, 400);
+			}
+
+			if (splitName === 'global') {
+				const servers = config.dns.nameservers.global;
+				servers.push(ns);
+
+				await context.hs.patch([
+					{
+						path: 'dns.nameservers.global',
+						value: servers,
+					},
+				]);
+			} else {
+				const splits = config.dns.nameservers.split;
+				const servers = splits[splitName] ?? [];
+				servers.push(ns);
+
+				await context.hs.patch([
+					{
+						path: `dns.nameservers.split."${splitName}"`,
+						value: servers,
+					},
+				]);
+			}
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Nameserver added successfully' };
+		}
+		case 'remove_domain': {
+			const config = context.hs.c!;
+			const domain = formData.get('domain')?.toString();
+			if (!domain) {
+				return data({ success: false }, 400);
+			}
+
+			const domains = config.dns.search_domains.filter((i) => i !== domain);
+			await context.hs.patch([
+				{
+					path: 'dns.search_domains',
+					value: domains,
+				},
+			]);
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Domain removed successfully' };
+		}
+		case 'add_domain': {
+			const config = context.hs.c!;
+			const domain = formData.get('domain')?.toString();
+			if (!domain) {
+				return data({ success: false }, 400);
+			}
+
+			const domains = config.dns.search_domains;
+			domains.push(domain);
+
+			await context.hs.patch([
+				{
+					path: 'dns.search_domains',
+					value: domains,
+				},
+			]);
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'Domain added successfully' };
+		}
+		case 'remove_record': {
+			const recordName = formData.get('record_name')?.toString();
+			const recordType = formData.get('record_type')?.toString();
+
+			if (!recordName || !recordType) {
+				return data({ success: false }, 400);
+			}
+
+			// Value is not needed for removal
+			const restart = await context.hs.removeDNS({
+				name: recordName,
+				type: recordType,
+				value: '',
+			});
+
+			if (!restart) {
+				return;
+			}
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'DNS record removed successfully' };
+		}
+		case 'add_record': {
+			const recordName = formData.get('record_name')?.toString();
+			const recordType = formData.get('record_type')?.toString();
+			const recordValue = formData.get('record_value')?.toString();
+
+			if (!recordName || !recordType || !recordValue) {
+				return data({ success: false }, 400);
+			}
+
+			const restart = await context.hs.addDNS({
+				name: recordName,
+				type: recordType,
+				value: recordValue,
+			});
+
+			if (!restart) {
+				return;
+			}
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'DNS record added successfully' };
+		}
+		case 'override_dns': {
+			const override = formData.get('override_dns')?.toString();
+			if (!override) {
+				return data({ success: false }, 400);
+			}
+
+			const overrideValue = override === 'true';
+			await context.hs.patch([
+				{
+					path: 'dns.override_local_dns',
+					value: overrideValue,
+				},
+			]);
+
+			await context.integration?.onConfigChange(api);
+			return { message: 'DNS override updated successfully' };
+		}
 		default:
 			return data({ success: false }, 400);
 	}
 }
-
-async function renameTailnet(formData: FormData, context: LoadContext) {
-	const newName = formData.get('new_name')?.toString();
-	if (!newName) {
-		return data({ success: false }, 400);
-	}
-
-	await context.hs.patch([
-		{
-			path: 'dns.base_domain',
-			value: newName,
-		},
-	]);
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function toggleMagic(formData: FormData, context: LoadContext) {
-	const newState = formData.get('new_state')?.toString();
-	if (!newState) {
-		return data({ success: false }, 400);
-	}
-
-	await context.hs.patch([
-		{
-			path: 'dns.magic_dns',
-			value: newState === 'enabled',
-		},
-	]);
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function removeNs(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const ns = formData.get('ns')?.toString();
-	const splitName = formData.get('split_name')?.toString();
-
-	if (!ns || !splitName) {
-		return data({ success: false }, 400);
-	}
-
-	if (splitName === 'global') {
-		const servers = config.dns.nameservers.global.filter((i) => i !== ns);
-
-		await context.hs.patch([
-			{
-				path: 'dns.nameservers.global',
-				value: servers,
-			},
-		]);
-	} else {
-		const splits = config.dns.nameservers.split;
-		const servers = splits[splitName].filter((i) => i !== ns);
-
-		await context.hs.patch([
-			{
-				path: `dns.nameservers.split."${splitName}"`,
-				value: servers.length > 0 ? servers : null,
-			},
-		]);
-	}
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function addNs(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const ns = formData.get('ns')?.toString();
-	const splitName = formData.get('split_name')?.toString();
-
-	if (!ns || !splitName) {
-		return data({ success: false }, 400);
-	}
-
-	if (splitName === 'global') {
-		const servers = config.dns.nameservers.global;
-		servers.push(ns);
-
-		await context.hs.patch([
-			{
-				path: 'dns.nameservers.global',
-				value: servers,
-			},
-		]);
-	} else {
-		const splits = config.dns.nameservers.split;
-		const servers = splits[splitName] ?? [];
-		servers.push(ns);
-
-		await context.hs.patch([
-			{
-				path: `dns.nameservers.split."${splitName}"`,
-				value: servers,
-			},
-		]);
-	}
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function removeDomain(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const domain = formData.get('domain')?.toString();
-	if (!domain) {
-		return data({ success: false }, 400);
-	}
-
-	const domains = config.dns.search_domains.filter((i) => i !== domain);
-	await context.hs.patch([
-		{
-			path: 'dns.search_domains',
-			value: domains,
-		},
-	]);
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function addDomain(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const domain = formData.get('domain')?.toString();
-	if (!domain) {
-		return data({ success: false }, 400);
-	}
-
-	const domains = config.dns.search_domains;
-	domains.push(domain);
-
-	await context.hs.patch([
-		{
-			path: 'dns.search_domains',
-			value: domains,
-		},
-	]);
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function removeRecord(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const recordName = formData.get('record_name')?.toString();
-	const recordType = formData.get('record_type')?.toString();
-
-	if (!recordName || !recordType) {
-		return data({ success: false }, 400);
-	}
-
-	// Value is not needed for removal
-	const restart = await context.hs.removeDNS({
-		name: recordName,
-		type: recordType,
-		value: '',
-	});
-
-	if (!restart) {
-		return;
-	}
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function addRecord(formData: FormData, context: LoadContext) {
-	const config = context.hs.c!;
-	const recordName = formData.get('record_name')?.toString();
-	const recordType = formData.get('record_type')?.toString();
-	const recordValue = formData.get('record_value')?.toString();
-
-	if (!recordName || !recordType || !recordValue) {
-		return data({ success: false }, 400);
-	}
-
-	const restart = await context.hs.addDNS({
-		name: recordName,
-		type: recordType,
-		value: recordValue,
-	});
-
-	if (!restart) {
-		return;
-	}
-
-	await context.integration?.onConfigChange(context.client);
-}
-
-async function overrideDns(formData: FormData, context: LoadContext) {
-	const override = formData.get('override_dns')?.toString();
-	if (!override) {
-		return data({ success: false }, 400);
-	}
-
-	const overrideValue = override === 'true';
-	await context.hs.patch([
-		{
-			path: 'dns.override_local_dns',
-			value: overrideValue,
-		},
-	]);
-
-	await context.integration?.onConfigChange(context.client);
-}

app/routes/dns/overview.tsx

@@ -84,20 +84,20 @@ export default function Page() {
 					tailnet.
 				</Notice>
 			)}
-			<RenameTailnet name={data.baseDomain} isDisabled={isDisabled} />
+			<RenameTailnet isDisabled={isDisabled} name={data.baseDomain} />
 			<ManageNS
-				nameservers={allNs}
 				isDisabled={isDisabled}
+				nameservers={allNs}
 				overrideLocalDns={data.overrideDns}
 			/>
-			<ManageRecords records={data.extraRecords} isDisabled={isDisabled} />
+			<ManageRecords isDisabled={isDisabled} records={data.extraRecords} />
 			<ManageDomains
-				searchDomains={data.searchDomains}
 				isDisabled={isDisabled}
 				magic={data.magicDns ? data.baseDomain : undefined}
+				searchDomains={data.searchDomains}
 			/>
 
-			<div className="flex flex-col w-2/3">
+			<div className="flex flex-col w-full sm:w-2/3">
 				<h1 className="text-2xl font-medium mb-4">Magic DNS</h1>
 				<p className="mb-4">
 					Automatically register domain names for each device on the tailnet.
@@ -108,7 +108,7 @@ export default function Page() {
 					</Code>{' '}
 					when Magic DNS is enabled.
 				</p>
-				<ToggleMagic isEnabled={data.magicDns} isDisabled={isDisabled} />
+				<ToggleMagic isDisabled={isDisabled} isEnabled={data.magicDns} />
 			</div>
 		</div>
 	);

app/routes/machines/components/machine-row.tsx

@@ -1,222 +1,214 @@
-import { ChevronDown, Copy } from 'lucide-react';
-import { useMemo } from 'react';
-import { Link } from 'react-router';
-import Chip from '~/components/Chip';
-import Menu from '~/components/Menu';
-import StatusCircle from '~/components/StatusCircle';
-import { ExitNodeTag } from '~/components/tags/ExitNode';
-import { ExpiryTag } from '~/components/tags/Expiry';
-import { HeadplaneAgentTag } from '~/components/tags/HeadplaneAgent';
-import { SubnetTag } from '~/components/tags/Subnet';
-import { TailscaleSSHTag } from '~/components/tags/TailscaleSSH';
-import type { User } from '~/types';
-import cn from '~/utils/cn';
-import * as hinfo from '~/utils/host-info';
-import { PopulatedNode } from '~/utils/node-info';
-import toast from '~/utils/toast';
-import MenuOptions from './menu';
+import { ChevronDown, Copy } from "lucide-react";
+import { useMemo } from "react";
+import { Link } from "react-router";
+
+import type { User } from "~/types";
+
+import Chip from "~/components/Chip";
+import Menu from "~/components/Menu";
+import StatusCircle from "~/components/StatusCircle";
+import { ExitNodeTag } from "~/components/tags/ExitNode";
+import { ExpiryTag } from "~/components/tags/Expiry";
+import { HeadplaneAgentTag } from "~/components/tags/HeadplaneAgent";
+import { SubnetTag } from "~/components/tags/Subnet";
+import { TailscaleSSHTag } from "~/components/tags/TailscaleSSH";
+import cn from "~/utils/cn";
+import * as hinfo from "~/utils/host-info";
+import { PopulatedNode } from "~/utils/node-info";
+import { formatTimeDelta } from "~/utils/time";
+import toast from "~/utils/toast";
+
+import MenuOptions from "./menu";
 
 interface Props {
-	node: PopulatedNode;
-	users: User[];
-	isAgent?: boolean;
-	magic?: string;
-	isDisabled?: boolean;
+  node: PopulatedNode;
+  users: User[];
+  isAgent?: boolean;
+  magic?: string;
+  isDisabled?: boolean;
+  existingTags?: string[];
+  supportsNodeOwnerChange: boolean;
 }
 
 export default function MachineRow({
-	node,
-	users,
-	isAgent,
-	magic,
-	isDisabled,
+  node,
+  users,
+  isAgent,
+  magic,
+  isDisabled,
+  existingTags,
+  supportsNodeOwnerChange,
 }: Props) {
-	const uiTags = useMemo(() => {
-		const tags = uiTagsForNode(node, isAgent);
-		return tags;
-	}, [node, isAgent]);
+  const uiTags = useMemo(() => uiTagsForNode(node, isAgent), [node, isAgent]);
 
-	const ipOptions = useMemo(() => {
-		if (magic) {
-			return [...node.ipAddresses, `${node.givenName}.${magic}`];
-		}
+  const ipOptions = useMemo(() => {
+    if (magic) {
+      return [...node.ipAddresses, `${node.givenName}.${magic}`];
+    }
 
-		return node.ipAddresses;
-	}, [magic, node.ipAddresses]);
+    return node.ipAddresses;
+  }, [magic, node.ipAddresses]);
 
-	return (
-		<tr
-			className="group hover:bg-headplane-50 dark:hover:bg-headplane-950"
-			key={node.id}
-		>
-			<td className="pl-0.5 py-2 focus-within:ring-3">
-				<Link
-					className={cn('group/link h-full focus:outline-hidden')}
-					to={`/machines/${node.id}`}
-				>
-					<p
-						className={cn(
-							'font-semibold leading-snug',
-							'group-hover/link:text-blue-600',
-							'dark:group-hover/link:text-blue-400',
-						)}
-					>
-						{node.givenName}
-					</p>
-					<p className="text-sm opacity-50">
-						{node.user.name || node.user.displayName || node.user.email || node.user.id}
-					</p>
-					<div className="flex gap-1 flex-wrap mt-1.5">
-						{mapTagsToComponents(node, uiTags)}
-						{node.validTags.map((tag) => (
-							<Chip key={tag} text={tag} />
-						))}
-					</div>
-				</Link>
-			</td>
-			<td className="py-2">
-				<div className="flex items-center gap-x-1">
-					{node.ipAddresses[0]}
-					<Menu placement="bottom end">
-						<Menu.IconButton className="bg-transparent" label="IP Addresses">
-							<ChevronDown className="w-4 h-4" />
-						</Menu.IconButton>
-						<Menu.Panel
-							onAction={async (key) => {
-								await navigator.clipboard.writeText(key.toString());
-								toast('Copied IP address to clipboard');
-							}}
-						>
-							<Menu.Section>
-								{ipOptions.map((ip) => (
-									<Menu.Item key={ip} textValue={ip}>
-										<div
-											className={cn(
-												'flex items-center justify-between',
-												'text-sm w-full gap-x-6',
-											)}
-										>
-											{ip}
-											<Copy className="w-3 h-3" />
-										</div>
-									</Menu.Item>
-								))}
-							</Menu.Section>
-						</Menu.Panel>
-					</Menu>
-				</div>
-			</td>
-			{/* We pass undefined when agents are not enabled */}
-			{isAgent !== undefined ? (
-				<td className="py-2">
-					{node.hostInfo !== undefined ? (
-						<>
-							<p className="leading-snug">
-								{hinfo.getTSVersion(node.hostInfo)}
-							</p>
-							<p className="text-sm opacity-50 max-w-48 truncate">
-								{hinfo.getOSInfo(node.hostInfo)}
-							</p>
-						</>
-					) : (
-						<p className="text-sm opacity-50">Unknown</p>
-					)}
-				</td>
-			) : undefined}
-			<td className="py-2">
-				<span
-					className={cn(
-						'flex items-center gap-x-1 text-sm',
-						'text-headplane-600 dark:text-headplane-300',
-					)}
-				>
-					<StatusCircle
-						className="w-4 h-4"
-						isOnline={node.online && !node.expired}
-					/>
-					<p suppressHydrationWarning>
-						{node.online && !node.expired
-							? 'Connected'
-							: new Date(node.lastSeen).toLocaleString()}
-					</p>
-				</span>
-			</td>
-			<td className="py-2 pr-0.5">
-				<MenuOptions
-					isDisabled={isDisabled}
-					magic={magic}
-					node={node}
-					users={users}
-				/>
-			</td>
-		</tr>
-	);
+  return (
+    <tr className="group hover:bg-headplane-50 dark:hover:bg-headplane-950" key={node.id}>
+      <td className="py-2 pl-0.5 focus-within:ring-3">
+        <Link className={cn("group/link h-full focus:outline-hidden")} to={`/machines/${node.id}`}>
+          <p
+            className={cn(
+              "font-semibold leading-snug",
+              "group-hover/link:text-blue-600",
+              "dark:group-hover/link:text-blue-400",
+            )}
+          >
+            {node.givenName}
+          </p>
+          <p className="text-sm opacity-50">
+            {node.user.name || node.user.displayName || node.user.email || node.user.id}
+          </p>
+          <div className="mt-1.5 flex flex-wrap gap-1">
+            {mapTagsToComponents(node, uiTags)}
+            {node.tags?.map((tag) => (
+              <Chip key={tag} text={tag} />
+            ))}
+          </div>
+        </Link>
+      </td>
+      <td className="py-2">
+        <div className="flex items-center gap-x-1">
+          {node.ipAddresses[0]}
+          <Menu placement="bottom end">
+            <Menu.IconButton className="bg-transparent" label="IP Addresses">
+              <ChevronDown className="h-4 w-4" />
+            </Menu.IconButton>
+            <Menu.Panel
+              onAction={async (key) => {
+                await navigator.clipboard.writeText(key.toString());
+                toast("Copied IP address to clipboard");
+              }}
+            >
+              <Menu.Section>
+                {ipOptions.map((ip) => (
+                  <Menu.Item key={ip} textValue={ip}>
+                    <div
+                      className={cn("flex items-center justify-between", "text-sm w-full gap-x-6")}
+                    >
+                      {ip}
+                      <Copy className="h-3 w-3" />
+                    </div>
+                  </Menu.Item>
+                ))}
+              </Menu.Section>
+            </Menu.Panel>
+          </Menu>
+        </div>
+      </td>
+      {/* We pass undefined when agents are not enabled */}
+      {isAgent !== undefined ? (
+        <td className="py-2">
+          {node.hostInfo !== undefined ? (
+            <>
+              <p className="leading-snug">{hinfo.getTSVersion(node.hostInfo)}</p>
+              <p className="max-w-48 truncate text-sm opacity-50">
+                {hinfo.getOSInfo(node.hostInfo)}
+              </p>
+            </>
+          ) : (
+            <p className="text-sm opacity-50">Unknown</p>
+          )}
+        </td>
+      ) : undefined}
+      <td className="py-2">
+        <div className="flex items-start gap-x-1">
+          <StatusCircle className="mt-0.5 h-4 w-4" isOnline={node.online && !node.expired} />
+          <div>
+            <p
+              className={cn("text-sm", "text-headplane-600 dark:text-headplane-300")}
+              suppressHydrationWarning
+            >
+              {node.online && !node.expired
+                ? "Connected"
+                : new Date(node.lastSeen).toLocaleString()}
+            </p>
+            {!(node.online && !node.expired) && (
+              <p className="text-xs opacity-50" suppressHydrationWarning>
+                {formatTimeDelta(new Date(node.lastSeen))}
+              </p>
+            )}
+          </div>
+        </div>
+      </td>
+      <td className="py-2 pr-0.5">
+        <MenuOptions
+          existingTags={existingTags}
+          isDisabled={isDisabled}
+          magic={magic}
+          node={node}
+          users={users}
+          supportsNodeOwnerChange={supportsNodeOwnerChange}
+        />
+      </td>
+    </tr>
+  );
 }
 
 export function uiTagsForNode(node: PopulatedNode, isAgent?: boolean) {
-	const uiTags: string[] = [];
-	if (node.expired) {
-		uiTags.push('expired');
-	}
+  const uiTags: string[] = [];
+  if (node.expired) {
+    uiTags.push("expired");
+  }
 
-	if (node.expiry === null) {
-		uiTags.push('no-expiry');
-	}
+  if (node.expiry === null) {
+    uiTags.push("no-expiry");
+  }
 
-	if (node.customRouting.exitRoutes.length > 0) {
-		if (node.customRouting.exitApproved) {
-			uiTags.push('exit-approved');
-		} else {
-			uiTags.push('exit-waiting');
-		}
-	}
+  if (node.customRouting.exitRoutes.length > 0) {
+    if (node.customRouting.exitApproved) {
+      uiTags.push("exit-approved");
+    } else {
+      uiTags.push("exit-waiting");
+    }
+  }
 
-	if (node.customRouting.subnetWaitingRoutes.length > 0) {
-		uiTags.push('subnet-waiting');
-	} else if (node.customRouting.subnetApprovedRoutes.length > 0) {
-		uiTags.push('subnet-approved');
-	}
+  if (node.customRouting.subnetWaitingRoutes.length > 0) {
+    uiTags.push("subnet-waiting");
+  } else if (node.customRouting.subnetApprovedRoutes.length > 0) {
+    uiTags.push("subnet-approved");
+  }
 
-	if (node.hostInfo?.sshHostKeys && node.hostInfo?.sshHostKeys.length > 0) {
-		uiTags.push('tailscale-ssh');
-	}
+  if (node.hostInfo?.sshHostKeys && node.hostInfo?.sshHostKeys.length > 0) {
+    uiTags.push("tailscale-ssh");
+  }
 
-	if (isAgent === true) {
-		uiTags.push('headplane-agent');
-	}
+  if (isAgent === true) {
+    uiTags.push("headplane-agent");
+  }
 
-	return uiTags;
+  return uiTags;
 }
 
 export function mapTagsToComponents(node: PopulatedNode, uiTags: string[]) {
-	return uiTags.map((tag) => {
-		switch (tag) {
-			case 'exit-approved':
-			case 'exit-waiting':
-				return <ExitNodeTag isEnabled={tag === 'exit-approved'} key={tag} />;
+  return uiTags.map((tag) => {
+    switch (tag) {
+      case "exit-approved":
+      case "exit-waiting":
+        return <ExitNodeTag isEnabled={tag === "exit-approved"} key={tag} />;
 
-			case 'subnet-approved':
-			case 'subnet-waiting':
-				return <SubnetTag isEnabled={tag === 'subnet-approved'} key={tag} />;
+      case "subnet-approved":
+      case "subnet-waiting":
+        return <SubnetTag isEnabled={tag === "subnet-approved"} key={tag} />;
 
-			case 'expired':
-			case 'no-expiry':
-				return (
-					<ExpiryTag
-						expiry={node.expiry ?? undefined}
-						key={tag}
-						variant={tag}
-					/>
-				);
+      case "expired":
+      case "no-expiry":
+        return <ExpiryTag expiry={node.expiry ?? undefined} key={tag} variant={tag} />;
 
-			case 'tailscale-ssh':
-				return <TailscaleSSHTag key={tag} />;
+      case "tailscale-ssh":
+        return <TailscaleSSHTag key={tag} />;
 
-			case 'headplane-agent':
-				return <HeadplaneAgentTag key={tag} />;
+      case "headplane-agent":
+        return <HeadplaneAgentTag key={tag} />;
 
-			default:
-				return null;
-		}
-	});
+      default:
+        return null;
+    }
+  });
 }

app/routes/machines/components/menu.tsx

@@ -11,12 +11,15 @@ import Move from '../dialogs/move';
 import Rename from '../dialogs/rename';
 import Routes from '../dialogs/routes';
 import Tags from '../dialogs/tags';
+
 interface MenuProps {
 	node: PopulatedNode;
 	users: User[];
 	magic?: string;
 	isFullButton?: boolean;
 	isDisabled?: boolean;
+	existingTags?: string[];
+	supportsNodeOwnerChange: boolean;
 }
 
 type Modal = 'rename' | 'expire' | 'remove' | 'routes' | 'move' | 'tags' | null;
@@ -27,6 +30,8 @@ export default function MachineMenu({
 	users,
 	isFullButton,
 	isDisabled,
+	existingTags,
+	supportsNodeOwnerChange,
 }: MenuProps) {
 	const [modal, setModal] = useState<Modal>(null);
 	const supportsTailscaleSSH =
@@ -36,8 +41,8 @@ export default function MachineMenu({
 		<div className="flex items-center justify-end px-4 gap-1.5">
 			{modal === 'remove' && (
 				<Delete
-					machine={node}
 					isOpen={modal === 'remove'}
+					machine={node}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
@@ -45,19 +50,19 @@ export default function MachineMenu({
 			)}
 			{modal === 'move' && (
 				<Move
-					machine={node}
-					users={users}
 					isOpen={modal === 'move'}
+					machine={node}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
+					users={users}
 				/>
 			)}
 			{modal === 'rename' && (
 				<Rename
+					isOpen={modal === 'rename'}
 					machine={node}
 					magic={magic}
-					isOpen={modal === 'rename'}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
@@ -65,8 +70,8 @@ export default function MachineMenu({
 			)}
 			{modal === 'routes' && (
 				<Routes
-					node={node}
 					isOpen={modal === 'routes'}
+					node={node}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
@@ -74,8 +79,9 @@ export default function MachineMenu({
 			)}
 			{modal === 'tags' && (
 				<Tags
-					machine={node}
+					existingTags={existingTags}
 					isOpen={modal === 'tags'}
+					machine={node}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
@@ -83,8 +89,8 @@ export default function MachineMenu({
 			)}
 			{node.expired && modal === 'expire' ? undefined : (
 				<Expire
-					machine={node}
 					isOpen={modal === 'expire'}
+					machine={node}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
@@ -95,33 +101,23 @@ export default function MachineMenu({
 				isFullButton ? (
 					<Button
 						className="flex items-center gap-x-2"
-						variant="heavy"
 						onPress={() => {
 							// We need to use JS to open the SSH URL
 							// in a new WINDOW since href can only
 							// do a new TAB.
 							window.open(
-								`${__PREFIX__}/ssh?hostname=${node.name}`,
+								`${__PREFIX__}/ssh?hostname=${node.givenName}`,
 								'_blank',
 								'noopener,noreferrer,width=800,height=600',
 							);
 						}}
+						variant="heavy"
 					>
 						<SquareTerminal className="h-5" />
 						<p>SSH</p>
 					</Button>
 				) : (
 					<Button
-						onPress={() => {
-							// We need to use JS to open the SSH URL
-							// in a new WINDOW since href can only
-							// do a new TAB.
-							window.open(
-								`${__PREFIX__}/ssh?hostname=${node.name}`,
-								'_blank',
-								'noopener,noreferrer,width=800,height=600',
-							);
-						}}
 						className={cn(
 							'py-0.5 w-fit bg-transparent border-transparent',
 							'border group-hover:border-headplane-200',
@@ -129,6 +125,16 @@ export default function MachineMenu({
 							'opacity-0 pointer-events-none group-hover:opacity-100',
 							'group-hover:pointer-events-auto',
 						)}
+						onPress={() => {
+							// We need to use JS to open the SSH URL
+							// in a new WINDOW since href can only
+							// do a new TAB.
+							window.open(
+								`${__PREFIX__}/ssh?hostname=${node.givenName}`,
+								'_blank',
+								'noopener,noreferrer,width=800,height=600',
+							);
+						}}
 					>
 						SSH
 					</Button>
@@ -142,25 +148,25 @@ export default function MachineMenu({
 					</Menu.Button>
 				) : (
 					<Menu.IconButton
-						label="Machine Options"
 						className={cn(
 							'py-0.5 w-10 bg-transparent border-transparent',
 							'border group-hover:border-headplane-200',
 							'dark:group-hover:border-headplane-700',
 						)}
+						label="Machine Options"
 					>
 						<Ellipsis className="h-5" />
 					</Menu.IconButton>
 				)}
 				<Menu.Panel
-					onAction={(key) => setModal(key as Modal)}
 					disabledKeys={node.expired ? ['expire'] : []}
+					onAction={(key) => setModal(key as Modal)}
 				>
 					<Menu.Section>
 						<Menu.Item key="rename">Edit machine name</Menu.Item>
 						<Menu.Item key="routes">Edit route settings</Menu.Item>
 						<Menu.Item key="tags">Edit ACL tags</Menu.Item>
-						<Menu.Item key="move">Change owner</Menu.Item>
+						{supportsNodeOwnerChange && <Menu.Item key="move">Change owner</Menu.Item>}
 					</Menu.Section>
 					<Menu.Section>
 						<Menu.Item key="expire" textValue="Expire">

app/routes/machines/dialogs/delete.tsx

@@ -14,16 +14,16 @@ export default function Delete({ machine, isOpen, setIsOpen }: DeleteProps) {
 	return (
 		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
 			<Dialog.Panel
-				variant="destructive"
 				onSubmit={() => navigate('/machines')}
+				variant="destructive"
 			>
 				<Dialog.Title>Remove {machine.givenName}</Dialog.Title>
 				<Dialog.Text>
 					This machine will be permanently removed from your network. To re-add
 					it, you will need to reauthenticate to your tailnet from the device.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="delete" />
-				<input type="hidden" name="node_id" value={machine.id} />
+				<input name="action_id" type="hidden" value="delete" />
+				<input name="node_id" type="hidden" value={machine.id} />
 			</Dialog.Panel>
 		</Dialog>
 	);

app/routes/machines/dialogs/move.tsx

@@ -11,30 +11,32 @@ interface MoveProps {
 }
 
 export default function Move({ machine, users, isOpen, setIsOpen }: MoveProps) {
-	const [userId, setUserId] = useState<Key | null>(null);
+	const [userId, setUserId] = useState<Key | null>(machine.user.id);
 
 	return (
 		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
-			<Dialog.Panel>
+			<Dialog.Panel isDisabled={userId === machine.user.id}>
 				<Dialog.Title>Change the owner of {machine.givenName}</Dialog.Title>
 				<Dialog.Text>
 					The owner of the machine is the user associated with it.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="reassign" />
-				<input type="hidden" name="node_id" value={machine.id} />
-				<input type="hidden" name="user_id" value={userId?.toString()} />
+				<input name="action_id" type="hidden" value="reassign" />
+				<input name="node_id" type="hidden" value={machine.id} />
+				<input name="user_id" type="hidden" value={userId?.toString()} />
 				<Select
+					defaultSelectedKey={machine.user.id}
 					isRequired
 					label="Owner"
 					name="user"
-					placeholder="Select a user"
-					defaultSelectedKey={machine.user.id}
 					onSelectionChange={(key) => {
 						setUserId(key);
 					}}
+					placeholder="Select a user"
 				>
 					{users.map((user) => (
-					    <Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
+						<Select.Item key={user.id}>
+							{user.name || user.displayName || user.email || user.id}
+						</Select.Item>
 					))}
 				</Select>
 			</Dialog.Panel>

app/routes/machines/dialogs/new.tsx

@@ -20,24 +20,28 @@ export default function NewMachine(data: NewMachineProps) {
 	const [mkey, setMkey] = useState('');
 	const navigate = useNavigate();
 
+	const isMkeyInvalid = mkey.length > 0 && mkey.length !== 24;
+
 	return (
 		<>
 			<Dialog isOpen={pushDialog} onOpenChange={setPushDialog}>
-				<Dialog.Panel isDisabled={mkey.length < 1}>
+				<Dialog.Panel isDisabled={mkey.length !== 24}>
 					<Dialog.Title>Register Machine Key</Dialog.Title>
 					<Dialog.Text className="mb-4">
 						The machine key is given when you run{' '}
 						<Code isCopyable>tailscale up --login-server={data.server}</Code> on
 						your device.
 					</Dialog.Text>
-					<input type="hidden" name="action_id" value="register" />
+					<input name="action_id" type="hidden" value="register" />
 					<Input
+						errorMessage="Machine key must be exactly 24 characters"
+						isInvalid={isMkeyInvalid}
 						isRequired
 						label="Machine Key"
-						placeholder="AbCd..."
-						validationBehavior="native"
 						name="register_key"
 						onChange={setMkey}
+						placeholder="AbCd..."
+						validationBehavior="native"
 					/>
 					<Select
 						isRequired
@@ -46,12 +50,14 @@ export default function NewMachine(data: NewMachineProps) {
 						placeholder="Select a user"
 					>
 						{data.users.map((user) => (
-						    <Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
+							<Select.Item key={user.id}>
+								{user.name || user.displayName || user.email || user.id}
+							</Select.Item>
 						))}
 					</Select>
 				</Dialog.Panel>
 			</Dialog>
-			<Menu isDisabled={data.isDisabled} disabledKeys={data.disabledKeys}>
+			<Menu disabledKeys={data.disabledKeys} isDisabled={data.isDisabled}>
 				<Menu.Button variant="heavy">Add Device</Menu.Button>
 				<Menu.Panel
 					onAction={(key) => {

app/routes/machines/dialogs/rename.tsx

@@ -27,16 +27,15 @@ export default function Rename({
 					This name is shown in the admin panel, in Tailscale clients, and used
 					when generating MagicDNS names.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="rename" />
-				<input type="hidden" name="node_id" value={machine.id} />
+				<input name="action_id" type="hidden" value="rename" />
+				<input name="node_id" type="hidden" value={machine.id} />
 				<Input
+					defaultValue={machine.givenName}
 					isRequired
 					label="Machine name"
-					placeholder="Machine name"
-					validationBehavior="native"
 					name="name"
-					defaultValue={machine.givenName}
 					onChange={setName}
+					placeholder="Machine name"
 					validate={(value) => {
 						if (value.length === 0) {
 							return 'Cannot be empty';
@@ -66,6 +65,7 @@ export default function Rename({
 							return 'Cannot contain consecutive hyphens';
 						}
 					}}
+					validationBehavior="native"
 				/>
 				{magic ? (
 					name.length > 0 && name !== machine.givenName ? (

app/routes/machines/dialogs/routes.tsx

@@ -30,8 +30,8 @@ export default function Routes({ node, isOpen, setIsOpen }: RoutesProps) {
 					Connect to devices you can't install Tailscale on by advertising
 					IP ranges as subnet routes.{' '}
 					<Link
-						to="https://tailscale.com/kb/1019/subnets"
 						name="Tailscale Subnets Documentation"
+						to="https://tailscale.com/kb/1019/subnets"
 					>
 						Learn More
 					</Link>
@@ -70,8 +70,8 @@ export default function Routes({ node, isOpen, setIsOpen }: RoutesProps) {
 				<Dialog.Text>
 					Allow your network to route internet traffic through this machine.{' '}
 					<Link
-						to="https://tailscale.com/kb/1103/exit-nodes"
 						name="Tailscale Exit-node Documentation"
+						to="https://tailscale.com/kb/1103/exit-nodes"
 					>
 						Learn More
 					</Link>

app/routes/machines/dialogs/tags.tsx

@@ -1,101 +1,141 @@
-import { Plus, TagsIcon, X } from 'lucide-react';
-import { useState } from 'react';
-import Button from '~/components/Button';
-import Dialog from '~/components/Dialog';
-import Input from '~/components/Input';
-import Link from '~/components/Link';
-import TableList from '~/components/TableList';
-import type { Machine } from '~/types';
-import cn from '~/utils/cn';
+import { Plus, TagsIcon, X } from "lucide-react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useFetcher } from "react-router";
+
+import type { Machine } from "~/types";
+
+import Button from "~/components/Button";
+import Dialog from "~/components/Dialog";
+import Link from "~/components/Link";
+import Select from "~/components/Select";
+import TableList from "~/components/TableList";
+import cn from "~/utils/cn";
 
 interface TagsProps {
-	machine: Machine;
-	isOpen: boolean;
-	setIsOpen: (isOpen: boolean) => void;
+  machine: Machine;
+  isOpen: boolean;
+  setIsOpen: (isOpen: boolean) => void;
+  existingTags?: string[];
 }
 
-export default function Tags({ machine, isOpen, setIsOpen }: TagsProps) {
-	const [tags, setTags] = useState(machine.forcedTags);
-	const [tag, setTag] = useState('');
+export default function Tags({ machine, isOpen, setIsOpen, existingTags }: TagsProps) {
+  const fetcher = useFetcher();
+  const submittingRef = useRef(false);
+  const [tags, setTags] = useState([...machine.tags]);
+  const [tag, setTag] = useState("tag:");
+  const tagIsInvalid = useMemo(() => {
+    return tag.length === 0 || !tag.startsWith("tag:") || tags.includes(tag);
+  }, [tag, tags]);
 
-	return (
-		<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
-			<Dialog.Panel>
-				<Dialog.Title>Edit ACL tags for {machine.givenName}</Dialog.Title>
-				<Dialog.Text>
-					ACL tags can be used to reference machines in your ACL policies. See
-					the{' '}
-					<Link
-						to="https://tailscale.com/kb/1068/acl-tags"
-						name="Tailscale documentation"
-					>
-						Tailscale documentation
-					</Link>{' '}
-					for more information.
-				</Dialog.Text>
-				<input type="hidden" name="action_id" value="update_tags" />
-				<input type="hidden" name="node_id" value={machine.id} />
-				<input type="hidden" name="tags" value={tags.join(',')} />
-				<TableList className="mt-4">
-					{tags.length === 0 ? (
-						<TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
-							<TagsIcon />
-							<p className="font-semibold">No tags are set on this machine</p>
-						</TableList.Item>
-					) : (
-						tags.map((item) => (
-							<TableList.Item className="font-mono" key={item} id={item}>
-								{item}
-								<Button
-									className="rounded-md p-0.5"
-									onPress={() => {
-										setTags(tags.filter((tag) => tag !== item));
-									}}
-								>
-									<X className="p-1" />
-								</Button>
-							</TableList.Item>
-						))
-					)}
-					<TableList.Item
-						className={cn(
-							'rounded-b-xl focus-within:ring-3',
-							tag.length > 0 &&
-								(!tag.startsWith('tag:') || tags.includes(tag)) &&
-								'ring-3 ring-red-500 ring-opacity-50',
-						)}
-					>
-						<Input
-							labelHidden
-							label="Add a tag"
-							placeholder="tag:example"
-							onChange={setTag}
-							className={cn(
-								'border-none font-mono p-0',
-								'rounded-none focus:ring-0 w-full',
-							)}
-						/>
-						<Button
-							className={cn(
-								'rounded-md p-0.5',
-								(!tag.startsWith('tag:') || tags.includes(tag)) &&
-									'opacity-50 cursor-not-allowed',
-							)}
-							isDisabled={
-								tag.length === 0 ||
-								!tag.startsWith('tag:') ||
-								tags.includes(tag)
-							}
-							onPress={() => {
-								setTags([...tags, tag]);
-								setTag('');
-							}}
-						>
-							<Plus className="p-1" />
-						</Button>
-					</TableList.Item>
-				</TableList>
-			</Dialog.Panel>
-		</Dialog>
-	);
+  const validNodeTags = useMemo(() => {
+    return existingTags?.filter((nodeTag) => !tags.includes(nodeTag)) || [];
+  }, [tags]);
+
+  const error = fetcher.data && !fetcher.data.success ? fetcher.data.error : null;
+
+  useEffect(() => {
+    if (fetcher.data?.success) {
+      submittingRef.current = false;
+      setIsOpen(false);
+    }
+
+    if (fetcher.state === "idle" && fetcher.data && !fetcher.data.success) {
+      submittingRef.current = false;
+    }
+  }, [fetcher.data, fetcher.state]);
+
+  useEffect(() => {
+    if (isOpen) {
+      setTags([...machine.tags]);
+    }
+  }, [isOpen]);
+
+  return (
+    <Dialog
+      isOpen={isOpen}
+      onOpenChange={(open) => {
+        if (!open && submittingRef.current) return;
+        setIsOpen(open);
+      }}
+    >
+      <Dialog.Panel
+        onSubmit={(event) => {
+          event.preventDefault();
+          submittingRef.current = true;
+          const form = new FormData();
+          form.set("action_id", "update_tags");
+          form.set("node_id", machine.id);
+          form.set("tags", tags.filter((t) => t !== "").join(","));
+          fetcher.submit(form, { method: "POST" });
+        }}
+        isDisabled={fetcher.state !== "idle"}
+      >
+        <Dialog.Title>Edit ACL tags for {machine.givenName}</Dialog.Title>
+        <Dialog.Text>
+          ACL tags can be used to reference machines in your ACL policies. See the{" "}
+          <Link name="Tailscale documentation" to="https://tailscale.com/kb/1068/acl-tags">
+            Tailscale documentation
+          </Link>{" "}
+          for more information.
+        </Dialog.Text>
+        {error ? (
+          <p className="mt-2 rounded-lg bg-red-50 p-3 text-sm text-red-700 dark:bg-red-900/20 dark:text-red-400">
+            {error}
+          </p>
+        ) : null}
+        <TableList className="mt-4">
+          {tags.length === 0 ? (
+            <TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
+              <TagsIcon />
+              <p className="font-semibold">No tags are set on this machine</p>
+            </TableList.Item>
+          ) : (
+            tags.map((item) => (
+              <TableList.Item className="font-mono" id={item} key={item}>
+                {item}
+                <Button
+                  className="rounded-md p-0.5"
+                  onPress={() => {
+                    setTags(tags.filter((tag) => tag !== item));
+                  }}
+                >
+                  <X className="p-1" />
+                </Button>
+              </TableList.Item>
+            ))
+          )}
+        </TableList>
+
+        <div className="mt-2 flex items-center gap-2">
+          <Select
+            allowsCustomValue
+            aria-label="Add a tag"
+            className="w-full"
+            inputValue={tag}
+            isInvalid={tag.length > 0 && tagIsInvalid}
+            onInputChange={setTag}
+            placeholder="tag:example"
+          >
+            {validNodeTags.map((nodeTag) => {
+              return <Select.Item key={nodeTag}>{nodeTag}</Select.Item>;
+            })}
+          </Select>
+          <Button
+            className={cn("rounded-md p-1", tagIsInvalid && "opacity-50 cursor-not-allowed")}
+            isDisabled={tagIsInvalid}
+            onPress={() => {
+              setTags([...tags, tag]);
+              setTag("tag:");
+            }}
+          >
+            <Plus className="p-1" size={30} />
+          </Button>
+        </div>
+        <p className="mt-2 text-sm opacity-50">
+          Not seeing the tags you expect? Tags need to be defined in your access control policy
+          before they can be assigned to machines.
+        </p>
+      </Dialog.Panel>
+    </Dialog>
+  );
 }

app/routes/machines/machine-actions.ts

@@ -1,266 +1,191 @@
-import { type ActionFunctionArgs, data, redirect } from 'react-router';
-import type { LoadContext } from '~/server';
-import { Capabilities } from '~/server/web/roles';
-import { Machine } from '~/types';
+import { data, redirect } from "react-router";
 
-export async function machineAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
-	const session = await context.sessions.auth(request);
-	const check = await context.sessions.check(
-		request,
-		Capabilities.write_machines,
-	);
+import { isDataWithApiError } from "~/server/headscale/api/error-client";
+import { Capabilities } from "~/server/web/roles";
 
-	const formData = await request.formData();
-	const apiKey = session.api_key;
+import type { Route } from "./+types/machine";
 
-	const action = formData.get('action_id')?.toString();
-	if (!action) {
-		throw data('Missing `action_id` in the form data.', {
-			status: 400,
-		});
-	}
+export async function machineAction({ request, context }: Route.ActionArgs) {
+  const session = await context.sessions.auth(request);
+  const check = await context.sessions.check(request, Capabilities.write_machines);
 
-	// Fast track register since it doesn't require an existing machine
-	if (action === 'register') {
-		if (!check) {
-			throw data('You do not have permission to manage machines', {
-				status: 403,
-			});
-		}
+  const formData = await request.formData();
+  const api = context.hsApi.getRuntimeClient(session.api_key);
 
-		return registerMachine(formData, apiKey, context);
-	}
+  const action = formData.get("action_id")?.toString();
+  if (!action) {
+    throw data("Missing `action_id` in the form data.", {
+      status: 400,
+    });
+  }
 
-	// Check if the user has permission to manage this machine
-	const nodeId = formData.get('node_id')?.toString();
-	if (!nodeId) {
-		throw data('Missing `node_id` in the form data.', {
-			status: 400,
-		});
-	}
+  // Fast track register since it doesn't require an existing machine
+  if (action === "register") {
+    if (!check) {
+      throw data("You do not have permission to manage machines", {
+        status: 403,
+      });
+    }
 
-	const { nodes } = await context.client.get<{ nodes: Machine[] }>(
-		'v1/node',
-		apiKey,
-	);
+    const registrationKey = formData.get("register_key")?.toString();
+    if (!registrationKey) {
+      throw data("Missing `register_key` in the form data.", {
+        status: 400,
+      });
+    }
 
-	const node = nodes.find((node) => node.id === nodeId);
-	if (!node) {
-		throw data(`Machine with ID ${nodeId} not found`, {
-			status: 404,
-		});
-	}
+    const user = formData.get("user")?.toString();
+    if (!user) {
+      throw data("Missing `user` in the form data.", {
+        status: 400,
+      });
+    }
 
-	if (
-		node.user.providerId?.split('/').pop() !== session.user.subject &&
-		!check
-	) {
-		throw data('You do not have permission to act on this machine', {
-			status: 403,
-		});
-	}
+    const node = await api.registerNode(user, registrationKey);
+    return redirect(`/machines/${node.id}`);
+  }
 
-	switch (action) {
-		case 'rename': {
-			return renameMachine(formData, apiKey, nodeId, context);
-		}
+  // Check if the user has permission to manage this machine
+  const nodeId = formData.get("node_id")?.toString();
+  if (!nodeId) {
+    throw data("Missing `node_id` in the form data.", {
+      status: 400,
+    });
+  }
 
-		case 'delete': {
-			return deleteMachine(apiKey, nodeId, context);
-		}
+  const node = await api.getNode(nodeId);
+  if (!node) {
+    throw data(`Machine with ID ${nodeId} not found`, {
+      status: 404,
+    });
+  }
 
-		case 'expire': {
-			return expireMachine(apiKey, nodeId, context);
-		}
+  if (node.user.providerId?.split("/").pop() !== session.user.subject && !check) {
+    throw data("You do not have permission to act on this machine", {
+      status: 403,
+    });
+  }
 
-		case 'update_tags': {
-			return updateTags(formData, apiKey, nodeId, context);
-		}
+  switch (action) {
+    case "rename": {
+      const newName = formData.get("name")?.toString();
+      if (!newName) {
+        throw data("Missing `name` in the form data.", {
+          status: 400,
+        });
+      }
 
-		case 'update_routes': {
-			return updateRoutes(formData, apiKey, nodeId, context);
-		}
+      const name = String(formData.get("name"));
+      await api.renameNode(nodeId, name);
+      return { message: "Machine renamed" };
+    }
 
-		case 'reassign': {
-			return reassignMachine(formData, apiKey, nodeId, context);
-		}
+    case "delete": {
+      await api.deleteNode(nodeId);
+      return redirect("/machines");
+    }
 
-		default:
-			throw data('Invalid action', {
-				status: 400,
-			});
-	}
-}
-
-async function registerMachine(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const registrationKey = formData.get('register_key')?.toString();
-	if (!registrationKey) {
-		throw data('Missing `register_key` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const user = formData.get('user')?.toString();
-	if (!user) {
-		throw data('Missing `user` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const qp = new URLSearchParams();
-	qp.append('user', user);
-	qp.append('key', registrationKey);
-	const url = `v1/node/register?${qp.toString()}`;
-	const { node } = await context.client.post<{ node: Machine }>(url, apiKey, {
-		user,
-		key: registrationKey,
-	});
-
-	return redirect(`/machines/${node.id}`);
-}
-
-async function renameMachine(
-	formData: FormData,
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	const newName = formData.get('name')?.toString();
-	if (!newName) {
-		throw data('Missing `name` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const name = String(formData.get('name'));
-	await context.client.post(`v1/node/${nodeId}/rename/${name}`, apiKey);
-	return { message: 'Machine renamed' };
-}
-
-async function deleteMachine(
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	await context.client.delete(`v1/node/${nodeId}`, apiKey);
-	return redirect('/machines');
-}
-
-async function expireMachine(
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	await context.client.post(`v1/node/${nodeId}/expire`, apiKey);
-	return { message: 'Machine expired' };
-}
-
-async function updateTags(
-	formData: FormData,
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	const tags = formData.get('tags')?.toString().split(',') ?? [];
-	if (tags.length === 0) {
-		throw data('Missing `tags` in the form data.', {
-			status: 400,
-		});
-	}
-
-	await context.client.post(`v1/node/${nodeId}/tags`, apiKey, {
-		tags: tags.map((tag) => tag.trim()).filter((tag) => tag !== ''),
-	});
-
-	return { message: 'Tags updated' };
-}
-
-async function updateRoutes(
-	formData: FormData,
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	const { node } = await context.client.get<{ node: Machine }>(
-		`v1/node/${nodeId}`,
-		apiKey,
-	);
-
-	const newApproved = node.approvedRoutes;
-	const routes = formData.get('routes')?.toString();
-	if (!routes) {
-		throw data('Missing `routes` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const allRoutes = routes.split(',').map((route) => route.trim());
-	if (allRoutes.length === 0) {
-		throw data('No routes provided to update', {
-			status: 400,
-		});
-	}
-
-	const enabled = formData.get('enabled')?.toString();
-	if (enabled === undefined) {
-		throw data('Missing `enabled` in the form data.', {
-			status: 400,
-		});
-	}
-
-	if (enabled === 'true') {
-		for (const route of allRoutes) {
-			// If already approved, skip, otherwise add to approved
-			if (newApproved.includes(route)) {
-				continue;
-			}
-
-			newApproved.push(route);
-		}
-	} else {
-		for (const route of allRoutes) {
-			// If not approved, skip, otherwise remove from approved
-			if (!newApproved.includes(route)) {
-				continue;
-			}
-
-			const index = newApproved.indexOf(route);
-			if (index > -1) {
-				newApproved.splice(index, 1);
-			}
-		}
-	}
-
-	await context.client.post(`v1/node/${nodeId}/approve_routes`, apiKey, {
-		routes: newApproved,
-	});
-
-	return { message: 'Routes updated' };
-}
-
-async function reassignMachine(
-	formData: FormData,
-	apiKey: string,
-	nodeId: string,
-	context: LoadContext,
-) {
-	const user = formData.get('user_id')?.toString();
-	if (!user) {
-		throw data('Missing `user_id` in the form data.', {
-			status: 400,
-		});
-	}
-
-	await context.client.post(`v1/node/${nodeId}/user`, apiKey, {
-		user,
-	});
-
-	return { message: 'Machine reassigned' };
+    case "expire": {
+      await api.expireNode(nodeId);
+      return { message: "Machine expired" };
+    }
+
+    case "update_tags": {
+      const tags = formData.get("tags")?.toString().split(",") ?? [];
+      if (tags.length === 0) {
+        throw data("Missing `tags` in the form data.", {
+          status: 400,
+        });
+      }
+
+      try {
+        await api.setNodeTags(
+          nodeId,
+          tags.map((tag) => tag.trim()).filter((tag) => tag !== ""),
+        );
+
+        return { success: true as const, message: "Tags updated" };
+      } catch (error) {
+        if (isDataWithApiError(error) && error.data.statusCode === 400) {
+          return data(
+            {
+              success: false as const,
+              error:
+                "One or more tags are not defined in your ACL policy. Please add them to your policy before assigning them to a machine.",
+            },
+            { status: 400 },
+          );
+        }
+
+        throw error;
+      }
+    }
+
+    case "update_routes": {
+      const newApproved = node.approvedRoutes;
+      const routes = formData.get("routes")?.toString();
+      if (!routes) {
+        throw data("Missing `routes` in the form data.", {
+          status: 400,
+        });
+      }
+
+      const allRoutes = routes.split(",").map((route) => route.trim());
+      if (allRoutes.length === 0) {
+        throw data("No routes provided to update", {
+          status: 400,
+        });
+      }
+
+      const enabled = formData.get("enabled")?.toString();
+      if (enabled === undefined) {
+        throw data("Missing `enabled` in the form data.", {
+          status: 400,
+        });
+      }
+
+      if (enabled === "true") {
+        for (const route of allRoutes) {
+          // If already approved, skip, otherwise add to approved
+          if (newApproved.includes(route)) {
+            continue;
+          }
+
+          newApproved.push(route);
+        }
+      } else {
+        for (const route of allRoutes) {
+          // If not approved, skip, otherwise remove from approved
+          if (!newApproved.includes(route)) {
+            continue;
+          }
+
+          const index = newApproved.indexOf(route);
+          if (index > -1) {
+            newApproved.splice(index, 1);
+          }
+        }
+      }
+
+      await api.approveNodeRoutes(nodeId, newApproved);
+      return { message: "Routes updated" };
+    }
+
+    case "reassign": {
+      const user = formData.get("user_id")?.toString();
+      if (!user) {
+        throw data("Missing `user_id` in the form data.", {
+          status: 400,
+        });
+      }
+
+      await api.setNodeUser(nodeId, user);
+      return { message: "Machine reassigned" };
+    }
+
+    default:
+      throw data("Invalid action", {
+        status: 400,
+      });
+  }
 }

app/routes/machines/machine.tsx

@@ -1,409 +1,356 @@
-import { CheckCircle, CircleSlash, Info, UserCircle } from 'lucide-react';
-import { useMemo, useState } from 'react';
-import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
-import { Link as RemixLink, useLoaderData } from 'react-router';
-import Attribute from '~/components/Attribute';
-import Button from '~/components/Button';
-import Card from '~/components/Card';
-import Chip from '~/components/Chip';
-import Link from '~/components/Link';
-import StatusCircle from '~/components/StatusCircle';
-import Tooltip from '~/components/Tooltip';
-import type { LoadContext } from '~/server';
-import type { Machine, User } from '~/types';
-import cn from '~/utils/cn';
-import { getOSInfo, getTSVersion } from '~/utils/host-info';
-import { mapNodes } from '~/utils/node-info';
-import { mapTagsToComponents, uiTagsForNode } from './components/machine-row';
-import MenuOptions from './components/menu';
-import Routes from './dialogs/routes';
-import { machineAction } from './machine-actions';
+import { CheckCircle, CircleSlash, Info, UserCircle } from "lucide-react";
+import { useMemo, useState } from "react";
+import { data, Link as RemixLink } from "react-router";
 
-export async function loader({
-	request,
-	params,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	const session = await context.sessions.auth(request);
-	if (!params.id) {
-		throw new Error('No machine ID provided');
-	}
+import Attribute from "~/components/Attribute";
+import Button from "~/components/Button";
+import Card from "~/components/Card";
+import Chip from "~/components/Chip";
+import Link from "~/components/Link";
+import StatusCircle from "~/components/StatusCircle";
+import Tooltip from "~/components/Tooltip";
+import cn from "~/utils/cn";
+import { getOSInfo, getTSVersion } from "~/utils/host-info";
+import { mapNodes, sortNodeTags } from "~/utils/node-info";
 
-	let magic: string | undefined;
-	if (context.hs.readable()) {
-		if (context.hs.c?.dns.magic_dns) {
-			magic = context.hs.c.dns.base_domain;
-		}
-	}
+import type { Route } from "./+types/machine";
 
-	const [machine, { users }] = await Promise.all([
-		context.client.get<{ node: Machine }>(
-			`v1/node/${params.id}`,
-			session.api_key,
-		),
-		context.client.get<{ users: User[] }>('v1/user', session.api_key),
-	]);
+import { mapTagsToComponents, uiTagsForNode } from "./components/machine-row";
+import MenuOptions from "./components/menu";
+import Routes from "./dialogs/routes";
+import { machineAction } from "./machine-actions";
 
-	const lookup = await context.agents?.lookup([machine.node.nodeKey]);
-	const [node] = mapNodes([machine.node], lookup);
-	const tags = Array.from(
-		new Set([...node.validTags, ...node.forcedTags]),
-	).sort();
+export async function loader({ request, params, context }: Route.LoaderArgs) {
+  const session = await context.sessions.auth(request);
+  if (!params.id) {
+    throw new Error("No machine ID provided");
+  }
 
-	return {
-		node,
-		tags,
-		users,
-		magic,
-		agent: context.agents?.agentID(),
-		stats: lookup?.[node.nodeKey],
-	};
+  if (params.id.endsWith(".ico")) {
+    throw data(null, { status: 204 });
+  }
+
+  let magic: string | undefined;
+  if (context.hs.readable()) {
+    if (context.hs.c?.dns.magic_dns) {
+      magic = context.hs.c.dns.base_domain;
+    }
+  }
+
+  const api = context.hsApi.getRuntimeClient(session.api_key);
+  const [nodes, users] = await Promise.all([api.getNodes(), api.getUsers()]);
+  const node = nodes.find((node) => node.id === params.id);
+
+  const lookup = await context.agents?.lookup([node.nodeKey]);
+  const [enhancedNode] = mapNodes([node], lookup);
+  const tags = [...node.tags].sort();
+  const supportsNodeOwnerChange = ! context.hsApi.clientHelpers.isAtleast("0.28.0-beta.1");
+
+  return {
+    node: enhancedNode,
+    tags,
+    users,
+    magic,
+    agent: context.agents?.agentID(),
+    stats: lookup?.[enhancedNode.nodeKey],
+    existingTags: sortNodeTags(nodes),
+    supportsNodeOwnerChange: supportsNodeOwnerChange,
+  };
 }
 
-export async function action(request: ActionFunctionArgs) {
-	return machineAction(request);
-}
+export const action = machineAction;
 
-export default function Page() {
-	const { node, tags, magic, users, agent, stats } =
-		useLoaderData<typeof loader>();
-	const [showRouting, setShowRouting] = useState(false);
+export default function Page({
+  loaderData: { node, tags, users, magic, agent, stats, existingTags, supportsNodeOwnerChange },
+}: Route.ComponentProps) {
+  const [showRouting, setShowRouting] = useState(false);
 
-	const uiTags = useMemo(() => {
-		const tags = uiTagsForNode(node, agent === node.nodeKey);
-		return tags;
-	}, [node, agent]);
+  const uiTags = useMemo(() => {
+    const tags = uiTagsForNode(node, agent === node.nodeKey);
+    return tags;
+  }, [node, agent]);
 
-	return (
-		<div>
-			<p className="mb-8 text-md">
-				<RemixLink className="font-medium" to="/machines">
-					All Machines
-				</RemixLink>
-				<span className="mx-2">/</span>
-				{node.givenName}
-			</p>
-			<div
-				className={cn(
-					'flex justify-between items-center pb-2',
-					'border-b border-headplane-100 dark:border-headplane-800',
-				)}
-			>
-				<span className="flex items-baseline gap-x-4 text-sm">
-					<h1 className="text-2xl font-medium">{node.givenName}</h1>
-					<StatusCircle className="w-4 h-4" isOnline={node.online} />
-				</span>
-				<MenuOptions isFullButton magic={magic} node={node} users={users} />
-			</div>
-			<div className="flex gap-1 mb-4">
-				<div className="border-r border-headplane-100 dark:border-headplane-800 p-2 pr-4">
-					<span className="text-sm text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
-						Managed by
-						<Tooltip>
-							<Info className="p-1" />
-							<Tooltip.Body>
-								By default, a machine’s permissions match its creator’s.
-							</Tooltip.Body>
-						</Tooltip>
-					</span>
-					<div className="flex items-center gap-x-2.5 mt-1">
-						<UserCircle />
-						{node.user.name ||
-							node.user.displayName ||
-							node.user.email ||
-							node.user.id}
-					</div>
-				</div>
-				<div className="p-2 pl-4">
-					<p className="text-sm text-headplane-600 dark:text-headplane-300">
-						Status
-					</p>
-					<div className="flex gap-1 mt-1 mb-8">
-						{mapTagsToComponents(node, uiTags)}
-						{tags.map((tag) => (
-							<Chip key={tag} text={tag} />
-						))}
-					</div>
-				</div>
-			</div>
-			<Routes isOpen={showRouting} node={node} setIsOpen={setShowRouting} />
-			<h2 className="text-xl font-medium mt-8">Subnets & Routing</h2>
-			<div className="flex items-center justify-between mb-4">
-				<p>
-					Subnets let you expose physical network routes onto Tailscale.{' '}
-					<Link
-						name="Tailscale Subnets Documentation"
-						to="https://tailscale.com/kb/1019/subnets"
-					>
-						Learn More
-					</Link>
-				</p>
-				<Button onPress={() => setShowRouting(true)}>Review</Button>
-			</div>
-			<Card
-				className={cn(
-					'w-full max-w-full grid sm:grid-cols-2',
-					'md:grid-cols-4 gap-8 mr-2 text-sm mb-8',
-				)}
-				variant="flat"
-			>
-				<div>
-					<span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
-						Approved
-						<Tooltip>
-							<Info className="w-3.5 h-3.5" />
-							<Tooltip.Body>
-								Traffic to these routes are being routed through this machine.
-							</Tooltip.Body>
-						</Tooltip>
-					</span>
-					<div className="mt-1">
-						{node.customRouting.subnetApprovedRoutes.length === 0 ? (
-							<span className="opacity-50">—</span>
-						) : (
-							<ul className="leading-normal">
-								{node.customRouting.subnetApprovedRoutes.map((route) => (
-									<li key={route}>{route}</li>
-								))}
-							</ul>
-						)}
-					</div>
-					<Button
-						className={cn(
-							'px-1.5 py-0.5 rounded-md mt-1.5',
-							'text-blue-500 dark:text-blue-400',
-						)}
-						onPress={() => setShowRouting(true)}
-					>
-						Edit
-					</Button>
-				</div>
-				<div>
-					<span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
-						Awaiting Approval
-						<Tooltip>
-							<Info className="w-3.5 h-3.5" />
-							<Tooltip.Body>
-								This machine is advertising these routes, but they must be
-								approved before traffic will be routed to them.
-							</Tooltip.Body>
-						</Tooltip>
-					</span>
-					<div className="mt-1">
-						{node.customRouting.subnetWaitingRoutes.length === 0 ? (
-							<span className="opacity-50">—</span>
-						) : (
-							<ul className="leading-normal">
-								{node.customRouting.subnetWaitingRoutes.map((route) => (
-									<li key={route}>{route}</li>
-								))}
-							</ul>
-						)}
-					</div>
-					<Button
-						className={cn(
-							'px-1.5 py-0.5 rounded-md mt-1.5',
-							'text-blue-500 dark:text-blue-400',
-						)}
-						onPress={() => setShowRouting(true)}
-					>
-						Edit
-					</Button>
-				</div>
-				<div>
-					<span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
-						Exit Node
-						<Tooltip>
-							<Info className="w-3.5 h-3.5" />
-							<Tooltip.Body>
-								Whether this machine can act as an exit node for your tailnet.
-							</Tooltip.Body>
-						</Tooltip>
-					</span>
-					<div className="mt-1">
-						{node.customRouting.exitRoutes.length === 0 ? (
-							<span className="opacity-50">—</span>
-						) : node.customRouting.exitApproved ? (
-							<span className="flex items-center gap-x-1">
-								<CheckCircle className="w-3.5 h-3.5 text-green-700" />
-								Allowed
-							</span>
-						) : (
-							<span className="flex items-center gap-x-1">
-								<CircleSlash className="w-3.5 h-3.5 text-red-700" />
-								Awaiting Approval
-							</span>
-						)}
-					</div>
-					<Button
-						className={cn(
-							'px-1.5 py-0.5 rounded-md mt-1.5',
-							'text-blue-500 dark:text-blue-400',
-						)}
-						onPress={() => setShowRouting(true)}
-					>
-						Edit
-					</Button>
-				</div>
-			</Card>
-			<h2 className="text-xl font-medium">Machine Details</h2>
-			<p className="mb-4">
-				Information about this machine’s network. Used to debug connection
-				issues.
-			</p>
-			<Card
-				className="w-full max-w-full grid grid-cols-1 lg:grid-cols-2 gap-y-2 sm:gap-x-12"
-				variant="flat"
-			>
-				<div className="flex flex-col gap-1">
-					<Attribute
-						name="Creator"
-						value={
-							node.user.name ||
-							node.user.displayName ||
-							node.user.email ||
-							node.user.id
-						}
-					/>
-					<Attribute name="Machine name" value={node.givenName} />
-					<Attribute
-						name="OS hostname"
-						tooltip="OS hostname is published by the machine’s operating system and is used as the default name for the machine."
-						value={node.name}
-					/>
-					{stats ? (
-						<>
-							<Attribute name="OS" value={getOSInfo(stats)} />
-							<Attribute name="Tailscale version" value={getTSVersion(stats)} />
-						</>
-					) : undefined}
-					<Attribute
-						name="ID"
-						tooltip="ID for this machine. Used in the Headscale API."
-						value={node.id}
-					/>
-					<Attribute
-						isCopyable
-						name="Node key"
-						tooltip="Public key which uniquely identifies this machine."
-						value={node.nodeKey}
-					/>
-					<Attribute
-						name="Created"
-						value={new Date(node.createdAt).toLocaleString()}
-					/>
-					<Attribute
-						name="Last Seen"
-						value={
-							node.online
-								? 'Connected'
-								: new Date(node.lastSeen).toLocaleString()
-						}
-					/>
-					<Attribute
-						name="Key expiry"
-						value={
-							node.expiry !== null
-								? new Date(node.expiry).toLocaleString()
-								: 'Never'
-						}
-					/>
-					{magic ? (
-						<Attribute
-							isCopyable
-							name="Domain"
-							value={`${node.givenName}.${magic}`}
-						/>
-					) : undefined}
-				</div>
-				<div className="flex flex-col gap-1">
-					<p className="uppercase text-sm font-semibold opacity-75">
-						Addresses
-					</p>
-					<Attribute
-						isCopyable
-						name="Tailscale IPv4"
-						tooltip="This machine’s IPv4 address within your tailnet (your private Tailscale network)."
-						value={getIpv4Address(node.ipAddresses)}
-					/>
-					<Attribute
-						isCopyable
-						name="Tailscale IPv6"
-						tooltip="This machine’s IPv6 address within your tailnet (your private Tailscale network). Connections within your tailnet support IPv6 even if your ISP does not."
-						value={getIpv6Address(node.ipAddresses)}
-					/>
-					<Attribute
-						isCopyable
-						name="Short domain"
-						tooltip="Users of your tailnet can use this DNS short name to access this machine."
-						value={node.givenName}
-					/>
-					{magic ? (
-						<Attribute
-							isCopyable
-							name="Full domain"
-							tooltip="Users of your tailnet can use this DNS name to access this machine."
-							value={`${node.givenName}.${magic}`}
-						/>
-					) : undefined}
-					{stats ? (
-						<>
-							<p className="uppercase text-sm font-semibold opacity-75 mt-4">
-								Client Connectivity
-							</p>
-							<Attribute
-								name="Varies"
-								tooltip="Whether the machine is behind a difficult NAT that varies the machine’s IP address depending on the destination."
-								value={stats.NetInfo?.MappingVariesByDestIP ? 'Yes' : 'No'}
-							/>
-							<Attribute
-								name="Hairpinning"
-								tooltip="Whether the machine needs to traverse NATs with hairpinning."
-								value={stats.NetInfo?.HairPinning ? 'Yes' : 'No'}
-							/>
-							<Attribute
-								name="IPv6"
-								value={stats.NetInfo?.WorkingIPv6 ? 'Yes' : 'No'}
-							/>
-							<Attribute
-								name="UDP"
-								value={stats.NetInfo?.WorkingUDP ? 'Yes' : 'No'}
-							/>
-							<Attribute
-								name="UPnP"
-								value={stats.NetInfo?.UPnP ? 'Yes' : 'No'}
-							/>
-							<Attribute name="PCP" value={stats.NetInfo?.PCP ? 'Yes' : 'No'} />
-							<Attribute
-								name="NAT-PMP"
-								value={stats.NetInfo?.PMP ? 'Yes' : 'No'}
-							/>
-						</>
-					) : undefined}
-				</div>
-			</Card>
-		</div>
-	);
+  return (
+    <div>
+      <p className="text-md mb-8">
+        <RemixLink className="font-medium" to="/machines">
+          All Machines
+        </RemixLink>
+        <span className="mx-2">/</span>
+        {node.givenName}
+      </p>
+      <div
+        className={cn(
+          "flex justify-between items-center pb-2",
+          "border-b border-headplane-100 dark:border-headplane-800",
+        )}
+      >
+        <span className="flex items-baseline gap-x-4 text-sm">
+          <h1 className="text-2xl font-medium">{node.givenName}</h1>
+          <StatusCircle className="h-4 w-4" isOnline={node.online} />
+        </span>
+        <MenuOptions
+          existingTags={existingTags}
+          isFullButton
+          magic={magic}
+          node={node}
+          users={users}
+          supportsNodeOwnerChange={supportsNodeOwnerChange}
+        />
+      </div>
+      <div className="mb-4 flex gap-1">
+        <div className="border-headplane-100 dark:border-headplane-800 border-r p-2 pr-4">
+          <span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1 text-sm">
+            Managed by
+            <Tooltip>
+              <Info className="p-1" />
+              <Tooltip.Body>By default, a machine’s permissions match its creator’s.</Tooltip.Body>
+            </Tooltip>
+          </span>
+          <div className="mt-1 flex items-center gap-x-2.5">
+            <UserCircle />
+            {node.user.name || node.user.displayName || node.user.email || node.user.id}
+          </div>
+        </div>
+        <div className="p-2 pl-4">
+          <p className="text-headplane-600 dark:text-headplane-300 text-sm">Status</p>
+          <div className="mt-1 mb-8 flex gap-1">
+            {mapTagsToComponents(node, uiTags)}
+            {tags.map((tag) => (
+              <Chip key={tag} text={tag} />
+            ))}
+          </div>
+        </div>
+      </div>
+      <Routes isOpen={showRouting} node={node} setIsOpen={setShowRouting} />
+      <h2 className="mt-8 text-xl font-medium">Subnets & Routing</h2>
+      <div className="mb-4 flex items-center justify-between">
+        <p>
+          Subnets let you expose physical network routes onto Tailscale.{" "}
+          <Link name="Tailscale Subnets Documentation" to="https://tailscale.com/kb/1019/subnets">
+            Learn More
+          </Link>
+        </p>
+        <Button onPress={() => setShowRouting(true)}>Review</Button>
+      </div>
+      <Card
+        className={cn(
+          "w-full max-w-full grid sm:grid-cols-2",
+          "md:grid-cols-4 gap-8 mr-2 text-sm mb-8",
+        )}
+        variant="flat"
+      >
+        <div>
+          <span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
+            Approved
+            <Tooltip>
+              <Info className="h-3.5 w-3.5" />
+              <Tooltip.Body>
+                Traffic to these routes are being routed through this machine.
+              </Tooltip.Body>
+            </Tooltip>
+          </span>
+          <div className="mt-1">
+            {node.customRouting.subnetApprovedRoutes.length === 0 ? (
+              <span className="opacity-50">—</span>
+            ) : (
+              <ul className="leading-normal">
+                {node.customRouting.subnetApprovedRoutes.map((route) => (
+                  <li key={route}>{route}</li>
+                ))}
+              </ul>
+            )}
+          </div>
+          <Button
+            className={cn("px-1.5 py-0.5 rounded-md mt-1.5", "text-blue-500 dark:text-blue-400")}
+            onPress={() => setShowRouting(true)}
+          >
+            Edit
+          </Button>
+        </div>
+        <div>
+          <span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
+            Awaiting Approval
+            <Tooltip>
+              <Info className="h-3.5 w-3.5" />
+              <Tooltip.Body>
+                This machine is advertising these routes, but they must be approved before traffic
+                will be routed to them.
+              </Tooltip.Body>
+            </Tooltip>
+          </span>
+          <div className="mt-1">
+            {node.customRouting.subnetWaitingRoutes.length === 0 ? (
+              <span className="opacity-50">—</span>
+            ) : (
+              <ul className="leading-normal">
+                {node.customRouting.subnetWaitingRoutes.map((route) => (
+                  <li key={route}>{route}</li>
+                ))}
+              </ul>
+            )}
+          </div>
+          <Button
+            className={cn("px-1.5 py-0.5 rounded-md mt-1.5", "text-blue-500 dark:text-blue-400")}
+            onPress={() => setShowRouting(true)}
+          >
+            Edit
+          </Button>
+        </div>
+        <div>
+          <span className="text-headplane-600 dark:text-headplane-300 flex items-center gap-x-1">
+            Exit Node
+            <Tooltip>
+              <Info className="h-3.5 w-3.5" />
+              <Tooltip.Body>
+                Whether this machine can act as an exit node for your tailnet.
+              </Tooltip.Body>
+            </Tooltip>
+          </span>
+          <div className="mt-1">
+            {node.customRouting.exitRoutes.length === 0 ? (
+              <span className="opacity-50">—</span>
+            ) : node.customRouting.exitApproved ? (
+              <span className="flex items-center gap-x-1">
+                <CheckCircle className="h-3.5 w-3.5 text-green-700" />
+                Allowed
+              </span>
+            ) : (
+              <span className="flex items-center gap-x-1">
+                <CircleSlash className="h-3.5 w-3.5 text-red-700" />
+                Awaiting Approval
+              </span>
+            )}
+          </div>
+          <Button
+            className={cn("px-1.5 py-0.5 rounded-md mt-1.5", "text-blue-500 dark:text-blue-400")}
+            onPress={() => setShowRouting(true)}
+          >
+            Edit
+          </Button>
+        </div>
+      </Card>
+      <h2 className="text-xl font-medium">Machine Details</h2>
+      <p className="mb-4">
+        Information about this machine’s network. Used to debug connection issues.
+      </p>
+      <Card
+        className="grid w-full max-w-full grid-cols-1 gap-y-2 sm:gap-x-12 lg:grid-cols-2"
+        variant="flat"
+      >
+        <div className="flex flex-col gap-1">
+          <Attribute
+            name="Creator"
+            value={node.user.name || node.user.displayName || node.user.email || node.user.id}
+          />
+          <Attribute name="Machine name" value={node.givenName} />
+          <Attribute
+            name="OS hostname"
+            tooltip="OS hostname is published by the machine’s operating system and is used as the default name for the machine."
+            value={node.name}
+          />
+          {stats ? (
+            <>
+              <Attribute name="OS" value={getOSInfo(stats)} />
+              <Attribute name="Tailscale version" value={getTSVersion(stats)} />
+            </>
+          ) : undefined}
+          <Attribute
+            name="ID"
+            tooltip="ID for this machine. Used in the Headscale API."
+            value={node.id}
+          />
+          <Attribute
+            isCopyable
+            name="Node key"
+            tooltip="Public key which uniquely identifies this machine."
+            value={node.nodeKey}
+          />
+          <Attribute name="Created" value={new Date(node.createdAt).toLocaleString()} />
+          <Attribute
+            name="Last Seen"
+            value={node.online ? "Connected" : new Date(node.lastSeen).toLocaleString()}
+          />
+          <Attribute
+            name="Key expiry"
+            value={node.expiry !== null ? new Date(node.expiry).toLocaleString() : "Never"}
+          />
+          {magic ? (
+            <Attribute isCopyable name="Domain" value={`${node.givenName}.${magic}`} />
+          ) : undefined}
+        </div>
+        <div className="flex flex-col gap-1">
+          <p className="text-sm font-semibold uppercase opacity-75">Addresses</p>
+          <Attribute
+            isCopyable
+            name="Tailscale IPv4"
+            tooltip="This machine’s IPv4 address within your tailnet (your private Tailscale network)."
+            value={getIpv4Address(node.ipAddresses)}
+          />
+          <Attribute
+            isCopyable
+            name="Tailscale IPv6"
+            tooltip="This machine’s IPv6 address within your tailnet (your private Tailscale network). Connections within your tailnet support IPv6 even if your ISP does not."
+            value={getIpv6Address(node.ipAddresses)}
+          />
+          <Attribute
+            isCopyable
+            name="Short domain"
+            tooltip="Users of your tailnet can use this DNS short name to access this machine."
+            value={node.givenName}
+          />
+          {magic ? (
+            <Attribute
+              isCopyable
+              name="Full domain"
+              tooltip="Users of your tailnet can use this DNS name to access this machine."
+              value={`${node.givenName}.${magic}`}
+            />
+          ) : undefined}
+          {stats ? (
+            <>
+              <p className="mt-4 text-sm font-semibold uppercase opacity-75">Client Connectivity</p>
+              <Attribute
+                name="Varies"
+                tooltip="Whether the machine is behind a difficult NAT that varies the machine’s IP address depending on the destination."
+                value={stats.NetInfo?.MappingVariesByDestIP ? "Yes" : "No"}
+              />
+              <Attribute
+                name="Hairpinning"
+                tooltip="Whether the machine needs to traverse NATs with hairpinning."
+                value={stats.NetInfo?.HairPinning ? "Yes" : "No"}
+              />
+              <Attribute name="IPv6" value={stats.NetInfo?.WorkingIPv6 ? "Yes" : "No"} />
+              <Attribute name="UDP" value={stats.NetInfo?.WorkingUDP ? "Yes" : "No"} />
+              <Attribute name="UPnP" value={stats.NetInfo?.UPnP ? "Yes" : "No"} />
+              <Attribute name="PCP" value={stats.NetInfo?.PCP ? "Yes" : "No"} />
+              <Attribute name="NAT-PMP" value={stats.NetInfo?.PMP ? "Yes" : "No"} />
+            </>
+          ) : undefined}
+        </div>
+      </Card>
+    </div>
+  );
 }
 
 function getIpv4Address(addresses: string[]) {
-	for (const address of addresses) {
-		if (address.startsWith('100.')) {
-			// Return the first CGNAT address
-			return address;
-		}
-	}
+  for (const address of addresses) {
+    if (address.startsWith("100.")) {
+      // Return the first CGNAT address
+      return address;
+    }
+  }
 
-	return '—';
+  return "—";
 }
 
 function getIpv6Address(addresses: string[]) {
-	for (const address of addresses) {
-		if (address.startsWith('fd')) {
-			// Return the first IPv6 address
-			return address;
-		}
-	}
+  for (const address of addresses) {
+    if (address.startsWith("fd")) {
+      // Return the first IPv6 address
+      return address;
+    }
+  }
 
-	return '—';
+  return "—";
 }

app/routes/machines/overview.tsx

@@ -1,22 +1,18 @@
-import { Info } from 'lucide-react';
-import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
-import { useLoaderData } from 'react-router';
+import { ChevronDown, ChevronUp, Info, X } from 'lucide-react';
+import { useMemo, useState } from 'react';
 import Code from '~/components/Code';
+import Input from '~/components/Input';
 import Link from '~/components/Link';
 import Tooltip from '~/components/Tooltip';
-import type { LoadContext } from '~/server';
 import { Capabilities } from '~/server/web/roles';
-import type { Machine, User } from '~/types';
 import cn from '~/utils/cn';
-import { mapNodes } from '~/utils/node-info';
+import { mapNodes, sortNodeTags } from '~/utils/node-info';
+import type { Route } from './+types/overview';
 import MachineRow from './components/machine-row';
 import NewMachine from './dialogs/new';
 import { machineAction } from './machine-actions';
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
 	const user = session.user;
 	if (!user) {
@@ -40,10 +36,8 @@ export async function loader({
 		Capabilities.write_machines,
 	);
 
-	const [{ nodes }, { users }] = await Promise.all([
-		context.client.get<{ nodes: Machine[] }>('v1/node', session.api_key),
-		context.client.get<{ users: User[] }>('v1/user', session.api_key),
-	]);
+	const api = context.hsApi.getRuntimeClient(session.api_key);
+	const [nodes, users] = await Promise.all([api.getNodes(), api.getUsers()]);
 
 	let magic: string | undefined;
 	if (context.hs.readable()) {
@@ -54,6 +48,7 @@ export async function loader({
 
 	const stats = await context.agents?.lookup(nodes.map((node) => node.nodeKey));
 	const populatedNodes = mapNodes(nodes, stats);
+	const supportsNodeOwnerChange = ! context.hsApi.clientHelpers.isAtleast("0.28.0-beta.1");
 
 	return {
 		populatedNodes,
@@ -69,20 +64,103 @@ export async function loader({
 			Capabilities.generate_authkeys,
 		),
 		subject: user.subject,
+		supportsNodeOwnerChange: supportsNodeOwnerChange,
 	};
 }
 
-export async function action(request: ActionFunctionArgs) {
-	return machineAction(request);
-}
+export const action = machineAction;
 
-export default function Page() {
-	const data = useLoaderData<typeof loader>();
+type SortField = 'name' | 'ip' | 'version' | 'lastSeen';
+
+export default function Page({ loaderData }: Route.ComponentProps) {
+	const [searchQuery, setSearchQuery] = useState('');
+	const [sortField, setSortField] = useState<SortField>('name');
+	const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc');
+
+	const filteredAndSortedNodes = useMemo(() => {
+		const query = searchQuery.toLowerCase().trim();
+
+		let nodes = loaderData.populatedNodes.filter((node) => {
+			if (!query) return true;
+			if (node.givenName.toLowerCase().includes(query)) return true;
+			if (node.ipAddresses.some((ip) => ip.toLowerCase().includes(query)))
+				return true;
+			return false;
+		});
+
+		nodes = [...nodes].sort((a, b) => {
+			let comparison = 0;
+
+			switch (sortField) {
+				case 'name':
+					comparison = a.givenName.localeCompare(b.givenName);
+					break;
+				case 'ip': {
+					const getIPv4 = (addresses: string[]) =>
+						addresses.find((ip) => !ip.includes(':')) || addresses[0] || '';
+					const ipA = getIPv4(a.ipAddresses);
+					const ipB = getIPv4(b.ipAddresses);
+
+					if (!ipA.includes(':') && !ipB.includes(':')) {
+						const octetsA = ipA.split('.').map(Number);
+						const octetsB = ipB.split('.').map(Number);
+						for (let i = 0; i < 4; i++) {
+							if (octetsA[i] !== octetsB[i]) {
+								comparison = octetsA[i] - octetsB[i];
+								break;
+							}
+						}
+					} else {
+						comparison = ipA.localeCompare(ipB);
+					}
+					break;
+				}
+				case 'version': {
+					const versionA = a.hostInfo?.IPNVersion?.split('-')[0] || '0';
+					const versionB = b.hostInfo?.IPNVersion?.split('-')[0] || '0';
+					const partsA = versionA.split('.').map(Number);
+					const partsB = versionB.split('.').map(Number);
+					const maxLen = Math.max(partsA.length, partsB.length);
+
+					for (let i = 0; i < maxLen; i++) {
+						const segA = partsA[i] || 0;
+						const segB = partsB[i] || 0;
+						if (segA !== segB) {
+							comparison = segA - segB;
+							break;
+						}
+					}
+					break;
+				}
+				case 'lastSeen':
+					if (a.online !== b.online) {
+						comparison = a.online ? 1 : -1;
+						break;
+					}
+					comparison =
+						new Date(a.lastSeen).getTime() - new Date(b.lastSeen).getTime();
+					break;
+			}
+
+			return sortDirection === 'asc' ? comparison : -comparison;
+		});
+
+		return nodes;
+	}, [loaderData.populatedNodes, searchQuery, sortField, sortDirection]);
+
+	const handleSort = (field: SortField) => {
+		if (sortField === field) {
+			setSortDirection((prev) => (prev === 'asc' ? 'desc' : 'asc'));
+		} else {
+			setSortField(field);
+			setSortDirection('asc');
+		}
+	};
 
 	return (
 		<>
-			<div className="flex justify-between items-center mb-6">
-				<div className="flex flex-col w-2/3">
+			<div className="flex flex-col sm:flex-row sm:justify-between sm:items-center gap-4 mb-6">
+				<div className="flex flex-col">
 					<h1 className="text-2xl font-medium mb-2">Machines</h1>
 					<p>
 						Manage the devices connected to your Tailnet.{' '}
@@ -95,63 +173,222 @@ export default function Page() {
 					</p>
 				</div>
 				<NewMachine
-					disabledKeys={data.preAuth ? [] : ['pre-auth']}
-					isDisabled={!data.writable}
-					server={data.publicServer ?? data.server}
-					users={data.users}
+					disabledKeys={loaderData.preAuth ? [] : ['pre-auth']}
+					isDisabled={!loaderData.writable}
+					server={loaderData.publicServer ?? loaderData.server}
+					users={loaderData.users}
 				/>
 			</div>
-			<table className="table-auto w-full rounded-lg">
-				<thead className="text-headplane-600 dark:text-headplane-300">
-					<tr className="text-left px-0.5">
-						<th className="uppercase text-xs font-bold pb-2">Name</th>
-						<th className="pb-2 w-1/4">
-							<div className="flex items-center gap-x-1">
-								<p className="uppercase text-xs font-bold">Addresses</p>
-								{data.magic ? (
-									<Tooltip>
-										<Info className="w-4 h-4" />
-										<Tooltip.Body className="font-normal">
-											Since MagicDNS is enabled, you can access devices based on
-											their name and also at{' '}
-											<Code>
-												[name].
-												{data.magic}
-											</Code>
-										</Tooltip.Body>
-									</Tooltip>
-								) : undefined}
-							</div>
-						</th>
-						{/* We only want to show the version column if there are agents */}
-						{data.agent !== undefined ? (
-							<th className="uppercase text-xs font-bold pb-2">Version</th>
-						) : undefined}
-						<th className="uppercase text-xs font-bold pb-2">Last Seen</th>
-					</tr>
-				</thead>
-				<tbody
-					className={cn(
-						'divide-y divide-headplane-100 dark:divide-headplane-800 align-top',
-						'border-t border-headplane-100 dark:border-headplane-800',
+			<div className="mb-4 flex items-center gap-4">
+				<div className="relative w-64">
+					<Input
+						label="Search machines"
+						labelHidden
+						maxLength={100}
+						onChange={(value) => setSearchQuery(value.slice(0, 100))}
+						placeholder="Search by name or IP address..."
+						value={searchQuery}
+					/>
+					{searchQuery && (
+						<button
+							aria-label="Clear search"
+							className={cn(
+								'absolute right-2 top-1/2 -translate-y-1/2',
+								'p-1 rounded-full',
+								'text-headplane-400 hover:text-headplane-600',
+								'dark:text-headplane-500 dark:hover:text-headplane-300',
+								'hover:bg-headplane-100 dark:hover:bg-headplane-800',
+							)}
+							onClick={() => setSearchQuery('')}
+							type="button"
+						>
+							<X className="w-4 h-4" />
+						</button>
 					)}
-				>
-					{data.populatedNodes.map((machine) => (
-						<MachineRow
-							isAgent={data.agent ? data.agent === machine.nodeKey : undefined}
-							isDisabled={
-								data.writable
-									? false // If the user has write permissions, they can edit all machines
-									: machine.user.providerId?.split('/').pop() !== data.subject
-							}
-							key={machine.id}
-							magic={data.magic}
-							node={machine}
-							users={data.users}
-						/>
-					))}
-				</tbody>
-			</table>
+				</div>
+				<span className="text-sm text-headplane-500 whitespace-nowrap">
+					{searchQuery
+						? `Showing ${filteredAndSortedNodes.length} of ${loaderData.populatedNodes.length} machines`
+						: `${loaderData.populatedNodes.length} machines`}
+				</span>
+			</div>
+			<div className="overflow-x-auto">
+				<table className="table-auto w-full rounded-lg min-w-[640px]">
+					<thead className="text-headplane-600 dark:text-headplane-300">
+						<tr className="text-left px-0.5">
+							<th
+								aria-sort={
+									sortField === 'name'
+										? sortDirection === 'asc'
+											? 'ascending'
+											: 'descending'
+										: 'none'
+								}
+								className="uppercase text-xs font-bold pb-2"
+							>
+								<button
+									aria-label="Sort by name"
+									className={cn(
+										'flex items-center gap-x-1 cursor-pointer',
+										'hover:text-headplane-900 dark:hover:text-headplane-100',
+									)}
+									onClick={() => handleSort('name')}
+									type="button"
+								>
+									Name
+									{sortField === 'name' &&
+										(sortDirection === 'asc' ? (
+											<ChevronUp className="w-3 h-3" />
+										) : (
+											<ChevronDown className="w-3 h-3" />
+										))}
+								</button>
+							</th>
+							<th
+								aria-sort={
+									sortField === 'ip'
+										? sortDirection === 'asc'
+											? 'ascending'
+											: 'descending'
+										: 'none'
+								}
+								className="pb-2 w-1/4"
+							>
+								<div className="flex items-center gap-x-1">
+									<button
+										aria-label="Sort by IP address"
+										className={cn(
+											'flex items-center gap-x-1 cursor-pointer uppercase text-xs font-bold',
+											'hover:text-headplane-900 dark:hover:text-headplane-100',
+										)}
+										onClick={() => handleSort('ip')}
+										type="button"
+									>
+										Addresses
+										{sortField === 'ip' &&
+											(sortDirection === 'asc' ? (
+												<ChevronUp className="w-3 h-3" />
+											) : (
+												<ChevronDown className="w-3 h-3" />
+											))}
+									</button>
+									{loaderData.magic ? (
+										<Tooltip>
+											<Info className="w-4 h-4" />
+											<Tooltip.Body className="font-normal">
+												Since MagicDNS is enabled, you can access devices based
+												on their name and also at{' '}
+												<Code>
+													[name].
+													{loaderData.magic}
+												</Code>
+											</Tooltip.Body>
+										</Tooltip>
+									) : undefined}
+								</div>
+							</th>
+							{/* We only want to show the version column if there are agents */}
+							{loaderData.agent !== undefined ? (
+								<th
+									aria-sort={
+										sortField === 'version'
+											? sortDirection === 'asc'
+												? 'ascending'
+												: 'descending'
+											: 'none'
+									}
+									className="uppercase text-xs font-bold pb-2"
+								>
+									<button
+										aria-label="Sort by version"
+										className={cn(
+											'flex items-center gap-x-1 cursor-pointer',
+											'hover:text-headplane-900 dark:hover:text-headplane-100',
+										)}
+										onClick={() => handleSort('version')}
+										type="button"
+									>
+										Version
+										{sortField === 'version' &&
+											(sortDirection === 'asc' ? (
+												<ChevronUp className="w-3 h-3" />
+											) : (
+												<ChevronDown className="w-3 h-3" />
+											))}
+									</button>
+								</th>
+							) : undefined}
+							<th
+								aria-sort={
+									sortField === 'lastSeen'
+										? sortDirection === 'asc'
+											? 'ascending'
+											: 'descending'
+										: 'none'
+								}
+								className="uppercase text-xs font-bold pb-2"
+							>
+								<button
+									aria-label="Sort by last seen"
+									className={cn(
+										'flex items-center gap-x-1 cursor-pointer',
+										'hover:text-headplane-900 dark:hover:text-headplane-100',
+									)}
+									onClick={() => handleSort('lastSeen')}
+									type="button"
+								>
+									Last Seen
+									{sortField === 'lastSeen' &&
+										(sortDirection === 'asc' ? (
+											<ChevronUp className="w-3 h-3" />
+										) : (
+											<ChevronDown className="w-3 h-3" />
+										))}
+								</button>
+							</th>
+						</tr>
+					</thead>
+					<tbody
+						className={cn(
+							'divide-y divide-headplane-100 dark:divide-headplane-800 align-top',
+							'border-t border-headplane-100 dark:border-headplane-800',
+						)}
+					>
+						{filteredAndSortedNodes.length === 0 ? (
+							<tr>
+								<td
+									className="py-8 text-center text-headplane-500"
+									colSpan={loaderData.agent !== undefined ? 5 : 4}
+								>
+									No machines found matching "{searchQuery}"
+								</td>
+							</tr>
+						) : (
+							filteredAndSortedNodes.map((node) => (
+								<MachineRow
+									existingTags={sortNodeTags(loaderData.nodes)}
+									isAgent={
+										loaderData.agent
+											? loaderData.agent === node.nodeKey
+											: undefined
+									}
+									isDisabled={
+										loaderData.writable
+											? false // If the user has write permissions, they can edit all machines
+											: node.user.providerId?.split('/').pop() !==
+												loaderData.subject
+									}
+									key={node.id}
+									magic={loaderData.magic}
+									node={node}
+									users={loaderData.users}
+									supportsNodeOwnerChange={loaderData.supportsNodeOwnerChange}
+								/>
+							))
+						)}
+					</tbody>
+				</table>
+			</div>
 		</>
 	);
 }

app/routes/settings/auth-keys/actions.ts

@@ -1,118 +1,94 @@
-import { ActionFunctionArgs, data } from 'react-router';
-import { LoadContext } from '~/server';
-import { Capabilities } from '~/server/web/roles';
-import { PreAuthKey } from '~/types';
+import { data } from "react-router";
 
-export async function authKeysAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
-	const session = await context.sessions.auth(request);
-	const check = await context.sessions.check(
-		request,
-		Capabilities.generate_authkeys,
-	);
+import { Capabilities } from "~/server/web/roles";
 
-	if (!check) {
-		throw data('You do not have permission to manage pre-auth keys', {
-			status: 403,
-		});
-	}
+import type { Route } from "./+types/overview";
 
-	const formData = await request.formData();
-	const apiKey = session.api_key;
-	const action = formData.get('action_id')?.toString();
-	if (!action) {
-		throw data('Missing `action_id` in the form data.', {
-			status: 400,
-		});
-	}
+export async function authKeysAction({ request, context }: Route.ActionArgs) {
+  const session = await context.sessions.auth(request);
+  const check = await context.sessions.check(request, Capabilities.generate_authkeys);
 
-	switch (action) {
-		case 'add_preauthkey':
-			return await addPreAuthKey(formData, apiKey, context);
-		case 'expire_preauthkey':
-			return await expirePreAuthKey(formData, apiKey, context);
-		default:
-			return data('Invalid action', {
-				status: 400,
-			});
-	}
-}
-
-async function addPreAuthKey(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const user = formData.get('user_id')?.toString();
-	if (!user) {
-		return data('Missing `user_id` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const expiry = formData.get('expiry')?.toString();
-	if (!expiry) {
-		return data('Missing `expiry` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const reusable = formData.get('reusable')?.toString();
-	if (!reusable) {
-		return data('Missing `reusable` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const ephemeral = formData.get('ephemeral')?.toString();
-	if (!ephemeral) {
-		return data('Missing `ephemeral` in the form data.', {
-			status: 400,
-		});
-	}
-
-	// Extract the first "word" from expiry which is the day number
-	// Calculate the date X days from now using the day number
-	const day = Number(expiry.toString().split(' ')[0]);
-	const date = new Date();
-	date.setDate(date.getDate() + day);
-
-	await context.client.post<{ preAuthKey: PreAuthKey }>(
-		'v1/preauthkey',
-		apiKey,
-		{
-			user,
-			ephemeral: ephemeral === 'on',
-			reusable: reusable === 'on',
-			expiration: date.toISOString(),
-			aclTags: [], // TODO
-		},
-	);
-
-	return data('Pre-auth key created');
-}
-
-async function expirePreAuthKey(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const key = formData.get('key')?.toString();
-	if (!key) {
-		return data('Missing `key` in the form data.', {
-			status: 400,
-		});
-	}
-
-	const user = formData.get('user_id')?.toString();
-	if (!user) {
-		return data('Missing `user_id` in the form data.', {
-			status: 400,
-		});
-	}
-
-	await context.client.post('v1/preauthkey/expire', apiKey, { user, key });
-	return data('Pre-auth key expired');
+  if (!check) {
+    throw data("You do not have permission to manage pre-auth keys", {
+      status: 403,
+    });
+  }
+
+  const formData = await request.formData();
+  const api = context.hsApi.getRuntimeClient(session.api_key);
+  const action = formData.get("action_id")?.toString();
+  if (!action) {
+    throw data("Missing `action_id` in the form data.", {
+      status: 400,
+    });
+  }
+
+  switch (action) {
+    case "add_preauthkey": {
+      const user = formData.get("user_id")?.toString();
+      if (!user) {
+        return data("Missing `user_id` in the form data.", {
+          status: 400,
+        });
+      }
+
+      const expiry = formData.get("expiry")?.toString();
+      if (!expiry) {
+        return data("Missing `expiry` in the form data.", {
+          status: 400,
+        });
+      }
+
+      const reusable = formData.get("reusable")?.toString();
+      if (!reusable) {
+        return data("Missing `reusable` in the form data.", {
+          status: 400,
+        });
+      }
+
+      const ephemeral = formData.get("ephemeral")?.toString();
+      if (!ephemeral) {
+        return data("Missing `ephemeral` in the form data.", {
+          status: 400,
+        });
+      }
+
+      // Extract the first "word" from expiry which is the day number
+      // Calculate the date X days from now using the day number
+      const day = Number(expiry.toString().split(" ")[0]);
+      const date = new Date();
+      date.setDate(date.getDate() + day);
+      const key = await api.createPreAuthKey(
+        user,
+        ephemeral === "on",
+        reusable === "on",
+        date,
+        [], // TODO
+      );
+
+      return data({ success: true as const, key: key.key });
+    }
+    case "expire_preauthkey": {
+      const key = formData.get("key")?.toString();
+      if (!key) {
+        return data("Missing `key` in the form data.", {
+          status: 400,
+        });
+      }
+
+      const user = formData.get("user_id")?.toString();
+      if (!user) {
+        return data("Missing `user_id` in the form data.", {
+          status: 400,
+        });
+      }
+
+      await api.expirePreAuthKey(user, key);
+      return data("Pre-auth key expired");
+    }
+    default:
+      return data("Invalid action", {
+        status: 400,
+      });
+  }
 }

app/routes/settings/auth-keys/auth-key-row.tsx

@@ -1,58 +1,32 @@
-import Attribute from '~/components/Attribute';
-import Button from '~/components/Button';
-import Code from '~/components/Code';
-import type { PreAuthKey, User } from '~/types';
-import toast from '~/utils/toast';
-import ExpireAuthKey from './dialogs/expire-auth-key';
+import type { PreAuthKey, User } from "~/types";
+
+import Attribute from "~/components/Attribute";
+
+import ExpireAuthKey from "./dialogs/expire-auth-key";
 
 interface Props {
-	authKey: PreAuthKey;
-	user: User;
-	url: string;
+  authKey: PreAuthKey;
+  user: User;
 }
 
-export default function AuthKeyRow({ authKey, user, url }: Props) {
-	const createdAt = new Date(authKey.createdAt).toLocaleString();
-	const expiration = new Date(authKey.expiration).toLocaleString();
+export default function AuthKeyRow({ authKey, user }: Props) {
+  const createdAt = new Date(authKey.createdAt).toLocaleString();
+  const expiration = new Date(authKey.expiration).toLocaleString();
 
-	return (
-		<div className="w-full">
-			<Attribute isCopyable name="Key" value={authKey.key} />
-			<Attribute
-				isCopyable
-				name="User"
-				value={user.name || user.displayName || user.email || user.id}
-			/>
-			<Attribute name="Reusable" value={authKey.reusable ? 'Yes' : 'No'} />
-			<Attribute name="Ephemeral" value={authKey.ephemeral ? 'Yes' : 'No'} />
-			<Attribute name="Used" value={authKey.used ? 'Yes' : 'No'} />
-			<Attribute name="Created" value={createdAt} />
-			<Attribute name="Expiration" value={expiration} />
-			<p className="mb-1 mt-4">
-				To use this key, run the following command on your device:
-			</p>
-			<Code className="text-sm">
-				tailscale up --login-server={url} --authkey {authKey.key}
-			</Code>
-			<div className="flex gap-4 items-center" suppressHydrationWarning>
-				{(authKey.used && !authKey.reusable) ||
-				new Date(authKey.expiration) < new Date() ? undefined : (
-					<ExpireAuthKey authKey={authKey} user={user} />
-				)}
-				<Button
-					className="my-4"
-					onPress={async () => {
-						await navigator.clipboard.writeText(
-							`tailscale up --login-server=${url} --authkey ${authKey.key}`,
-						);
-
-						toast('Copied command to clipboard');
-					}}
-					variant="light"
-				>
-					Copy Tailscale Command
-				</Button>
-			</div>
-		</div>
-	);
+  return (
+    <div className="w-full">
+      <Attribute name="Key" value={authKey.key} />
+      <Attribute name="User" value={user.name || user.displayName || user.email || user.id} />
+      <Attribute name="Reusable" value={authKey.reusable ? "Yes" : "No"} />
+      <Attribute name="Ephemeral" value={authKey.ephemeral ? "Yes" : "No"} />
+      <Attribute name="Used" value={authKey.used ? "Yes" : "No"} />
+      <Attribute name="Created" value={createdAt} />
+      <Attribute name="Expiration" value={expiration} />
+      {!((authKey.used && !authKey.reusable) || new Date(authKey.expiration) < new Date()) && (
+        <div className="mt-2" suppressHydrationWarning>
+          <ExpireAuthKey authKey={authKey} user={user} />
+        </div>
+      )}
+    </div>
+  );
 }

app/routes/settings/auth-keys/dialogs/add-auth-key.tsx

@@ -1,100 +1,166 @@
-import { Key, useState } from 'react';
-import { useFetcher } from 'react-router';
-import Dialog from '~/components/Dialog';
-import Link from '~/components/Link';
-import NumberInput from '~/components/NumberInput';
-import Select from '~/components/Select';
-import Switch from '~/components/Switch';
-import type { User } from '~/types';
+import { Key, useEffect, useRef, useState } from "react";
+import { useFetcher } from "react-router";
+
+import type { User } from "~/types";
+
+import Button from "~/components/Button";
+import Code from "~/components/Code";
+import Dialog from "~/components/Dialog";
+import Link from "~/components/Link";
+import NumberInput from "~/components/NumberInput";
+import Select from "~/components/Select";
+import Switch from "~/components/Switch";
+import toast from "~/utils/toast";
 
 interface AddAuthKeyProps {
-	users: User[];
+  users: User[];
+  url: string;
 }
 
-// TODO: Tags
-export default function AddAuthKey(data: AddAuthKeyProps) {
-	const [reusable, setReusable] = useState(false);
-	const [ephemeral, setEphemeral] = useState(false);
-	const [userId, setUserId] = useState<Key | null>(data.users[0]?.id);
+export default function AddAuthKey({ users, url }: AddAuthKeyProps) {
+  const fetcher = useFetcher();
+  const submittingRef = useRef(false);
+  const [isOpen, setIsOpen] = useState(false);
+  const [reusable, setReusable] = useState(false);
+  const [ephemeral, setEphemeral] = useState(false);
+  const [userId, setUserId] = useState<Key | null>(users[0]?.id);
 
-	return (
-		<Dialog>
-			<Dialog.Button className="my-4">Create pre-auth key</Dialog.Button>
-			<Dialog.Panel>
-				<Dialog.Title>Generate auth key</Dialog.Title>
-				<input type="hidden" name="action_id" value="add_preauthkey" />
-				<input type="hidden" name="user_id" value={userId?.toString()} />
-				<Select
-					isRequired
-					label="User"
-					name="user"
-					placeholder="Select a user"
-					description="This is the user machines will belong to when they authenticate."
-					className="mb-2"
-					onSelectionChange={(value) => {
-						setUserId(value);
-					}}
-				>
-					{data.users.map((user) => (
-					    <Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
-					))}
-				</Select>
-				<NumberInput
-					isRequired
-					name="expiry"
-					label="Key Expiration"
-					description="Set this key to expire after a certain number of days."
-					minValue={1}
-					maxValue={365_000} // 1000 years
-					defaultValue={90}
-					formatOptions={{
-						style: 'unit',
-						unit: 'day',
-						unitDisplay: 'short',
-					}}
-				/>
-				<div className="flex justify-between items-center gap-2 mt-6">
-					<div>
-						<Dialog.Text className="font-semibold">Reusable</Dialog.Text>
-						<Dialog.Text className="text-sm">
-							Use this key to authenticate more than one device.
-						</Dialog.Text>
-					</div>
-					<Switch
-						label="Reusable"
-						name="reusable"
-						defaultSelected={reusable}
-						onChange={() => {
-							setReusable(!reusable);
-						}}
-					/>
-				</div>
-				<input type="hidden" name="reusable" value={reusable.toString()} />
-				<div className="flex justify-between items-center gap-2 mt-6">
-					<div>
-						<Dialog.Text className="font-semibold">Ephemeral</Dialog.Text>
-						<Dialog.Text className="text-sm">
-							Devices authenticated with this key will be automatically removed
-							once they go offline.{' '}
-							<Link
-								to="https://tailscale.com/kb/1111/ephemeral-nodes"
-								name="Tailscale Ephemeral Nodes Documentation"
-							>
-								Learn more
-							</Link>
-						</Dialog.Text>
-					</div>
-					<Switch
-						label="Ephemeral"
-						name="ephemeral"
-						defaultSelected={ephemeral}
-						onChange={() => {
-							setEphemeral(!ephemeral);
-						}}
-					/>
-				</div>
-				<input type="hidden" name="ephemeral" value={ephemeral.toString()} />
-			</Dialog.Panel>
-		</Dialog>
-	);
+  const createdKey = fetcher.data?.success ? fetcher.data.key : null;
+
+  useEffect(() => {
+    if (fetcher.state === "idle" && fetcher.data) {
+      submittingRef.current = false;
+    }
+  }, [fetcher.data, fetcher.state]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      setReusable(false);
+      setEphemeral(false);
+      setUserId(users[0]?.id);
+      fetcher.data = undefined;
+    }
+  }, [isOpen]);
+
+  return (
+    <Dialog
+      isOpen={isOpen}
+      onOpenChange={(open) => {
+        if (!open && submittingRef.current) return;
+        setIsOpen(open);
+      }}
+    >
+      <Button className="my-4" onPress={() => setIsOpen(true)}>
+        Create pre-auth key
+      </Button>
+      {createdKey ? (
+        <Dialog.Panel variant="unactionable">
+          <Dialog.Title>Pre-auth key created</Dialog.Title>
+          <Dialog.Text>
+            Copy this key now. You will not be able to see the full key again.
+          </Dialog.Text>
+          <div className="bg-headplane-100 dark:bg-headplane-800 mt-4 flex items-center gap-2 rounded-lg px-3 py-2">
+            <code className="min-w-0 flex-1 truncate font-mono text-sm">{createdKey}</code>
+            <Button
+              className="shrink-0"
+              onPress={async () => {
+                await navigator.clipboard.writeText(createdKey);
+                toast("Copied key to clipboard");
+              }}
+              variant="light"
+            >
+              Copy
+            </Button>
+          </div>
+          <Dialog.Text className="mt-4 text-sm">To register a device with this key:</Dialog.Text>
+          <Code isCopyable className="mt-1 block text-sm">
+            {`tailscale up --login-server=${url} --authkey ${createdKey}`}
+          </Code>
+        </Dialog.Panel>
+      ) : (
+        <Dialog.Panel
+          onSubmit={(event) => {
+            event.preventDefault();
+            submittingRef.current = true;
+            const form = new FormData(event.currentTarget as HTMLFormElement);
+            form.set("action_id", "add_preauthkey");
+            form.set("user_id", userId?.toString() ?? "");
+            form.set("reusable", reusable ? "on" : "off");
+            form.set("ephemeral", ephemeral ? "on" : "off");
+            fetcher.submit(form, { method: "POST" });
+          }}
+          isDisabled={fetcher.state !== "idle"}
+        >
+          <Dialog.Title>Generate auth key</Dialog.Title>
+          <Select
+            className="mb-2"
+            description="This is the user machines will belong to when they authenticate."
+            isRequired
+            label="User"
+            onSelectionChange={(value) => {
+              setUserId(value);
+            }}
+            placeholder="Select a user"
+          >
+            {users.map((user) => (
+              <Select.Item key={user.id}>
+                {user.name || user.displayName || user.email || user.id}
+              </Select.Item>
+            ))}
+          </Select>
+          <NumberInput
+            defaultValue={90}
+            description="Set this key to expire after a certain number of days."
+            formatOptions={{
+              style: "unit",
+              unit: "day",
+              unitDisplay: "short",
+            }}
+            isRequired
+            label="Key Expiration"
+            maxValue={365_000}
+            minValue={1}
+            name="expiry"
+          />
+          <div className="mt-6 flex items-center justify-between gap-2">
+            <div>
+              <Dialog.Text className="font-semibold">Reusable</Dialog.Text>
+              <Dialog.Text className="text-sm">
+                Use this key to authenticate more than one device.
+              </Dialog.Text>
+            </div>
+            <Switch
+              defaultSelected={reusable}
+              label="Reusable"
+              onChange={() => {
+                setReusable(!reusable);
+              }}
+            />
+          </div>
+          <div className="mt-6 flex items-center justify-between gap-2">
+            <div>
+              <Dialog.Text className="font-semibold">Ephemeral</Dialog.Text>
+              <Dialog.Text className="text-sm">
+                Devices authenticated with this key will be automatically removed once they go
+                offline.{" "}
+                <Link
+                  name="Tailscale Ephemeral Nodes Documentation"
+                  to="https://tailscale.com/kb/1111/ephemeral-nodes"
+                >
+                  Learn more
+                </Link>
+              </Dialog.Text>
+            </div>
+            <Switch
+              defaultSelected={ephemeral}
+              label="Ephemeral"
+              onChange={() => {
+                setEphemeral(!ephemeral);
+              }}
+            />
+          </div>
+        </Dialog.Panel>
+      )}
+    </Dialog>
+  );
 }

app/routes/settings/auth-keys/dialogs/expire-auth-key.tsx

@@ -12,9 +12,9 @@ export default function ExpireAuthKey({ authKey, user }: ExpireAuthKeyProps) {
 			<Dialog.Button variant="heavy">Expire Key</Dialog.Button>
 			<Dialog.Panel variant="destructive">
 				<Dialog.Title>Expire auth key?</Dialog.Title>
-				<input type="hidden" name="action_id" value="expire_preauthkey" />
-				<input type="hidden" name="user_id" value={user.id} />
-				<input type="hidden" name="key" value={authKey.key} />
+				<input name="action_id" type="hidden" value="expire_preauthkey" />
+				<input name="user_id" type="hidden" value={user.id} />
+				<input name="key" type="hidden" value={authKey.key} />
 				<Dialog.Text>
 					Expiring this authentication key will immediately prevent it from
 					being used to authenticate new devices. This action cannot be undone.

app/routes/settings/auth-keys/overview.tsx

@@ -1,256 +1,232 @@
-import { FileKey2 } from 'lucide-react';
-import { useMemo, useState } from 'react';
-import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
-import { Link as RemixLink, useLoaderData } from 'react-router';
-import Code from '~/components/Code';
-import Link from '~/components/Link';
-import Notice from '~/components/Notice';
-import Select from '~/components/Select';
-import TableList from '~/components/TableList';
-import type { LoadContext } from '~/server';
-import { Capabilities } from '~/server/web/roles';
-import type { PreAuthKey, User } from '~/types';
-import log from '~/utils/log';
-import { authKeysAction } from './actions';
-import AuthKeyRow from './auth-key-row';
-import AddAuthKey from './dialogs/add-auth-key';
+import { FileKey2 } from "lucide-react";
+import { useMemo, useState } from "react";
+import { Link as RemixLink } from "react-router";
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	const session = await context.sessions.auth(request);
-	const { users } = await context.client.get<{ users: User[] }>(
-		'v1/user',
-		session.api_key,
-	);
+import Code from "~/components/Code";
+import Link from "~/components/Link";
+import Notice from "~/components/Notice";
+import Select from "~/components/Select";
+import TableList from "~/components/TableList";
+import { Capabilities } from "~/server/web/roles";
+import log from "~/utils/log";
 
-	const preAuthKeys = await Promise.all(
-		users
-			.filter((user) => user.name?.length > 0) // Filter out any invalid users
-			.map(async (user) => {
-				const qp = new URLSearchParams();
-				qp.set('user', user.id);
+import type { Route } from "./+types/overview";
 
-				try {
-					const { preAuthKeys } = await context.client.get<{
-						preAuthKeys: PreAuthKey[];
-					}>(`v1/preauthkey?${qp.toString()}`, session.api_key);
-					return {
-						success: true,
-						user,
-						preAuthKeys,
-					};
-				} catch (error) {
-					log.error('api', 'GET /v1/preauthkey for %s: %o', user.name, error);
-					return {
-						success: false,
-						user,
-						error,
-						preAuthKeys: [] as PreAuthKey[],
-					};
-				}
-			}),
-	);
+import { authKeysAction } from "./actions";
+import AuthKeyRow from "./auth-key-row";
+import AddAuthKey from "./dialogs/add-auth-key";
 
-	const keys = preAuthKeys
-		.filter(({ success }) => success)
-		.map(({ user, preAuthKeys }) => ({
-			user,
-			preAuthKeys,
-		}));
+export async function loader({ request, context }: Route.LoaderArgs) {
+  const session = await context.sessions.auth(request);
+  const api = context.hsApi.getRuntimeClient(session.api_key);
 
-	const missing = preAuthKeys
-		.filter(({ success }) => !success)
-		.map(({ user, error }) => ({
-			user,
-			error,
-		}));
+  const users = await api.getUsers();
+  const preAuthKeys = await Promise.all(
+    users
+      .filter((user) => user.name?.length > 0) // Filter out any invalid users
+      .map(async (user) => {
+        try {
+          const preAuthKeys = await api.getPreAuthKeys(user.id);
+          return {
+            success: true,
+            user,
+            preAuthKeys,
+          };
+        } catch (error) {
+          log.error("api", "GET /v1/preauthkey for %s: %o", user.name, error);
+          return {
+            success: false,
+            user,
+            error,
+            preAuthKeys: [],
+          };
+        }
+      }),
+  );
 
-	return {
-		keys,
-		missing,
-		users,
-		access: await context.sessions.check(
-			request,
-			Capabilities.generate_authkeys,
-		),
-		url: context.config.headscale.public_url ?? context.config.headscale.url,
-	};
+  const keys = preAuthKeys
+    .filter(({ success }) => success)
+    .map(({ user, preAuthKeys }) => ({
+      user,
+      preAuthKeys,
+    }));
+
+  const missing = preAuthKeys
+    .filter(({ success }) => !success)
+    .map(({ user, error }) => ({
+      user,
+      error,
+    }));
+
+  return {
+    keys,
+    missing,
+    users,
+    access: await context.sessions.check(request, Capabilities.generate_authkeys),
+    url: context.config.headscale.public_url ?? context.config.headscale.url,
+  };
 }
 
-export async function action(request: ActionFunctionArgs<LoadContext>) {
-	return authKeysAction(request);
-}
-
-type Status = 'all' | 'active' | 'expired' | 'reusable' | 'ephemeral';
-export default function Page() {
-	const { keys, missing, users, url, access } = useLoaderData<typeof loader>();
-	const [selectedUser, setSelectedUser] = useState('__headplane_all');
-	const [status, setStatus] = useState<Status>('active');
-	const isDisabled =
-		!access || keys.flatMap(({ preAuthKeys }) => preAuthKeys).length === 0;
-
-	const filteredKeys = useMemo(() => {
-		const now = new Date();
-		return keys
-			.filter(({ user }) => {
-				if (selectedUser === '__headplane_all') {
-					return true;
-				}
-
-				return user.id === selectedUser;
-			})
-			.flatMap(({ preAuthKeys }) => preAuthKeys)
-			.filter((key) => {
-				if (status === 'all') {
-					return true;
-				}
-
-				if (status === 'ephemeral') {
-					return key.ephemeral;
-				}
-
-				if (status === 'reusable') {
-					return key.reusable;
-				}
-
-				const expiry = new Date(key.expiration);
-				if (status === 'expired') {
-					// Expired keys are either used or expired
-					// BUT only used if they are not reusable
-					if (key.used && !key.reusable) {
-						return true;
-					}
-
-					return expiry < now;
-				}
-
-				if (status === 'active') {
-					// Active keys are either not expired or reusable
-					if (expiry < now) {
-						return false;
-					}
-
-					if (!key.used) {
-						return true;
-					}
-
-					return key.reusable;
-				}
-
-				return false;
-			});
-	}, [keys, selectedUser, status]);
-
-	return (
-		<div className="flex flex-col md:w-2/3">
-			<p className="mb-8 text-md">
-				<RemixLink className="font-medium" to="/settings">
-					Settings
-				</RemixLink>
-				<span className="mx-2">/</span> Pre-Auth Keys
-			</p>
-			{!access ? (
-				<Notice title="Pre-auth key permissions restricted" variant="warning">
-					You do not have the necessary permissions to generate pre-auth keys.
-					Please contact your administrator to request access or to generate a
-					pre-auth key for you.
-				</Notice>
-			) : missing.length > 0 ? (
-				<Notice title="Missing authentication keys" variant="error">
-					An error occurred while fetching the authentication keys for the
-					following users:{' '}
-					{missing.map(({ user }, index) => (
-						<>
-							<Code key={user.name}>{user.name}</Code>
-							{index < missing.length - 1 ? ', ' : '. '}
-						</>
-					))}
-					Their keys may not be listed correctly. Please check the server logs
-					for more information.
-				</Notice>
-			) : undefined}
-			<h1 className="text-2xl font-medium mb-2">Pre-Auth Keys</h1>
-			<p className="mb-4">
-				Headscale fully supports pre-authentication keys in order to easily add
-				devices to your Tailnet. To learn more about using pre-authentication
-				keys, visit the{' '}
-				<Link
-					name="Tailscale Auth Keys documentation"
-					to="https://tailscale.com/kb/1085/auth-keys/"
-				>
-					Tailscale documentation
-				</Link>
-			</p>
-			<AddAuthKey users={users} />
-			<div className="flex items-center gap-4 mt-4">
-				<Select
-					className="w-full"
-					defaultSelectedKey="__headplane_all"
-					isDisabled={isDisabled}
-					label="User"
-					onSelectionChange={(value) =>
-						setSelectedUser(value?.toString() ?? '')
-					}
-					placeholder="Select a user"
-				>
-					{[
-						<Select.Item key="__headplane_all">All</Select.Item>,
-						...keys.map(({ user }) => (
-							<Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
-						)),
-					]}
-				</Select>
-				<Select
-					className="w-full"
-					defaultSelectedKey="active"
-					isDisabled={isDisabled}
-					label="Status"
-					onSelectionChange={(value) =>
-						setStatus((value?.toString() ?? 'active') as Status)
-					}
-					placeholder="Select a status"
-				>
-					<Select.Item key="all">All</Select.Item>
-					<Select.Item key="active">Active</Select.Item>
-					<Select.Item key="expired">Used/Expired</Select.Item>
-					<Select.Item key="reusable">Reusable</Select.Item>
-					<Select.Item key="ephemeral">Ephemeral</Select.Item>
-				</Select>
-			</div>
-			<TableList className="mt-4">
-				{keys.flatMap(({ preAuthKeys }) => preAuthKeys).length === 0 ? (
-					<TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
-						<FileKey2 />
-						<p className="font-semibold">
-							No pre-auth keys have been created yet.
-						</p>
-					</TableList.Item>
-				) : filteredKeys.length === 0 ? (
-					<TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
-						<FileKey2 />
-						<p className="font-semibold">
-							No pre-auth keys match the selected filters.
-						</p>
-					</TableList.Item>
-				) : (
-					filteredKeys.map((key) => {
-						// TODO: Why is Headscale using email as the user ID here?
-						// https://github.com/juanfont/headscale/issues/2520
-						const user = users.find((user) => user.id === key.user.id);
-						if (!user) {
-							return null;
-						}
-
-						return (
-							<TableList.Item key={key.id}>
-								<AuthKeyRow authKey={key} url={url} user={user} />
-							</TableList.Item>
-						);
-					})
-				)}
-			</TableList>
-		</div>
-	);
+export const action = authKeysAction;
+
+type Status = "all" | "active" | "expired" | "reusable" | "ephemeral";
+export default function Page({
+  loaderData: { keys, missing, users, url, access },
+}: Route.ComponentProps) {
+  const [selectedUser, setSelectedUser] = useState("__headplane_all");
+  const [status, setStatus] = useState<Status>("active");
+  const isDisabled = !access || keys.flatMap(({ preAuthKeys }) => preAuthKeys).length === 0;
+
+  const filteredKeys = useMemo(() => {
+    const now = new Date();
+    return keys
+      .filter(({ user }) => {
+        if (selectedUser === "__headplane_all") {
+          return true;
+        }
+
+        return user.id === selectedUser;
+      })
+      .flatMap(({ preAuthKeys }) => preAuthKeys)
+      .filter((key) => {
+        if (status === "all") {
+          return true;
+        }
+
+        if (status === "ephemeral") {
+          return key.ephemeral;
+        }
+
+        if (status === "reusable") {
+          return key.reusable;
+        }
+
+        const expiry = new Date(key.expiration);
+        if (status === "expired") {
+          // Expired keys are either used or expired
+          // BUT only used if they are not reusable
+          if (key.used && !key.reusable) {
+            return true;
+          }
+
+          return expiry < now;
+        }
+
+        if (status === "active") {
+          // Active keys are either not expired or reusable
+          if (expiry < now) {
+            return false;
+          }
+
+          if (!key.used) {
+            return true;
+          }
+
+          return key.reusable;
+        }
+
+        return false;
+      });
+  }, [keys, selectedUser, status]);
+
+  return (
+    <div className="flex flex-col md:w-2/3">
+      <p className="text-md mb-8">
+        <RemixLink className="font-medium" to="/settings">
+          Settings
+        </RemixLink>
+        <span className="mx-2">/</span> Pre-Auth Keys
+      </p>
+      {!access ? (
+        <Notice title="Pre-auth key permissions restricted" variant="warning">
+          You do not have the necessary permissions to generate pre-auth keys. Please contact your
+          administrator to request access or to generate a pre-auth key for you.
+        </Notice>
+      ) : missing.length > 0 ? (
+        <Notice title="Missing authentication keys" variant="error">
+          An error occurred while fetching the authentication keys for the following users:{" "}
+          {missing.map(({ user }, index) => (
+            <>
+              <Code key={user.name}>{user.name}</Code>
+              {index < missing.length - 1 ? ", " : ". "}
+            </>
+          ))}
+          Their keys may not be listed correctly. Please check the server logs for more information.
+        </Notice>
+      ) : undefined}
+      <h1 className="mb-2 text-2xl font-medium">Pre-Auth Keys</h1>
+      <p className="mb-4">
+        Headscale fully supports pre-authentication keys in order to easily add devices to your
+        Tailnet. To learn more about using pre-authentication keys, visit the{" "}
+        <Link
+          name="Tailscale Auth Keys documentation"
+          to="https://tailscale.com/kb/1085/auth-keys/"
+        >
+          Tailscale documentation
+        </Link>
+      </p>
+      <AddAuthKey url={url} users={users} />
+      <div className="mt-4 flex items-center gap-4">
+        <Select
+          className="w-full"
+          defaultSelectedKey="__headplane_all"
+          isDisabled={isDisabled}
+          label="User"
+          onSelectionChange={(value) => setSelectedUser(value?.toString() ?? "")}
+          placeholder="Select a user"
+        >
+          {[
+            <Select.Item key="__headplane_all">All</Select.Item>,
+            ...keys.map(({ user }) => (
+              <Select.Item key={user.id}>
+                {user.name || user.displayName || user.email || user.id}
+              </Select.Item>
+            )),
+          ]}
+        </Select>
+        <Select
+          className="w-full"
+          defaultSelectedKey="active"
+          isDisabled={isDisabled}
+          label="Status"
+          onSelectionChange={(value) => setStatus((value?.toString() ?? "active") as Status)}
+          placeholder="Select a status"
+        >
+          <Select.Item key="all">All</Select.Item>
+          <Select.Item key="active">Active</Select.Item>
+          <Select.Item key="expired">Used/Expired</Select.Item>
+          <Select.Item key="reusable">Reusable</Select.Item>
+          <Select.Item key="ephemeral">Ephemeral</Select.Item>
+        </Select>
+      </div>
+      <TableList className="mt-4">
+        {keys.flatMap(({ preAuthKeys }) => preAuthKeys).length === 0 ? (
+          <TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
+            <FileKey2 />
+            <p className="font-semibold">No pre-auth keys have been created yet.</p>
+          </TableList.Item>
+        ) : filteredKeys.length === 0 ? (
+          <TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
+            <FileKey2 />
+            <p className="font-semibold">No pre-auth keys match the selected filters.</p>
+          </TableList.Item>
+        ) : (
+          filteredKeys.map((key) => {
+            // TODO: Why is Headscale using email as the user ID here?
+            // https://github.com/juanfont/headscale/issues/2520
+            const user = users.find((user) => user.id === key.user.id);
+            if (!user) {
+              return null;
+            }
+
+            return (
+              <TableList.Item key={key.id}>
+                <AuthKeyRow authKey={key} user={user} />
+              </TableList.Item>
+            );
+          })
+        )}
+      </TableList>
+    </div>
+  );
 }

app/routes/settings/overview.tsx

@@ -1,80 +1,73 @@
-import { ArrowRight } from 'lucide-react';
-import {
-	LoaderFunctionArgs,
-	Link as RemixLink,
-	useLoaderData,
-} from 'react-router';
-import Link from '~/components/Link';
-import { LoadContext } from '~/server';
+import { ArrowRight } from "lucide-react";
+import { Link as RemixLink } from "react-router";
 
-export async function loader({ context }: LoaderFunctionArgs<LoadContext>) {
-	return {
-		config: context.hs.writable(),
-		oidc: context.oidc,
-	};
+import Link from "~/components/Link";
+
+import type { Route } from "./+types/overview";
+
+export async function loader({ context }: Route.LoaderArgs) {
+  const oidcConnector = await context.oidcConnector?.get();
+  return {
+    config: context.hs.writable(),
+    isOidcEnabled: oidcConnector?.isValid ?? false,
+  };
 }
 
-export default function Page() {
-	const { config, oidc } = useLoaderData<typeof loader>();
-
-	return (
-		<div className="flex flex-col gap-8 max-w-(--breakpoint-lg)">
-			<div className="flex flex-col w-2/3">
-				<h1 className="text-2xl font-medium mb-4">Settings</h1>
-				<p>
-					The settings page is still under construction. As I'm able to add more
-					features, I'll be adding them here. If you require any features, feel
-					free to open an issue on the GitHub repository.
-				</p>
-			</div>
-			<div className="flex flex-col w-2/3">
-				<h1 className="text-2xl font-medium mb-4">Pre-Auth Keys</h1>
-				<p>
-					Headscale fully supports pre-authentication keys in order to easily
-					add devices to your Tailnet. To learn more about using
-					pre-authentication keys, visit the{' '}
-					<Link
-						name="Tailscale Auth Keys documentation"
-						to="https://tailscale.com/kb/1085/auth-keys/"
-					>
-						Tailscale documentation
-					</Link>
-				</p>
-			</div>
-			<RemixLink to="/settings/auth-keys">
-				<div className="text-lg font-medium flex items-center">
-					Manage Auth Keys
-					<ArrowRight className="w-5 h-5 ml-2" />
-				</div>
-			</RemixLink>
-			{config && oidc ? (
-				<>
-					<div className="flex flex-col w-2/3">
-						<h1 className="text-2xl font-medium mb-4">
-							Authentication Restrictions
-						</h1>
-						<p>
-							Headscale supports restricting OIDC authentication to only allow
-							certain email domains, groups, or users to authenticate. This can
-							be used to limit access to your Tailnet to only certain users or
-							groups and Headplane will also respect these settings when
-							authenticating.{' '}
-							<Link
-								name="Headscale OIDC documentation"
-								to="https://headscale.net/stable/ref/oidc/#basic-configuration"
-							>
-								Learn More
-							</Link>
-						</p>
-					</div>
-					<RemixLink to="/settings/restrictions">
-						<div className="text-lg font-medium flex items-center">
-							Manage Restrictions
-							<ArrowRight className="w-5 h-5 ml-2" />
-						</div>
-					</RemixLink>
-				</>
-			) : undefined}
-		</div>
-	);
+export default function Page({ loaderData: { config, isOidcEnabled } }: Route.ComponentProps) {
+  return (
+    <div className="flex max-w-(--breakpoint-lg) flex-col gap-8">
+      <div className="flex w-full flex-col sm:w-2/3">
+        <h1 className="mb-4 text-2xl font-medium">Settings</h1>
+        <p>
+          The settings page is still under construction. As I'm able to add more features, I'll be
+          adding them here. If you require any features, feel free to open an issue on the GitHub
+          repository.
+        </p>
+      </div>
+      <div className="flex w-full flex-col sm:w-2/3">
+        <h1 className="mb-4 text-2xl font-medium">Pre-Auth Keys</h1>
+        <p>
+          Headscale fully supports pre-authentication keys in order to easily add devices to your
+          Tailnet. To learn more about using pre-authentication keys, visit the{" "}
+          <Link
+            name="Tailscale Auth Keys documentation"
+            to="https://tailscale.com/kb/1085/auth-keys/"
+          >
+            Tailscale documentation
+          </Link>
+        </p>
+      </div>
+      <RemixLink to="/settings/auth-keys">
+        <div className="flex items-center text-lg font-medium">
+          Manage Auth Keys
+          <ArrowRight className="ml-2 h-5 w-5" />
+        </div>
+      </RemixLink>
+      {config && isOidcEnabled ? (
+        <>
+          <div className="flex w-full flex-col sm:w-2/3">
+            <h1 className="mb-4 text-2xl font-medium">Authentication Restrictions</h1>
+            <p>
+              Headscale supports restricting OIDC authentication to only allow certain email
+              domains, groups, or users to authenticate. This can be used to limit access to your
+              Tailnet to only certain users or groups and Headplane will also respect these settings
+              when authenticating.{" "}
+              <Link
+                name="Headscale OIDC documentation"
+                to="https://headscale.net/stable/ref/oidc/#basic-configuration"
+              >
+                Learn More
+              </Link>
+            </p>
+          </div>
+          <RemixLink to="/settings/restrictions">
+            <div className="flex items-center text-lg font-medium">
+              Manage Restrictions
+              <ArrowRight className="ml-2 h-5 w-5" />
+            </div>
+          </RemixLink>
+        </>
+      ) : undefined}
+    </div>
+  );
 }

app/routes/settings/restrictions/actions.ts

@@ -1,11 +1,11 @@
-import { ActionFunctionArgs, data } from 'react-router';
-import { LoadContext } from '~/server';
+import { data } from 'react-router';
 import { Capabilities } from '~/server/web/roles';
+import type { Route } from './+types/overview';
 
 export async function restrictionAction({
 	request,
 	context,
-}: ActionFunctionArgs<LoadContext>) {
+}: Route.ActionArgs) {
 	const check = await context.sessions.check(
 		request,
 		Capabilities.configure_iam,
@@ -31,29 +31,162 @@ export async function restrictionAction({
 		});
 	}
 
+	// We only need healthchecks which don't rely on an API key
+	const api = context.hsApi.getRuntimeClient('fake-api-key');
 	switch (action) {
 		case 'add_domain': {
-			return addDomain(formData, context);
+			const domain = formData.get('domain')?.toString()?.trim();
+			if (!domain) {
+				throw data('No domain provided.', {
+					status: 400,
+				});
+			}
+
+			const domains = [
+				...new Set([...(context.hs.c?.oidc?.allowed_domains ?? []), domain]),
+			];
+
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_domains',
+					value: domains,
+				},
+			]);
+
+			context.integration?.onConfigChange(api);
+			return data('Domain added successfully.');
 		}
 
 		case 'remove_domain': {
-			return removeDomain(formData, context);
+			const domain = formData.get('domain')?.toString()?.trim();
+			if (!domain) {
+				throw data('No domain provided.', {
+					status: 400,
+				});
+			}
+
+			const storedDomains = context.hs.c?.oidc?.allowed_domains ?? [];
+			if (!storedDomains.includes(domain)) {
+				// Domain not found in the list
+				throw data(`Domain "${domain}" not found in allowed domains.`, {
+					status: 400,
+				});
+			}
+
+			// Filter out the domain to remove it from the list
+			const domains = storedDomains.filter((d: string) => d !== domain);
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_domains',
+					value: domains,
+				},
+			]);
+			context.integration?.onConfigChange(api);
+			return data('Domain removed successfully.');
 		}
 
 		case 'add_group': {
-			return addGroup(formData, context);
+			const group = formData.get('group')?.toString()?.trim();
+			if (!group) {
+				throw data('No group provided.', {
+					status: 400,
+				});
+			}
+
+			const groups = [
+				...new Set([...(context.hs.c?.oidc?.allowed_groups ?? []), group]),
+			];
+
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_groups',
+					value: groups,
+				},
+			]);
+
+			context.integration?.onConfigChange(api);
+			return data('Group added successfully.');
 		}
 
 		case 'remove_group': {
-			return removeGroup(formData, context);
+			const group = formData.get('group')?.toString()?.trim();
+			if (!group) {
+				throw data('No group provided.', {
+					status: 400,
+				});
+			}
+
+			const storedGroups = context.hs.c?.oidc?.allowed_groups ?? [];
+			if (!storedGroups.includes(group)) {
+				// Group not found in the list
+				throw data(`Group "${group}" not found in allowed groups.`, {
+					status: 400,
+				});
+			}
+
+			// Filter out the group to remove it from the list
+			const groups = storedGroups.filter((d: string) => d !== group);
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_groups',
+					value: groups,
+				},
+			]);
+
+			context.integration?.onConfigChange(api);
+			return data('Group removed successfully.');
 		}
 
 		case 'add_user': {
-			return addUser(formData, context);
+			const user = formData.get('user')?.toString()?.trim();
+			if (!user) {
+				throw data('No user provided.', {
+					status: 400,
+				});
+			}
+
+			const users = [
+				...new Set([...(context.hs.c?.oidc?.allowed_users ?? []), user]),
+			];
+
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_users',
+					value: users,
+				},
+			]);
+
+			context.integration?.onConfigChange(api);
+			return data('User added successfully.');
 		}
 
 		case 'remove_user': {
-			return removeUser(formData, context);
+			const user = formData.get('user')?.toString()?.trim();
+			if (!user) {
+				throw data('No user provided.', {
+					status: 400,
+				});
+			}
+
+			const storedUsers = context.hs.c?.oidc?.allowed_users ?? [];
+			if (!storedUsers.includes(user)) {
+				// User not found in the list
+				throw data(`User "${user}" not found in allowed users.`, {
+					status: 400,
+				});
+			}
+
+			// Filter out the user to remove it from the list
+			const users = storedUsers.filter((d: string) => d !== user);
+			await context.hs.patch([
+				{
+					path: 'oidc.allowed_users',
+					value: users,
+				},
+			]);
+
+			context.integration?.onConfigChange(api);
+			return data('User removed successfully.');
 		}
 
 		default: {
@@ -63,159 +196,3 @@ export async function restrictionAction({
 		}
 	}
 }
-
-async function addDomain(formData: FormData, context: LoadContext) {
-	const domain = formData.get('domain')?.toString()?.trim();
-	if (!domain) {
-		throw data('No domain provided.', {
-			status: 400,
-		});
-	}
-
-	const domains = [
-		...new Set([...(context.hs.c?.oidc?.allowed_domains ?? []), domain]),
-	];
-
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_domains',
-			value: domains,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('Domain added successfully.');
-}
-
-async function removeDomain(formData: FormData, context: LoadContext) {
-	const domain = formData.get('domain')?.toString()?.trim();
-	if (!domain) {
-		throw data('No domain provided.', {
-			status: 400,
-		});
-	}
-
-	const storedDomains = context.hs.c?.oidc?.allowed_domains ?? [];
-	if (!storedDomains.includes(domain)) {
-		// Domain not found in the list
-		throw data(`Domain "${domain}" not found in allowed domains.`, {
-			status: 400,
-		});
-	}
-
-	// Filter out the domain to remove it from the list
-	const domains = storedDomains.filter((d: string) => d !== domain);
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_domains',
-			value: domains,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('Domain removed successfully.');
-}
-
-async function addUser(formData: FormData, context: LoadContext) {
-	const user = formData.get('user')?.toString()?.trim();
-	if (!user) {
-		throw data('No user provided.', {
-			status: 400,
-		});
-	}
-
-	const users = [
-		...new Set([...(context.hs.c?.oidc?.allowed_users ?? []), user]),
-	];
-
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_users',
-			value: users,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('User added successfully.');
-}
-
-async function removeUser(formData: FormData, context: LoadContext) {
-	const user = formData.get('user')?.toString()?.trim();
-	if (!user) {
-		throw data('No user provided.', {
-			status: 400,
-		});
-	}
-
-	const storedUsers = context.hs.c?.oidc?.allowed_users ?? [];
-	if (!storedUsers.includes(user)) {
-		// User not found in the list
-		throw data(`User "${user}" not found in allowed users.`, {
-			status: 400,
-		});
-	}
-
-	// Filter out the user to remove it from the list
-	const users = storedUsers.filter((d: string) => d !== user);
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_users',
-			value: users,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('User removed successfully.');
-}
-
-async function addGroup(formData: FormData, context: LoadContext) {
-	const group = formData.get('group')?.toString()?.trim();
-	if (!group) {
-		throw data('No group provided.', {
-			status: 400,
-		});
-	}
-
-	const groups = [
-		...new Set([...(context.hs.c?.oidc?.allowed_groups ?? []), group]),
-	];
-
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_groups',
-			value: groups,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('Group added successfully.');
-}
-
-async function removeGroup(formData: FormData, context: LoadContext) {
-	const group = formData.get('group')?.toString()?.trim();
-	if (!group) {
-		throw data('No group provided.', {
-			status: 400,
-		});
-	}
-
-	const storedGroups = context.hs.c?.oidc?.allowed_groups ?? [];
-	if (!storedGroups.includes(group)) {
-		// Group not found in the list
-		throw data(`Group "${group}" not found in allowed groups.`, {
-			status: 400,
-		});
-	}
-
-	// Filter out the group to remove it from the list
-	const groups = storedGroups.filter((d: string) => d !== group);
-	await context.hs.patch([
-		{
-			path: 'oidc.allowed_groups',
-			value: groups,
-		},
-	]);
-
-	context.integration?.onConfigChange(context.client);
-	return data('Group removed successfully.');
-}

app/routes/settings/restrictions/dialogs/add-domain.tsx

@@ -39,19 +39,19 @@ export default function AddDomain({ domains, isDisabled }: AddDomainProps) {
 					Add this domain to a list of allowed email domains that can
 					authenticate with Headscale via OIDC.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="add_domain" />
+				<input name="action_id" type="hidden" value="add_domain" />
 				<Input
-					isRequired
-					label="Domain"
 					description={
 						domain.trim().length > 0
 							? `Matches users with <user>@${domain.trim()}`
 							: 'Enter a domain to match users with their email addresses.'
 					}
-					placeholder="example.com"
+					isInvalid={domain.trim().length === 0 || isInvalid}
+					isRequired
+					label="Domain"
 					name="domain"
 					onChange={setDomain}
-					isInvalid={domain.trim().length === 0 || isInvalid}
+					placeholder="example.com"
 				/>
 				{isInvalid && (
 					<p className="text-red-500 text-sm mt-2">

app/routes/settings/restrictions/dialogs/add-group.tsx

@@ -30,15 +30,15 @@ export default function AddGroup({ groups, isDisabled }: AddGroupProps) {
 					Add this group to a list of allowed groups that can authenticate with
 					Headscale via OIDC.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="add_group" />
+				<input name="action_id" type="hidden" value="add_group" />
 				<Input
+					description="The group to allow for OIDC authentication."
+					isInvalid={group.trim().length === 0 || isInvalid}
 					isRequired
 					label="Group"
-					description="The group to allow for OIDC authentication."
-					placeholder="admin"
 					name="group"
 					onChange={setGroup}
-					isInvalid={group.trim().length === 0 || isInvalid}
+					placeholder="admin"
 				/>
 				{isInvalid && (
 					<p className="text-red-500 text-sm mt-2">

app/routes/settings/restrictions/dialogs/add-user.tsx

@@ -30,15 +30,15 @@ export default function AddUser({ users, isDisabled }: AddUserProps) {
 					Add this user to a list of allowed users that can authenticate with
 					Headscale via OIDC.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="add_user" />
+				<input name="action_id" type="hidden" value="add_user" />
 				<Input
+					description="The user to allow for OIDC authentication."
+					isInvalid={user.trim().length === 0 || isInvalid}
 					isRequired
 					label="User"
-					description="The user to allow for OIDC authentication."
-					placeholder="john_doe"
 					name="user"
 					onChange={setUser}
-					isInvalid={user.trim().length === 0 || isInvalid}
+					placeholder="john_doe"
 				/>
 				{isInvalid && (
 					<p className="text-red-500 text-sm mt-2">

app/routes/settings/restrictions/overview.tsx

@@ -1,24 +1,15 @@
-import {
-	ActionFunctionArgs,
-	LoaderFunctionArgs,
-	Link as RemixLink,
-	data,
-	useLoaderData,
-} from 'react-router';
+import { data, Link as RemixLink } from 'react-router';
 import Link from '~/components/Link';
 import Notice from '~/components/Notice';
-import { LoadContext } from '~/server';
 import { Capabilities } from '~/server/web/roles';
+import type { Route } from './+types/overview';
 import { restrictionAction } from './actions';
 import AddDomain from './dialogs/add-domain';
 import AddGroup from './dialogs/add-group';
 import AddUser from './dialogs/add-user';
 import RestrictionTable from './table';
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	const check = await context.sessions.check(request, Capabilities.read_users);
 	if (!check) {
 		throw data('You do not have permission to view IAM settings.', {
@@ -43,19 +34,18 @@ export async function loader({
 	};
 }
 
-export async function action(request: ActionFunctionArgs) {
-	return restrictionAction(request);
-}
+export const action = restrictionAction;
 
-export default function Page() {
-	const { access, writable, settings } = useLoaderData<typeof loader>();
+export default function Page({
+	loaderData: { access, writable, settings },
+}: Route.ComponentProps) {
 	const isDisabled = writable ? !access : true;
 
 	return (
 		<div className="flex flex-col gap-4 max-w-(--breakpoint-lg)">
-			<div className="flex flex-col w-2/3">
+			<div className="flex flex-col w-full sm:w-2/3">
 				<p className="mb-4 text-md">
-					<RemixLink to="/settings" className="font-medium">
+					<RemixLink className="font-medium" to="/settings">
 						Settings
 					</RemixLink>
 					<span className="mx-2">/</span> Authentication Restrictions
@@ -85,33 +75,33 @@ export default function Page() {
 					used to limit access to your Tailnet to only certain users or groups
 					and Headplane will also respect these settings when authenticating.{' '}
 					<Link
-						to="https://headscale.net/stable/ref/oidc/#basic-configuration"
 						name="Headscale OIDC documentation"
+						to="https://headscale.net/stable/ref/oidc/#basic-configuration"
 					>
 						Learn More
 					</Link>
 				</p>
 			</div>
 			<RestrictionTable
+				isDisabled={isDisabled}
 				type="domain"
 				values={settings.domains}
-				isDisabled={isDisabled}
 			>
 				<AddDomain domains={settings.domains} isDisabled={isDisabled} />
 			</RestrictionTable>
 			<RestrictionTable
+				isDisabled={isDisabled}
 				type="group"
 				values={settings.groups}
-				isDisabled={isDisabled}
 			>
 				<AddGroup groups={settings.groups} isDisabled={isDisabled} />
 			</RestrictionTable>
 			<RestrictionTable
+				isDisabled={isDisabled}
 				type="user"
 				values={settings.users}
-				isDisabled={isDisabled}
 			>
-				<AddUser users={settings.users} isDisabled={isDisabled} />
+				<AddUser isDisabled={isDisabled} users={settings.users} />
 			</RestrictionTable>
 		</div>
 	);

app/routes/settings/restrictions/table.tsx

@@ -19,7 +19,7 @@ export default function RestrictionTable({
 	isDisabled,
 }: RestrictionProps) {
 	return (
-		<div className="w-2/3">
+		<div className="w-full sm:w-2/3">
 			<h2 className="text-2xl font-medium mt-8">
 				Permitted {type.charAt(0).toUpperCase() + type.slice(1)}s
 			</h2>
@@ -40,18 +40,18 @@ export default function RestrictionTable({
 							)}
 							<Form method="POST">
 								<input
-									type="hidden"
 									name="action_id"
+									type="hidden"
 									value={`remove_${type}`}
 								/>
-								<input type="hidden" name={type} value={value} />
+								<input name={type} type="hidden" value={value} />
 								<Button
-									isDisabled={isDisabled}
-									type="submit"
 									className={cn(
 										'px-2 py-1 rounded-md',
 										'text-red-500 dark:text-red-400',
 									)}
+									isDisabled={isDisabled}
+									type="submit"
 								>
 									Remove
 								</Button>
@@ -61,7 +61,7 @@ export default function RestrictionTable({
 				) : (
 					<TableList.Item className="flex flex-col items-center gap-2.5 py-4 opacity-70">
 						{iconForType(type)}
-						<p className="font-semibold">
+						<p className="font-semibold text-center">
 							All {type}s are permitted to authenticate.
 						</p>
 					</TableList.Item>

app/routes/ssh/console.tsx

@@ -1,281 +1,276 @@
-/** biome-ignore-all lint/correctness/noNestedComponentDefinitions: Wtf? */
-import { faker } from '@faker-js/faker';
-import { eq } from 'drizzle-orm';
-import { Loader2 } from 'lucide-react';
-import { useEffect, useState } from 'react';
-import {
-	ActionFunctionArgs,
-	data,
-	LoaderFunctionArgs,
-	ShouldRevalidateFunction,
-	useLoaderData,
-	useSubmit,
-} from 'react-router';
-import wasm from '~/hp_ssh.wasm?url';
-import { LoadContext } from '~/server';
-import { EphemeralNodeInsert, ephemeralNodes } from '~/server/db/schema';
-import { Machine, PreAuthKey, User } from '~/types';
-import { useLiveData } from '~/utils/live-data';
-import '~/wasm_exec';
-import UserPrompt from './user-prompt';
-import XTerm from './xterm.client';
+import { faker } from "@faker-js/faker";
+import { eq } from "drizzle-orm";
+import { Loader2 } from "lucide-react";
+import { useEffect, useState } from "react";
+import { data, type ShouldRevalidateFunction, useSubmit } from "react-router";
+import { ExternalScriptsHandle } from "remix-utils/external-scripts";
+
+import { EphemeralNodeInsert, ephemeralNodes } from "~/server/db/schema";
+import { useLiveData } from "~/utils/live-data";
+
+import type { Route } from "./+types/console";
+
+import UserPrompt from "./user-prompt";
+import XTerm from "./xterm.client";
 
 export const shouldRevalidate: ShouldRevalidateFunction = () => {
-	return false;
+  return false;
 };
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
-	if (!context.agents?.agentID()) {
-		throw data(
-			'WebSSH is only available with the Headplane agent integration',
-			400,
-		);
-	}
+export async function loader({ request, context }: Route.LoaderArgs) {
+  const origin = new URL(request.url).origin;
+  const assets = ["/wasm_exec.js", "/hp_ssh.wasm"];
+  const missing: string[] = [];
 
-	const session = await context.sessions.auth(request);
-	if (session.user.subject === 'unknown-non-oauth') {
-		throw data('Only OAuth users are allowed to use WebSSH', 403);
-	}
-	const { users } = await context.client.get<{ users: User[] }>(
-		'v1/user',
-		session.api_key,
-	);
+  for (const file of assets) {
+    const res = await fetch(`${origin}${file}`, { method: "HEAD" });
+    if (!res.ok) missing.push(file);
+  }
 
-	// MARK: This assumes that a user has authenticated with Headscale first
-	// Since the only way to enforce permissions via ACLs is to generate a
-	// pre-authkey which REQUIRES a user ID, meaning the user has to have
-	// authenticated with Headscale first.
-	const lookup = users.find((u) => {
-		const subject = u.providerId?.split('/').pop();
-		if (!subject) {
-			return false;
-		}
-		return subject === session.user.subject;
-	});
+  if (missing.length > 0) {
+    throw data("WebSSH is not configured in this build.", 405);
+  }
 
-	if (!lookup) {
-		throw data(
-			`User with subject ${session.user.subject} not found within Headscale`,
-			404,
-		);
-	}
+  if (!context.agents?.agentID()) {
+    throw data("WebSSH is only available with the Headplane agent integration", 400);
+  }
 
-	const { preAuthKey } = await context.client.post<{ preAuthKey: PreAuthKey }>(
-		'v1/preauthkey',
-		session.api_key,
-		{
-			user: lookup.id,
-			reusable: false,
-			ephemeral: true,
-			expiration: new Date(Date.now() + 60 * 1000).toISOString(), // 1 minute
-		},
-	);
+  const session = await context.sessions.auth(request);
+  if (session.user.subject === "unknown-non-oauth") {
+    throw data("Only OAuth users are allowed to use WebSSH", 403);
+  }
 
-	// TODO: Enable config to enforce generate_authkeys capability
-	// For now, any user is capable of WebSSH connections
-	// const check = await context.sessions.check(
-	// 	request,
-	// 	Capabilities.generate_authkeys,
-	// );
+  const api = context.hsApi.getRuntimeClient(session.api_key);
+  const users = await api.getUsers();
 
-	const qp = new URL(request.url).searchParams;
-	const username = qp.get('username') || undefined;
-	const hostname = qp.get('hostname') || undefined;
-	if (!hostname) {
-		throw data('Missing required parameter:  hostname', 400);
-	}
+  // MARK: This assumes that a user has authenticated with Headscale first
+  // Since the only way to enforce permissions via ACLs is to generate a
+  // pre-authkey which REQUIRES a user ID, meaning the user has to have
+  // authenticated with Headscale first.
+  const lookup = users.find((u) => {
+    const subject = u.providerId?.split("/").pop();
+    if (!subject) {
+      return false;
+    }
+    return subject === session.user.subject;
+  });
 
-	if (!username) {
-		return {
-			ipnDetails: undefined,
-			sshDetails: {
-				username,
-				hostname,
-			},
-		};
-	}
+  if (!lookup) {
+    throw data(`User with subject ${session.user.subject} not found within Headscale`, 404);
+  }
 
-	// We're making a request to <url>/key?v=116 to check the CORS headers
-	const u = context.config.headscale.public_url ?? context.config.headscale.url;
-	// const res = await fetch(`${u}/key?v=116`, {
-	// 	method: 'GET',
-	// });
+  const preAuthKey = await api.createPreAuthKey(
+    lookup.id,
+    true, // ephemeral
+    false, // reusable
+    new Date(Date.now() + 60 * 1000), // expiration: 1 minute
+    null, // aclTags
+  );
 
-	// const corsOrigin = res.headers.get('Access-Control-Allow-Origin');
-	// const corsMethods = res.headers.get('Access-Control-Allow-Methods');
-	// const corsHeaders = res.headers.get('Access-Control-Allow-Headers');
-	// console.log(corsOrigin, corsMethods, corsHeaders);
+  // TODO: Enable config to enforce generate_authkeys capability
+  // For now, any user is capable of WebSSH connections
+  // const check = await context.sessions.check(
+  // 	request,
+  // 	Capabilities.generate_authkeys,
+  // );
 
-	// if (!corsOrigin || !corsMethods || !corsHeaders) {
-	// 	throw data(
-	// 		'Headscale server does not have the required CORS headers for WebSSH',
-	// 		500,
-	// 	);
-	// }
+  const qp = new URL(request.url).searchParams;
+  const username = qp.get("username") || undefined;
+  const hostname = qp.get("hostname") || undefined;
+  if (!hostname) {
+    throw data("Missing required parameter:  hostname", 400);
+  }
 
-	const { nodes } = await context.client.get<{ nodes: Machine[] }>(
-		'v1/node',
-		session.api_key,
-	);
+  if (!username) {
+    return {
+      ipnDetails: undefined,
+      sshDetails: {
+        username,
+        hostname,
+      },
+    };
+  }
 
-	// node.name is the hostname, given_name is the set name
-	const lookupNode = nodes.find((n) => n.name === hostname);
-	if (!lookupNode) {
-		throw data(`Node with hostname ${hostname} not found`, 404);
-	}
+  // We're making a request to <url>/key?v=116 to check the CORS headers
+  const u = context.config.headscale.public_url ?? context.config.headscale.url;
+  // const res = await fetch(`${u}/key?v=116`, {
+  // 	method: 'GET',
+  // });
 
-	// Last thing is keeping track of the ephemeral node in the database
-	// because Headscale doesn't automatically delete ephemeral nodes???
-	const [_ephemeralNode] = await context.db
-		.insert(ephemeralNodes)
-		.values({
-			auth_key: preAuthKey.key,
-		} satisfies EphemeralNodeInsert)
-		.returning();
+  // const corsOrigin = res.headers.get('Access-Control-Allow-Origin');
+  // const corsMethods = res.headers.get('Access-Control-Allow-Methods');
+  // const corsHeaders = res.headers.get('Access-Control-Allow-Headers');
+  // console.log(corsOrigin, corsMethods, corsHeaders);
 
-	return {
-		ipnDetails: {
-			PreAuthKey: preAuthKey.key,
-			Hostname: generateHostname(username),
-			ControlURL: u,
-		},
+  // if (!corsOrigin || !corsMethods || !corsHeaders) {
+  // 	throw data(
+  // 		'Headscale server does not have the required CORS headers for WebSSH',
+  // 		500,
+  // 	);
+  // }
 
-		sshDetails: {
-			username,
-			hostname,
-		},
-	};
+  const nodes = await api.getNodes();
+  const lookupNode = nodes.find((n) => n.givenName === hostname);
+  if (!lookupNode) {
+    throw data(`Node with hostname ${hostname} not found`, 404);
+  }
+
+  // Last thing is keeping track of the ephemeral node in the database
+  // because Headscale doesn't automatically delete ephemeral nodes???
+  const [_ephemeralNode] = await context.db
+    .insert(ephemeralNodes)
+    .values({
+      auth_key: preAuthKey.key,
+    } satisfies EphemeralNodeInsert)
+    .returning();
+
+  return {
+    ipnDetails: {
+      PreAuthKey: preAuthKey.key,
+      Hostname: generateHostname(username),
+      ControlURL: u,
+    },
+
+    sshDetails: {
+      username,
+      hostname,
+    },
+  };
 }
 
 function generateHostname(username: string) {
-	const adjective = faker.word.adjective({
-		length: {
-			min: 3,
-			max: 6,
-		},
-	});
+  const adjective = faker.word.adjective({
+    length: {
+      min: 3,
+      max: 6,
+    },
+  });
 
-	const noun = faker.word.noun({
-		length: {
-			min: 3,
-			max: 6,
-		},
-	});
+  const noun = faker.word.noun({
+    length: {
+      min: 3,
+      max: 6,
+    },
+  });
 
-	return `ssh-${adjective}-${noun}-${username}`;
+  return `ssh-${adjective}-${noun}-${username}`;
 }
 
-export async function action({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
-	const _session = await context.sessions.auth(request);
-	if (!context.agents?.agentID()) {
-		throw data(
-			'WebSSH is only available with the Headplane agent integration',
-			400,
-		);
-	}
+export async function action({ request, context }: Route.ActionArgs) {
+  await context.sessions.auth(request);
+  if (!context.agents?.agentID()) {
+    throw data("WebSSH is only available with the Headplane agent integration", 400);
+  }
 
-	const form = await request.formData();
-	const nodeKey = form.get('node_key');
-	const authKey = form.get('auth_key');
+  const form = await request.formData();
+  const nodeKey = form.get("node_key");
+  const authKey = form.get("auth_key");
 
-	if (nodeKey === null || typeof nodeKey !== 'string') {
-		throw data('Missing node_key', 400);
-	}
+  if (nodeKey === null || typeof nodeKey !== "string") {
+    throw data("Missing node_key", 400);
+  }
 
-	if (authKey === null || typeof authKey !== 'string') {
-		throw data('Missing auth_key', 400);
-	}
+  if (authKey === null || typeof authKey !== "string") {
+    throw data("Missing auth_key", 400);
+  }
 
-	await context.db
-		.update(ephemeralNodes)
-		.set({
-			node_key: nodeKey,
-		})
-		.where(eq(ephemeralNodes.auth_key, authKey));
+  await context.db
+    .update(ephemeralNodes)
+    .set({
+      node_key: nodeKey,
+    })
+    .where(eq(ephemeralNodes.auth_key, authKey));
 }
 
-export default function Page() {
-	const submit = useSubmit();
-	const { pause } = useLiveData();
+export const links: Route.LinksFunction = () => [
+  {
+    rel: "preload",
+    href: "/hp_ssh.wasm",
+    as: "fetch",
+    type: "application/wasm",
+    crossOrigin: "anonymous",
+  },
+];
 
-	const [ipn, setIpn] = useState<TsWasmNet | null>(null);
-	const [nodeKey, setNodeKey] = useState<string | null>(null);
-	const { ipnDetails, sshDetails } = useLoaderData<typeof loader>();
+export const handle: ExternalScriptsHandle = {
+  scripts: [
+    {
+      src: "/wasm_exec.js",
+      crossOrigin: "anonymous",
+      preload: true,
+    },
+  ],
+};
 
-	useEffect(() => {
-		if (!ipnDetails) {
-			return;
-		}
+export default function Page({ loaderData: { ipnDetails, sshDetails } }: Route.ComponentProps) {
+  const submit = useSubmit();
+  const { pause } = useLiveData();
 
-		pause();
-		const go = new Go(); // Go is defined by wasm_exec.js
-		WebAssembly.instantiateStreaming(fetch(wasm), go.importObject).then(
-			(value) => {
-				go.run(value.instance);
-				const handle = TsWasmNet(ipnDetails, {
-					NotifyState: (state) => {
-						console.log('State changed:', state);
-						if (state === 'Running') {
-							setIpn(handle);
-						}
-					},
-					NotifyNetMap: (netmap) => {
-						// Only set NodeKey if it is not already set and then
-						// also dispatch that to the backend to track the
-						// ephemeral node.
-						//
-						// We open an SSE connection to the backend
-						// so that when the connection is closed,
-						// the backend can delete the ephemeral node.
-						if (nodeKey === null) {
-							setNodeKey(netmap.NodeKey);
-							submit(
-								{
-									node_key: netmap.NodeKey,
-									auth_key: ipnDetails.PreAuthKey,
-								},
-								{ method: 'POST' },
-							);
-						}
-					},
-					NotifyBrowseToURL: (url) => {
-						console.log('Browse to URL:', url);
-					},
-					NotifyPanicRecover: (message) => {
-						console.error('Panic recover:', message);
-					},
-				});
+  const [ipn, setIpn] = useState<TsWasmNet | null>(null);
+  const [nodeKey, setNodeKey] = useState<string | null>(null);
 
-				handle.Start();
-			},
-		);
-	}, []);
+  useEffect(() => {
+    if (!ipnDetails) {
+      return;
+    }
 
-	if (!sshDetails.username) {
-		return <UserPrompt hostname={sshDetails.hostname} />;
-	}
+    pause();
+    const go = new Go(); // Go is defined by wasm_exec.js
+    WebAssembly.instantiateStreaming(fetch("/hp_ssh.wasm"), go.importObject).then((value) => {
+      go.run(value.instance);
+      const handle = TsWasmNet(ipnDetails, {
+        NotifyState: (state) => {
+          console.log("State changed:", state);
+          if (state === "Running") {
+            setIpn(handle);
+          }
+        },
+        NotifyNetMap: (netmap) => {
+          // Only set NodeKey if it is not already set and then
+          // also dispatch that to the backend to track the
+          // ephemeral node.
+          //
+          // We open an SSE connection to the backend
+          // so that when the connection is closed,
+          // the backend can delete the ephemeral node.
+          if (nodeKey === null) {
+            setNodeKey(netmap.NodeKey);
+            submit(
+              {
+                node_key: netmap.NodeKey,
+                auth_key: ipnDetails.PreAuthKey,
+              },
+              { method: "POST" },
+            );
+          }
+        },
+        NotifyBrowseToURL: (url) => {
+          console.log("Browse to URL:", url);
+        },
+        NotifyPanicRecover: (message) => {
+          console.error("Panic recover:", message);
+        },
+      });
 
-	return (
-		<div className="w-screen h-screen bg-headplane-900">
-			{ipn === null ? (
-				<div className="mx-auto h-screen flex items-center justify-center">
-					<Loader2 className="animate-spin size-10 text-headplane-50" />
-				</div>
-			) : (
-				<div className="flex flex-col h-screen">
-					<XTerm
-						hostname={sshDetails.hostname}
-						ipn={ipn}
-						username={sshDetails.username}
-					/>
-				</div>
-			)}
-		</div>
-	);
+      handle.Start();
+    });
+  }, []);
+
+  if (!sshDetails.username) {
+    return <UserPrompt hostname={sshDetails.hostname} />;
+  }
+
+  return (
+    <div className="bg-headplane-900 h-screen w-screen">
+      {ipn === null ? (
+        <div className="mx-auto flex h-screen items-center justify-center">
+          <Loader2 className="text-headplane-50 size-10 animate-spin" />
+        </div>
+      ) : (
+        <div className="flex h-screen flex-col">
+          <XTerm hostname={sshDetails.hostname} ipn={ipn} username={sshDetails.username} />
+        </div>
+      )}
+    </div>
+  );
 }

app/routes/users/components/manage-banner.tsx

@@ -1,17 +1,16 @@
 import { Building2, House, Key } from 'lucide-react';
 import Card from '~/components/Card';
 import Link from '~/components/Link';
-import type { HeadplaneConfig } from '~/server/config/schema';
 import CreateUser from '../dialogs/create-user';
 
 interface ManageBannerProps {
-	oidc?: NonNullable<HeadplaneConfig['oidc']>;
+	oidc?: { issuer: string };
 	isDisabled?: boolean;
 }
 
 export default function ManageBanner({ oidc, isDisabled }: ManageBannerProps) {
 	return (
-		<Card variant="flat" className="mb-8 w-full max-w-full p-0">
+		<Card className="mb-8 w-full max-w-full p-0" variant="flat">
 			<div className="flex flex-col md:flex-row">
 				<div className="w-full p-4 border-b md:border-b-0 border-headplane-100 dark:border-headplane-800">
 					{oidc ? (
@@ -26,14 +25,14 @@ export default function ManageBanner({ oidc, isDisabled }: ManageBannerProps) {
 						{oidc ? (
 							<>
 								Users are managed through your{' '}
-								<Link to={oidc.issuer} name="OIDC Provider">
+								<Link name="OIDC Provider" to={oidc.issuer}>
 									OpenID Connect provider
 								</Link>
 								{'. '}
 								Groups and user information do not automatically sync.{' '}
 								<Link
-									to="https://headscale.net/stable/ref/oidc"
 									name="Headscale OIDC Documentation"
+									to="https://headscale.net/stable/ref/oidc"
 								>
 									Learn more
 								</Link>
@@ -43,8 +42,8 @@ export default function ManageBanner({ oidc, isDisabled }: ManageBannerProps) {
 								Users are not managed externally. Using OpenID Connect can
 								create a better experience when using Headscale.{' '}
 								<Link
-									to="https://headscale.net/stable/ref/oidc"
 									name="Headscale OIDC Documentation"
+									to="https://headscale.net/stable/ref/oidc"
 								>
 									Learn more
 								</Link>
@@ -61,7 +60,7 @@ export default function ManageBanner({ oidc, isDisabled }: ManageBannerProps) {
 							: 'You can add, remove, and rename users here.'}
 					</p>
 					<div className="flex items-center gap-2 mt-4">
-						<CreateUser isOidc={oidc !== undefined} isDisabled={isDisabled} />
+						<CreateUser isDisabled={isDisabled} isOidc={oidc !== undefined} />
 					</div>
 				</div>
 			</div>

app/routes/users/components/menu.tsx

@@ -22,40 +22,40 @@ export default function UserMenu({ user }: MenuProps) {
 		<>
 			{modal === 'rename' && (
 				<Rename
-					user={user}
 					isOpen={modal === 'rename'}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
+					user={user}
 				/>
 			)}
 			{modal === 'delete' && (
 				<Delete
-					user={user}
 					isOpen={modal === 'delete'}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
+					user={user}
 				/>
 			)}
 			{modal === 'reassign' && (
 				<Reassign
-					user={user}
 					isOpen={modal === 'reassign'}
 					setIsOpen={(isOpen) => {
 						if (!isOpen) setModal(null);
 					}}
+					user={user}
 				/>
 			)}
 
 			<Menu disabledKeys={user.provider === 'oidc' ? ['rename'] : ['reassign']}>
 				<Menu.IconButton
-					label="Machine Options"
 					className={cn(
 						'py-0.5 w-10 bg-transparent border-transparent',
 						'border group-hover:border-headplane-200',
 						'dark:group-hover:border-headplane-700',
 					)}
+					label="Machine Options"
 				>
 					<Ellipsis className="h-5" />
 				</Menu.IconButton>

app/routes/users/components/user-row.tsx

@@ -18,22 +18,24 @@ export default function UserRow({ user, role }: UserRowProps) {
 
 	return (
 		<tr
-			key={user.id}
 			className="group hover:bg-headplane-50 dark:hover:bg-headplane-950"
+			key={user.id}
 		>
 			<td className="pl-0.5 py-2">
 				<div className="flex items-center">
 					{user.profilePicUrl ? (
 						<img
-							src={user.profilePicUrl}
 							alt={user.name || user.displayName}
 							className="w-10 h-10 rounded-full"
+							src={user.profilePicUrl}
 						/>
 					) : (
 						<CircleUser className="w-10 h-10" />
 					)}
 					<div className="ml-4">
-						<p className={cn('font-semibold leading-snug')}>{user.name || user.displayName}</p>
+						<p className={cn('font-semibold leading-snug')}>
+							{user.name || user.displayName}
+						</p>
 						<p className="text-sm opacity-50">{user.email}</p>
 					</div>
 				</div>
@@ -43,8 +45,8 @@ export default function UserRow({ user, role }: UserRowProps) {
 			</td>
 			<td className="pl-0.5 py-2">
 				<p
-					suppressHydrationWarning
 					className="text-sm text-headplane-600 dark:text-headplane-300"
+					suppressHydrationWarning
 				>
 					{new Date(user.createdAt).toLocaleDateString()}
 				</p>
@@ -56,7 +58,7 @@ export default function UserRow({ user, role }: UserRowProps) {
 						'text-headplane-600 dark:text-headplane-300',
 					)}
 				>
-					<StatusCircle isOnline={isOnline} className="w-4 h-4" />
+					<StatusCircle className="w-4 h-4" isOnline={isOnline} />
 					<p suppressHydrationWarning>
 						{isOnline ? 'Connected' : new Date(lastSeen).toLocaleString()}
 					</p>

app/routes/users/dialogs/create-user.tsx

@@ -24,15 +24,14 @@ export default function CreateUser({ isOidc, isDisabled }: CreateUserProps) {
 						</>
 					) : undefined}
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="create_user" />
+				<input name="action_id" type="hidden" value="create_user" />
 				<div className="flex flex-col gap-4">
 					<Input
 						isRequired
-						name="username"
-						type="text"
 						label="Username"
+						name="username"
 						placeholder="my-new-user"
-						validationBehavior="native"
+						type="text"
 						validate={(value) => {
 							if (value.trim().length === 0) {
 								return 'Username is required';
@@ -44,19 +43,20 @@ export default function CreateUser({ isOidc, isDisabled }: CreateUserProps) {
 
 							return true;
 						}}
-					/>
-					<Input
-						name="display_name"
-						type="text"
-						label="Display Name"
-						placeholder="John Doe"
 						validationBehavior="native"
 					/>
 					<Input
-						name="email"
-						type="email"
+						label="Display Name"
+						name="display_name"
+						placeholder="John Doe"
+						type="text"
+						validationBehavior="native"
+					/>
+					<Input
 						label="Email"
+						name="email"
 						placeholder="name@example.com"
+						type="email"
 						validationBehavior="native"
 					/>
 				</div>

app/routes/users/dialogs/delete-user.tsx

@@ -32,8 +32,8 @@ export default function DeleteUser({ user, isOpen, setIsOpen }: DeleteProps) {
 						)}
 					</Dialog.Text>
 				)}
-				<input type="hidden" name="action_id" value="delete_user" />
-				<input type="hidden" name="user_id" value={user.id} />
+				<input name="action_id" type="hidden" value="delete_user" />
+				<input name="user_id" type="hidden" value={user.id} />
 			</Dialog.Panel>
 		</Dialog>
 	);

app/routes/users/dialogs/reassign-user.tsx

@@ -21,14 +21,16 @@ export default function ReassignUser({
 			<Dialog.Panel
 				variant={user.headplaneRole === 'owner' ? 'unactionable' : 'normal'}
 			>
-				<Dialog.Title>Change role for {user.name || user.displayName}?</Dialog.Title>
+				<Dialog.Title>
+					Change role for {user.name || user.displayName}?
+				</Dialog.Title>
 				<Dialog.Text className="mb-6">
 					Most roles are carried straight from Tailscale. However, keep in mind
 					that I have not fully implemented permissions yet and some things may
 					be accessible to everyone. The only fully completed role is Member.{' '}
 					<Link
-						to="https://tailscale.com/kb/1138/user-roles"
 						name="Tailscale User Roles documentation"
+						to="https://tailscale.com/kb/1138/user-roles"
 					>
 						Learn More
 					</Link>
@@ -37,21 +39,21 @@ export default function ReassignUser({
 					<Notice>The Tailnet owner cannot be reassigned.</Notice>
 				) : (
 					<>
-						<input type="hidden" name="action_id" value="reassign_user" />
-						<input type="hidden" name="user_id" value={user.id} />
+						<input name="action_id" type="hidden" value="reassign_user" />
+						<input name="user_id" type="hidden" value={user.id} />
 						<RadioGroup
-							isRequired
-							name="new_role"
-							label="Role"
 							className="gap-4"
 							defaultValue={user.headplaneRole}
+							isRequired
+							label="Role"
+							name="new_role"
 						>
 							{Object.keys(Roles)
 								.filter((role) => role !== 'owner')
 								.map((role) => {
 									const { name, desc } = mapRoleToName(role);
 									return (
-										<RadioGroup.Radio key={role} value={role} label={name}>
+										<RadioGroup.Radio key={role} label={name} value={role}>
 											<div className="block">
 												<p className="font-bold">{name}</p>
 												<p className="opacity-70">{desc}</p>

app/routes/users/dialogs/rename-user.tsx

@@ -15,18 +15,18 @@ export default function RenameUser({ user, isOpen, setIsOpen }: RenameProps) {
 			<Dialog.Panel>
 				<Dialog.Title>Rename {user.name || user.displayName}?</Dialog.Title>
 				<Dialog.Text className="mb-6">
-					Enter a new username for {user.name || user.displayName}. Changing a username will not
-					update any ACL policies that may refer to this user by their old
-					username.
+					Enter a new username for {user.name || user.displayName}. Changing a
+					username will not update any ACL policies that may refer to this user
+					by their old username.
 				</Dialog.Text>
-				<input type="hidden" name="action_id" value="rename_user" />
-				<input type="hidden" name="user_id" value={user.id} />
+				<input name="action_id" type="hidden" value="rename_user" />
+				<input name="user_id" type="hidden" value={user.id} />
 				<Input
-					isRequired
-					name="new_name"
-					label="Username"
-					placeholder="my-new-name"
 					defaultValue={user.name}
+					isRequired
+					label="Username"
+					name="new_name"
+					placeholder="my-new-name"
 				/>
 			</Dialog.Panel>
 		</Dialog>

app/routes/users/onboarding-skip.tsx

@@ -1,12 +1,9 @@
 import { eq } from 'drizzle-orm';
-import { LoaderFunctionArgs, redirect } from 'react-router';
-import { LoadContext } from '~/server';
+import { redirect } from 'react-router';
 import { users } from '~/server/db/schema';
+import type { Route } from './+types/onboarding-skip';
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	try {
 		const { user } = await context.sessions.auth(request);
 		await context.db

app/routes/users/onboarding.tsx

@@ -1,26 +1,20 @@
+import { Icon } from '@iconify/react';
 import { ArrowRight } from 'lucide-react';
 import { useEffect } from 'react';
-import { GrApple } from 'react-icons/gr';
-import { ImFinder } from 'react-icons/im';
-import { MdAndroid } from 'react-icons/md';
-import { PiTerminalFill, PiWindowsLogoFill } from 'react-icons/pi';
-import { LoaderFunctionArgs, NavLink, useLoaderData } from 'react-router';
+import { NavLink } from 'react-router';
 import Button from '~/components/Button';
 import Card from '~/components/Card';
 import Link from '~/components/Link';
 import Options from '~/components/Options';
 import StatusCircle from '~/components/StatusCircle';
-import { LoadContext } from '~/server';
 import { Machine } from '~/types';
 import cn from '~/utils/cn';
 import { useLiveData } from '~/utils/live-data';
 import log from '~/utils/log';
 import toast from '~/utils/toast';
+import type { Route } from './+types/onboarding';
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
 
 	// Try to determine the OS split between Linux, Windows, macOS, iOS, and Android
@@ -51,13 +45,10 @@ export async function loader({
 			break;
 	}
 
+	const api = context.hsApi.getRuntimeClient(session.api_key);
 	let firstMachine: Machine | undefined;
 	try {
-		const { nodes } = await context.client.get<{ nodes: Machine[] }>(
-			'v1/node',
-			session.api_key,
-		);
-
+		const nodes = await api.getNodes();
 		const node = nodes.find((n) => {
 			if (n.user.provider !== 'oidc') {
 				return false;
@@ -90,8 +81,9 @@ export async function loader({
 	};
 }
 
-export default function Page() {
-	const { user, osValue, firstMachine } = useLoaderData<typeof loader>();
+export default function Page({
+	loaderData: { user, osValue, firstMachine },
+}: Route.ComponentProps) {
 	const { pause, resume } = useLiveData();
 	useEffect(() => {
 		if (firstMachine) {
@@ -132,7 +124,7 @@ export default function Page() {
 							key="linux"
 							title={
 								<div className="flex items-center gap-1">
-									<PiTerminalFill className="ml-1 w-4" />
+									<Icon className="ml-1 w-4" icon="ion:terminal" />
 									<span>Linux</span>
 								</div>
 							}
@@ -163,7 +155,7 @@ export default function Page() {
 							key="windows"
 							title={
 								<div className="flex items-center gap-1">
-									<PiWindowsLogoFill className="ml-1 w-4" />
+									<Icon className="ml-1 w-4" icon="mdi:microsoft" />
 									<span>Windows</span>
 								</div>
 							}
@@ -186,7 +178,10 @@ export default function Page() {
 							key="macos"
 							title={
 								<div className="flex items-center gap-1">
-									<ImFinder className="ml-1 w-4" />
+									<Icon
+										className="ml-1 w-4"
+										icon="streamline-logos:mac-finder-logo-solid"
+									/>
 									<span>macOS</span>
 								</div>
 							}
@@ -218,7 +213,7 @@ export default function Page() {
 							key="ios"
 							title={
 								<div className="flex items-center gap-1">
-									<GrApple className="ml-1 w-4" />
+									<Icon className="ml-1 w-4" icon="grommet-icons:apple" />
 									<span>iOS</span>
 								</div>
 							}
@@ -241,7 +236,7 @@ export default function Page() {
 							key="android"
 							title={
 								<div className="flex items-center gap-1">
-									<MdAndroid className="ml-1 w-4" />
+									<Icon className="ml-1 w-4" icon="material-symbols:android" />
 									<span>Android</span>
 								</div>
 							}

app/routes/users/overview.tsx

@@ -1,10 +1,9 @@
+import { createHash } from 'node:crypto';
 import { useEffect, useState } from 'react';
-import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
-import { useLoaderData } from 'react-router';
-import type { LoadContext } from '~/server';
 import { Capabilities } from '~/server/web/roles';
-import { Machine, User } from '~/types';
+import type { Machine, User } from '~/types';
 import cn from '~/utils/cn';
+import type { Route } from './+types/overview';
 import ManageBanner from './components/manage-banner';
 import UserRow from './components/user-row';
 import { userAction } from './user-actions';
@@ -13,10 +12,7 @@ interface UserMachine extends User {
 	machines: Machine[];
 }
 
-export async function loader({
-	request,
-	context,
-}: LoaderFunctionArgs<LoadContext>) {
+export async function loader({ request, context }: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
 	const check = await context.sessions.check(request, Capabilities.read_users);
 	if (!check) {
@@ -31,14 +27,24 @@ export async function loader({
 		Capabilities.write_users,
 	);
 
-	const [machines, apiUsers] = await Promise.all([
-		context.client.get<{ nodes: Machine[] }>('v1/node', session.api_key),
-		context.client.get<{ users: User[] }>('v1/user', session.api_key),
-	]);
+	const api = context.hsApi.getRuntimeClient(session.api_key);
+	const [nodes, apiUsers] = await Promise.all([api.getNodes(), api.getUsers()]);
 
-	const users = apiUsers.users.map((user) => ({
+	const users = apiUsers.map((user) => ({
 		...user,
-		machines: machines.nodes.filter((machine) => machine.user.id === user.id),
+		machines: nodes.filter((node) => node.user.id === user.id),
+		profilePicUrl:
+			context.config.oidc?.profile_picture_source === 'gravatar'
+				? (() => {
+						if (!user.email) {
+							return undefined;
+						}
+
+						const emailHash = user.email.trim().toLowerCase();
+						const hash = createHash('sha256').update(emailHash).digest('hex');
+						return `https://www.gravatar.com/avatar/${hash}?s=200&d=identicon&r=x`;
+					})()
+				: user.profilePicUrl,
 	}));
 
 	const roles = await Promise.all(
@@ -77,28 +83,29 @@ export async function loader({
 
 	return {
 		writable: writablePermission, // whether the user can write to the API
-		oidc: context.config.oidc,
+		oidc: context.config.oidc
+			? {
+					issuer: context.config.oidc.issuer,
+				}
+			: undefined,
 		roles,
 		magic,
 		users,
 	};
 }
 
-export async function action(data: ActionFunctionArgs) {
-	return userAction(data);
-}
+export const action = userAction;
 
-export default function Page() {
-	const data = useLoaderData<typeof loader>();
-	const [users, setUsers] = useState<UserMachine[]>(data.users);
+export default function Page({ loaderData }: Route.ComponentProps) {
+	const [users, setUsers] = useState<UserMachine[]>(loaderData.users);
 
 	// This useEffect is entirely for the purpose of updating the users when the
 	// drag and drop changes the machines between users. It's pretty hacky, but
 	// the idea is to treat data.users as the source of truth and update the
 	// local state when it changes.
 	useEffect(() => {
-		setUsers(data.users);
-	}, [data.users]);
+		setUsers(loaderData.users);
+	}, [loaderData.users]);
 
 	return (
 		<>
@@ -106,33 +113,35 @@ export default function Page() {
 			<p className="mb-8 text-md">
 				Manage the users in your network and their permissions.
 			</p>
-			<ManageBanner isDisabled={!data.writable} oidc={data.oidc} />
-			<table className="table-auto w-full rounded-lg">
-				<thead className="text-headplane-600 dark:text-headplane-300">
-					<tr className="text-left px-0.5">
-						<th className="uppercase text-xs font-bold pb-2">User</th>
-						<th className="uppercase text-xs font-bold pb-2">Role</th>
-						<th className="uppercase text-xs font-bold pb-2">Created At</th>
-						<th className="uppercase text-xs font-bold pb-2">Last Seen</th>
-					</tr>
-				</thead>
-				<tbody
-					className={cn(
-						'divide-y divide-headplane-100 dark:divide-headplane-800 align-top',
-						'border-t border-headplane-100 dark:border-headplane-800',
-					)}
-				>
-					{users
-						.sort((a, b) => a.name.localeCompare(b.name))
-						.map((user) => (
-							<UserRow
-								key={user.id}
-								role={data.roles[users.indexOf(user)]}
-								user={user}
-							/>
-						))}
-				</tbody>
-			</table>
+			<ManageBanner isDisabled={!loaderData.writable} oidc={loaderData.oidc} />
+			<div className="overflow-x-auto">
+				<table className="table-auto w-full rounded-lg min-w-[640px]">
+					<thead className="text-headplane-600 dark:text-headplane-300">
+						<tr className="text-left px-0.5">
+							<th className="uppercase text-xs font-bold pb-2">User</th>
+							<th className="uppercase text-xs font-bold pb-2">Role</th>
+							<th className="uppercase text-xs font-bold pb-2">Created At</th>
+							<th className="uppercase text-xs font-bold pb-2">Last Seen</th>
+						</tr>
+					</thead>
+					<tbody
+						className={cn(
+							'divide-y divide-headplane-100 dark:divide-headplane-800 align-top',
+							'border-t border-headplane-100 dark:border-headplane-800',
+						)}
+					>
+						{users
+							.sort((a, b) => a.name.localeCompare(b.name))
+							.map((user) => (
+								<UserRow
+									key={user.id}
+									role={loaderData.roles[users.indexOf(user)]}
+									user={user}
+								/>
+							))}
+					</tbody>
+				</table>
+			</div>
 		</>
 	);
 }

app/routes/users/user-actions.ts

@@ -1,140 +1,115 @@
-import { ActionFunctionArgs, data } from 'react-router';
-import type { LoadContext } from '~/server';
+import { data } from 'react-router';
 import { Capabilities, Roles } from '~/server/web/roles';
-import { User } from '~/types';
-import { data400, data403 } from '~/utils/res';
+import type { Route } from './+types/overview';
 
-export async function userAction({
-	request,
-	context,
-}: ActionFunctionArgs<LoadContext>) {
+export async function userAction({ request, context }: Route.ActionArgs) {
 	const session = await context.sessions.auth(request);
 	const check = await context.sessions.check(request, Capabilities.write_users);
 	if (!check) {
-		throw data403('You do not have permission to update users');
+		throw data('You do not have permission to update users', {
+			status: 403,
+		});
 	}
 
-	const apiKey = session.api_key;
 	const formData = await request.formData();
 	const action = formData.get('action_id')?.toString();
 	if (!action) {
-		throw data400('Missing `action_id` in the form data.');
+		throw data('Missing `action_id` in the form data.', {
+			status: 404,
+		});
 	}
 
+	const api = context.hsApi.getRuntimeClient(session.api_key);
 	switch (action) {
-		case 'create_user':
-			return createUser(formData, apiKey, context);
-		case 'delete_user':
-			return deleteUser(formData, apiKey, context);
-		case 'rename_user':
-			return renameUser(formData, apiKey, context);
-		case 'reassign_user':
-			return reassignUser(formData, apiKey, context);
+		case 'create_user': {
+			const name = formData.get('username')?.toString();
+			const displayName = formData.get('display_name')?.toString();
+			const email = formData.get('email')?.toString();
+
+			if (!name) {
+				throw data('Missing `username` in the form data.', {
+					status: 400,
+				});
+			}
+
+			await api.createUser(name, email, displayName);
+			return { message: 'User created successfully' };
+		}
+		case 'delete_user': {
+			const userId = formData.get('user_id')?.toString();
+			if (!userId) {
+				throw data('Missing `user_id` in the form data.', {
+					status: 400,
+				});
+			}
+
+			await api.deleteUser(userId);
+			return { message: 'User deleted successfully' };
+		}
+		case 'rename_user': {
+			const userId = formData.get('user_id')?.toString();
+			const newName = formData.get('new_name')?.toString();
+			if (!userId || !newName) {
+				return data({ success: false }, 400);
+			}
+
+			const users = await api.getUsers(userId);
+			const user = users.find((user) => user.id === userId);
+			if (!user) {
+				throw data(`No user found with id: ${userId}`, { status: 400 });
+			}
+
+			if (user.provider === 'oidc') {
+				// OIDC users cannot be renamed via this endpoint, return an error
+				throw data('Users managed by OIDC cannot be renamed', {
+					status: 403,
+				});
+			}
+
+			await api.renameUser(userId, newName);
+			return { message: 'User renamed successfully' };
+		}
+		case 'reassign_user': {
+			const userId = formData.get('user_id')?.toString();
+			const newRole = formData.get('new_role')?.toString();
+			if (!userId || !newRole) {
+				throw data('Missing `user_id` or `new_role` in the form data.', {
+					status: 400,
+				});
+			}
+
+			const users = await api.getUsers(userId);
+			const user = users.find((user) => user.id === userId);
+			if (!user?.providerId) {
+				throw data('Specified user is not an OIDC user', {
+					status: 400,
+				});
+			}
+
+			// For some reason, headscale makes providerID a url where the
+			// last component is the subject, so we need to strip that out
+			const subject = user.providerId?.split('/').pop();
+			if (!subject) {
+				throw data(
+					'Malformed `providerId` for the specified user. Cannot find subject.',
+					{ status: 400 },
+				);
+			}
+
+			const result = await context.sessions.reassignSubject(
+				subject,
+				newRole as keyof typeof Roles,
+			);
+
+			if (!result) {
+				throw data('Failed to reassign user role.', { status: 500 });
+			}
+
+			return { message: 'User reassigned successfully' };
+		}
 		default:
-			throw data400('Invalid `action_id` provided.');
+			throw data('Invalid `action_id` provided.', {
+				status: 400,
+			});
 	}
 }
-
-async function createUser(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const name = formData.get('username')?.toString();
-	const displayName = formData.get('display_name')?.toString();
-	const email = formData.get('email')?.toString();
-
-	if (!name) {
-		throw data400('Missing `username` in the form data.');
-	}
-
-	await context.client.post('v1/user', apiKey, {
-		name,
-		displayName,
-		email,
-	});
-}
-
-async function deleteUser(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const userId = formData.get('user_id')?.toString();
-	if (!userId) {
-		throw data400('Missing `user_id` in the form data.');
-	}
-
-	await context.client.delete(`v1/user/${userId}`, apiKey);
-}
-
-async function renameUser(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const userId = formData.get('user_id')?.toString();
-	const newName = formData.get('new_name')?.toString();
-	if (!userId || !newName) {
-		return data({ success: false }, 400);
-	}
-
-	const { users } = await context.client.get<{ users: User[] }>(
-		'v1/user',
-		apiKey,
-	);
-
-	const user = users.find((user) => user.id === userId);
-	if (!user) {
-		throw data400(`No user found with id: ${userId}`);
-	}
-
-	if (user.provider === 'oidc') {
-		// OIDC users cannot be renamed via this endpoint, return an error
-		throw data403('Users managed by OIDC cannot be renamed');
-	}
-
-	await context.client.post(`v1/user/${userId}/rename/${newName}`, apiKey);
-}
-
-async function reassignUser(
-	formData: FormData,
-	apiKey: string,
-	context: LoadContext,
-) {
-	const userId = formData.get('user_id')?.toString();
-	const newRole = formData.get('new_role')?.toString();
-	if (!userId || !newRole) {
-		throw data400('Missing `user_id` or `new_role` in the form data.');
-	}
-
-	const { users } = await context.client.get<{ users: User[] }>(
-		'v1/user',
-		apiKey,
-	);
-
-	const user = users.find((user) => user.id === userId);
-	if (!user?.providerId) {
-		throw data400('Specified user is not an OIDC user');
-	}
-
-	// For some reason, headscale makes providerID a url where the
-	// last component is the subject, so we need to strip that out
-	const subject = user.providerId?.split('/').pop();
-	if (!subject) {
-		throw data400(
-			'Malformed `providerId` for the specified user. Cannot find subject.',
-		);
-	}
-
-	const result = await context.sessions.reassignSubject(
-		subject,
-		newRole as keyof typeof Roles,
-	);
-
-	if (!result) {
-		return data({ success: false }, 403);
-	}
-
-	return data({ success: true });
-}

app/routes/util/healthz.ts

@@ -1,8 +1,10 @@
-import { LoaderFunctionArgs } from 'react-router';
-import type { LoadContext } from '~/server';
+import type { Route } from './+types/healthz';
+
+export async function loader({ context }: Route.LoaderArgs) {
+	// Use a fake API key for healthcheck
+	const api = context.hsApi.getRuntimeClient('fake-api-key');
+	const healthy = await api.isHealthy();
 
-export async function loader({ context }: LoaderFunctionArgs<LoadContext>) {
-	const healthy = await context.client.healthcheck();
 	return new Response(JSON.stringify({ status: healthy ? 'OK' : 'ERROR' }), {
 		status: healthy ? 200 : 500,
 		headers: {

app/routes/util/info.ts

@@ -0,0 +1,59 @@
+import { versions } from 'node:process';
+import { data } from 'react-router';
+import type { Route } from './+types/info';
+
+export async function loader({ request, context }: Route.LoaderArgs) {
+	if (context.config.server.info_secret == null) {
+		throw data(
+			{
+				status: 'Forbidden',
+			},
+			403,
+		);
+	}
+
+	const bearer = request.headers.get('Authorization') ?? '';
+	if (!bearer.startsWith('Bearer ')) {
+		throw data(
+			{
+				status: 'Unauthorized',
+			},
+			401,
+		);
+	}
+
+	const token = bearer.slice('Bearer '.length).trim();
+	if (token !== context.config.server.info_secret) {
+		throw data(
+			{
+				status: 'Forbidden',
+			},
+			403,
+		);
+	}
+
+	// Use a fake API key for healthcheck
+	const api = context.hsApi.getRuntimeClient('fake-api-key');
+	const healthy = await api.isHealthy();
+
+	const body = {
+		status: healthy ? 'healthy' : 'unhealthy',
+		headplane_version: __VERSION__,
+		headscale_canonical_version: healthy ? context.hsApi.apiVersion : 'unknown',
+		internal_versions: {
+			node: versions.node,
+			v8: versions.v8,
+			uv: versions.uv,
+			zlib: versions.zlib,
+			openssl: versions.openssl,
+			libc: versions.libc,
+		},
+	};
+
+	return new Response(JSON.stringify(body), {
+		status: 200,
+		headers: {
+			'Content-Type': 'application/json',
+		},
+	});
+}

app/server/README.md

@@ -1,33 +0,0 @@
-# Headplane Server
-This code is responsible for all code that is necessary *before* any
-web server is started. It is the only part of the code that contains
-many side-effects (in this case, importing a module may run code).
-
-# Hierarchy
-```
-server
-├── index.ts: Loads everything and starts the web server.
-├── agent/
-│   ├── dispatcher.ts: Serializes commands for the agent control fd (stdin).
-│   ├── ssh.ts: Manages & multiplexes the active web SSH connections
-│   ├── env.ts: Checks the environment variables for custom overrides.
-├── config/
-│   ├── integration/
-│   │   ├── abstract.ts: Defines the abstract class for integrations.
-│   │   ├── docker.ts: Contains the Docker integration.
-│   │   ├── index.ts: Determines the correct integration to use (if any).
-│   │   ├── kubernetes.ts: Contains the Kubernetes integration.
-│   │   ├── proc.ts: Contains the Proc integration.
-│   ├── env.ts: Checks the environment variables for custom overrides.
-│   ├── loader.ts: Checks the configuration file and coalesces with ENV.
-│   ├── schema.ts: Defines the schema for the Headplane configuration.
-├── headscale/
-│   ├── api-client.ts: Creates the HTTP client that talks to the Headscale API.
-│   ├── api-error.ts: Contains the ResponseError definition.
-│   ├── config-loader.ts: Loads the Headscale configuration (if available).
-│   ├── config-schema.ts: Defines the schema for the Headscale configuration.
-├── web/
-│   ├── agent.ts: Handles setting up the agent WebSocket if needed.
-│   ├── oidc.ts: Loads and validates an OIDC configuration (if available).
-│   ├── roles.ts: Contains information about authentication permissions.
-│   ├── sessions.ts: Initializes the session store and methods to manage it.

app/server/config/config-schema.ts

@@ -0,0 +1,206 @@
+import { type } from 'arktype';
+import log from '~/utils/log';
+import DockerIntegration from './integration/docker';
+import KubernetesIntegration from './integration/kubernetes';
+import ProcIntegration from './integration/proc';
+import { deprecatedField } from './utils';
+
+export const pathSupportedKeys = [
+	'server.cookie_secret',
+	'oidc.client_secret',
+	'oidc.headscale_api_key',
+	'integration.agent.pre_authkey',
+] as const;
+
+const serverConfig = type({
+	host: 'string.ip = "0.0.0.0"',
+	port: 'number.integer = 3000',
+	base_url: 'string.url?',
+	data_path: 'string.lower = "/var/lib/headplane/"',
+	info_secret: 'string?',
+
+	cookie_secret: '(32 <= string <= 32)',
+	cookie_secure: 'boolean = true',
+	cookie_domain: 'string.lower?',
+	cookie_max_age: 'number.integer = 86400',
+});
+
+const partialServerConfig = type({
+	host: 'string.ip?',
+	port: 'number.integer?',
+	base_url: 'string.url?',
+	data_path: 'string.lower?',
+	info_secret: 'string?',
+
+	cookie_secret: '(32 <= string <= 32)?',
+	cookie_secure: 'boolean?',
+	cookie_domain: 'string.lower?',
+	cookie_max_age: 'number.integer?',
+});
+
+const headscaleConfig = type({
+	url: type('string.url').pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v)),
+	public_url: type('string.url')
+		.pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v))
+		.optional(),
+	config_path: 'string.lower?',
+	config_strict: 'boolean = true',
+	dns_records_path: 'string.lower?',
+	tls_cert_path: 'string.lower?',
+});
+
+const partialHeadscaleConfig = type({
+	url: type('string.url')
+		.pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v))
+		.optional(),
+	public_url: type('string.url')
+		.pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v))
+		.optional(),
+	config_path: 'string.lower?',
+	config_strict: 'boolean?',
+	dns_records_path: 'string.lower?',
+	tls_cert_path: 'string.lower?',
+});
+
+const oidcConfig = type({
+	issuer: 'string.url',
+	client_id: 'string',
+	client_secret: 'string',
+	headscale_api_key: 'string',
+	use_pkce: 'boolean = false',
+	redirect_uri: type('string.url')
+		.pipe((value, ctx) => {
+			log.warn(
+				'config',
+				'%s is deprecated and will be removed in 0.7.0',
+				ctx.propString,
+			);
+
+			const cleanedValue = new URL(value.trim());
+			if (cleanedValue.pathname.endsWith(`${__PREFIX__}/oidc/callback`)) {
+				cleanedValue.pathname = cleanedValue.pathname.replace(
+					`${__PREFIX__}/oidc/callback`,
+					'/',
+				);
+
+				log.warn(
+					'config',
+					'Please migrate to using `server.base_url` with a value of "%s"',
+					cleanedValue.toString(),
+				);
+			}
+
+			return cleanedValue.toString();
+		})
+		.optional(),
+	disable_api_key_login: 'boolean = false',
+	scope: 'string = "openid email profile"',
+	profile_picture_source: '"oidc" | "gravatar" = "oidc"',
+	extra_params: 'Record<string, string>?',
+
+	authorization_endpoint: 'string.url?',
+	token_endpoint: 'string.url?',
+	userinfo_endpoint: 'string.url?',
+	token_endpoint_auth_method:
+		'"client_secret_basic" | "client_secret_post" | "client_secret_jwt"?',
+
+	// Old/deprecated options
+	user_storage_file: 'string.lower = "/var/lib/headplane/users.json"',
+	strict_validation: type('unknown').narrow(deprecatedField()).optional(),
+});
+
+const partialOidcConfig = type({
+	issuer: 'string.url?',
+	client_id: 'string?',
+	client_secret: 'string?',
+	use_pkce: 'boolean?',
+	headscale_api_key: 'string?',
+	redirect_uri: 'string.url?',
+	disable_api_key_login: 'boolean?',
+	scope: 'string?',
+	extra_params: 'Record<string, string>?',
+	profile_picture_source: '"oidc" | "gravatar"?',
+
+	authorization_endpoint: 'string.url?',
+	token_endpoint: 'string.url?',
+	userinfo_endpoint: 'string.url?',
+	token_endpoint_auth_method:
+		'"client_secret_basic" | "client_secret_post" | "client_secret_jwt"?',
+
+	// Old/deprecated options
+	user_storage_file: 'string.lower?',
+	strict_validation: type('unknown').narrow(deprecatedField()).optional(),
+});
+
+const agentConfig = type({
+	enabled: 'boolean',
+	host_name: 'string = "headplane-agent"',
+	pre_authkey: 'string',
+	cache_ttl: 'number.integer = 180000',
+	cache_path: 'string = "/var/lib/headplane/agent_cache.json"',
+	executable_path: 'string = "/usr/libexec/headplane/agent"',
+	work_dir: 'string = "/var/lib/headplane/agent"',
+});
+
+const partialAgentConfig = type({
+	enabled: 'boolean?',
+	host_name: 'string?',
+	pre_authkey: 'string?',
+	cache_ttl: 'number.integer?',
+	cache_path: 'string?',
+	executable_path: 'string?',
+	work_dir: 'string?',
+});
+
+const integrationConfig = type({
+	docker: DockerIntegration.configSchema.full,
+	kubernetes: KubernetesIntegration.configSchema.full,
+	proc: ProcIntegration.configSchema.full,
+	agent: agentConfig.optional(),
+}).partial();
+
+export const partialIntegrationConfig = type({
+	docker: DockerIntegration.configSchema.partial,
+	kubernetes: KubernetesIntegration.configSchema.partial,
+	proc: ProcIntegration.configSchema.partial,
+	agent: partialAgentConfig.optional(),
+}).partial();
+
+export const headplaneConfig = type({
+	debug: 'boolean = false',
+	server: serverConfig,
+	headscale: headscaleConfig,
+	oidc: oidcConfig.optional(),
+	integration: integrationConfig.optional(),
+}).onDeepUndeclaredKey('delete');
+
+export const partialHeadplaneConfig = type({
+	debug: 'boolean?',
+	server: partialServerConfig.optional(),
+	headscale: partialHeadscaleConfig.optional(),
+	oidc: partialOidcConfig.optional(),
+	integration: partialIntegrationConfig.optional(),
+});
+
+export type HeadplaneConfig = typeof headplaneConfig.infer;
+export type PartialHeadplaneConfig = typeof partialHeadplaneConfig.infer;
+
+type DotNotationToObjects<
+	T extends string,
+	V,
+> = T extends `${infer K}.${infer Rest}`
+	? { [P in K]?: DotNotationToObjects<Rest, V> }
+	: { [P in `${T}_path`]?: V };
+
+type ObjectDeepMerge<T> = T extends object
+	? {
+			[K in keyof T]: T[K] extends object ? ObjectDeepMerge<T[K]> : T[K];
+		}
+	: T;
+
+type ConfigWithPathKeys = ObjectDeepMerge<
+	DotNotationToObjects<(typeof pathSupportedKeys)[number], string | undefined>
+>;
+
+export type PartialHeadplaneConfigWithPaths = PartialHeadplaneConfig &
+	ConfigWithPathKeys;

app/server/config/env.ts

@@ -1,76 +0,0 @@
-import { exit } from 'node:process';
-import { type } from 'arktype';
-import log from '~/utils/log';
-
-// Custom type for boolean environment variables, allowing for values like
-// 1, true, yes, and on to count as a truthy value.
-const booleanEnv = type('string | undefined').pipe((v) => {
-	return ['1', 'true', 'yes', 'on'].includes(v?.toLowerCase() ?? '');
-});
-
-export const envVariables = {
-	debugLog: 'HEADPLANE_DEBUG_LOG',
-	envOverrides: 'HEADPLANE_LOAD_ENV_OVERRIDES',
-	configPath: 'HEADPLANE_CONFIG_PATH',
-} as const;
-
-export function configureLogger(env: string | undefined) {
-	const result = booleanEnv(env);
-	if (result instanceof type.errors) {
-		log.error(
-			'config',
-			'HEADPLANE_DEBUG_LOG value is invalid: %s',
-			result.summary,
-		);
-		log.info('config', 'Using a default value: false');
-		log.debug = () => {}; // Disable debug logging if the value is invalid
-		log.debugEnabled = false;
-		return;
-	}
-
-	if (result === false) {
-		log.debug = () => {}; // Disable debug logging if the value is false
-		log.debugEnabled = false;
-		return;
-	}
-
-	log.debug('config', 'Debug logging has been enabled');
-	log.debug('config', 'It is recommended this be disabled in production');
-}
-
-export interface EnvOverrides {
-	loadEnv: boolean;
-	path: string;
-}
-
-export function configureConfig(overrides: {
-	loadEnv: string | undefined;
-	path: string | undefined;
-}): EnvOverrides {
-	const loadResult = booleanEnv(overrides.loadEnv);
-	if (loadResult instanceof type.errors) {
-		log.error(
-			'config',
-			'HEADPLANE_LOAD_ENV_OVERRIDES value is invalid: %s',
-			loadResult.summary,
-		);
-
-		exit(1);
-	}
-
-	const pathResult = type('string | undefined')(overrides.path);
-	if (pathResult instanceof type.errors) {
-		log.error(
-			'config',
-			'HEADPLANE_CONFIG_PATH value is invalid: %s',
-			pathResult.summary,
-		);
-
-		exit(1);
-	}
-
-	return {
-		loadEnv: loadResult,
-		path: pathResult ?? '/etc/headplane/config.yaml',
-	};
-}

app/server/config/error.ts

@@ -0,0 +1,74 @@
+interface ErrorCodes {
+	CONFLICTING_SECRET_PATH_FIELD: {
+		fieldName: string;
+	};
+
+	INVALID_REQUIRED_FIELDS: {
+		messages: string[];
+	};
+
+	MISSING_INTERPOLATION_VARIABLE: {
+		pathKey: string;
+		variableName: string;
+	};
+
+	MISSING_SECRET_FILE: {
+		pathKey: string;
+		filePath: string;
+	};
+}
+
+const translationsWithVars: {
+	[K in keyof ErrorCodes]: (vars: ErrorCodes[K]) => string;
+} = {
+	CONFLICTING_SECRET_PATH_FIELD: ({ fieldName }) =>
+		`Both "${fieldName}" and "${fieldName}_path" are set; please provide only one of these fields.`,
+	INVALID_REQUIRED_FIELDS: ({ messages }) =>
+		`The configuration is missing required fields or has invalid values:\n- ${messages.join('\n- ')}`,
+	MISSING_INTERPOLATION_VARIABLE: ({ pathKey, variableName }) =>
+		`Could not resolve environment variable "${variableName}" for configuration key "${pathKey}".`,
+
+	MISSING_SECRET_FILE: ({ pathKey, filePath }) =>
+		`The secret file specified in "${pathKey}" could not be accessed at path "${filePath}". Please ensure the file exists and is readable.`,
+} as const;
+
+/**
+ * Custom error class for configuration-related errors.
+ */
+export class ConfigError extends Error {
+	/**
+	 * The error code representing the type of configuration error.
+	 */
+	code: keyof ErrorCodes;
+
+	/**
+	 * Creates a new ConfigError instance.
+	 *
+	 * @param code The error code
+	 * @param vars The variables to interpolate into the error message
+	 */
+	constructor(code: keyof ErrorCodes, vars: unknown) {
+		super(
+			translationsWithVars[code](
+				vars as (typeof translationsWithVars)[typeof code] extends (
+					vars: infer U,
+				) => string
+					? U
+					: never,
+			),
+		);
+		this.code = code;
+		this.name = 'ConfigError';
+	}
+
+	/**
+	 * Factory method to create a ConfigError instance.
+	 *
+	 * @param code The error code
+	 * @param vars The variables to interpolate into the error message
+	 * @returns A new ConfigError instance
+	 */
+	static from<K extends keyof ErrorCodes>(code: K, vars: ErrorCodes[K]) {
+		return new ConfigError(code, vars);
+	}
+}

app/server/config/integration/abstract.ts

@@ -1,4 +1,4 @@
-import type { ApiClient } from '~/server/headscale/api-client';
+import type { RuntimeApiClient } from '~/server/headscale/api/endpoints';
 
 export abstract class Integration<T> {
 	protected context: NonNullable<T>;
@@ -11,6 +11,6 @@ export abstract class Integration<T> {
 	}
 
 	abstract isAvailable(): Promise<boolean> | boolean;
-	abstract onConfigChange(client: ApiClient): Promise<void> | void;
+	abstract onConfigChange(client: RuntimeApiClient): Promise<void> | void;
 	abstract get name(): string;
 }

app/server/config/integration/docker.ts

@@ -1,9 +1,9 @@
-import { constants, access } from 'node:fs/promises';
+import { access, constants } from 'node:fs/promises';
 import { setTimeout } from 'node:timers/promises';
+import { type } from 'arktype';
 import { Client } from 'undici';
-import { ApiClient } from '~/server/headscale/api-client';
+import type { RuntimeApiClient } from '~/server/headscale/api/endpoints';
 import log from '~/utils/log';
-import type { HeadplaneConfig } from '../schema';
 import { Integration } from './abstract';
 
 interface DockerContainer {
@@ -11,8 +11,25 @@ interface DockerContainer {
 	Names: string[];
 }
 
-type T = NonNullable<HeadplaneConfig['integration']>['docker'];
-export default class DockerIntegration extends Integration<T> {
+const configSchema = {
+	full: type({
+		enabled: 'boolean',
+		container_name: 'string?',
+		container_label: 'string = "me.tale.headplane.target=headscale"',
+		socket: 'string = "unix:///var/run/docker.sock"',
+	}),
+
+	partial: type({
+		enabled: 'boolean?',
+		container_name: 'string?',
+		container_label: 'string?',
+		socket: 'string?',
+	}).partial(),
+};
+
+export default class DockerIntegration extends Integration<
+	typeof configSchema.full.infer
+> {
 	private maxAttempts = 10;
 	private client: Client | undefined;
 	private containerId: string | undefined;
@@ -21,6 +38,10 @@ export default class DockerIntegration extends Integration<T> {
 		return 'Docker';
 	}
 
+	static get configSchema() {
+		return configSchema;
+	}
+
 	async getContainerName(label: string, value: string): Promise<string> {
 		if (!this.client) {
 			throw new Error('Docker client is not initialized');
@@ -60,7 +81,7 @@ export default class DockerIntegration extends Integration<T> {
 		// Basic configuration check, the name overrides the container_label
 		// selector because of legacy support.
 		const { container_name, container_label } = this.context;
-		if (container_name.length === 0 && container_label.length === 0) {
+		if (container_name?.length === 0 && container_label.length === 0) {
 			log.error(
 				'config',
 				'Missing a Docker `container_name` or `container_label`',
@@ -94,7 +115,7 @@ export default class DockerIntegration extends Integration<T> {
 
 			try {
 				log.info('config', 'Checking API: %s', fetchU);
-				await fetch(new URL('/v1.30/version', fetchU).href);
+				await fetch(new URL('/v1.44/version', fetchU).href);
 			} catch (error) {
 				log.error('config', 'Failed to connect to Docker API: %s', error);
 				log.debug('config', 'Connection error: %o', error);
@@ -127,7 +148,7 @@ export default class DockerIntegration extends Integration<T> {
 
 		const qp = new URLSearchParams({
 			filters: JSON.stringify(
-				container_name.length > 0
+				container_name != null && container_name.length > 0
 					? { name: [container_name] }
 					: { label: [container_label] },
 			),
@@ -140,7 +161,7 @@ export default class DockerIntegration extends Integration<T> {
 		);
 		const res = await this.client.request({
 			method: 'GET',
-			path: `/v1.30/containers/json?${qp.toString()}`,
+			path: `/v1.44/containers/json?${qp.toString()}`,
 		});
 
 		if (res.statusCode !== 200) {
@@ -151,7 +172,7 @@ export default class DockerIntegration extends Integration<T> {
 
 		const data = (await res.body.json()) as DockerContainer[];
 		if (data.length > 1) {
-			if (container_name.length > 0) {
+			if (container_name != null && container_name.length > 0) {
 				log.error(
 					'config',
 					`Found multiple containers with name ${container_name}`,
@@ -167,7 +188,7 @@ export default class DockerIntegration extends Integration<T> {
 		}
 
 		if (data.length === 0) {
-			if (container_name.length > 0) {
+			if (container_name != null && container_name.length > 0) {
 				log.error(
 					'config',
 					`No container found with the name ${container_name}`,
@@ -193,7 +214,7 @@ export default class DockerIntegration extends Integration<T> {
 		return this.client !== undefined && this.containerId !== undefined;
 	}
 
-	async onConfigChange(client: ApiClient) {
+	async onConfigChange(client: RuntimeApiClient) {
 		if (!this.client) {
 			return;
 		}
@@ -211,7 +232,7 @@ export default class DockerIntegration extends Integration<T> {
 
 			const response = await this.client.request({
 				method: 'POST',
-				path: `/v1.30/containers/${this.containerId}/restart`,
+				path: `/v1.44/containers/${this.containerId}/restart`,
 			});
 
 			if (response.statusCode !== 204) {
@@ -233,14 +254,14 @@ export default class DockerIntegration extends Integration<T> {
 		while (attempts <= this.maxAttempts) {
 			try {
 				log.debug('config', 'Checking Headscale status (attempt %d)', attempts);
-				const status = await client.healthcheck();
+				const status = await client.isHealthy();
 				if (status === false) {
 					throw new Error('Headscale is not running');
 				}
 
 				log.info('config', 'Headscale is up and running');
 				return;
-			} catch (error) {
+			} catch {
 				if (attempts < this.maxAttempts) {
 					attempts++;
 					await setTimeout(1000);

app/server/config/integration/index.ts

@@ -1,5 +1,5 @@
-import { HeadplaneConfig } from '~/server/config/schema';
 import log from '~/utils/log';
+import type { HeadplaneConfig } from '../config-schema';
 import dockerIntegration from './docker';
 import kubernetesIntegration from './kubernetes';
 import procIntegration from './proc';
@@ -47,16 +47,16 @@ function getIntegration(integration: HeadplaneConfig['integration']) {
 
 	if (docker?.enabled) {
 		log.info('config', 'Using Docker integration');
-		return new dockerIntegration(integration?.docker);
+		return new dockerIntegration(integration!.docker!);
 	}
 
 	if (k8s?.enabled) {
 		log.info('config', 'Using Kubernetes integration');
-		return new kubernetesIntegration(integration?.kubernetes);
+		return new kubernetesIntegration(integration!.kubernetes!);
 	}
 
 	if (proc?.enabled) {
 		log.info('config', 'Using Proc integration');
-		return new procIntegration(integration?.proc);
+		return new procIntegration(integration!.proc!);
 	}
 }

app/server/config/integration/kubernetes.ts

@@ -1,246 +1,167 @@
-import { readFile, readdir } from 'node:fs/promises';
-import { platform } from 'node:os';
-import { join, resolve } from 'node:path';
-import { kill } from 'node:process';
-import { setTimeout } from 'node:timers/promises';
-import { CoreV1Api, KubeConfig } from '@kubernetes/client-node';
-import { ApiClient } from '~/server/headscale/api-client';
-import log from '~/utils/log';
-import { HeadplaneConfig } from '../schema';
-import { Integration } from './abstract';
+import { CoreV1Api, KubeConfig } from "@kubernetes/client-node";
+import { type } from "arktype";
+import { readdir, readFile } from "node:fs/promises";
+import { platform } from "node:os";
+import { join } from "node:path";
+
+import type { RuntimeApiClient } from "~/server/headscale/api/endpoints";
+
+import log from "~/utils/log";
+
+import { Integration } from "./abstract";
+import { findHeadscaleServe, signalAndWaitHealthy } from "./proc-helper";
 
 // https://github.com/kubernetes-client/javascript/blob/055b83c6504dfd1b2a2d081efd974163c6cbb808/src/config.ts#L40
-const svcRoot = '/var/run/secrets/kubernetes.io/serviceaccount';
+const svcRoot = "/var/run/secrets/kubernetes.io/serviceaccount";
 const svcCaPath = `${svcRoot}/ca.crt`;
 const svcTokenPath = `${svcRoot}/token`;
 const svcNamespacePath = `${svcRoot}/namespace`;
 
-type T = NonNullable<HeadplaneConfig['integration']>['kubernetes'];
-export default class KubernetesIntegration extends Integration<T> {
-	private pid: number | undefined;
-	private maxAttempts = 10;
+const configSchema = {
+  full: type({
+    enabled: "boolean",
+    pod_name: "string",
+    validate_manifest: "boolean = true",
+  }),
 
-	get name() {
-		return 'Kubernetes (k8s)';
-	}
+  partial: type({
+    enabled: "boolean?",
+    pod_name: "string?",
+    validate_manifest: "boolean?",
+  }).partial(),
+};
 
-	async isAvailable() {
-		if (platform() !== 'linux') {
-			log.error('config', 'Kubernetes is only available on Linux');
-			return false;
-		}
+export default class KubernetesIntegration extends Integration<typeof configSchema.full.infer> {
+  private pid: number | undefined;
 
-		try {
-			log.debug('config', 'Checking Kubernetes service account at %s', svcRoot);
-			const files = await readdir(svcRoot);
-			if (files.length === 0) {
-				log.error('config', 'Kubernetes service account not found');
-				return false;
-			}
+  get name() {
+    return "Kubernetes (k8s)";
+  }
 
-			const mappedFiles = new Set(files.map((file) => join(svcRoot, file)));
-			const expectedFiles = [svcCaPath, svcTokenPath, svcNamespacePath];
+  static get configSchema() {
+    return configSchema;
+  }
 
-			log.debug('config', 'Looking for %s', expectedFiles.join(', '));
-			if (!expectedFiles.every((file) => mappedFiles.has(file))) {
-				log.error('config', 'Malformed Kubernetes service account');
-				return false;
-			}
-		} catch (error) {
-			log.error('config', 'Failed to access %s: %s', svcRoot, error);
-			return false;
-		}
+  async isAvailable() {
+    if (platform() !== "linux") {
+      log.error("config", "Kubernetes is only available on Linux");
+      return false;
+    }
 
-		log.debug('config', 'Reading Kubernetes service account at %s', svcRoot);
-		const namespace = await readFile(svcNamespacePath, 'utf8');
+    try {
+      log.debug("config", "Checking Kubernetes service account at %s", svcRoot);
+      const files = await readdir(svcRoot);
+      if (files.length === 0) {
+        log.error("config", "Kubernetes service account not found");
+        return false;
+      }
 
-		// Some very ugly nesting but it's necessary
-		if (this.context.validate_manifest === false) {
-			log.warn('config', 'Skipping strict Pod status check');
-		} else {
-			const pod = this.context.pod_name;
-			if (!pod) {
-				log.error('config', 'Missing POD_NAME variable');
-				return false;
-			}
+      const mappedFiles = new Set(files.map((file) => join(svcRoot, file)));
+      const expectedFiles = [svcCaPath, svcTokenPath, svcNamespacePath];
 
-			if (pod.trim().length === 0) {
-				log.error('config', 'Pod name is empty');
-				return false;
-			}
+      log.debug("config", "Looking for %s", expectedFiles.join(", "));
+      if (!expectedFiles.every((file) => mappedFiles.has(file))) {
+        log.error("config", "Malformed Kubernetes service account");
+        return false;
+      }
+    } catch (error) {
+      log.error("config", "Failed to access %s: %s", svcRoot, error);
+      return false;
+    }
 
-			log.debug(
-				'config',
-				'Checking Kubernetes pod %s in namespace %s',
-				pod,
-				namespace,
-			);
+    log.debug("config", "Reading Kubernetes service account at %s", svcRoot);
+    const namespace = await readFile(svcNamespacePath, "utf8");
 
-			try {
-				log.debug('config', 'Attempgin to get cluster KubeConfig');
-				const kc = new KubeConfig();
-				kc.loadFromCluster();
+    // Some very ugly nesting but it's necessary
+    if (this.context.validate_manifest === false) {
+      log.warn("config", "Skipping strict Pod status check");
+    } else {
+      const pod = this.context.pod_name;
+      if (!pod) {
+        log.error("config", "Missing POD_NAME variable");
+        return false;
+      }
 
-				const cluster = kc.getCurrentCluster();
-				if (!cluster) {
-					log.error('config', 'Malformed kubeconfig');
-					return false;
-				}
+      if (pod.trim().length === 0) {
+        log.error("config", "Pod name is empty");
+        return false;
+      }
 
-				log.info(
-					'config',
-					'Service account connected to %s (%s)',
-					cluster.name,
-					cluster.server,
-				);
+      log.debug("config", "Checking Kubernetes pod %s in namespace %s", pod, namespace);
 
-				const kCoreV1Api = kc.makeApiClient(CoreV1Api);
+      try {
+        log.debug("config", "Attempgin to get cluster KubeConfig");
+        const kc = new KubeConfig();
+        kc.loadFromCluster();
 
-				log.info('config', 'Checking pod %s in namespace %s', pod, namespace);
-				log.debug('config', 'Reading pod info for %s', pod);
-				const body = await kCoreV1Api.readNamespacedPod({
-					name: pod,
-					namespace,
-				});
+        const cluster = kc.getCurrentCluster();
+        if (!cluster) {
+          log.error("config", "Malformed kubeconfig");
+          return false;
+        }
 
-				if (!body.spec) {
-					log.error(
-						'config',
-						'Missing spec in pod info for %s/%s',
-						pod,
-						namespace,
-					);
+        log.info("config", "Service account connected to %s (%s)", cluster.name, cluster.server);
 
-					return false;
-				}
+        const kCoreV1Api = kc.makeApiClient(CoreV1Api);
 
-				log.debug('config', 'Got pod info: %o', body.spec);
-				const shared = body.spec.shareProcessNamespace;
-				if (shared === undefined) {
-					log.error(
-						'config',
-						'Pod does not have spec.shareProcessNamespace set',
-					);
+        log.info("config", "Checking pod %s in namespace %s", pod, namespace);
+        log.debug("config", "Reading pod info for %s", pod);
+        const body = await kCoreV1Api.readNamespacedPod({
+          name: pod,
+          namespace,
+        });
 
-					return false;
-				}
+        if (!body.spec) {
+          log.error("config", "Missing spec in pod info for %s/%s", pod, namespace);
 
-				if (!shared) {
-					log.error(
-						'config',
-						'Pod has set but disabled spec.shareProcessNamespace',
-					);
+          return false;
+        }
 
-					return false;
-				}
+        log.debug("config", "Got pod info: %o", body.spec);
+        const shared = body.spec.shareProcessNamespace;
+        if (shared === undefined) {
+          log.error("config", "Pod does not have spec.shareProcessNamespace set");
 
-				log.info('config', 'Pod %s enabled shared processes', pod);
-			} catch (error) {
-				log.error('config', 'Failed to read pod info: %s', error);
-				return false;
-			}
-		}
+          return false;
+        }
 
-		log.debug('config', 'Looking for namespaced process in /proc');
-		const dir = resolve('/proc');
-		try {
-			const subdirs = await readdir(dir);
-			const promises = subdirs.map(async (dir) => {
-				const pid = Number.parseInt(dir, 10);
+        if (!shared) {
+          log.error("config", "Pod has set but disabled spec.shareProcessNamespace");
 
-				if (Number.isNaN(pid)) {
-					return;
-				}
+          return false;
+        }
 
-				const path = join('/proc', dir, 'comm');
-				try {
-					log.debug('config', 'Reading %s', path);
-					const data = await readFile(path, 'utf8');
-					if (data.trim() !== 'headscale') {
-						throw new Error(
-							`Found PID with unexpected command: ${data.trim()}`,
-						);
-					}
+        log.info("config", "Pod %s enabled shared processes", pod);
+      } catch (error) {
+        log.error("config", "Failed to read pod info: %s", error);
+        return false;
+      }
+    }
 
-					return pid;
-				} catch (error) {
-					log.debug('config', 'Failed to read %s: %s', path, error);
-				}
-			});
+    try {
+      const result = await findHeadscaleServe();
+      if (!result) {
+        log.error("config", "Could not find headscale serve process");
+        return false;
+      }
 
-			const results = await Promise.allSettled(promises);
-			const pids = [];
+      this.pid = result;
+      log.info("config", "Found headscale serve (PID %d)", this.pid);
+      return true;
+    } catch (error) {
+      log.error("config", "Failed to scan /proc: %s", error);
+      return false;
+    }
+  }
 
-			for (const result of results) {
-				if (result.status === 'fulfilled' && result.value) {
-					pids.push(result.value);
-				}
-			}
+  async onConfigChange(client: RuntimeApiClient) {
+    if (!this.pid) {
+      return;
+    }
 
-			log.debug('config', 'Found Headscale processes: %o', pids);
-			if (pids.length > 1) {
-				log.error(
-					'config',
-					'Found %d Headscale processes: %s',
-					pids.length,
-					pids.join(', '),
-				);
-				return false;
-			}
-
-			if (pids.length === 0) {
-				log.error('config', 'Could not find Headscale process');
-				return false;
-			}
-
-			this.pid = pids[0];
-			log.info('config', 'Found Headscale process with PID: %d', this.pid);
-			return true;
-		} catch {
-			log.error('config', 'Failed to read /proc');
-			return false;
-		}
-	}
-
-	async onConfigChange(client: ApiClient) {
-		if (!this.pid) {
-			return;
-		}
-
-		try {
-			log.info('config', 'Sending SIGTERM to Headscale');
-			kill(this.pid, 'SIGTERM');
-		} catch (error) {
-			log.error('config', 'Failed to send SIGTERM to Headscale: %s', error);
-			log.debug('config', 'kill(1) error: %o', error);
-		}
-
-		await setTimeout(1000);
-		let attempts = 0;
-		while (attempts <= this.maxAttempts) {
-			try {
-				log.debug('config', 'Checking Headscale status (attempt %d)', attempts);
-				const status = await client.healthcheck();
-				if (status === false) {
-					throw new Error('Headscale is not running');
-				}
-
-				log.info('config', 'Headscale is up and running');
-				return;
-			} catch (error) {
-				if (attempts < this.maxAttempts) {
-					attempts++;
-					await setTimeout(1000);
-					continue;
-				}
-
-				log.error(
-					'config',
-					'Missed restart deadline for Headscale (pid %d)',
-					this.pid,
-				);
-				return;
-			}
-		}
-	}
+    await signalAndWaitHealthy(client, {
+      pid: this.pid,
+      signal: "SIGHUP",
+    });
+  }
 }

app/server/config/integration/proc-helper.ts

@@ -0,0 +1,116 @@
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { kill } from "node:process";
+import { setTimeout } from "node:timers/promises";
+
+import type { RuntimeApiClient } from "~/server/headscale/api/endpoints";
+
+import log from "~/utils/log";
+
+/**
+ * Does a two-stage scan of /proc to find the headscale process that is running
+ * a "serve" subcommand. It first scans all processes' comm files to find
+ * headscale processes, then checks their cmdline files to see if "serve" is
+ * the second argument.
+ *
+ * @param procPath The path to the proc filesystem (default: /proc)
+ * @returns The PID of the headscale serve process, or undefined if not found
+ */
+export async function findHeadscaleServe(procPath = "/proc"): Promise<number | undefined> {
+  const subdirs = await readdir(procPath);
+  const commResults = await Promise.allSettled(
+    subdirs.map(async (entry) => {
+      const pid = Number.parseInt(entry, 10);
+      if (Number.isNaN(pid)) {
+        return undefined;
+      }
+
+      try {
+        const comm = await readFile(join(procPath, entry, "comm"), "utf8");
+        return comm.trim() === "headscale" ? pid : undefined;
+      } catch {
+        return undefined;
+      }
+    }),
+  );
+
+  const headscalePids = commResults
+    .map((result) => {
+      if (result.status === "fulfilled" && result.value !== undefined) {
+        return result.value;
+      }
+      return undefined;
+    })
+    .filter((pid): pid is number => pid !== undefined);
+
+  if (headscalePids.length === 0) {
+    return undefined;
+  }
+
+  log.debug("config", "Found %d headscale process(es), checking for serve", headscalePids.length);
+  for (const pid of headscalePids) {
+    try {
+      const cmdline = await readFile(join(procPath, pid.toString(), "cmdline"), "utf8");
+      const args = cmdline.split("\0").filter(Boolean);
+
+      if (args[1] === "serve") {
+        return pid;
+      }
+    } catch {
+      // Process may have exited between stages
+    }
+  }
+
+  return undefined;
+}
+
+/**
+ * Options for signaling the headscale process.
+ */
+export interface SignalHeadscaleOptions {
+  pid: number;
+  signal?: NodeJS.Signals;
+  maxAttempts?: number;
+  retryDelayMs?: number;
+}
+
+/**
+ * Sends a signal to the headscale process and waits for it to become healthy.
+ * @param client The RuntimeApiClient to check health
+ * @param options Options for signaling and waiting
+ * @returns True if headscale became healthy, false otherwise
+ */
+export async function signalAndWaitHealthy(
+  client: RuntimeApiClient,
+  options: SignalHeadscaleOptions,
+): Promise<boolean> {
+  const { pid, signal = "SIGHUP", maxAttempts = 10, retryDelayMs = 1000 } = options;
+
+  try {
+    kill(pid, signal);
+    log.info("config", "Sent %s to Headscale (PID %d)", signal, pid);
+  } catch (error) {
+    log.error("config", "Failed to send %s to PID %d: %s", signal, pid, error);
+    return false;
+  }
+
+  await setTimeout(retryDelayMs);
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const healthy = await client.isHealthy();
+      if (healthy) {
+        log.info("config", "Headscale is healthy after restart");
+        return true;
+      }
+    } catch {
+      // Still restarting
+    }
+
+    if (attempt < maxAttempts) {
+      await setTimeout(retryDelayMs);
+    }
+  }
+
+  log.error("config", "Headscale did not become healthy after %d attempts", maxAttempts);
+  return false;
+}

app/server/config/integration/proc.ts

@@ -1,152 +1,64 @@
-import { readFile, readdir } from 'node:fs/promises';
-import { platform } from 'node:os';
-import { join, resolve } from 'node:path';
-import { kill } from 'node:process';
-import { setTimeout } from 'node:timers/promises';
-import { ApiClient } from '~/server/headscale/api-client';
-import log from '~/utils/log';
-import { HeadplaneConfig } from '../schema';
-import { Integration } from './abstract';
+import { type } from "arktype";
+import { platform } from "node:os";
 
-type T = NonNullable<HeadplaneConfig['integration']>['proc'];
-export default class ProcIntegration extends Integration<T> {
-	private pid: number | undefined;
-	private maxAttempts = 10;
+import type { RuntimeApiClient } from "~/server/headscale/api/endpoints";
 
-	get name() {
-		return 'Native Linux (/proc)';
-	}
+import log from "~/utils/log";
 
-	async isAvailable() {
-		if (platform() !== 'linux') {
-			log.error('config', '/proc is only available on Linux');
-			return false;
-		}
+import { Integration } from "./abstract";
+import { findHeadscaleServe, signalAndWaitHealthy } from "./proc-helper";
 
-		log.debug('config', 'Checking /proc for Headscale process');
-		const dir = resolve('/proc');
-		try {
-			const subdirs = await readdir(dir);
-			const promises = subdirs.map(async (dir) => {
-				const pid = Number.parseInt(dir, 10);
+const configSchema = {
+  full: type({
+    enabled: "boolean",
+  }),
 
-				if (Number.isNaN(pid)) {
-					return;
-				}
+  partial: type({
+    enabled: "boolean?",
+  }).partial(),
+};
 
-				const path = join('/proc', dir, 'comm');
-				try {
-					log.debug('config', 'Reading %s', path);
-					const data = await readFile(path, 'utf8');
-					if (data.trim() !== 'headscale') {
-						throw new Error(
-							`Found PID with unexpected command: ${data.trim()}`,
-						);
-					}
+export default class ProcIntegration extends Integration<typeof configSchema.full.infer> {
+  private pid: number | undefined;
 
-					return pid;
-				} catch (error) {
-					log.debug('config', 'Failed to read %s: %s', path, error);
-				}
-			});
+  get name() {
+    return "Native Linux (/proc)";
+  }
 
-			const results = await Promise.allSettled(promises);
-			const pids = [];
+  static get configSchema() {
+    return configSchema;
+  }
 
-			for (const result of results) {
-				if (result.status === 'fulfilled' && result.value) {
-					pids.push(result.value);
-				}
-			}
-
-			log.debug('config', 'Found Headscale processes: %o', pids);
-			if (pids.length > 1) {
-				log.warn(
-					'config',
-					'Found %d Headscale processes: %s',
-					pids.length,
-					pids.join(', '),
-				);
-
-        log.debug('config', 'Checking if any of them have Parent PID = 1, assuming thats the correct PID');
-        const ppidRegex = /(?:PPid:\s)(\d+)(?:\n?)/;
-        for (const pid of pids) {
-          const pidStatusPath = join('/proc', pid.toString(), 'status');
-          try {
-            log.debug('config', 'Reading %s', pidStatusPath);
-            const pidData = await readFile(pidStatusPath, 'utf8');
-            const ppidResult = pidData.match(ppidRegex);
-
-            if (ppidResult !== null) {
-              const potentialPPid = Number.parseInt(ppidResult[1], 10);
-              if (potentialPPid === 1) {
-                this.pid = pid;
-                log.info('config', 'Found potential Headscale process with PID: %d based on Parent PID = 1', this.pid);
-                return true;
-              }
-            }
-          } catch (error) {
-            log.error('config', 'Failed to read %s: %s', pidStatusPath, error);
-          }
-        }
+  async isAvailable() {
+    if (platform() !== "linux") {
+      log.error("config", "/proc is only available on Linux");
+      return false;
+    }
 
+    try {
+      const result = await findHeadscaleServe();
+      if (!result) {
+        log.error("config", "Could not find headscale serve process");
         return false;
       }
 
-			if (pids.length === 0) {
-				log.error('config', 'Could not find Headscale process');
-				return false;
-			}
+      this.pid = result;
+      log.info("config", "Found headscale serve (PID %d)", this.pid);
+      return true;
+    } catch (error) {
+      log.error("config", "Failed to scan /proc: %s", error);
+      return false;
+    }
+  }
 
-			this.pid = pids[0];
-			log.info('config', 'Found Headscale process with PID: %d', this.pid);
-			return true;
-		} catch {
-			log.error('config', 'Failed to read /proc');
-			return false;
-		}
-	}
+  async onConfigChange(client: RuntimeApiClient) {
+    if (!this.pid) {
+      return;
+    }
 
-	async onConfigChange(client: ApiClient) {
-		if (!this.pid) {
-			return;
-		}
-
-		try {
-			log.info('config', 'Sending SIGTERM to Headscale');
-			kill(this.pid, 'SIGTERM');
-		} catch (error) {
-			log.error('config', 'Failed to send SIGTERM to Headscale: %s', error);
-			log.debug('config', 'kill(1) error: %o', error);
-		}
-
-		await setTimeout(1000);
-		let attempts = 0;
-		while (attempts <= this.maxAttempts) {
-			try {
-				log.debug('config', 'Checking Headscale status (attempt %d)', attempts);
-				const status = await client.healthcheck();
-				if (status === false) {
-					log.error('config', 'Headscale is not running');
-					return;
-				}
-
-				log.info('config', 'Headscale is up and running');
-				return;
-			} catch (error) {
-				if (attempts < this.maxAttempts) {
-					attempts++;
-					await setTimeout(1000);
-					continue;
-				}
-
-				log.error(
-					'config',
-					'Missed restart deadline for Headscale (pid %d)',
-					this.pid,
-				);
-				return;
-			}
-		}
-	}
+    await signalAndWaitHealthy(client, {
+      pid: this.pid,
+      signal: "SIGHUP",
+    });
+  }
 }

app/server/config/load.ts

@@ -0,0 +1,267 @@
+import { access, constants, readFile } from 'node:fs/promises';
+import { type } from 'arktype';
+import { load } from 'js-yaml';
+import log from '~/utils/log';
+import {
+	headplaneConfig,
+	PartialHeadplaneConfig,
+	partialHeadplaneConfig,
+	pathSupportedKeys,
+} from './config-schema';
+import { ConfigError } from './error';
+
+/**
+ * Main entrypoint that attempts to load and merge configuration from both
+ * a YAML config file (if available) and environment variables. Importantly,
+ * the environment variables will override any values set in the config file.
+ *
+ * The function also supports loading secret values from file paths for
+ * specific configuration keys (e.g., certificates, private keys) by checking
+ * for corresponding `_path` suffixed environment variables or config file
+ * entries.
+ *
+ * @param configPathOverride Used for testing to override the config file path
+ * @returns @ref{HeadplaneConfig} The fully validated configuration
+ * @throws {Error} If there are validation errors in the final configuration
+ */
+export async function loadConfig(configPathOverride?: string) {
+	const configPath =
+		configPathOverride != null
+			? configPathOverride
+			: process.env.HEADPLANE_CONFIG_PATH != null
+				? String(process.env.HEADPLANE_CONFIG_PATH)
+				: '/etc/headplane/config.yaml';
+
+	const fileConfig = await loadConfigFile(configPath);
+	const envConfig = await loadConfigEnv();
+
+	const combinedConfig = deepMerge(fileConfig, envConfig);
+	await loadConfigKeyPaths(combinedConfig);
+
+	const finalConfig = headplaneConfig(combinedConfig);
+	if (finalConfig instanceof type.errors) {
+		throw ConfigError.from('INVALID_REQUIRED_FIELDS', {
+			messages: finalConfig.map((e) => e.toString()),
+		});
+	}
+
+	return finalConfig;
+}
+
+/**
+ * Attempts to load configuration from a YAML file at the specified path.
+ * If the file is not accessible, it returns undefined.
+ *
+ * @param path The file path to load the configuration from
+ * @returns A partial configuration object or undefined
+ * @throws {Error} If there are validation errors in the loaded configuration
+ */
+export async function loadConfigFile(path: string) {
+	try {
+		await access(path, constants.R_OK);
+	} catch {
+		log.info('config', 'Could not access config file at path: %s', path);
+		return;
+	}
+
+	const rawBuffer = await readFile(path, 'utf8');
+	const rawConfig = load(rawBuffer);
+	const config = partialHeadplaneConfig(rawConfig);
+	if (config instanceof type.errors) {
+		throw ConfigError.from('INVALID_REQUIRED_FIELDS', {
+			messages: config.map((e) => e.toString()),
+		});
+	}
+
+	return config;
+}
+
+/**
+ * Loads configuration overrides from environment variables prefixed with
+ * `HEADPLANE_`. Nested configuration keys can be represented using double
+ * underscores (`__`). For example, `HEADPLANE_SERVER__PORT=8080` would set
+ * the `server.port` configuration key to `8080`.
+ *
+ * @returns A partial configuration object or undefined
+ * @throws {Error} If there are validation errors in the loaded configuration
+ */
+export async function loadConfigEnv() {
+	if (process.env.HEADPLANE_LOAD_ENV_OVERRIDES != null) {
+		log.warn(
+			'config',
+			'HEADPLANE_LOAD_ENV_OVERRIDES is deprecated and will be removed in future versions',
+		);
+		log.warn(
+			'config',
+			'Environment variables are always loaded and `.env` files are no longer supported',
+		);
+	}
+
+	const rawConfig: Record<string, unknown> = {};
+	for (const [key, value] of Object.entries(process.env)) {
+		if (value == null || !key.startsWith('HEADPLANE_')) {
+			continue;
+		}
+
+		const parsedValue = parseEnvValue(value);
+		const configKey = key.slice('HEADPLANE_'.length).toLowerCase();
+		deepSet(rawConfig, configKey.split('__'), parsedValue);
+	}
+
+	const config = partialHeadplaneConfig(rawConfig);
+	if (config instanceof type.errors) {
+		throw ConfigError.from('INVALID_REQUIRED_FIELDS', {
+			messages: config.map((e) => e.toString()),
+		});
+	}
+
+	return Object.keys(config).length > 0 ? config : undefined;
+}
+
+/**
+ * Deeply merges multiple objects together. Later objects in the arguments
+ * list will override properties of earlier objects.
+ *
+ * @param objects The objects to merge
+ * @returns The merged object
+ */
+function deepMerge<T>(...objects: (T | undefined)[]): T {
+	const result: { [key: string]: unknown } = {};
+	for (const obj of objects.filter((o) => o != null)) {
+		for (const [key, value] of Object.entries(
+			obj as {
+				[key: string]: unknown;
+			},
+		)) {
+			if (value != null && typeof value === 'object' && !Array.isArray(value)) {
+				if (
+					result[key] == null ||
+					typeof result[key] !== 'object' ||
+					Array.isArray(result[key])
+				) {
+					result[key] = {};
+				}
+				result[key] = deepMerge(result[key], value);
+			} else {
+				result[key] = value;
+			}
+		}
+	}
+
+	return result as T;
+}
+
+/**
+ * Sets a value deeply within an object based on the provided path.
+ *
+ * @param obj The object to set the value in
+ * @param path An array of keys representing the path to set
+ * @param value The value to set at the specified path
+ */
+function deepSet(
+	obj: { [key: string]: unknown },
+	path: string[],
+	value: unknown,
+): void {
+	let current = obj;
+	for (let i = 0; i < path.length - 1; i++) {
+		const key = path[i];
+		if (current[key] == null || typeof current[key] !== 'object') {
+			current[key] = {};
+		}
+
+		current = current[key] as { [key: string]: unknown };
+	}
+
+	current[path[path.length - 1]] = value;
+}
+
+/**
+ * Parses an environment variable string value into an appropriate type.
+ * Supports booleans, null, undefined, and numbers. Falls back to string.
+ *
+ * @param value The environment variable string value
+ * @returns The parsed value
+ */
+function parseEnvValue(value: string): unknown {
+	const v = value.trim().toLowerCase();
+	if (v === 'true') return true;
+	if (v === 'false') return false;
+	if (v === 'null') return null;
+	if (v === 'undefined') return undefined;
+
+	if (/^-?\d+(\.\d+)?$/.test(v)) {
+		const num = Number(v);
+		if (!Number.isNaN(num)) return num;
+	}
+
+	return value;
+}
+
+/**
+ * For configuration keys that support loading from file paths (e.g.,
+ * certificates, private keys), this function checks for corresponding
+ * `_path` suffixed keys and loads the file content if the main key is
+ * not already set.
+ *
+ * @param partial The partial configuration object to update
+ */
+export async function loadConfigKeyPaths(partial: PartialHeadplaneConfig) {
+	for (const key of pathSupportedKeys) {
+		const pathKey = `${key}_path`;
+		const pathValue = deepGet(partial, pathKey.split('.'));
+		const existing = deepGet(partial, key.split('.'));
+
+		if (pathValue == null || typeof pathValue !== 'string') {
+			continue;
+		}
+
+		if (existing != null) {
+			throw ConfigError.from('CONFLICTING_SECRET_PATH_FIELD', {
+				fieldName: key,
+			});
+		}
+
+		const realPath = pathValue.replace(/\$\{([^}]+)\}/g, (_, variableName) => {
+			const value = process.env[variableName];
+			if (value === undefined) {
+				throw ConfigError.from('MISSING_INTERPOLATION_VARIABLE', {
+					pathKey: `${key}_path`,
+					variableName: variableName,
+				});
+			}
+
+			return value;
+		});
+
+		try {
+			const fileContent = await readFile(realPath, 'utf8');
+			deepSet(partial, key.split('.'), fileContent.trim().normalize());
+		} catch {
+			throw ConfigError.from('MISSING_SECRET_FILE', {
+				pathKey: `${key}_path`,
+				filePath: realPath,
+			});
+		}
+	}
+}
+
+/**
+ * Deeply retrieves a value from an object based on the provided path.
+ *
+ * @param obj The object to retrieve the value from
+ * @param path An array of keys representing the path to retrieve
+ * @returns The value at the specified path or undefined if not found
+ */
+function deepGet(obj: { [key: string]: unknown }, path: string[]): unknown {
+	let current = obj;
+	for (const segment of path) {
+		if (current == null || typeof current !== 'object') {
+			return undefined;
+		}
+
+		current = current[segment] as { [key: string]: unknown };
+	}
+
+	return current;
+}

app/server/config/loader.ts

@@ -1,303 +0,0 @@
-import { access, constants, readFile } from 'node:fs/promises';
-import { env } from 'node:process';
-import { type } from 'arktype';
-import { configDotenv } from 'dotenv';
-import { parseDocument } from 'yaml';
-import log from '~/utils/log';
-import { EnvOverrides, envVariables } from './env';
-import {
-	HeadplaneConfig,
-	headplaneConfig,
-	partialHeadplaneConfig,
-} from './schema';
-
-// Custom error for config issues
-export class ConfigError extends Error {
-	constructor(message: string) {
-		super(message);
-		this.name = 'ConfigError';
-	}
-}
-
-/**
- * Interpolate environment variables in a string
- * Replaces ${VAR_NAME} patterns with the actual environment variable values
- */
-export function interpolateEnvVars(str: string): string {
-	return str.replace(/\$\{([^}]+)\}/g, (_, varName) => {
-		const value = env[varName];
-		if (value === undefined) {
-			throw new ConfigError(`Environment variable "${varName}" not found`);
-		}
-		return value;
-	});
-}
-
-// loadConfig is a has a lifetime of the entire application and is
-// used to load the configuration for Headplane. It is called once.
-//
-// TODO: Potential for file watching on the configuration
-// But this may not be necessary as a use-case anyways
-export async function loadConfig({ loadEnv, path }: EnvOverrides) {
-	log.debug('config', 'Loading configuration file: %s', path);
-	await validateConfigPath(path);
-
-	const data = await loadConfigFile(path);
-	if (!data) {
-		throw new ConfigError('Failed to load configuration file');
-	}
-
-	let config = validateConfig({ ...data, debug: log.debugEnabled });
-
-	if (!loadEnv) {
-		log.debug('config', 'Environment variable overrides are disabled');
-		log.debug('config', 'This also disables the loading of a .env file');
-		const moddedConfig = await loadSecretsFromFiles(config);
-		log.debug('config', 'Loaded file-based secrets');
-		return moddedConfig;
-	}
-
-	log.info('config', 'Loading a .env file (if available)');
-	configDotenv({ override: true, quiet: true });
-	const merged = coalesceEnv(config);
-	if (merged) config = merged;
-	if (config.headscale && typeof config.headscale.config_path === 'string') {
-		config.headscale.config_path = interpolateEnvVars(
-			config.headscale.config_path,
-		);
-	}
-
-	const moddedConfig = await loadSecretsFromFiles(config);
-	log.debug('config', 'Loaded file-based secrets');
-
-	return moddedConfig;
-}
-
-/**
- * Recursively walks the config object; for any key in the whitelist of secret path keys,
- * reads that file and assigns its contents to the corresponding key
- * without the suffix, then removes the "_path" property.
- */
-const SECRET_PATH_KEYS = [
-	'pre_authkey_path',
-	'client_secret_path',
-	'headscale_api_key_path',
-	'cookie_secret_path',
-] as const;
-
-// For fast set hashing lookups, but we still need the array for typings
-const SECRET_PATH_KEY_SET = new Set<string>(SECRET_PATH_KEYS);
-
-type SecretPathKey = (typeof SECRET_PATH_KEYS)[number];
-type StripPath<S extends string> = S extends `${infer T}_path` ? T : never;
-type KeysToPromote<T> = Extract<keyof T & string, SecretPathKey>;
-type MappedKeys<T> = StripPath<KeysToPromote<T>>;
-
-type NonNullablized<T> = Omit<T, KeysToPromote<T> | MappedKeys<T>> & {
-	[K in MappedKeys<T>]-?: string;
-};
-
-type NestedNonNullablized<T> = T extends readonly (infer U)[]
-	? readonly NestedNonNullablized<U>[]
-	: T extends (infer U)[]
-		? NestedNonNullablized<U>[]
-		: T extends object
-			? {
-					[K in keyof NonNullablized<T>]: NestedNonNullablized<
-						NonNullablized<T>[K]
-					>;
-				}
-			: T;
-
-async function loadSecretsFromFiles<T extends object>(
-	obj: T,
-): Promise<NestedNonNullablized<T>> {
-	// Work with a Record so we can mutate/delete properties
-	const record = obj as Record<string, unknown>;
-
-	for (const key of Object.keys(record)) {
-		const val = record[key];
-
-		if (val && typeof val === 'object') {
-			// recurse into nested objects
-			record[key] = await loadSecretsFromFiles(val);
-			continue;
-		}
-
-		if (SECRET_PATH_KEY_SET.has(key) && typeof val === 'string') {
-			try {
-				const path = interpolateEnvVars(val);
-				const content = await readFile(path, 'utf8');
-				const secretKey = key.slice(0, -5); // drop '_path'
-				record[secretKey] = content.trim();
-				delete record[key];
-				log.debug('config', 'Loaded secret from %s → %s', val, secretKey);
-			} catch (err) {
-				if (err instanceof ConfigError) throw err;
-				log.error('config', 'Failed to read secret file %s: %s', val, err);
-				throw new ConfigError(`Failed to read secret file ${val}: ${err}`);
-			}
-		}
-	}
-
-	// Cast back to the original T so callers keep their precise type
-	return record as NestedNonNullablized<T>;
-}
-
-async function validateConfigPath(path: string) {
-	try {
-		await access(path, constants.F_OK | constants.R_OK);
-		log.info('config', 'Found a valid configuration file at %s', path);
-		return true;
-	} catch (error) {
-		log.error('config', 'Unable to read a configuration file at %s', path);
-		log.error('config', '%s', error);
-		throw new ConfigError(
-			`Unable to read configuration file at ${path}: ${error}`,
-		);
-	}
-}
-
-async function loadConfigFile(path: string): Promise<unknown> {
-	log.debug('config', 'Reading configuration file at %s', path);
-	try {
-		const data = await readFile(path, 'utf8');
-		const configYaml = parseDocument(data);
-		if (configYaml.errors.length > 0) {
-			log.error('config', 'Cannot parse configuration file at %s', path);
-			for (const error of configYaml.errors) {
-				log.error('config', ` - ${error.toString()}`);
-			}
-
-			throw new ConfigError(`Cannot parse configuration file at ${path}`);
-		}
-
-		if (configYaml.warnings.length > 0) {
-			log.warn(
-				'config',
-				'Warnings while parsing configuration file at %s',
-				path,
-			);
-			for (const warning of configYaml.warnings) {
-				log.warn('config', ` - ${warning.toString()}`);
-			}
-		}
-
-		return configYaml.toJSON() as unknown;
-	} catch (e) {
-		log.error('config', 'Error reading configuration file at %s', path);
-		log.error('config', '%s', e);
-		throw new ConfigError(`Error reading configuration file at ${path}: ${e}`);
-	}
-}
-
-export function validateConfig(config: unknown) {
-	log.debug('config', 'Validating Headplane configuration');
-	const result = headplaneConfig(config);
-	if (result instanceof type.errors) {
-		const errorMessages = [];
-		for (const [number, error] of result.entries()) {
-			const errorMsg = error.toString();
-			log.error('config', ` - (${number}): ${errorMsg}`);
-			errorMessages.push(errorMsg);
-		}
-		throw new ConfigError(errorMessages.join('\n'));
-	}
-	return result;
-}
-
-function coalesceEnv(config: HeadplaneConfig) {
-	const envConfig: Record<string, unknown> = {};
-	const rootKeys: string[] = Object.values(envVariables);
-
-	// Typescript is still insanely stupid at nullish filtering
-	const vars = Object.entries(env).filter(([key, value]) => {
-		if (!value) {
-			return false;
-		}
-
-		if (!key.startsWith('HEADPLANE_')) {
-			return false;
-		}
-
-		// Filter out the rootEnv configurations
-		if (rootKeys.includes(key)) {
-			return false;
-		}
-
-		return true;
-	}) as [string, string][];
-
-	log.debug('config', 'Coalescing %s environment variables', vars.length);
-	for (const [key, value] of vars) {
-		const configPath = key.replace('HEADPLANE_', '').toLowerCase().split('__');
-		log.debug(
-			'config',
-			` - ${key}=${new Array(value.length).fill('*').join('')}`,
-		);
-
-		let current = envConfig;
-		while (configPath.length > 1) {
-			const path = configPath.shift() as string;
-			if (!(path in current)) {
-				current[path] = {};
-			}
-
-			current = current[path] as Record<string, unknown>;
-		}
-
-		current[configPath[0]] = value;
-	}
-
-	const toMerge = coalesceConfig(envConfig);
-	if (!toMerge) {
-		return;
-	}
-
-	// Deep merge the environment variables into the configuration
-	// This will overwrite any existing values in the configuration
-	return deepMerge(config, toMerge);
-}
-
-export function coalesceConfig(config: unknown) {
-	log.debug('config', 'Revalidating config after coalescing variables');
-	const out = partialHeadplaneConfig(config);
-	if (out instanceof type.errors) {
-		log.error('config', 'Error parsing variables:');
-		for (const [number, error] of out.entries()) {
-			log.error('config', ` - (${number}): ${error.toString()}`);
-		}
-
-		return;
-	}
-
-	return out;
-}
-
-type DeepPartial<T> =
-	| {
-			[P in keyof T]?: DeepPartial<T[P]>;
-	  }
-	| undefined;
-
-function deepMerge<T>(target: T, source: DeepPartial<T>): T {
-	if (typeof target !== 'object' || typeof source !== 'object')
-		return source as T;
-	const result = { ...target } as T;
-
-	for (const key in source) {
-		const val = source[key];
-		if (val === undefined || val === null) {
-			continue;
-		}
-
-		if (typeof val === 'object') {
-			result[key] = deepMerge(result[key], val);
-			continue;
-		}
-
-		result[key] = val;
-	}
-
-	return result;
-}

app/server/config/schema.ts

@@ -1,223 +0,0 @@
-import { type } from 'arktype';
-
-const stringToBool = type('string | boolean').pipe((v) => {
-	if (typeof v === 'string') {
-		if (v === '1' || v === 'true' || v === 'yes') {
-			return true;
-		}
-
-		if (v === '0' || v === 'false' || v === 'no') {
-			return false;
-		}
-
-		throw new Error(`Invalid string value for boolean: ${v}`);
-	}
-
-	return Boolean(v);
-});
-
-const serverConfig = type({
-	host: 'string.ip',
-	port: type('string | number.integer').pipe((v) => Number(v)),
-	data_path: 'string = "/var/lib/headplane/"',
-	cookie_secret: '(32 <= string <= 32)?',
-	cookie_secret_path: 'string?',
-	cookie_secure: stringToBool,
-})
-	.narrow((obj: Record<string, unknown>, ctx: any) => {
-		const hasVal = obj.cookie_secret != null && `${obj.cookie_secret}` !== '';
-		const hasPath =
-			obj.cookie_secret_path != null && obj.cookie_secret_path !== '';
-		if (hasVal && hasPath)
-			return ctx.reject(
-				`Only one of "cookie_secret" or "cookie_secret_path" may be set.`,
-			);
-		if (!hasVal && !hasPath)
-			return ctx.reject(
-				`Either "cookie_secret" or "cookie_secret_path" must be provided for cookie_secret.`,
-			);
-		return true;
-	})
-	.onDeepUndeclaredKey('reject');
-
-const partialServerConfig = type({
-	host: 'string.ip?',
-	port: type('string | number.integer')
-		.pipe((v) => Number(v))
-		.optional(),
-	data_path: 'string = "/var/lib/headplane/"',
-	cookie_secret: '32 <= string <= 32?',
-	cookie_secret_path: 'string?',
-	cookie_secure: stringToBool.optional(),
-});
-
-const oidcConfig = type({
-	issuer: 'string.url',
-	client_id: 'string',
-	client_secret: 'string?',
-	client_secret_path: 'string?',
-	token_endpoint_auth_method:
-		'"client_secret_basic" | "client_secret_post" | "client_secret_jwt"',
-	redirect_uri: 'string.url?',
-	user_storage_file: 'string = "/var/lib/headplane/users.json"',
-	disable_api_key_login: stringToBool,
-	headscale_api_key: 'string?',
-	headscale_api_key_path: 'string?',
-	profile_picture_source: '"oidc" | "gravatar" = "oidc"',
-	strict_validation: stringToBool.default(true),
-	scope: 'string = "openid email profile"',
-	extra_params: 'Record<string, string>?',
-	authorization_endpoint: 'string.url?',
-	token_endpoint: 'string.url?',
-	userinfo_endpoint: 'string.url?',
-})
-	.narrow((obj: Record<string, unknown>, ctx: any) => {
-		const hasVal =
-			obj.headscale_api_key != null && `${obj.headscale_api_key}` !== '';
-		const hasPath =
-			obj.headscale_api_key_path != null && obj.headscale_api_key_path !== '';
-		if (hasVal && hasPath)
-			return ctx.reject(
-				`Only one of "headscale_api_key" or "headscale_api_key_path" may be set.`,
-			);
-		if (!hasVal && !hasPath)
-			return ctx.reject(
-				`Either "headscale_api_key" or "headscale_api_key_path" must be provided.`,
-			);
-		return true;
-	})
-	.onDeepUndeclaredKey('reject');
-
-const partialOidcConfig = type({
-	issuer: 'string.url?',
-	client_id: 'string?',
-	client_secret: 'string?',
-	client_secret_path: 'string?',
-	token_endpoint_auth_method:
-		'"client_secret_basic" | "client_secret_post" | "client_secret_jwt"?',
-	redirect_uri: 'string.url?',
-	user_storage_file: 'string?',
-	disable_api_key_login: stringToBool.optional(),
-	headscale_api_key: 'string?',
-	headscale_api_key_path: 'string?',
-	profile_picture_source: '("oidc" | "gravatar")?',
-	strict_validation: stringToBool.default(true),
-	scope: 'string?',
-	extra_params: 'Record<string, string>?',
-	authorization_endpoint: 'string.url?',
-	token_endpoint: 'string.url?',
-	userinfo_endpoint: 'string.url?',
-});
-
-const headscaleConfig = type({
-	url: type('string.url').pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v)),
-	tls_cert_path: 'string?',
-	public_url: 'string.url?',
-	config_path: 'string?',
-	config_strict: stringToBool,
-	dns_records_path: 'string?',
-}).onDeepUndeclaredKey('reject');
-
-const partialHeadscaleConfig = type({
-	url: type('string.url')
-		.pipe((v) => (v.endsWith('/') ? v.slice(0, -1) : v))
-		.optional(),
-	tls_cert_path: 'string?',
-	public_url: 'string.url?',
-	config_path: 'string?',
-	config_strict: stringToBool.optional(),
-	dns_records_path: 'string?',
-});
-
-const agentConfig = type({
-	enabled: stringToBool.default(false),
-	host_name: 'string = "headplane-agent"',
-	pre_authkey: 'string?',
-	pre_authkey_path: 'string?',
-	cache_ttl: 'number.integer = 180000',
-	cache_path: 'string = "/var/lib/headplane/agent_cache.json"',
-	executable_path: 'string = "/usr/libexec/headplane/agent"',
-	work_dir: 'string = "/var/lib/headplane/agent"',
-})
-	.narrow((obj: Record<string, unknown>, ctx: any) => {
-		const hasVal = obj.pre_authkey != null && `${obj.pre_authkey}` !== '';
-		const hasPath = obj.pre_authkey_path != null && obj.pre_authkey_path !== '';
-		if (hasVal && hasPath)
-			return ctx.reject(
-				`Only one of "pre_authkey" or "pre_authkey_path" may be set.`,
-			);
-		if (!hasVal && !hasPath)
-			return ctx.reject(
-				`Either "pre_authkey" or "pre_authkey_path" must be provided.`,
-			);
-		return true;
-	})
-	.onDeepUndeclaredKey('reject');
-
-const partialAgentConfig = type({
-	enabled: stringToBool.default(false),
-	host_name: 'string = "headplane-agent"',
-	pre_authkey: 'string?',
-	pre_authkey_path: 'string?',
-	cache_ttl: 'number.integer = 180000',
-	cache_path: 'string = "/var/lib/headplane/agent_cache.json"',
-	executable_path: 'string = "/usr/libexec/headplane/agent"',
-	work_dir: 'string = "/var/lib/headplane/agent"',
-});
-
-const dockerConfig = type({
-	enabled: stringToBool,
-	container_name: 'string = ""',
-	container_label: 'string = "me.tale.headplane.target=headscale"',
-	socket: 'string = "unix:///var/run/docker.sock"',
-});
-
-const partialDockerConfig = type({
-	enabled: stringToBool,
-	container_name: 'string | undefined',
-	container_label: 'string | undefined',
-	socket: 'string | undefined',
-}).partial();
-
-const kubernetesConfig = type({
-	enabled: stringToBool,
-	pod_name: 'string',
-	validate_manifest: stringToBool,
-});
-
-const procConfig = type({
-	enabled: stringToBool,
-});
-
-const integrationConfig = type({
-	'docker?': dockerConfig,
-	'kubernetes?': kubernetesConfig,
-	'proc?': procConfig,
-	'agent?': agentConfig,
-});
-
-const partialIntegrationConfig = type({
-	'docker?': partialDockerConfig,
-	'kubernetes?': kubernetesConfig.partial(),
-	'proc?': procConfig.partial(),
-	'agent?': partialAgentConfig,
-}).partial();
-
-export const headplaneConfig = type({
-	debug: stringToBool,
-	server: serverConfig,
-	'oidc?': oidcConfig,
-	'integration?': integrationConfig,
-	headscale: headscaleConfig,
-}).onDeepUndeclaredKey('delete');
-
-export const partialHeadplaneConfig = type({
-	debug: stringToBool,
-	server: partialServerConfig,
-	'oidc?': partialOidcConfig,
-	'integration?': partialIntegrationConfig,
-	headscale: partialHeadscaleConfig,
-}).partial();
-
-export type HeadplaneConfig = typeof headplaneConfig.infer;
-export type PartialHeadplaneConfig = typeof partialHeadplaneConfig.infer;

app/server/config/utils.ts

@@ -0,0 +1,9 @@
+import type { Traversal } from 'arktype';
+import log from '~/utils/log';
+
+export function deprecatedField() {
+	return (_: unknown, ctx: Traversal) => {
+		log.warn('config', `${ctx.propString} is deprecated and has no effect.`);
+		return true;
+	};
+}

app/server/db/pruner.ts

@@ -1,14 +1,12 @@
 import { eq, isNotNull } from 'drizzle-orm';
-import { LoaderFunctionArgs } from 'react-router';
-import { Machine } from '~/types';
 import log from '~/utils/log';
-import { LoadContext } from '..';
+import type { Route } from '../../layouts/+types/dashboard';
 import { ephemeralNodes } from './schema';
 
 export async function pruneEphemeralNodes({
 	context,
 	request,
-}: LoaderFunctionArgs<LoadContext>) {
+}: Route.LoaderArgs) {
 	const session = await context.sessions.auth(request);
 	const ephemerals = await context.db
 		.select()
@@ -20,11 +18,8 @@ export async function pruneEphemeralNodes({
 		return;
 	}
 
-	const { nodes } = await context.client.get<{ nodes: Machine[] }>(
-		'v1/node',
-		session.api_key,
-	);
-
+	const api = context.hsApi.getRuntimeClient(session.api_key);
+	const nodes = await api.getNodes();
 	const toPrune = nodes.filter((node) => {
 		if (node.online) {
 			return false;
@@ -42,7 +37,7 @@ export async function pruneEphemeralNodes({
 	const promises = toPrune.map((node) => {
 		return async () => {
 			log.debug('api', `Pruning node ${node.name}`);
-			await context.client.delete(`v1/node/${node.id}`, session.api_key);
+			await api.deleteNode(node.id);
 
 			await context.db
 				.delete(ephemeralNodes)

app/server/headscale/api-client.ts

@@ -1,263 +0,0 @@
-import { readFile } from 'node:fs/promises';
-import { data } from 'react-router';
-import { Agent, Dispatcher, request } from 'undici';
-import { errors } from 'undici';
-import log from '~/utils/log';
-import ResponseError from './api-error';
-
-function isNodeNetworkError(error: unknown): error is NodeJS.ErrnoException {
-	const keys = Object.keys(error as Record<string, unknown>);
-	return (
-		typeof error === 'object' &&
-		error !== null &&
-		keys.includes('code') &&
-		keys.includes('errno')
-	);
-}
-
-function friendlyError(givenError: unknown) {
-	let error: unknown = givenError;
-	if (error instanceof AggregateError) {
-		error = error.errors[0];
-	}
-
-	switch (true) {
-		case error instanceof errors.BodyTimeoutError:
-		case error instanceof errors.ConnectTimeoutError:
-		case error instanceof errors.HeadersTimeoutError:
-			return data('Timed out waiting for a response from the Headscale API', {
-				statusText: 'Request Timeout',
-				status: 408,
-			});
-
-		case error instanceof errors.SocketError:
-		case error instanceof errors.SecureProxyConnectionError:
-		case error instanceof errors.ClientClosedError:
-		case error instanceof errors.ClientDestroyedError:
-		case error instanceof errors.RequestAbortedError:
-			return data('The Headscale API is not reachable', {
-				statusText: 'Service Unavailable',
-				status: 503,
-			});
-
-		case error instanceof errors.InvalidArgumentError:
-		case error instanceof errors.InvalidReturnValueError:
-		case error instanceof errors.NotSupportedError:
-			return data('Unable to make a request (this is most likely a bug)', {
-				statusText: 'Internal Server Error',
-				status: 500,
-			});
-
-		case error instanceof errors.HeadersOverflowError:
-		case error instanceof errors.RequestContentLengthMismatchError:
-		case error instanceof errors.ResponseContentLengthMismatchError:
-		case error instanceof errors.ResponseExceededMaxSizeError:
-			return data('The Headscale API returned a malformed response', {
-				statusText: 'Bad Gateway',
-				status: 502,
-			});
-
-		case isNodeNetworkError(error):
-			if (error.code === 'ECONNREFUSED') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'ENOTFOUND') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'EAI_AGAIN') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'ETIMEDOUT') {
-				return data('Timed out waiting for a response from the Headscale API', {
-					statusText: 'Request Timeout',
-					status: 408,
-				});
-			}
-
-			if (error.code === 'ECONNRESET') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'EPIPE') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'ENETUNREACH') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			if (error.code === 'ENETRESET') {
-				return data('The Headscale API is not reachable', {
-					statusText: 'Service Unavailable',
-					status: 503,
-				});
-			}
-
-			return data('The Headscale API is not reachable', {
-				statusText: 'Service Unavailable',
-				status: 503,
-			});
-
-		default:
-			return data((error as Error).message ?? 'An unknown error occurred', {
-				statusText: 'Internal Server Error',
-				status: 500,
-			});
-	}
-}
-
-export async function createApiClient(base: string, certPath?: string) {
-	if (!certPath) {
-		return new ApiClient(new Agent(), base);
-	}
-
-	try {
-		log.debug('config', 'Loading certificate from %s', certPath);
-		const data = await readFile(certPath, 'utf8');
-
-		log.info('config', 'Using certificate from %s', certPath);
-		return new ApiClient(new Agent({ connect: { ca: data.trim() } }), base);
-	} catch (error) {
-		log.error('config', 'Failed to load Headscale TLS cert: %s', error);
-		log.debug('config', 'Error Details: %o', error);
-		return new ApiClient(new Agent(), base);
-	}
-}
-
-export class ApiClient {
-	private agent: Agent;
-	private base: string;
-
-	constructor(agent: Agent, base: string) {
-		this.agent = agent;
-		this.base = base;
-	}
-
-	private async defaultFetch(
-		url: string,
-		options?: Partial<Dispatcher.RequestOptions>,
-	) {
-		const method = options?.method ?? 'GET';
-		log.debug('api', '%s %s', method, url);
-
-		try {
-			const res = await request(new URL(url, this.base), {
-				dispatcher: this.agent,
-				headers: {
-					...options?.headers,
-					Accept: 'application/json',
-					'User-Agent': `Headplane/${__VERSION__}`,
-				},
-				body: options?.body,
-				method,
-			});
-
-			return res;
-		} catch (error: unknown) {
-			throw friendlyError(error);
-		}
-	}
-
-	async healthcheck() {
-		try {
-			const res = await request(new URL('/health', this.base), {
-				dispatcher: this.agent,
-				headers: {
-					Accept: 'application/json',
-					'User-Agent': `Headplane/${__VERSION__}`,
-				},
-			});
-
-			return res.statusCode === 200;
-		} catch (error) {
-			log.debug('api', 'Healthcheck failed %o', error);
-			return false;
-		}
-	}
-
-	async get<T = unknown>(url: string, key: string) {
-		const res = await this.defaultFetch(`/api/${url}`, {
-			headers: {
-				Authorization: `Bearer ${key}`,
-			},
-		});
-
-		if (res.statusCode >= 400) {
-			log.debug('api', 'GET %s failed with status %d', url, res.statusCode);
-			throw new ResponseError(res.statusCode, await res.body.text());
-		}
-
-		return res.body.json() as Promise<T>;
-	}
-
-	async post<T = unknown>(url: string, key: string, body?: unknown) {
-		const res = await this.defaultFetch(`/api/${url}`, {
-			method: 'POST',
-			body: body ? JSON.stringify(body) : undefined,
-			headers: {
-				Authorization: `Bearer ${key}`,
-			},
-		});
-
-		if (res.statusCode >= 400) {
-			log.debug('api', 'POST %s failed with status %d', url, res.statusCode);
-			throw new ResponseError(res.statusCode, await res.body.text());
-		}
-
-		return res.body.json() as Promise<T>;
-	}
-
-	async put<T = unknown>(url: string, key: string, body?: unknown) {
-		const res = await this.defaultFetch(`/api/${url}`, {
-			method: 'PUT',
-			body: body ? JSON.stringify(body) : undefined,
-			headers: {
-				Authorization: `Bearer ${key}`,
-			},
-		});
-
-		if (res.statusCode >= 400) {
-			log.debug('api', 'PUT %s failed with status %d', url, res.statusCode);
-			throw new ResponseError(res.statusCode, await res.body.text());
-		}
-
-		return res.body.json() as Promise<T>;
-	}
-
-	async delete<T = unknown>(url: string, key: string) {
-		const res = await this.defaultFetch(`/api/${url}`, {
-			method: 'DELETE',
-			headers: {
-				Authorization: `Bearer ${key}`,
-			},
-		});
-
-		if (res.statusCode >= 400) {
-			log.debug('api', 'DELETE %s failed with status %d', url, res.statusCode);
-			throw new ResponseError(res.statusCode, await res.body.text());
-		}
-
-		return res.body.json() as Promise<T>;
-	}
-}

app/server/headscale/api-error.ts

@@ -1,19 +0,0 @@
-// Represents an error that occurred during a response
-// Thrown when status codes are >= 400
-export default class ResponseError extends Error {
-	status: number;
-	response: string;
-	responseObject?: Record<string, unknown>;
-
-	constructor(status: number, response: string) {
-		super(`Response Error (${status}): ${response}`);
-		this.name = 'ResponseError';
-		this.status = status;
-		this.response = response;
-
-		try {
-			// Try to parse the response as JSON to get a response object
-			this.responseObject = JSON.parse(response);
-		} catch {}
-	}
-}

app/server/headscale/api/endpoints/api-keys.ts

@@ -0,0 +1,23 @@
+import type { Key } from '~/types';
+import { defineApiEndpoints } from '../factory';
+
+export interface ApiKeyEndpoints {
+	/**
+	 * Retrieves all API keys from the Headscale instance.
+	 *
+	 * @returns An array of `Key` objects representing the API keys.
+	 */
+	getApiKeys(): Promise<Key[]>;
+}
+
+export default defineApiEndpoints<ApiKeyEndpoints>((client, apiKey) => ({
+	getApiKeys: async () => {
+		const { apiKeys } = await client.apiFetch<{ apiKeys: Key[] }>(
+			'GET',
+			'v1/apikey',
+			apiKey,
+		);
+
+		return apiKeys;
+	},
+}));

app/server/headscale/api/endpoints/index.ts

@@ -0,0 +1,79 @@
+import {
+	composeEndpoints,
+	defineApiEndpoints,
+	type ExtractApiEndpoints,
+	type UnionToIntersection,
+} from '../factory';
+import type { HeadscaleApiInterface } from '../index';
+import apiKeyEndpoints from './api-keys';
+import nodeEndpoints from './nodes';
+import policyEndpoints from './policy';
+import preAuthKeyEndpoints from './pre-auth-keys';
+import userEndpoints from './users';
+
+interface HealthcheckEndpoint {
+	/**
+	 * Checks if the Headscale instance is healthy.
+	 *
+	 * @returns A boolean indicating if the instance is healthy.
+	 */
+	isHealthy(): Promise<boolean>;
+}
+
+const healthcheckEndpoint = defineApiEndpoints<HealthcheckEndpoint>(
+	(client, apiKey) => ({
+		isHealthy: async () => {
+			try {
+				const res = await client.rawFetch('/health', {
+					method: 'GET',
+					headers: {
+						// This doesn't really matter
+						Authorization: `Bearer ${apiKey}`,
+					},
+				});
+
+				return res.statusCode === 200;
+			} catch {
+				return false;
+			}
+		},
+	}),
+);
+
+/**
+ * A constant list of all endpoint groups.
+ * Add new endpoint groups here.
+ */
+export const endpointSets = [
+	apiKeyEndpoints,
+	healthcheckEndpoint,
+	nodeEndpoints,
+	policyEndpoints,
+	preAuthKeyEndpoints,
+	userEndpoints,
+] as const;
+
+/**
+ * All of the available API methods when interacting with Headscale's API.
+ * We have wrapped each operation with nice methods and parameters to make it
+ * easier to do integration testing by spinning up an actual Headscale instance
+ * and calling these methods against it.
+ *
+ * We also have the benefit of supporting multiple Headscale versions by
+ * passing in different internal implementations based on the OpenAPI spec.
+ */
+export type RuntimeApiClient = UnionToIntersection<
+	ExtractApiEndpoints<(typeof endpointSets)[number]>
+>;
+
+/**
+ * Composes all endpoint groups into a single runtime API client.
+ *
+ * @param client - The client helpers for making API requests.
+ * @param apiKey - The API key for authentication.
+ * @returns A fully composed runtime API client.
+ */
+export default (
+	client: HeadscaleApiInterface['clientHelpers'],
+	apiKey: string,
+) => composeEndpoints(endpointSets, client, apiKey);