From ad743797e40d36dd3da71e526805dddcb34ccbbd Mon Sep 17 00:00:00 2001
From: Conrad <conrad@innoiso.com>
Date: Mon, 26 Jan 2026 22:53:06 -0800
Subject: [PATCH] macOS: keep Not configured from snapping back to remote

---
 apps/macos/Sources/Clawdbot/AppState.swift | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/macos/Sources/Clawdbot/AppState.swift b/apps/macos/Sources/Clawdbot/AppState.swift
index 6ccb83369..3b2bce93c 100644
--- a/apps/macos/Sources/Clawdbot/AppState.swift
+++ b/apps/macos/Sources/Clawdbot/AppState.swift
@@ -533,6 +533,15 @@ final class AppState {
                     gateway["remote"] = remote
                     changed = true
                 }
+            } else if connectionMode == .unconfigured {
+                // Prevent implicit remote-mode re-selection when the user explicitly
+                // chooses "Not configured" in the UI. Leaving gateway.remote.url
+                // behind causes applyConfigOverrides to force .remote.
+                if var remote = gateway["remote"] as? [String: Any], remote["url"] != nil {
+                    remote.removeValue(forKey: "url")
+                    gateway["remote"] = remote
+                    changed = true
+                }
             }
 
             guard changed else { return }