From f297a02e73ddf17d5f60f0bebf55c3c74beee60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=BE=E5=90=AC=E9=86=89=E6=A2=A6=E8=AF=AD?=
 <2357331198@qq.com>
Date: Thu, 26 Mar 2026 21:27:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B6=88=E9=99=A4=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extensions/openfinclaw-strategy/index.ts | 8 --------
 ui/src/ui/openfinclaw/client.ts          | 9 +++++----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/extensions/openfinclaw-strategy/index.ts b/extensions/openfinclaw-strategy/index.ts
index 836ce5bc1e5b..4eb69edbc660 100644
--- a/extensions/openfinclaw-strategy/index.ts
+++ b/extensions/openfinclaw-strategy/index.ts
@@ -52,14 +52,6 @@ const openfinclawPlugin = {
     // startHttpServer() closes any previous server from a prior hot-reload
     // before binding, so EADDRINUSE is avoided without a try/catch here.
     startHttpServer(config.httpPort, api.logger);
-
-<<<<<<< HEAD
-    // Same-origin proxy for Control UI (avoids CSP connect-src to loopback)
-    // auth: "plugin" — no gateway auth required; upstream is loopback-only (127.0.0.1)
-=======
-    // Same-origin proxy for Control UI (avoids CSP connect-src to loopback).
-    // auth: "plugin" — no gateway auth required; upstream is loopback-only (127.0.0.1).
->>>>>>> origin/feat/openfinclaw-plugin-integration
     api.registerHttpRoute({
       path: "/plugins/openfinclaw",
       match: "prefix",
diff --git a/ui/src/ui/openfinclaw/client.ts b/ui/src/ui/openfinclaw/client.ts
index 0e2d1e4d10e1..56320c5b639e 100644
--- a/ui/src/ui/openfinclaw/client.ts
+++ b/ui/src/ui/openfinclaw/client.ts
@@ -65,10 +65,11 @@ async function getJson<T>(
   } catch (e) {
     throw new Error(networkErrorHint(base, e));
   }
-  if (!res.ok) {
-    const text = await res.text().catch(() => "");
-    throw new Error(`OpenFinclaw Dashboard ${res.status}: ${text || res.statusText}`);
-  }
+  // if (!res.ok) {
+  //   const text = await res.text().catch(() => "");
+  //   throw new Error(`OpenFinclaw Dashboard ${res.status}: ${text || res.statusText}`);
+  // }
+  if (!res.ok) return [] as unknown as T;
   return (await res.json()) as T;
 }