Promote staging to beta for Modeling Commons

.github/workflows/build-and-push-modeling-commons.yml

@@ -22,11 +22,16 @@ on:
       - 'yarn.lock'
       - '.github/workflows/build-and-push-modeling-commons.yml'
   workflow_dispatch:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    environment: netlogo1
+    environment: ${{ inputs.environment || 'modeling-commons-production' }}
     permissions:
       contents: read
       packages: write
@@ -39,31 +44,49 @@ jobs:
           node-version: '24'
           cache: yarn
 
+      - uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ hashFiles('yarn.lock') }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-${{ hashFiles('yarn.lock') }}-
+            ${{ runner.os }}-turbo-
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            apps/*/node_modules
+            packages/*/node_modules
+          key: node-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            node-modules-${{ runner.os }}-
+
       - name: Install dependencies
         run: yarn run init
         env:
-          HELIO_SKIP_CHECKS: '1'
-          NUXT_TELEMETRY_DISABLED: '1'
+          HELIO_SKIP_CHECKS: ${{ vars.HELIO_SKIP_CHECKS }}
+          NUXT_TELEMETRY_DISABLED: ${{ vars.NUXT_TELEMETRY_DISABLED }}
 
       - name: Build backend
         run: yarn workspace modeling-commons-backend fastify:build
         env:
-          HELIO_HEADLESS: 1
+          HELIO_HEADLESS: ${{ vars.HELIO_HEADLESS }}
 
       - name: Build frontend
         working-directory: apps/modeling-commons-frontend
         run: yarn nuxt:build
         env:
-          HELIO_HEADLESS: 1
-          NUXT_TELEMETRY_DISABLED: 1
-          NODE_OPTIONS: --max-old-space-size=4096
-          NUXT_PUBLIC_AUTH_BASE: 'https://beta.modelingcommons.org/api/auth'
-          NUXT_PUBLIC_API_BASE: 'https://beta.modelingcommons.org'
-          NUXT_PUBLIC_APP_URL: 'https://beta.modelingcommons.org'
-          NUXT_STORAGE_BASE_URL: 'https://cdn.modelingcommons.org'
-          NUXT_PUBLIC_CDN_URL: 'https://cdn.modelingcommons.org'
-          NUXT_PUBLIC_NETLOGO_WEB_URL: 'https://www.netlogoweb.org'
-          NUXT_PUBLIC_GA_TRACKING_ID: 'G-VJ4WPV2Q5B'
+          HELIO_HEADLESS: ${{ vars.HELIO_HEADLESS }}
+          NUXT_TELEMETRY_DISABLED: ${{ vars.NUXT_TELEMETRY_DISABLED }}
+          NODE_OPTIONS: ${{ vars.NODE_OPTIONS }}
+          NUXT_PUBLIC_AUTH_BASE: ${{ vars.NUXT_PUBLIC_AUTH_BASE }}
+          NUXT_PUBLIC_API_BASE: ${{ vars.NUXT_PUBLIC_API_BASE }}
+          NUXT_PUBLIC_APP_URL: ${{ vars.NUXT_PUBLIC_APP_URL }}
+          NUXT_STORAGE_BASE_URL: ${{ vars.NUXT_STORAGE_BASE_URL }}
+          NUXT_PUBLIC_CDN_URL: ${{ vars.NUXT_PUBLIC_CDN_URL }}
+          NUXT_PUBLIC_NETLOGO_WEB_URL: ${{ vars.NUXT_PUBLIC_NETLOGO_WEB_URL }}
+          NUXT_PUBLIC_GA_TRACKING_ID: ${{ vars.NUXT_PUBLIC_GA_TRACKING_ID }}
 
       - uses: docker/setup-buildx-action@v3
 
@@ -89,7 +112,7 @@ jobs:
           push: true
           tags: |
             ${{ steps.repo_slug.outputs.result }}/modeling-commons-backend:${{ github.sha }}
