@nextclaw/ui 0.12.9 → 0.12.11

package/src/app.tsx

@@ -1,77 +1,237 @@
-import { lazy, Suspense } from 'react';
-import { QueryClientProvider } from '@tanstack/react-query';
-import { AccountPanel } from '@/account/components/account-panel';
-import { appQueryClient } from '@/app-query-client';
-import { LoginPage } from '@/components/auth/login-page';
-import { AppLayout } from '@/components/layout/AppLayout';
-import { isTransientAuthStatusBootstrapError, useAuthStatus } from '@/hooks/use-auth';
-import { useRealtimeQueryBridge } from '@/hooks/use-realtime-query-bridge';
-import { AppPresenterProvider } from '@/presenter/app-presenter-context';
-import { PwaInstallBanner, PwaUpdateBanner } from '@/pwa/components/pwa-install-entry';
-import { startNextClawPwa } from '@/pwa/register-pwa';
-import { Toaster } from 'sonner';
-import { Routes, Route, Navigate } from 'react-router-dom';
-import { useEffect } from 'react';
+import { lazy, Suspense, useEffect } from "react";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { appQueryClient } from "@/app-query-client";
+import { AppManagerProvider } from "@/app/components/app-manager-provider";
+import { LoginPage } from "@/components/auth/login-page";
+import { AppLayout } from "@/components/layout/AppLayout";
+import { AccountPanel } from "@/features/account";
+import { useSystemStatusSources } from "@/features/system-status";
+import {
+  isTransientAuthStatusBootstrapError,
+  useAuthStatus,
+} from "@/hooks/use-auth";
+import { useRealtimeQueryBridge } from "@/hooks/use-realtime-query-bridge";
+import {
+  PwaInstallBanner,
+  PwaUpdateBanner,
+} from "@/pwa/components/pwa-install-entry";
+import { startNextClawPwa } from "@/pwa/register-pwa";
+import { Toaster } from "sonner";
+import { Routes, Route, Navigate } from "react-router-dom";
 
-const ModelConfigPage = lazy(async () => ({ default: (await import('@/components/config/ModelConfig')).ModelConfig }));
-const ChatPage = lazy(async () => ({ default: (await import('@/components/chat/chat-page')).ChatPage }));
-const SearchConfigPage = lazy(async () => ({ default: (await import('@/components/config/SearchConfig')).SearchConfig }));
-const ProvidersListPage = lazy(async () => ({ default: (await import('@/components/config/ProvidersList')).ProvidersList }));
-const ChannelsListPage = lazy(async () => ({ default: (await import('@/components/config/ChannelsList')).ChannelsList }));
-const RuntimeConfigPage = lazy(async () => ({ default: (await import('@/components/config/RuntimeConfig')).RuntimeConfig }));
-const DesktopUpdateConfigPage = lazy(async () => ({ default: (await import('@/components/config/desktop-update-config')).DesktopUpdateConfig }));
-const SecurityConfigPage = lazy(async () => ({ default: (await import('@/components/config/security-config')).SecurityConfig }));
-const SessionsConfigPage = lazy(async () => ({ default: (await import('@/components/config/SessionsConfig')).SessionsConfig }));
-const SecretsConfigPage = lazy(async () => ({ default: (await import('@/components/config/SecretsConfig')).SecretsConfig }));
-const RemoteAccessPage = lazy(async () => ({ default: (await import('@/components/remote/RemoteAccessPage')).RemoteAccessPage }));
-const MarketplacePage = lazy(async () => ({ default: (await import('@/components/marketplace/MarketplacePage')).MarketplacePage }));
-const McpMarketplacePage = lazy(async () => ({ default: (await import('@/components/marketplace/mcp/McpMarketplacePage')).McpMarketplacePage }));
+const ModelConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/ModelConfig")).ModelConfig,
+}));
+const ChatPage = lazy(async () => ({
+  default: (await import("@/components/chat/chat-page")).ChatPage,
+}));
+const SearchConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/SearchConfig")).SearchConfig,
+}));
+const ProvidersListPage = lazy(async () => ({
+  default: (await import("@/components/config/ProvidersList")).ProvidersList,
+}));
+const ChannelsListPage = lazy(async () => ({
+  default: (await import("@/components/config/ChannelsList")).ChannelsList,
+}));
+const RuntimeConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/RuntimeConfig")).RuntimeConfig,
+}));
+const DesktopUpdateConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/desktop-update-config"))
+    .DesktopUpdateConfig,
+}));
+const SecurityConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/security-config")).SecurityConfig,
+}));
+const SessionsConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/SessionsConfig")).SessionsConfig,
+}));
+const SecretsConfigPage = lazy(async () => ({
+  default: (await import("@/components/config/SecretsConfig")).SecretsConfig,
+}));
+const RemoteAccessPage = lazy(async () => ({
+  default: (await import("@/features/remote")).RemoteAccessPage,
+}));
+const MarketplacePage = lazy(async () => ({
+  default: (await import("@/components/marketplace/marketplace-page"))
+    .MarketplacePage,
+}));
+const McpMarketplacePage = lazy(async () => ({
+  default: (await import("@/components/marketplace/mcp/mcp-marketplace-page"))
+    .McpMarketplacePage,
+}));
 
 function RouteFallback() {
-  return <div className="h-full w-full animate-pulse rounded-2xl border border-border/40 bg-card/40" />;
+  return (
+    <div className="h-full w-full animate-pulse rounded-2xl border border-border/40 bg-card/40" />
+  );
 }
 
 function LazyRoute({ children }: { children: JSX.Element }) {
   return <Suspense fallback={<RouteFallback />}>{children}</Suspense>;
 }
 
