Merge branch 'staging' into sync/staging-to-main-2026-04-24

.github/workflows/e2e-api.yml

@@ -1,35 +1,21 @@
 name: E2E API Smoke Test
 # Extracted from ci.yml so workflow-level concurrency can protect this job
 # from run-level cancellation (issue #458).
-#
-# Problem: the job-level `concurrency.cancel-in-progress: false` in ci.yml
-# prevented *sibling* E2E jobs from killing each other, but GitHub still
-# cancelled the parent *workflow run* when a new push arrived. Since the job
-# lived inside that run, it got cancelled too.
-#
-# Fix: a dedicated workflow gets its own concurrency group at the workflow
-# level. New pushes to the same branch queue here instead of cancelling.
-# Fast jobs (platform-build, canvas-build, etc.) stay in ci.yml and continue
-# to benefit from run-level cancellation for quick feedback.
 
 on:
   push:
-    branches: [main]
+    branches: [main, staging]
     paths:
       - 'workspace-server/**'
       - 'tests/e2e/**'
       - '.github/workflows/e2e-api.yml'
   pull_request:
-    branches: [main]
+    branches: [main, staging]
     paths:
       - 'workspace-server/**'
       - 'tests/e2e/**'
       - '.github/workflows/e2e-api.yml'
 
-# Workflow-level concurrency: new runs queue rather than cancel.
-# `cancel-in-progress: false` is load-bearing — without it GitHub would still
-# cancel this run when the next push arrives, defeating the whole fix.
-# The group key includes github.ref so PRs don't compete with main.
 concurrency:
   group: e2e-api-${{ github.ref }}
   cancel-in-progress: false
@@ -39,12 +25,6 @@ jobs:
     name: E2E API Smoke Test
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    # Postgres + Redis run as sibling containers via `docker run`. Could
-    # switch to a `services:` block now that we're on Linux, but the
-    # explicit start-and-wait gives us pg_isready / PING readiness checks
-    # that match the 30-tick timeouts the rest of the job expects. Ports
-    # 15432/16379 avoid collision with anything the host may already have
-    # on the standard ports.
     env:
       DATABASE_URL: postgres://dev:dev@localhost:15432/molecule?sslmode=disable
       REDIS_URL: redis://localhost:16379
@@ -61,12 +41,7 @@ jobs:
       - name: Start Postgres (docker)
         run: |
           docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$PG_CONTAINER" \
-            -e POSTGRES_USER=dev \
-            -e POSTGRES_PASSWORD=dev \
-            -e POSTGRES_DB=molecule \
-            -p 15432:5432 \
-            postgres:16
+          docker run -d --name "$PG_CONTAINER" -e POSTGRES_USER=dev -e POSTGRES_PASSWORD=dev -e POSTGRES_DB=molecule -p 15432:5432 postgres:16
           for i in $(seq 1 30); do
             if docker exec "$PG_CONTAINER" pg_isready -U dev >/dev/null 2>&1; then
               echo "Postgres ready after ${i}s"
@@ -89,6 +64,7 @@ jobs:
             sleep 1
           done
           echo "::error::Redis did not become ready in 15s"
+          docker logs "$REDIS_CONTAINER" || true
           exit 1
       - name: Build platform
         working-directory: workspace-server
@@ -111,16 +87,14 @@ jobs:
           cat workspace-server/platform.log || true
           exit 1
       - name: Assert migrations applied
-        # Migrations auto-run at platform boot. Fail fast if they silently
-        # didn't — catches future migration-author mistakes before the E2E run.
         run: |
           tables=$(docker exec "$PG_CONTAINER" psql -U dev -d molecule -tAc "SELECT count(*) FROM information_schema.tables WHERE table_schema='public' AND table_name='workspaces'")
           if [ "$tables" != "1" ]; then
-            echo "::error::Migrations did not apply — 'workspaces' table missing"
+            echo "::error::Migrations did not apply"
             cat workspace-server/platform.log || true
             exit 1
           fi
-          echo "Migrations OK (workspaces table present)"
+          echo "Migrations OK"
       - name: Run E2E API tests
         run: bash tests/e2e/test_api.sh
       - name: Dump platform log on failure

workspace-server/go.mod

@@ -4,7 +4,7 @@ go 1.25.0
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2
-	github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260416194734-2cd28737f845
+	github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260421064811-7d98ae51e31d
 	github.com/alicebob/miniredis/v2 v2.37.0
 	github.com/creack/pty v1.1.18
 	github.com/docker/docker v28.2.2+incompatible
@@ -16,6 +16,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/lib/pq v1.10.9
+	github.com/opencontainers/image-spec v1.1.1
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1
 	golang.org/x/crypto v0.49.0
@@ -56,7 +57,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -78,4 +78,3 @@ require (
 	google.golang.org/protobuf v1.36.11 // indirect
 	gotest.tools/v3 v3.5.2 // indirect
 )
-

workspace-server/go.sum

@@ -4,8 +4,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
 github.com/Microsoft/go-winio v0.4.21 h1:+6mVbXh4wPzUrl1COX9A+ZCvEpYsOBZ6/+kwDnvLyro=
 github.com/Microsoft/go-winio v0.4.21/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260416194734-2cd28737f845 h1:Pae8GmpJOP/Bpf2KE1FhdN3zoPSbV/tl25yiAqEc4lM=
-github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260416194734-2cd28737f845/go.mod h1:3a6LR/zd7FjR9ZwLTbytwYlWuCBsbCOVFlEg0WnoYiM=
+github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260421064811-7d98ae51e31d h1:GpYhP6FxaJZc1Ljy5/YJ9ZIVGvfOqZBmDolNr2S5x2g=
+github.com/Molecule-AI/molecule-ai-plugin-github-app-auth v0.0.0-20260421064811-7d98ae51e31d/go.mod h1:3a6LR/zd7FjR9ZwLTbytwYlWuCBsbCOVFlEg0WnoYiM=
 github.com/alicebob/miniredis/v2 v2.37.0 h1:RheObYW32G1aiJIj81XVt78ZHJpHonHLHW7OLIshq68=
 github.com/alicebob/miniredis/v2 v2.37.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=