-            ${{ steps.repo_slug.outputs.result }}/modeling-commons-backend:latest
+            ${{ steps.repo_slug.outputs.result }}/modeling-commons-backend:${{ vars.VARIANT_IMAGE_TAG }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -101,15 +124,27 @@ jobs:
           push: true
           tags: |
             ${{ steps.repo_slug.outputs.result }}/modeling-commons-frontend:${{ github.sha }}
-            ${{ steps.repo_slug.outputs.result }}/modeling-commons-frontend:latest
+            ${{ steps.repo_slug.outputs.result }}/modeling-commons-frontend:${{ vars.VARIANT_IMAGE_TAG }}
+          build-args: |
+            NUXT_PUBLIC_API_BASE=${{ vars.NUXT_PUBLIC_API_BASE }}
+            NUXT_PUBLIC_AUTH_BASE=${{ vars.NUXT_PUBLIC_AUTH_BASE }}
+            NUXT_PUBLIC_APP_URL=${{ vars.NUXT_PUBLIC_APP_URL }}
+            NUXT_STORAGE_BASE_URL=${{ vars.NUXT_STORAGE_BASE_URL }}
+            NUXT_PUBLIC_CDN_URL=${{ vars.NUXT_PUBLIC_CDN_URL }}
+            NUXT_PUBLIC_NETLOGO_WEB_URL=${{ vars.NUXT_PUBLIC_NETLOGO_WEB_URL }}
+            NUXT_PUBLIC_GA_TRACKING_ID=${{ vars.NUXT_PUBLIC_GA_TRACKING_ID }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
   restart-deployments:
     needs: build-and-push
     runs-on: self-hosted
+    environment: ${{ inputs.environment || 'modeling-commons-production' }}
 
     steps:
       - name: Restart deployments
+        env:
+          KUBE_NAMESPACE: ${{ vars.KUBE_NAMESPACE }}
         run: |
           APISERVER=https://kubernetes.default.svc
           TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
@@ -123,5 +158,5 @@ jobs:
               -H "Content-Type: application/strategic-merge-patch+json" \
               -d "$PATCH" \
               --cacert "$CA" \
-              "$APISERVER/apis/apps/v1/namespaces/modeling-commons/deployments/$DEPLOY"
-          done
+              "$APISERVER/apis/apps/v1/namespaces/$KUBE_NAMESPACE/deployments/$DEPLOY"
+          done

.github/workflows/test-modeling-commons.yml

@@ -0,0 +1,159 @@
+name: Test Modeling Commons
+
+on:
+  push:
+    branches: [main, staging/modeling-commons]
+    paths:
+      - 'apps/modeling-commons-backend/**'
+      - 'apps/modeling-commons-frontend/**'
+      - 'packages/modeling-commons-shared/**'
+      - 'packages/typescript-config/**'
+      - 'packages/tailwind-config/**'
+      - 'packages/nuxt-core/**'
+      - 'packages/vue-ui/**'
+      - 'packages/markdown/**'
+      - 'packages/eslint-config/**'
+      - 'packages/utils/**'
+      - 'packages/common-data/**'
+      - 'packages/template/**'
+      - 'packages/nuxt-content-assets/**'
+      - 'packages/netlogo-docs/**'
+      - 'packages/emails/**'
+      - 'yarn.lock'
+      - '.github/workflows/build-and-push-modeling-commons.yml'
+      - '.github/workflows/test-modeling-commons.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: modeling-commons-testing
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    environment: netlogo1
+    permissions:
+      contents: read
+      packages: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: yarn
+
+      - uses: actions/cache@v4
+        with:
+          path: .turbo
+          key: ${{ runner.os }}-turbo-${{ hashFiles('yarn.lock') }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-turbo-${{ hashFiles('yarn.lock') }}-
+            ${{ runner.os }}-turbo-
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            node_modules
+            apps/*/node_modules
+            packages/*/node_modules
+          key: node-modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            node-modules-${{ runner.os }}-
+
+      - name: Install dependencies
+        run: yarn run init
+        env:
+          HELIO_SKIP_CHECKS: '1'
+          NUXT_TELEMETRY_DISABLED: '1'
+
+      - name: Build backend
+        run: yarn workspace modeling-commons-backend fastify:build
+        env:
+          HELIO_HEADLESS: 1
+
+      - name: Run services
+        run: docker compose -f docker-compose.dev.yml up -d --wait
+        working-directory: apps/modeling-commons-backend
+
+      - name: Seed the services
+        run: yarn run db:migrate:dev && yarn run db:seed
+        working-directory: apps/modeling-commons-backend
+
+      - name: Run backend tests
+        run: yarn run test
+        working-directory: apps/modeling-commons-backend
+
+      - name: Run backend server
+        run: node dist/src/index.ts &
+          timeout 30 bash -c 'until curl -sf http://localhost:3000/api/health; do sleep 1; done'
+        working-directory: apps/modeling-commons-backend
+
+      - name: Get Playwright version
+        id: pw-version
+        run: echo "version=$(npx playwright --version)" >> "$GITHUB_OUTPUT"
+
+      - uses: actions/cache@v4
+        id: playwright
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-${{ runner.os }}-${{ steps.pw-version.outputs.version }}
+
+      - name: Install Playwright browser
+        if: steps.playwright.outputs.cache-hit != 'true'
+        run: yarn run e2e:install-browser
+        working-directory: apps/modeling-commons-frontend
+
+      - name: Build frontend
+        run: yarn run nuxt:build
+        working-directory: apps/modeling-commons-frontend
+        env:
+          NUXT_TELEMETRY_DISABLED: '1'
+
+      - name: Run frontend server
+        run: node .output/server/index.mjs &
+          timeout 60 bash -c 'until curl -sf http://localhost:3005/ >/dev/null; do sleep 1; done'
+        working-directory: apps/modeling-commons-frontend
+        env:
+          PORT: '3005'
+          NODE_OPTIONS: --dns-result-order=ipv4first
+
+      # Split the suite so e2e doesn't share the runner's 2 cores with the other
+      # five in-process projects (plus Chromium).
+      # -- Omar Ibrahim, Jun 11 26
+      - name: Run in-process frontend tests
+        run: yarn run test:in-process
+        working-directory: apps/modeling-commons-frontend
+
+      # E2E runs against the already-built server (E2E_HOST), so the e2e project
+      # skips its per-file Nuxt build.
+      # -- Omar Ibrahim, Jun 11 26
+      - name: Run frontend e2e tests
+        run: yarn run test:e2e
+        working-directory: apps/modeling-commons-frontend
+        env:
+          E2E_HOST: http://localhost:3005
+          E2E_ARTIFACT_DIR: ${{ runner.temp }}/e2e-artifacts
+          MAILPIT_URL: http://localhost:8025
+
+      # Failure-only net: on a failed e2e run, upload the screenshot + HTML that
+      # dumpOnFailure captured at the point of failure.
+      - name: Upload e2e failure artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-failure-artifacts
+          if-no-files-found: ignore
+          path: ${{ runner.temp }}/e2e-artifacts
+
+      - if: always()
+        run: docker compose -f docker-compose.dev.yml down -v
+        working-directory: apps/modeling-commons-backend
+
+  deploy-staging:
+    needs: test
+    uses: ./.github/workflows/build-and-push-modeling-commons.yml
+    with:
+      environment: modeling-commons-staging

apps/modeling-commons-backend/AGENTS.md

@@ -33,6 +33,7 @@ Reference modules: `src/modules/model/` (full shape), `src/modules/event/` (read
 - Soft delete, don't hard delete: models/users carry `deletedAt`. Call `modelDomain.assertNotDeleted(entity)` before mutating.
 - **Models are written through drafts**, not directly. Flow: `POST /v1/model-drafts` → `PATCH /v1/model-drafts/:id` → multipart upload to `/v1/model-drafts/:id/files` → `POST /v1/model-drafts/:id/publish`. There is no `POST /v1/models`. Publish auto-creates `v1`; a model never has zero versions.
 - `POST /v1/models/:id/versions` is **multipart/form-data** (required `file` field), not JSON.
+- Draft data persists as versioned JSON validated by compiled Typebox `Parse` (`model-draft/schemas/v1.ts`); its `Clean` step strips properties absent from the schema, so add any new draft field to the schema or it's silently dropped on the next read.
 
 ## Routes
 
@@ -49,7 +50,7 @@ Reference modules: `src/modules/model/` (full shape), `src/modules/event/` (read
 Use path aliases, never relative `../../`:
 
 - `#src/...` - app source
-- `#prisma/index` - generated Prisma client (output is `generated/prisma`, not `@prisma/client`)
+- `#prisma/index` - generated Prisma client (output is `generated/prisma`, not `@prisma/client`). It's committed — after editing `schema.prisma` run `yarn db:generate` and commit the regenerated client alongside the migration.
 
 ## Client/request context
 
@@ -72,6 +73,7 @@ Use path aliases, never relative `../../`:
 ## Testing
 
 - `yarn run test:unit` (vitest) · `yarn run test:e2e` (cucumber, needs `yarn run svc` running for postgres/object-storage/mailpit/netlogo-services).
+- `test:unit` is fully mocked (no DB); apply pending migrations before `test:e2e` (`yarn run db:migrate:dev`) — an unapplied migration makes the generated client mismatch the DB and 500s every affected route. Diagnose e2e failures from `reports/cucumber-report.json`.
 - In vitest specs, import `beforeEach`/`afterEach` from `vitest`, never `node:test` — wrong import silently no-ops the hook.
 
 ## Config & limits