Add script and Justfile targets to sync all PRs with origin/main

Author: oleander

Dockerfile

@@ -46,8 +46,18 @@ WORKDIR /app
 
 RUN git clone --branch main /source /app --local
 RUN git remote set-url origin https://github.com/oleander/git-ai.git
+RUN git pull origin main
 RUN cargo fetch
 RUN cargo build
+RUN cargo clippy
+
+ARG PR_NUMBER
+ARG GH_TOKEN
+ENV GH_TOKEN=$GH_TOKEN
+RUN gh pr checkout $PR_NUMBER
+RUN cargo fetch
+RUN cargo build
+RUN cargo clippy
 
 # Default command that can be overridden
 SHELL ["/bin/bash", "-lc"]

Justfile

@@ -28,8 +28,16 @@ integration-test:
     docker build -t git-ai-test .
     docker run --rm git-ai-test -e OPENAI_API_KEY=$OPENAI_API_KEY
 
-# just pr "gh pr checkout 74 && cargo fmt --all"
-# just pr "gh pr checkout 74 && cargo build"
-pr CMD:
-    docker build --target pr-tester -t git-ai-pr-tester .
+# just pr 74 "cargo fmt --all"
+# just pr 74 "cargo build"
+pr PR_NUMBER CMD:
+    docker build --build-arg PR_NUMBER={{PR_NUMBER}} --build-arg GH_TOKEN=$(gh auth token) --target pr-tester -t git-ai-pr-tester .
     docker run -i --rm -e GITHUB_TOKEN=$(gh auth token) git-ai-pr-tester bash -c "{{CMD}}"
+
+# Sync all open PRs with origin/main
+sync-prs:
+    ./scripts/sync-all-prs
+
+# Sync a specific PR with origin/main
+sync-pr PR_NUM:
+    just pr {{PR_NUM}} "git fetch origin main && git merge origin/main --no-edit && cargo fmt --all && cargo check && git push origin HEAD"

scripts/sync-all-prs

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+#
+# Sync all open PRs with origin/main using the Justfile pr command
+#
+# This script:
+# 1. Fetches all open PRs from GitHub
+# 2. For each PR, uses `just pr` to checkout and merge origin/main
+# 3. Handles merge conflicts if they occur
+# 4. Pushes the updated branch back to origin
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+echo -e "${BLUE}=== Syncing all open PRs with origin/main ===${NC}"
+echo ""
+
+# Get list of open PRs using gh CLI
+echo -e "${BLUE}Fetching open PRs...${NC}"
+PR_LIST=$(gh pr list --state open --json number,headRefName --jq '.[] | "\(.number):\(.headRefName)"')
+
+if [ -z "$PR_LIST" ]; then
+    echo -e "${YELLOW}No open PRs found.${NC}"
+    exit 0
+fi
+
+echo -e "${GREEN}Found the following open PRs:${NC}"
+echo "$PR_LIST" | while IFS=: read -r pr_num branch; do
+    echo "  PR #$pr_num: $branch"
+done
+echo ""
+
+# Get current origin/main SHA
+MAIN_SHA=$(git rev-parse origin/main)
+echo -e "${BLUE}Current origin/main SHA: ${MAIN_SHA:0:8}${NC}"
+echo ""
+
+# Track success/failure
+SUCCESSFUL_PRS=()
+FAILED_PRS=()
+CONFLICT_PRS=()
+
+# Sync each PR
+echo "$PR_LIST" | while IFS=: read -r pr_num branch; do
+    echo ""
+    echo -e "${BLUE}=== Syncing PR #$pr_num ($branch) ===${NC}"
+
+    # Build the command to run inside the pr-tester container
+    SYNC_CMD="gh pr checkout $pr_num && \
+              git fetch origin main && \
+              git merge origin/main --no-edit && \
+              cargo fmt --all && \
+              cargo check && \
+              git push origin $branch"
+
+    # Run the command using the pr command from Justfile
+    if just pr "$SYNC_CMD"; then
+        echo -e "${GREEN}✓ Successfully synced PR #$pr_num${NC}"
+        SUCCESSFUL_PRS+=("$pr_num")
+    else
+        EXIT_CODE=$?
+        if [ $EXIT_CODE -eq 1 ]; then
+            echo -e "${RED}✗ Merge conflict in PR #$pr_num${NC}"
+            echo -e "${YELLOW}  Please resolve manually:${NC}"
+            echo -e "    just pr \"gh pr checkout $pr_num && git status\""
+            CONFLICT_PRS+=("$pr_num")
+        else
+            echo -e "${RED}✗ Failed to sync PR #$pr_num (exit code: $EXIT_CODE)${NC}"
+            FAILED_PRS+=("$pr_num")
+        fi
+    fi
+done
+
+# Summary
+echo ""
+echo -e "${BLUE}=== Summary ===${NC}"
+if [ ${#SUCCESSFUL_PRS[@]} -gt 0 ]; then
+    echo -e "${GREEN}Successfully synced (${#SUCCESSFUL_PRS[@]}):${NC} ${SUCCESSFUL_PRS[*]}"
+fi
+if [ ${#CONFLICT_PRS[@]} -gt 0 ]; then
+    echo -e "${YELLOW}Conflicts requiring manual resolution (${#CONFLICT_PRS[@]}):${NC} ${CONFLICT_PRS[*]}"
+fi
+if [ ${#FAILED_PRS[@]} -gt 0 ]; then
+    echo -e "${RED}Failed (${#FAILED_PRS[@]}):${NC} ${FAILED_PRS[*]}"
+fi
+
+# Exit with appropriate code
+if [ ${#CONFLICT_PRS[@]} -gt 0 ] || [ ${#FAILED_PRS[@]} -gt 0 ]; then
+    exit 1
+fi
+
+echo ""
+echo -e "${GREEN}All PRs synced successfully!${NC}"
+