diff --git a/docs/getting-started.md b/docs/getting-started.md
index a68b841e0..3f1843fc1 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -93,7 +93,6 @@ path that is currently incompatible with Bun and can cause memory corruption on
 reconnect. If you use WhatsApp, run the Gateway with **Node** until this is
 resolved. Baileys: https://github.com/WhiskeySockets/Baileys · Bun issue:
 https://github.com/oven-sh/bun/issues/5951
-
 ## 5) Pair + connect your first chat surface
 
 ### WhatsApp (QR login)
diff --git a/docs/wizard.md b/docs/wizard.md
index c513eb377..65bf7d8c3 100644
--- a/docs/wizard.md
+++ b/docs/wizard.md
@@ -82,6 +82,7 @@ It does **not** install or change anything on the remote host.
    - Windows: Scheduled Task
      - Runs on user logon; headless/system services are not configured by default.
    - **Runtime selection:** Node (recommended; required for WhatsApp) or Bun (faster, but incompatible with WhatsApp).
+   - **Runtime selection:** Node (recommended; required for WhatsApp) or Bun (faster, but incompatible with WhatsApp).
 
 7) **Health check**
    - Starts the Gateway (if needed) and runs `clawdbot health`.
diff --git a/src/commands/configure.ts b/src/commands/configure.ts
index 027f35dd0..2bc84c12e 100644
--- a/src/commands/configure.ts
+++ b/src/commands/configure.ts
@@ -64,6 +64,11 @@ import {
 import { setupProviders } from "./onboard-providers.js";
 import { promptRemoteGatewayConfig } from "./onboard-remote.js";
 import { setupSkills } from "./onboard-skills.js";
+import {
+  DEFAULT_GATEWAY_DAEMON_RUNTIME,
+  GATEWAY_DAEMON_RUNTIME_OPTIONS,
+  type GatewayDaemonRuntime,
+} from "./daemon-runtime.js";
 import {
   applyOpenAICodexModelDefault,
   OPENAI_CODEX_DEFAULT_MODEL,
diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
index 44f2ac5e2..beb414790 100644
--- a/src/commands/doctor.ts
+++ b/src/commands/doctor.ts
@@ -50,6 +50,11 @@ import {
   guardCancel,
   printWizardHeader,
 } from "./onboard-helpers.js";
+import {
+  DEFAULT_GATEWAY_DAEMON_RUNTIME,
+  GATEWAY_DAEMON_RUNTIME_OPTIONS,
+  type GatewayDaemonRuntime,
+} from "./daemon-runtime.js";
 import { ensureSystemdUserLingerInteractive } from "./systemd-linger.js";
 
 function resolveMode(cfg: ClawdbotConfig): "local" | "remote" {
diff --git a/src/commands/onboard-non-interactive.ts b/src/commands/onboard-non-interactive.ts
index ae96a26cd..24ad6d285 100644
--- a/src/commands/onboard-non-interactive.ts
+++ b/src/commands/onboard-non-interactive.ts
@@ -34,6 +34,10 @@ import type {
   OnboardMode,
   OnboardOptions,
 } from "./onboard-types.js";
+import {
+  DEFAULT_GATEWAY_DAEMON_RUNTIME,
+  isGatewayDaemonRuntime,
+} from "./daemon-runtime.js";
 import { ensureSystemdUserLingerNonInteractive } from "./systemd-linger.js";
 
 export async function runNonInteractiveOnboarding(
diff --git a/src/wizard/onboarding.ts b/src/wizard/onboarding.ts
index beb405b68..290bc7d3a 100644
--- a/src/wizard/onboarding.ts
+++ b/src/wizard/onboarding.ts
@@ -57,6 +57,11 @@ import type {
   OnboardOptions,
   ResetScope,
 } from "../commands/onboard-types.js";
+import {
+  DEFAULT_GATEWAY_DAEMON_RUNTIME,
+  GATEWAY_DAEMON_RUNTIME_OPTIONS,
+  type GatewayDaemonRuntime,
+} from "../commands/daemon-runtime.js";
 import {
   applyOpenAICodexModelDefault,
   OPENAI_CODEX_DEFAULT_MODEL,