+function ProtectedRoutes() {
+  return (
+    <Routes>
+      <Route path="/chat/skills" element={<Navigate to="/skills" replace />} />
+      <Route path="/chat/cron" element={<Navigate to="/cron" replace />} />
+      <Route path="/chat/agents" element={<Navigate to="/agents" replace />} />
+      <Route
+        path="/chat/:sessionId?"
+        element={
+          <LazyRoute>
+            <ChatPage view="chat" />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/agents"
+        element={
+          <LazyRoute>
+            <ChatPage view="agents" />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/skills"
+        element={
+          <LazyRoute>
+            <ChatPage view="skills" />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/cron"
+        element={
+          <LazyRoute>
+            <ChatPage view="cron" />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/model"
+        element={
+          <LazyRoute>
+            <ModelConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/search"
+        element={
+          <LazyRoute>
+            <SearchConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/providers"
+        element={
+          <LazyRoute>
+            <ProvidersListPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/channels"
+        element={
+          <LazyRoute>
+            <ChannelsListPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/runtime"
+        element={
+          <LazyRoute>
+            <RuntimeConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/updates"
+        element={
+          <LazyRoute>
+            <DesktopUpdateConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/remote"
+        element={
+          <LazyRoute>
+            <RemoteAccessPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/security"
+        element={
+          <LazyRoute>
+            <SecurityConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/sessions"
+        element={
+          <LazyRoute>
+            <SessionsConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/secrets"
+        element={
+          <LazyRoute>
+            <SecretsConfigPage />
+          </LazyRoute>
+        }
+      />
+      <Route path="/settings" element={<Navigate to="/model" replace />} />
+      <Route
+        path="/marketplace/skills"
+        element={<Navigate to="/skills" replace />}
+      />
+      <Route
+        path="/marketplace"
+        element={<Navigate to="/marketplace/plugins" replace />}
+      />
+      <Route
+        path="/marketplace/mcp"
+        element={
+          <LazyRoute>
+            <McpMarketplacePage />
+          </LazyRoute>
+        }
+      />
+      <Route
+        path="/marketplace/:type"
+        element={
+          <LazyRoute>
+            <MarketplacePage />
+          </LazyRoute>
+        }
+      />
+      <Route path="/" element={<Navigate to="/chat" replace />} />
+      <Route path="*" element={<Navigate to="/chat" replace />} />
+    </Routes>
+  );
+}
+
 function ProtectedApp() {
   useRealtimeQueryBridge(appQueryClient);
+  useSystemStatusSources();
 
   return (
-    <AppPresenterProvider>
+    <AppManagerProvider>
       <AppLayout>
-        <div className="w-full h-full">
-          <Routes>
-            <Route path="/chat/skills" element={<Navigate to="/skills" replace />} />
-            <Route path="/chat/cron" element={<Navigate to="/cron" replace />} />
-            <Route path="/chat/agents" element={<Navigate to="/agents" replace />} />
-            <Route path="/chat/:sessionId?" element={<LazyRoute><ChatPage view="chat" /></LazyRoute>} />
-            <Route path="/agents" element={<LazyRoute><ChatPage view="agents" /></LazyRoute>} />
-            <Route path="/skills" element={<LazyRoute><ChatPage view="skills" /></LazyRoute>} />
-            <Route path="/cron" element={<LazyRoute><ChatPage view="cron" /></LazyRoute>} />
-            <Route path="/model" element={<LazyRoute><ModelConfigPage /></LazyRoute>} />
-            <Route path="/search" element={<LazyRoute><SearchConfigPage /></LazyRoute>} />
-            <Route path="/providers" element={<LazyRoute><ProvidersListPage /></LazyRoute>} />
-            <Route path="/channels" element={<LazyRoute><ChannelsListPage /></LazyRoute>} />
-            <Route path="/runtime" element={<LazyRoute><RuntimeConfigPage /></LazyRoute>} />
-            <Route path="/updates" element={<LazyRoute><DesktopUpdateConfigPage /></LazyRoute>} />
-            <Route path="/remote" element={<LazyRoute><RemoteAccessPage /></LazyRoute>} />
-            <Route path="/security" element={<LazyRoute><SecurityConfigPage /></LazyRoute>} />
-            <Route path="/sessions" element={<LazyRoute><SessionsConfigPage /></LazyRoute>} />
-            <Route path="/secrets" element={<LazyRoute><SecretsConfigPage /></LazyRoute>} />
-            <Route path="/settings" element={<Navigate to="/model" replace />} />
-            <Route path="/marketplace/skills" element={<Navigate to="/skills" replace />} />
-            <Route path="/marketplace" element={<Navigate to="/marketplace/plugins" replace />} />
-            <Route path="/marketplace/mcp" element={<LazyRoute><McpMarketplacePage /></LazyRoute>} />
-            <Route path="/marketplace/:type" element={<LazyRoute><MarketplacePage /></LazyRoute>} />
-            <Route path="/" element={<Navigate to="/chat" replace />} />
-            <Route path="*" element={<Navigate to="/chat" replace />} />
-          </Routes>
-        </div>
+        <ProtectedRoutes />
       </AppLayout>
       <AccountPanel />
-    </AppPresenterProvider>
+    </AppManagerProvider>
   );
 }
 
@@ -80,7 +240,11 @@ function AuthGate() {
   const isTransientBootstrapFailure =
     authStatus.isError && isTransientAuthStatusBootstrapError(authStatus.error);
 
-  if ((authStatus.isLoading && !authStatus.isError) || isTransientBootstrapFailure || authStatus.isError) {
+  if (
+    (authStatus.isLoading && !authStatus.isError) ||
+    isTransientBootstrapFailure ||
+    authStatus.isError
+  ) {
     return <ProtectedApp />;
   }