fluxy-bot 0.1.45 → 0.2.0

package/bin/cli.js

@@ -8,10 +8,8 @@ import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+const ROOT = path.resolve(__dirname, '..');
 const DATA_DIR = path.join(os.homedir(), '.fluxy');
-const APP_DIR = path.join(DATA_DIR, 'app');
-// Use ~/.fluxy/app/ if it exists (editable copy), otherwise fall back to npm install location
-const ROOT = fs.existsSync(APP_DIR) ? APP_DIR : path.resolve(__dirname, '..');
 const CONFIG_PATH = path.join(DATA_DIR, 'config.json');
 const BIN_DIR = path.join(DATA_DIR, 'bin');
 const CF_PATH = path.join(BIN_DIR, 'cloudflared');

package/client/src/App.tsx

@@ -6,8 +6,6 @@ import DashboardLayout from './components/Layout/DashboardLayout';
 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,
@@ -72,7 +70,6 @@ export default function App() {
     <>
       <ErrorBoundary fallback={<DashboardError />}>
         <DashboardLayout onOpenOnboard={() => setShowOnboard(true)}>
-          <BuildOverlay ws={ws} />
           <DashboardPage />
         </DashboardLayout>
       </ErrorBoundary>

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

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

package/client/src/hooks/useChat.ts

@@ -52,67 +52,58 @@ export function useChat(ws: WsClient | null) {
       .catch(() => {});
   }, []);
 
-  // Load messages when conversationId is set (with retry for worker restarts)
+  // Load messages when conversationId is set
   useEffect(() => {
     if (!conversationId) return;
-    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}`;
-                    }
-                  }
-
-                  let attachments: StoredAttachment[] | undefined;
-                  if (m.attachments) {
-                    try {
-                      attachments = JSON.parse(m.attachments);
-                    } catch { /* ignore malformed */ }
+    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
                   }
-
-                  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; };
+                }
+
+                // 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(() => {
+        // Conversation gone — clear
+        setConversationId(null);
+        fetch('/api/context/clear', { method: 'POST' }).catch(() => {});
+      });
   }, [conversationId]);
 
   // Persist conversationId to DB when it changes
@@ -132,8 +123,7 @@ export function useChat(ws: WsClient | null) {
     if (!ws) return;
 
     const unsubs = [
-      ws.on('bot:typing', (data: { conversationId?: string }) => {
-        if (data.conversationId) setConversationId(data.conversationId);
+      ws.on('bot:typing', () => {
         setStreaming(true);
         setTools([]);
       }),
@@ -233,14 +223,13 @@ export function useChat(ws: WsClient | null) {
   }, [ws, conversationId]);
 
   const clearContext = useCallback(() => {
-    // Clear UI state only — starts a fresh conversation on next message.
-    // Old messages stay in DB (used as context for the agent).
     setMessages([]);
     setConversationId(null);
     setStreamBuffer('');
     setStreaming(false);
     setTools([]);
     prevConvId.current = null;
+    loaded.current = false;
     fetch('/api/context/clear', { method: 'POST' }).catch(() => {});
   }, []);
 

package/client/src/lib/ws-client.ts

@@ -20,7 +20,7 @@ export class WsClient {
 
   constructor(url?: string) {
     const proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
-    const host = location.host;
+    const host = import.meta.env.DEV ? 'localhost:3000' : location.host;
     this.url = url ?? `${proto}//${host}/ws`;
   }