Merge branch 'microsoft:main' into msri_enhanced_planning

Author: raghav-2002-os

.github/workflows/checks.yaml

@@ -36,6 +36,7 @@ jobs:
 
 
   lint:
+    needs: format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -55,6 +56,7 @@ jobs:
           poe lint samples
           poe lint tests
   pyright:
+    needs: lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -73,6 +75,7 @@ jobs:
           poe pyright src
 
   test:
+    needs: pyright
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/docker-build-push.yml

@@ -23,10 +23,10 @@ jobs:
       matrix:
         image:
           - name: magentic-ui-browser
-            context: src/magentic_ui/docker/magentic-ui-browser-docker
+            context: docker/magentic-ui-browser-docker
             registry_name: microsoft/magentic-ui-browser
           - name: magentic-ui-python-env
-            context: src/magentic_ui/docker/magentic-ui-python-env
+            context: docker/magentic-ui-python-env
             registry_name: microsoft/magentic-ui-python-env
 
     steps:

README.md

@@ -357,11 +357,10 @@ yarn build
 magentic-ui --port 8081
 ```
 
->**Note**: Running this command for the first time will build two docker containers required for the Magentic-UI agents. If you encounter problems, you can build them directly with the following commands from inside the repository: 
+>**Note**: Running this command for the first time will pull two docker images required for the Magentic-UI agents. If you encounter problems, you can build them directly with the following command:
 ```bash
-docker build -t magentic-ui-vnc-browser:latest ./src/magentic_ui/docker/magentic-ui-browser-docker
-
-docker build -t magentic-ui-python-env:latest ./src/magentic_ui/docker/magentic-ui-python-env
+cd docker
+sh build-all.sh
 ```
 
 #### Running the UI from source

TROUBLESHOOTING.md

@@ -35,26 +35,21 @@ Please read [Linux post-installation steps for Docker Engine
 - Make sure port 8081 is not being used by another application.
 - You can change the port with `magentic ui --port <another_port>`.
 
-## 3. 🏗️ Docker Image Build Fails
+## 3. 🏗️ Docker Image Pull Fails
 
 **Error:**  
-`build docker image Failed` or similar
+`Pulling docker image...Failed` or similar
 
 **Solution:**  
-- First try to rebuild the docker with the command:
-  ```bash
-  magentic ui --rebuild-docker
-  ```
 - Make sure you have a stable internet connection.
 - Update Docker to the latest version.
 - Check that you have enough disk space.
 - Try building the images manually:
   ```bash
-  docker build -t magentic-ui-vnc-browser:latest ./src/magentic_ui/docker/magentic-ui-browser-docker
-  docker build -t magentic-ui-python-env:latest ./src/magentic_ui/docker/magentic-ui-python-env
+  cd docker
+  sh build-all.sh
   ```
 
-
 ## 4. 🪟 WSL2 Not Set Up on Windows
 
 **Error:**  

docker/build-all.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+CWD="$(pwd)"
+if [[ "${CWD##*/}" != "docker" ]]; then
+    echo "Error: Must run this script from the docker folder."
+    exit 1
+fi
+
+# Run both build scripts in parallel in their respective directories
+(
+    cd magentic-ui-browser-docker && sh build.sh
+) &
+
+(
+    cd magentic-ui-python-env && sh build.sh
+) &
+
+wait
+echo "Both builds completed."

src/magentic_ui/docker/magentic-ui-browser-docker/Dockerfile renamed to docker/magentic-ui-browser-docker/Dockerfile

@@ -10,7 +10,7 @@ if [[ "$1" == "--push" ]] || [[ "${PUSH}" == "true" ]]; then
     PUSH_FLAG="--push"
     echo "Building and pushing images..."
 else
-    echo "Building images locally (use --push flag or set PUSH=true to push to registry)..."
+    echo "Building images locally..."
 fi
 
 docker buildx build \