From a89239e29e36b097ccafb2874fd80d7ae72be070 Mon Sep 17 00:00:00 2001
From: a1chzt <chizblank@gmail.com>
Date: Mon, 13 Apr 2026 21:36:16 +0800
Subject: [PATCH 1/3] fix: clear stale cloud model on disconnect and hide plan
 credits row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After cloud disconnect, the defaultModelId still pointed to a cloud/link
model, allowing the bot to keep using it. Three fixes:

1. cloud-disconnect route now calls ensureValidDefaultModel() + syncAll()
   so BYOK fallback works (matches cloud-profile/disconnect pattern)
2. disconnectDesktopCloud() clears defaultModelId when it was a cloud
   model, preventing stale refs when no BYOK is available
3. onCloudStateChanged restarts OpenClaw on both connect and disconnect
   (was connect-only) to flush cached provider credentials

Also removes the plan credits (套餐积分) row from the sidebar balance popup.
---
 apps/controller/src/app/container.ts          |  2 +-
 .../src/routes/desktop-compat-routes.ts       |  8 +++++--
 .../controller/src/store/nexu-config-store.ts | 11 ++++++++++
 apps/web/src/layouts/workspace-layout.tsx     | 22 -------------------
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/apps/controller/src/app/container.ts b/apps/controller/src/app/container.ts
index f5b2bbdeb..187135771 100644
--- a/apps/controller/src/app/container.ts
+++ b/apps/controller/src/app/container.ts
@@ -156,7 +156,7 @@ export async function createContainer(): Promise<ControllerContainer> {
   // auto-switching the default model during startup or first-channel connect.
   configStore.onCloudStateChanged = async (change) => {
     await openclawSyncService.syncAll();
-    if (!change.hadCloudInventory && change.hasCloudInventory) {
+    if (change.hadCloudInventory !== change.hasCloudInventory) {
       await openclawProcess.stop();
       openclawProcess.enableAutoRestart();
       openclawProcess.start();
diff --git a/apps/controller/src/routes/desktop-compat-routes.ts b/apps/controller/src/routes/desktop-compat-routes.ts
index f188c3f8c..93f4704bb 100644
--- a/apps/controller/src/routes/desktop-compat-routes.ts
+++ b/apps/controller/src/routes/desktop-compat-routes.ts
@@ -301,8 +301,12 @@ export function registerDesktopCompatRoutes(
         },
       },
     }),
-    async (c) =>
-      c.json(await container.desktopLocalService.disconnectCloud(), 200),
+    async (c) => {
+      const result = await container.desktopLocalService.disconnectCloud();
+      await container.modelProviderService.ensureValidDefaultModel();
+      const { configPushed } = await container.openclawSyncService.syncAll();
+      return c.json({ ...result, configPushed }, 200);
+    },
   );
 
   app.openapi(
diff --git a/apps/controller/src/store/nexu-config-store.ts b/apps/controller/src/store/nexu-config-store.ts
index f733911f6..1b3a51393 100644
--- a/apps/controller/src/store/nexu-config-store.ts
+++ b/apps/controller/src/store/nexu-config-store.ts
@@ -2688,6 +2688,12 @@ export class NexuConfigStore {
     const previousCloud = readDesktopCloud(await this.getConfig());
     this.abortDesktopCloudPolling();
 
+    const config = await this.getConfig();
+    const currentModelId = config.runtime.defaultModelId;
+    const wasCloudModel =
+      resolveManagedCloudModel(currentModelId, previousCloud.models ?? []) !==
+      null;
+
     await this.setDesktopCloudState({
       connected: false,
       polling: false,
@@ -2699,6 +2705,11 @@ export class NexuConfigStore {
       apiKey: null,
       models: [],
     });
+
+    if (wasCloudModel) {
+      await this.setDefaultModel("");
+    }
+
     await this.onCloudStateChanged?.({
       hadCloudInventory: (previousCloud.models?.length ?? 0) > 0,
       hasCloudInventory: false,
diff --git a/apps/web/src/layouts/workspace-layout.tsx b/apps/web/src/layouts/workspace-layout.tsx
index b08336aef..47d6a49fd 100644
--- a/apps/web/src/layouts/workspace-layout.tsx
+++ b/apps/web/src/layouts/workspace-layout.tsx
@@ -1085,28 +1085,6 @@ function WorkspaceLayoutInner() {
                                 {sidebarCreditBreakdown.giftedBalance}
                               </span>
                             </div>
-                            <div className="flex items-center justify-between">
-                              <span className="flex items-center gap-1 text-[11px] text-text-muted">
-                                {t("layout.sidebar.balancePopup.recharged")}
-                                <span className="group relative inline-flex cursor-default items-center">
-                                  <Info
-                                    size={10}
-                                    className="text-text-muted/60"
-                                  />
-                                  <span
-                                    role="tooltip"
-                                    className="pointer-events-none absolute bottom-full left-0 z-[10000] mb-1.5 w-52 rounded-md bg-neutral-800 px-2.5 py-1.5 text-left text-[11px] font-normal leading-snug text-white opacity-0 shadow-lg transition-opacity duration-150 group-hover:opacity-100"
-                                  >
-                                    {t(
-                                      "layout.sidebar.balancePopup.rechargedTooltip",
-                                    )}
-                                  </span>
-                                </span>
-                              </span>
-                              <span className="tabular-nums text-[11px] font-medium text-text-secondary">
-                                {sidebarCreditBreakdown.planBalance}
-                              </span>
-                            </div>
                           </div>
                           <button
                             type="button"

From 4bd156ce5caa7c28a490e2bf76f249571af77e29 Mon Sep 17 00:00:00 2001
From: a1chzt <chizblank@gmail.com>
Date: Mon, 13 Apr 2026 21:43:58 +0800
Subject: [PATCH 2/3] fix: auto-select default model on cloud state change

Add ensureValidDefaultModel() to onCloudStateChanged callback so that
after re-login, a cloud model is auto-selected when defaultModelId is
empty. This fixes the "No model configured" state after logout + re-login.
---
 apps/controller/src/app/container.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/controller/src/app/container.ts b/apps/controller/src/app/container.ts
index 187135771..f6a4bed6e 100644
--- a/apps/controller/src/app/container.ts
+++ b/apps/controller/src/app/container.ts
@@ -152,9 +152,10 @@ export async function createContainer(): Promise<ControllerContainer> {
   );
   const githubStarVerificationService = new GithubStarVerificationService();
 
-  // Wire cloud state change callback to sync refreshed cloud inventory without
-  // auto-switching the default model during startup or first-channel connect.
+  // Wire cloud state change callback to sync refreshed cloud inventory and
+  // auto-select a default model when inventory changes.
   configStore.onCloudStateChanged = async (change) => {
+    await modelProviderService.ensureValidDefaultModel();
     await openclawSyncService.syncAll();
     if (change.hadCloudInventory !== change.hasCloudInventory) {
       await openclawProcess.stop();

From f5cc28ef987049801dec98e448b563b2854f232e Mon Sep 17 00:00:00 2001
From: a1chzt <chizblank@gmail.com>
Date: Mon, 13 Apr 2026 21:59:08 +0800
Subject: [PATCH 3/3] fix: skip model/prompt override when selectedModelRef is
 empty

The nexu-runtime-model plugin reads the model ref from disk on every
turn. When selectedModelRef is "" (after cloud disconnect), the plugin
was still returning { modelOverride: "" } which let OpenClaw fall back
to the session's cached provider. Now it returns early with no override,
so OpenClaw uses whatever is in the current compiled config (which has
no link provider after disconnect).
---
 .../static/runtime-plugins/nexu-runtime-model/index.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/controller/static/runtime-plugins/nexu-runtime-model/index.js b/apps/controller/static/runtime-plugins/nexu-runtime-model/index.js
index bcf0c814f..3e289f16b 100644
--- a/apps/controller/static/runtime-plugins/nexu-runtime-model/index.js
+++ b/apps/controller/static/runtime-plugins/nexu-runtime-model/index.js
@@ -44,7 +44,7 @@ const plugin = {
   register(api) {
     api.on("before_model_resolve", async () => {
       const state = loadState();
-      if (!state) {
+      if (!state || !state.selectedModelRef) {
         return;
       }
       const slashIndex = state.selectedModelRef.indexOf("/");
@@ -63,7 +63,7 @@ const plugin = {
 
     api.on("before_prompt_build", async () => {
       const state = loadState();
-      if (!state?.promptNotice) {
+      if (!state?.selectedModelRef || !state?.promptNotice) {
         return;
       }
       return {