From 06a6d6967a0489293c479ea843330fc19ea82a89 Mon Sep 17 00:00:00 2001
From: taeng0204 <taeng02@icloud.com>
Date: Sat, 2 May 2026 13:49:26 +0900
Subject: [PATCH] fix(dashboard): defer unknown-route redirect while dashboard
 plugins load

---
 web/src/App.tsx | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/src/App.tsx b/web/src/App.tsx
index 813f48cc5f..7598e169bc 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -80,6 +80,25 @@ function RootRedirect() {
   return <Navigate to="/sessions" replace />;
 }
 
+function UnknownRouteFallback({ pluginsLoading }: { pluginsLoading: boolean }) {
+  if (!pluginsLoading) {
+    return <Navigate to="/sessions" replace />;
+  }
+
+  return (
+    <div
+      className="flex min-h-[16rem] min-w-0 items-center justify-center"
+      aria-busy="true"
+      aria-live="polite"
+    >
+      <div className="flex items-center gap-2 text-sm text-muted-foreground">
+        <Spinner />
+        <span>Loading dashboard plugins…</span>
+      </div>
+    </div>
+  );
+}
+
 const CHAT_NAV_ITEM: NavItem = {
   path: "/chat",
   labelKey: "chat",
@@ -582,7 +601,9 @@ export default function App() {
                   ))}
                   <Route
                     path="*"
-                    element={<Navigate to="/sessions" replace />}
+                    element={
+                      <UnknownRouteFallback pluginsLoading={pluginsLoading} />
+                    }
                   />
                 </Routes>