Merge branch 'main' into chore/propose-planner-route-encoding

.github/workflows/cd-apps.yml

@@ -177,8 +177,13 @@ jobs:
             # deploy from failing if Caddy itself is unhealthy.
             docker compose exec -T caddy caddy reload --config /etc/caddy/Caddyfile || true
 
-            # Clean up
-            docker image prune -af
+            # Clean up (best-effort). This runs AFTER the containers are
+            # swapped + Caddy reloaded, so the deploy already succeeded —
+            # a transient "a prune operation is already running" collision
+            # with a concurrent deploy/disk-maintenance prune must NOT fail
+            # an otherwise-green deploy. disk-maintenance.yml is the real
+            # image-prune safety net.
+            docker image prune -af || true
             docker compose ps
 
             # Annotate deploy in Grafana. GRAFANA_SERVICE_TOKEN lives

.github/workflows/disk-maintenance.yml

@@ -39,7 +39,11 @@ jobs:
             echo "before: $(df -h / | tail -1)"
             # 12h filter: never touch layers a same-day deploy may still
             # be assembling; running containers' images are never pruned.
-            docker image prune -af --filter "until=12h"
+            # `|| true`: a concurrent deploy's prune can make this collide
+            # with "a prune operation is already running" — that's benign
+            # (the other prune is freeing space too), and the disk-% gate
+            # below is the real assertion, so don't fail on the collision.
+            docker image prune -af --filter "until=12h" || true
             echo "after:  $(df -h / | tail -1)"
 
             PCT=$(df --output=pcent / | tail -1 | tr -dc '0-9')