fluxy-bot 0.1.41 → 0.1.42

package/client/src/App.tsx

@@ -7,6 +7,7 @@ import DashboardPage from './components/Dashboard/DashboardPage';
 import ChatView from './components/Chat/ChatView';
 import FluxyFab from './components/FluxyFab';
 import BuildOverlay from './components/BuildOverlay';
+
 import OnboardWizard from './components/Onboard/OnboardWizard';
 import {
   Sheet,
@@ -71,6 +72,7 @@ export default function App() {
     <>
       <ErrorBoundary fallback={<DashboardError />}>
         <DashboardLayout onOpenOnboard={() => setShowOnboard(true)}>
+          <BuildOverlay ws={ws} />
           <DashboardPage />
         </DashboardLayout>
       </ErrorBoundary>
@@ -117,7 +119,6 @@ export default function App() {
         </SheetContent>
       </Sheet>
 
-      <BuildOverlay ws={ws} />
       <FluxyFab onClick={() => setChatOpen((o) => !o)} />
 
       {/* Onboarding wizard overlay */}

package/client/src/components/BuildOverlay.tsx

@@ -20,9 +20,13 @@ export default function BuildOverlay({ ws }: Props) {
         setCopied(false);
       }),
       ws.on('build:complete', () => {
-        setState('idle');
-        // Auto-refresh after a brief delay so the user sees the transition
-        setTimeout(() => window.location.reload(), 500);
+        // Wait for API to be healthy before reloading (worker may be restarting)
+        const checkAndReload = () => {
+          fetch('/api/health')
+            .then((r) => { if (r.ok) window.location.reload(); else setTimeout(checkAndReload, 500); })
+            .catch(() => setTimeout(checkAndReload, 500));
+        };
+        checkAndReload();
       }),
       ws.on('build:error', (data: { error: string }) => {
         setState('error');
@@ -43,7 +47,7 @@ export default function BuildOverlay({ ws }: Props) {
   };
 
   return (
-    <div className="fixed inset-0 z-[100] bg-black/80 backdrop-blur-sm flex items-center justify-center p-6">
+    <div className="absolute inset-0 z-50 bg-black/80 backdrop-blur-sm flex items-center justify-center p-6">
       {state === 'building' && (
         <div className="text-center">
           <div className="inline-block h-8 w-8 animate-spin rounded-full border-2 border-white/20 border-t-white mb-4" />

package/client/src/components/Layout/DashboardLayout.tsx

@@ -17,7 +17,7 @@ export default function DashboardLayout({ children, onOpenOnboard }: Props) {
           <Sidebar />
         </div>
         {/* Main content */}
-        <main className="flex-1 overflow-y-auto p-4 md:p-6">{children}</main>
+        <main className="relative flex-1 overflow-y-auto p-4 md:p-6">{children}</main>
       </div>
     </div>
   );

package/client/src/hooks/useChat.ts

@@ -52,56 +52,67 @@ export function useChat(ws: WsClient | null) {
       .catch(() => {});
   }, []);
 
-  // Load messages when conversationId is set
+  // Load messages when conversationId is set (with retry for worker restarts)
   useEffect(() => {
     if (!conversationId) return;
-    fetch(`/api/conversations/${conversationId}`)
-      .then((r) => {
-        if (!r.ok) throw new Error('not found');
-        return r.json();
-      })
-      .then((data) => {
-        if (data.messages?.length) {
-          setMessages(
-            data.messages
-              .filter((m: any) => m.role === 'user' || m.role === 'assistant')
-              .map((m: any) => {
-                // Backward compat for audio_data: file path → URL, data: prefix → legacy, else → prepend data URL
-                let audioData: string | undefined;
-                if (m.audio_data) {
-                  if (m.audio_data.startsWith('data:')) {
-                    audioData = m.audio_data; // legacy data URL
-                  } else if (m.audio_data.includes('/')) {
-                    audioData = `/api/files/${m.audio_data}`; // file path → HTTP URL
-                  } else {
-                    audioData = `data:audio/webm;base64,${m.audio_data}`; // raw base64
+    let cancelled = false;
+    let retries = 0;
+
+    const loadMessages = () => {
+      fetch(`/api/conversations/${conversationId}`)
+        .then((r) => {
+          if (!r.ok) throw new Error('not found');
+          return r.json();
+        })
+        .then((data) => {
+          if (cancelled) return;
+          if (data.messages?.length) {
+            setMessages(
+              data.messages
+                .filter((m: any) => m.role === 'user' || m.role === 'assistant')
+                .map((m: any) => {
+                  let audioData: string | undefined;
+                  if (m.audio_data) {
+                    if (m.audio_data.startsWith('data:')) {
+                      audioData = m.audio_data;
+                    } else if (m.audio_data.includes('/')) {
+                      audioData = `/api/files/${m.audio_data}`;
+                    } else {
+                      audioData = `data:audio/webm;base64,${m.audio_data}`;
+                    }
                   }
-                }
-
-                // Parse stored attachments
-                let attachments: StoredAttachment[] | undefined;
-                if (m.attachments) {
-                  try {
-                    attachments = JSON.parse(m.attachments);
-                  } catch { /* ignore malformed */ }
-                }
-
-                return {
-                  id: m.id,
-                  role: m.role,
-                  content: m.content,
-                  timestamp: m.created_at,
-                  audioData,
-                  hasAttachments: !!(attachments && attachments.length > 0),
-                  attachments,
-                };
-              }),
-          );
-        }
-      })
-      .catch(() => {
-        // Network error (worker may be restarting) — don't clear, just ignore
-      });
+
+                  let attachments: StoredAttachment[] | undefined;
+                  if (m.attachments) {
+                    try {
+                      attachments = JSON.parse(m.attachments);
+                    } catch { /* ignore malformed */ }
+                  }
+
+                  return {
+                    id: m.id,
+                    role: m.role,
+                    content: m.content,
+                    timestamp: m.created_at,
+                    audioData,
+                    hasAttachments: !!(attachments && attachments.length > 0),
+                    attachments,
+                  };
+                }),
+            );
+          }
+        })
+        .catch(() => {
+          // Worker may be restarting — retry a few times
+          if (!cancelled && retries < 5) {
+            retries++;
+            setTimeout(loadMessages, 1000);
+          }
+        });
+    };
+
+    loadMessages();
+    return () => { cancelled = true; };
   }, [conversationId]);
 
   // Persist conversationId to DB when it changes