From 0f58cef75eb5da780dc4435199c55c925b8ace35 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 5 Apr 2026 11:42:29 +0100
Subject: [PATCH] fix: finalize facade re-entry landing cleanup (#61180)
 (thanks @adam91holt)

---
 CHANGELOG.md                          | 25 ------------
 src/plugin-sdk/facade-runtime.test.ts | 57 +++++++++++++++------------
 2 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c60c5a9b2..03972168b7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,31 +56,6 @@ Docs: https://docs.openclaw.ai
 - Telegram: fix current-model checks in the model picker, HTML-format non-default `/model` confirmations, explicit topic replies, persisted reaction ownership across restarts, caption-media placeholder and `file_id` preservation on download failure, and upgraded-install inbound image reads. (#60384, #60042, #59634, #59207, #59948, #59971)
 - Telegram/local Bot API: honor `channels.telegram.apiRoot` for buffered media downloads, add `channels.telegram.network.dangerouslyAllowPrivateNetwork` for trusted fake-IP setups, and require `channels.telegram.trustedLocalFileRoots` before reading absolute Bot API `file_path` values. (#59544, #60705)
 - Matrix: recover more reliably when secret storage or recovery keys are missing by recreating secret storage during repair and backup reset, hold crypto snapshot locks during persistence, and surface explicit too-large attachment markers. (#59846, #59851, #60599, #60289)
-=======
-- Plugins/facades: back-fill facade sentinels before tracked-plugin resolution re-enters config loading, so facade exports stay defined during circular provider normalization. (#61180) Thanks @adam91holt.
-- Gateway/macOS: let launchd `KeepAlive` own in-process gateway restarts again, adding a short supervised-exit delay so rapid restarts avoid launchd crash-loop unloads while `openclaw gateway restart` still reports real LaunchAgent errors synchronously.
-- Synology Chat/security: route webhook token comparison through the shared constant-time secret helper for consistency with other bundled plugins.
-- Models/MiniMax: honor `MINIMAX_API_HOST` for implicit bundled MiniMax provider catalogs so China-hosted API-key setups pick `api.minimaxi.com/anthropic` without manual provider config. (#34524) Thanks @caiqinghua.
-- Usage/MiniMax: invert remaining-style `usage_percent` fields when MiniMax reports only remaining percentage data, so usage bars stop showing nearly-full remaining quota as nearly-exhausted usage. (#60254) Thanks @jwchmodx.
-- MiniMax: advertise image input on bundled `MiniMax-M2.7` and `MiniMax-M2.7-highspeed` model definitions so image-capable flows can route through the M2.7 family correctly. (#54843) Thanks @MerlinMiao88888888.
-- Media understanding: auto-register image-capable config providers for vision routing, so custom GLM-style provider ids with image models stop failing with “no media-understanding provider registered”. (#51418) Thanks @xydt-610.
-- Providers/OpenAI: preserve native `reasoning.effort: "none"` and strict tool schemas on direct OpenAI-family endpoints, keep compat routes on compat shaping, fix Responses WebSocket warm-up behavior, keep stable session and turn metadata, and fall back more gracefully after early WebSocket failures.
-- Providers/OpenAI Codex: split native `contextWindow` from runtime `contextTokens`, keep the default effective cap at `272000`, and expose a per-model `contextTokens` override on `models.providers.*.models[]`.
-- Providers/compat: stop forcing OpenAI-only defaults on proxy and custom OpenAI-compatible routes, preserve native vendor-specific reasoning/tool/streaming behavior across Anthropic-compatible, Moonshot, Mistral, ModelStudio, OpenRouter, xAI, and Z.ai endpoints, and route GitHub Copilot Claude models through Anthropic Messages instead of OpenAI Responses.
-- Providers/Model Studio: preserve native streaming usage reporting for DashScope-compatible endpoints even when they are configured under a generic provider key, so streamed token totals stop sticking at zero. (#52395) Thanks @IVY-AI-gif.
-- Providers/OpenAI-compatible WS: compute fallback token totals from normalized usage when providers omit or zero `total_tokens`, so DashScope-compatible sessions stop storing zero totals after alias normalization. (#54940) Thanks @lyfuci.
-- Status/usage: let `/status` and `session_status` fall back to transcript token totals when the session meta store stayed at zero, so LM Studio, Ollama, DashScope, and similar OpenAI-compatible providers stop showing `Context: 0/...`. (#55041) Thanks @jjjojoj.
-- Providers/Z.AI: preserve explicitly registered `glm-5-*` variants like `glm-5-turbo` instead of intercepting them with the generic GLM-5 forward-compat shim. (#48185) Thanks @haoyu-haoyu.
-- Live model switching: only treat explicit user-driven model changes as pending live switches, so fallback rotation, heartbeat overrides, and compaction no longer trip `LiveSessionModelSwitchError` before making an API call. (#60266) Thanks @kiranvk-2011.
-- Voice-call/OpenAI: pass full plugin config into realtime transcription provider resolution so streaming calls can discover the bundled OpenAI realtime transcription provider again. Fixes #60936. Thanks @sliekens and @vincentkoc.
-- Plugins/OpenAI: enable `gpt-image-1` reference-image edits through `/images/edits` multipart uploads, and stop inferring unsupported resolution overrides when no explicit `size` or `resolution` is provided.
-- Gateway/startup: default `gateway.mode` to `local` when unset, detect PID recycling in gateway lock files on Windows and macOS, and show startup progress so healthy restarts stop getting blocked by stale locks. (#54801, #60085, #59843)
-- Mobile pairing/Android: tighten secure endpoint handling so Tailscale and public remote setup reject cleartext endpoints, private LAN pairing still works, merged-role approvals mint both node and operator device tokens, and bootstrap tokens survive node auto-pair until operator approval finishes. (#60128, #60208, #60221)
-- Android/Talk Mode: restore spoken assistant replies on node-scoped sessions by keeping reply routing synced to the resolved node session key and pausing mic capture during reply playback. (#60306) Thanks @MKV21.
-- Telegram: fix current-model checks in the model picker, HTML-format non-default `/model` confirmations, explicit topic replies, persisted reaction ownership across restarts, caption-media placeholder and `file_id` preservation on download failure, and upgraded-install inbound image reads. (#60384, #60042, #59634, #59207, #59948, #59971)
-- Telegram/local Bot API: honor `channels.telegram.apiRoot` for buffered media downloads, add `channels.telegram.network.dangerouslyAllowPrivateNetwork` for trusted fake-IP setups, and require `channels.telegram.trustedLocalFileRoots` before reading absolute Bot API `file_path` values. (#59544, #60705)
-- Matrix: recover more reliably when secret storage or recovery keys are missing by recreating secret storage during repair and backup reset, hold crypto snapshot locks during persistence, and surface explicit too-large attachment markers. (#59846, #59851, #60599, #60289)
->>>>>>> 0c5fc661aa (fix: refresh facade re-entry landing delta (#61180) (thanks @adam91holt))
 - ACP/agents: inherit the target agent workspace for cross-agent ACP spawns and fall back safely when the inherited workspace no longer exists. (#58438) Thanks @zssggle-rgb.
 - ACPX/Windows: preserve backslashes and absolute `.exe` paths in Claude CLI parsing, and fail fast on wrapper-script targets with guidance to use `cmd.exe /c`, `powershell.exe -File`, or `node <script>`. (#60689) Thanks @steipete.
 - Agents/Anthropic: preserve native `toolu_*` replay ids on direct Anthropic and Anthropic Vertex paths so cache-sensitive history stops rewriting known-valid Anthropic tool-use ids. (#52612)
diff --git a/src/plugin-sdk/facade-runtime.test.ts b/src/plugin-sdk/facade-runtime.test.ts
index e4f1b9a6939..a2476a41104 100644
--- a/src/plugin-sdk/facade-runtime.test.ts
+++ b/src/plugin-sdk/facade-runtime.test.ts
@@ -143,32 +143,36 @@ describe("plugin-sdk facade runtime", () => {
     const reentryMarkers: Array<string | undefined> = [];
 
     vi.resetModules();
-    vi.doMock("../plugins/manifest-registry.js", () => ({
-      loadPluginManifestRegistry: vi.fn(() => {
-        const load = (
-          globalThis as typeof globalThis & {
-            [FACADE_RUNTIME_GLOBAL]?: typeof loadBundledPluginPublicSurfaceModuleSync;
+    vi.doMock("../plugins/manifest-registry.js", async (importOriginal) => {
+      const actual = await importOriginal<typeof import("../plugins/manifest-registry.js")>();
+      return {
+        ...actual,
+        loadPluginManifestRegistry: vi.fn(() => {
+          const load = (
+            globalThis as typeof globalThis & {
+              [FACADE_RUNTIME_GLOBAL]?: typeof loadBundledPluginPublicSurfaceModuleSync;
+            }
+          )[FACADE_RUNTIME_GLOBAL];
+          if (typeof load !== "function") {
+            throw new Error("missing facade runtime test loader");
           }
-        )[FACADE_RUNTIME_GLOBAL];
-        if (typeof load !== "function") {
-          throw new Error("missing facade runtime test loader");
-        }
-        const reentered = load<{ marker?: string }>({
-          dirName: "demo",
-          artifactBasename: "api.js",
-        });
-        reentryMarkers.push(reentered.marker);
-        return {
-          plugins: [
-            {
-              id: "demo",
-              rootDir: path.join(dir, "demo"),
-              origin: "bundled",
-            },
-          ],
-        };
-      }),
-    }));
+          const reentered = load<{ marker?: string }>({
+            dirName: "demo",
+            artifactBasename: "api.js",
+          });
+          reentryMarkers.push(reentered.marker);
+          return {
+            plugins: [
+              {
+                id: "demo",
+                rootDir: path.join(dir, "demo"),
+                origin: "bundled",
+              },
+            ],
+          };
+        }),
+      };
+    });
 
     const facadeRuntime = await import("./facade-runtime.js");
     process.env.OPENCLAW_BUNDLED_PLUGINS_DIR = dir;
@@ -181,7 +185,8 @@ describe("plugin-sdk facade runtime", () => {
     });
 
     expect(loaded.marker).toBe("post-load-ok");
-    expect(reentryMarkers).toEqual(["post-load-ok"]);
+    expect(reentryMarkers.length).toBeGreaterThan(0);
+    expect(reentryMarkers.every((marker) => marker === "post-load-ok")).toBe(true);
     expect(facadeRuntime.listImportedBundledPluginFacadeIds()).toEqual(["demo"]);
     facadeRuntime.resetFacadeRuntimeStateForTest();
     vi.doUnmock("../plugins/manifest-registry.js");