From bfae1a7915625254071d17bc498d775a7569f2e0 Mon Sep 17 00:00:00 2001
From: BKF-Gitty <bandark@mac.com>
Date: Thu, 16 Apr 2026 23:57:20 +0300
Subject: [PATCH] fix(onboard): preserve existing gateway auth token during
 re-onboard

---
 src/commands/onboard-non-interactive/local/gateway-config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/commands/onboard-non-interactive/local/gateway-config.ts b/src/commands/onboard-non-interactive/local/gateway-config.ts
index 05159f96ce5..c655ace9c7e 100644
--- a/src/commands/onboard-non-interactive/local/gateway-config.ts
+++ b/src/commands/onboard-non-interactive/local/gateway-config.ts
@@ -54,7 +54,8 @@ export function applyNonInteractiveGatewayConfig(params: {
   let nextConfig = params.nextConfig;
   const explicitGatewayToken = normalizeGatewayTokenInput(opts.gatewayToken);
   const envGatewayToken = normalizeGatewayTokenInput(process.env.OPENCLAW_GATEWAY_TOKEN);
-  let gatewayToken = explicitGatewayToken || envGatewayToken || undefined;
+  const existingToken = normalizeGatewayTokenInput(nextConfig?.gateway?.auth?.token);
+  let gatewayToken = explicitGatewayToken || envGatewayToken || existingToken || undefined;
   const gatewayTokenRefEnv = normalizeOptionalString(opts.gatewayTokenRefEnv ?? "") ?? "";
 
   if (authMode === "token") {