Fix the frontend route overlapping with backend ones

src-python/src/main.py

@@ -158,21 +158,6 @@ async def startup_event():
     logger.info("✅ Server ready for robot connections!")
 
 
-@app.get("/")
-async def serve_frontend():
-    """Serve the main frontend page"""
-    static_dir = get_static_dir()
-    if not static_dir:
-        return {
-            "message": "Frontend not built. Run 'bun run build' to build the frontend."
-        }
-
-    index_file = os.path.join(static_dir, "index.html")
-    if os.path.exists(index_file):
-        return FileResponse(index_file)
-    return {"message": "Frontend not built. Run 'bun run build' to build the frontend."}
-
-
 @app.get("/status")
 async def get_status():
     """Get server status for health checks"""
@@ -185,39 +170,6 @@ async def get_status():
     }
 
 
-# Serve static assets from the _app directory
-@app.get("/_app/{path:path}")
-async def serve_app_assets(path: str):
-    """Serve Svelte app assets"""
-    static_dir = get_static_dir()
-    if not static_dir:
-        raise HTTPException(status_code=404, detail="Frontend not found")
-
-    file_path = os.path.join(static_dir, "_app", path)
-    if os.path.exists(file_path) and os.path.isfile(file_path):
-        return FileResponse(file_path)
-    raise HTTPException(status_code=404, detail="File not found")
-
-
-# Catch-all route for client-side routing (SPA fallback)
-@app.get("/{path:path}")
-async def serve_spa_fallback(path: str):
-    """Serve the frontend for client-side routing"""
-    # If it's an API, WebSocket, or static asset path, let it pass through to other handlers
-    if path.startswith(("api/", "ws/", "robots/", "_app/", "static/", "favicon")):
-        raise HTTPException(status_code=404, detail="Not found")
-
-    # For all other paths, serve the index.html (SPA)
-    static_dir = get_static_dir()
-    if not static_dir:
-        raise HTTPException(status_code=404, detail="Frontend not found")
-
-    index_file = os.path.join(static_dir, "index.html")
-    if os.path.exists(index_file):
-        return FileResponse(index_file)
-    raise HTTPException(status_code=404, detail="Frontend not found")
-
-
 # ============= ROBOT MANAGEMENT API =============
 
 
@@ -687,6 +639,53 @@ async def sync_slave_with_current_state(robot_id: str, websocket: WebSocket):
         })
 
 
+# ============= FRONTEND SERVING ROUTES (Must be last) =============
+
+
+# Serve static assets from the _app directory
+@app.get("/_app/{path:path}")
+async def serve_app_assets(path: str):
+    """Serve Svelte app assets"""
+    static_dir = get_static_dir()
+    if not static_dir:
+        raise HTTPException(status_code=404, detail="Frontend not found")
+
+    file_path = os.path.join(static_dir, "_app", path)
+    if os.path.exists(file_path) and os.path.isfile(file_path):
+        return FileResponse(file_path)
+    raise HTTPException(status_code=404, detail="File not found")
+
+
+@app.get("/")
+async def serve_frontend():
+    """Serve the main frontend page"""
+    static_dir = get_static_dir()
+    if not static_dir:
+        return {
+            "message": "Frontend not built. Run 'bun run build' to build the frontend."
+        }
+
+    index_file = os.path.join(static_dir, "index.html")
+    if os.path.exists(index_file):
+        return FileResponse(index_file)
+    return {"message": "Frontend not built. Run 'bun run build' to build the frontend."}
+
+
+# Catch-all route for client-side routing (SPA fallback) - MUST BE LAST
+@app.get("/{path:path}")
+async def serve_spa_fallback(path: str):
+    """Serve the frontend for client-side routing"""
+    # For all paths not handled by other routes, serve the index.html (SPA)
+    static_dir = get_static_dir()
+    if not static_dir:
+        raise HTTPException(status_code=404, detail="Frontend not found")
+
+    index_file = os.path.join(static_dir, "index.html")
+    if os.path.exists(index_file):
+        return FileResponse(index_file)
+    raise HTTPException(status_code=404, detail="Frontend not found")
+
+
 if __name__ == "__main__":
     import uvicorn