feat(scripts): add git cherry patch reality check and persistent Docker cargo cache

Author: Hypn0sis

scripts/deploy-remote.sh

@@ -164,10 +164,16 @@ if $DO_BUILD; then
     --exclude .git \
     "$(git rev-parse --show-toplevel)/" "$BUILD_DIR/"
 
+  # Persistent cargo registry cache — survives across Docker runs.
+  # First build: ~12 min (cold). Subsequent builds: ~30s if no new crates.
+  CARGO_CACHE_DIR="$HOME/.cargo-docker-cache"
+  mkdir -p "$CARGO_CACHE_DIR"
+
   docker run --rm \
     --platform linux/amd64 \
     -v "$LOCAL_OUT:/output" \
     -v "$BUILD_DIR:/build" \
+    -v "$CARGO_CACHE_DIR:/usr/local/cargo/registry" \
     -w /build \
     rust:1-slim-bookworm bash -c "
       set -e

scripts/sync-upstream-and-deploy.sh

@@ -43,19 +43,19 @@ done
 
 cd "$REPO_ROOT"
 
-# ── Step 0: PR status check ───────────────────────────────────────────────────
-# Dynamically fetch all PRs we authored on upstream (open + recently merged).
-# No hardcoded numbers — idempotent as PRs come and go.
+# ── Step 0: PR status check + patch reality check ────────────────────────────
+# PR status from GitHub (proxy — useful but not authoritative).
+# git cherry is the source of truth: + = genuinely not in upstream, - = already absorbed.
 echo "▶ Checking our upstream PRs on $UPSTREAM_REPO..."
 
 PR_CHECK_OK=true
+BRANCHES_TO_DELETE=()
 
 if ! command -v gh &>/dev/null; then
   echo "  ⚠ gh CLI not found — skipping PR check"
 elif ! gh auth status &>/dev/null 2>&1; then
   echo "  ⚠ gh not authenticated — skipping PR check"
 else
-  # Fetch all PRs authored by us: open ones + merged in last 30 days
   PRS_JSON="$(gh pr list \
     --repo "$UPSTREAM_REPO" \
     --author "@me" \
@@ -73,7 +73,6 @@ else
     echo "  ──────────────────────────────────────────────────────────────────"
 
     HAS_OPEN=false
-    BRANCHES_TO_DELETE=()
     CURRENT_BRANCH_NOW="$(git rev-parse --abbrev-ref HEAD)"
 
     while IFS= read -r pr; do
@@ -85,7 +84,6 @@ else
       case "$state" in
         MERGED)
           icon="[MERGED]"
-          # Queue branch for cleanup if it exists locally and we're not on it
           if [[ "$branch" != "$CURRENT_BRANCH_NOW" ]] && git show-ref --verify --quiet "refs/heads/$branch"; then
             BRANCHES_TO_DELETE+=("$branch")
           fi
@@ -108,35 +106,57 @@ for pr in prs:
 ")
 
     echo "  ──────────────────────────────────────────────────────────────────"
-
     if $HAS_OPEN; then
-      echo "  ⚠ Some PRs are still open — we carry those patches locally."
-      echo "    They will be included in the rebase until upstream merges them."
+      echo "  ⚠ Some PRs are still open — patches carried locally until upstream merges them."
     else
       echo "  ✓ All our PRs are merged — patch stack should be clean after rebase."
     fi
+    echo ""
+  fi
+fi
 
-    # Clean up local + fork branches for merged PRs
-    if [[ ${#BRANCHES_TO_DELETE[@]} -gt 0 ]]; then
-      echo ""
-      echo "── Cleaning up merged branches ───────────────────────────────────────"
-      for b in "${BRANCHES_TO_DELETE[@]}"; do
-        # Local branch — force delete since rebase may have changed SHAs
-        if git branch -D "$b" 2>/dev/null; then
-          echo "  ✓ Deleted local branch: $b"
-        fi
-        # Fork remote branch — best-effort, ignore if already gone
-        if git push "$FORK_REMOTE" --delete "$b" 2>/dev/null; then
-          echo "  ✓ Deleted fork remote branch: $b"
-        else
-          echo "  ℹ Fork branch already gone or not found: $b"
-        fi
-      done
-      echo "──────────────────────────────────────────────────────────────────────"
+# ── Patch reality check via git cherry ───────────────────────────────────────
+# Authoritative: checks actual code diff, not just PR state.
+# Catches squash-merges and closed-without-merge where PR state lies.
+echo "── Patch stack vs upstream (git cherry) ─────────────────────────────────"
+CHERRY_OUT="$(git cherry -v "$UPSTREAM_REMOTE/$UPSTREAM_BRANCH" HEAD 2>/dev/null || true)"
+if [[ -z "$CHERRY_OUT" ]]; then
+  echo "  ✓ No local patches — branch is identical to upstream"
+else
+  ABSORBED=0
+  while IFS= read -r line; do
+    marker="${line:0:1}"
+    msg="${line:2}"
+    if [[ "$marker" == "-" ]]; then
+      echo "  - [ABSORBED] $msg"
+      ABSORBED=$((ABSORBED + 1))
+    else
+      echo "  + [PENDING ] $msg"
     fi
+  done <<< "$CHERRY_OUT"
+  if [[ $ABSORBED -gt 0 ]]; then
     echo ""
+    echo "  ⚠ $ABSORBED commit(s) already absorbed by upstream — rebase will drop them."
   fi
 fi
+echo "─────────────────────────────────────────────────────────────────────────"
+
+# ── Cleanup merged branches ───────────────────────────────────────────────────
+if [[ ${#BRANCHES_TO_DELETE[@]} -gt 0 ]]; then
+  echo ""
+  echo "── Cleaning up merged branches ───────────────────────────────────────"
+  for b in "${BRANCHES_TO_DELETE[@]}"; do
+    if git branch -D "$b" 2>/dev/null; then
+      echo "  ✓ Deleted local branch: $b"
+    fi
+    if git push "$FORK_REMOTE" --delete "$b" 2>/dev/null; then
+      echo "  ✓ Deleted fork remote branch: $b"
+    else
+      echo "  ℹ Fork branch already gone: $b"
+    fi
+  done
+  echo "──────────────────────────────────────────────────────────────────────"
+fi
 
 if $PR_CHECK_ONLY; then
   exit 0