diff --git a/.github/workflows/assistant-to-the-branch-manager.yml b/.github/workflows/assistant-to-the-branch-manager.yml
index 447bf9c0b716..c4fb93a9ac39 100644
--- a/.github/workflows/assistant-to-the-branch-manager.yml
+++ b/.github/workflows/assistant-to-the-branch-manager.yml
@@ -17,6 +17,6 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: angular/dev-infra/github-actions/branch-manager@31db86455c01b4b7c17e46c21e545daa6371d7a1
+      - uses: angular/dev-infra/github-actions/branch-manager@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 164d2cd61195..296d678672a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Generate JSON schema types
@@ -44,11 +44,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Install node modules
@@ -61,11 +61,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Install node modules
@@ -84,13 +84,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
@@ -100,11 +100,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Install node modules
@@ -137,7 +137,7 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Download built Windows E2E tests
@@ -164,13 +164,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
@@ -188,13 +188,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run CLI E2E tests
@@ -208,13 +208,13 @@ jobs:
       SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           google_credential: ${{ secrets.RBE_TRUSTED_BUILDS_USER }}
       - name: Run E2E Browser tests
@@ -244,11 +244,11 @@ jobs:
       CIRCLE_BRANCH: ${{ github.ref_name }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - run: pnpm admin snapshots --verbose
         env:
           SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml
index 84dc541a4260..c969e6cf76ca 100644
--- a/.github/workflows/dev-infra.yml
+++ b/.github/workflows/dev-infra.yml
@@ -13,13 +13,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: angular/dev-infra/github-actions/pull-request-labeling@31db86455c01b4b7c17e46c21e545daa6371d7a1
+      - uses: angular/dev-infra/github-actions/pull-request-labeling@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
   post_approval_changes:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: angular/dev-infra/github-actions/post-approval-changes@31db86455c01b4b7c17e46c21e545daa6371d7a1
+      - uses: angular/dev-infra/github-actions/post-approval-changes@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/feature-requests.yml b/.github/workflows/feature-requests.yml
index 3b144e3bbd77..1bebf8f0d09e 100644
--- a/.github/workflows/feature-requests.yml
+++ b/.github/workflows/feature-requests.yml
@@ -16,6 +16,6 @@ jobs:
     if: github.repository == 'angular/angular-cli'
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/feature-request@31db86455c01b4b7c17e46c21e545daa6371d7a1
+      - uses: angular/dev-infra/github-actions/feature-request@6fa596ff434e3cabe6d7deb90fbb611304837b47
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
index 9b6893ee0ed3..4c86c905b742 100644
--- a/.github/workflows/perf.yml
+++ b/.github/workflows/perf.yml
@@ -23,7 +23,7 @@ jobs:
       workflows: ${{ steps.workflows.outputs.workflows }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - id: workflows
@@ -38,9 +38,9 @@ jobs:
         workflow: ${{ fromJSON(needs.list.outputs.workflows) }}
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       # We utilize the google-github-actions/auth action to allow us to get an active credential using workflow
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 560b685b79cd..e315b4ba68e2 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup ESLint Caching
         uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -66,17 +66,17 @@ jobs:
         # it has been merged.
         run: pnpm ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
       - name: Check Package Licenses
-        uses: angular/dev-infra/github-actions/linting/licenses@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/linting/licenses@6fa596ff434e3cabe6d7deb90fbb611304837b47
 
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Build release targets
@@ -93,11 +93,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Run module and package tests
@@ -114,13 +114,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Run CLI E2E tests
         run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
@@ -128,11 +128,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Build E2E tests for Windows on Linux
@@ -156,7 +156,7 @@ jobs:
     runs-on: windows-2025
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Download built Windows E2E tests
@@ -183,13 +183,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Run CLI E2E tests
         run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.${{ matrix.subset }}_node${{ matrix.node }}
 
@@ -205,12 +205,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Install node modules
         run: pnpm install --frozen-lockfile
       - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/setup@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@31db86455c01b4b7c17e46c21e545daa6371d7a1
+        uses: angular/dev-infra/github-actions/bazel/configure-remote@6fa596ff434e3cabe6d7deb90fbb611304837b47
       - name: Run CLI E2E tests
         run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
diff --git a/MODULE.bazel b/MODULE.bazel
index a40376290129..5c1c06223ce3 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -25,7 +25,7 @@ git_override(
 bazel_dep(name = "devinfra")
 git_override(
     module_name = "devinfra",
-    commit = "31db86455c01b4b7c17e46c21e545daa6371d7a1",
+    commit = "6fa596ff434e3cabe6d7deb90fbb611304837b47",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
diff --git a/package.json b/package.json
index 4e2a3b219c72..816cd98bf206 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@angular/forms": "21.1.2",
     "@angular/localize": "21.1.2",
     "@angular/material": "21.1.2",
-    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#b48eb307ab83560c557cea5dcaa467d229e438eb",
+    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#c503215089b76bf804da6569c8127f8e23061fef",
     "@angular/platform-browser": "21.1.2",
     "@angular/platform-server": "21.1.2",
     "@angular/router": "21.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 23366ee302c5..30972f7adcbd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -47,8 +47,8 @@ importers:
         specifier: 21.1.2
         version: 21.1.2(1e32b508546eaa30e3213c6dfe771430)
       '@angular/ng-dev':
-        specifier: https://github.com/angular/dev-infra-private-ng-dev-builds.git#b48eb307ab83560c557cea5dcaa467d229e438eb
-        version: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/b48eb307ab83560c557cea5dcaa467d229e438eb(@modelcontextprotocol/sdk@1.25.2(zod@4.3.5))
+        specifier: https://github.com/angular/dev-infra-private-ng-dev-builds.git#c503215089b76bf804da6569c8127f8e23061fef
+        version: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/c503215089b76bf804da6569c8127f8e23061fef(@modelcontextprotocol/sdk@1.25.2(zod@4.3.6))
       '@angular/platform-browser':
         specifier: 21.1.2
         version: 21.1.2(@angular/animations@21.1.2(@angular/core@21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2)(zone.js@0.16.0)))(@angular/common@21.1.2(@angular/core@21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2)(zone.js@0.16.0))(rxjs@7.8.2))(@angular/core@21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2)(zone.js@0.16.0))
@@ -1026,9 +1026,9 @@ packages:
       '@angular/platform-browser': ^21.0.0 || ^22.0.0
       rxjs: ^6.5.3 || ^7.4.0
 
-  '@angular/ng-dev@https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/b48eb307ab83560c557cea5dcaa467d229e438eb':
-    resolution: {tarball: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/b48eb307ab83560c557cea5dcaa467d229e438eb}
-    version: 0.0.0-31db86455c01b4b7c17e46c21e545daa6371d7a1
+  '@angular/ng-dev@https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/c503215089b76bf804da6569c8127f8e23061fef':
+    resolution: {tarball: https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/c503215089b76bf804da6569c8127f8e23061fef}
+    version: 0.0.0-6fa596ff434e3cabe6d7deb90fbb611304837b47
     hasBin: true
 
   '@angular/platform-browser@21.1.2':
@@ -9205,6 +9205,9 @@ packages:
   zod@4.3.5:
     resolution: {integrity: sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==}
 
+  zod@4.3.6:
+    resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
+
   zone.js@0.16.0:
     resolution: {integrity: sha512-LqLPpIQANebrlxY6jKcYKdgN5DTXyyHAKnnWWjE5pPfEQ4n7j5zn7mOEEpwNZVKGqx3kKKmvplEmoBrvpgROTA==}
 
@@ -9395,11 +9398,11 @@ snapshots:
       rxjs: 7.8.2
       tslib: 2.8.1
 
-  '@angular/ng-dev@https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/b48eb307ab83560c557cea5dcaa467d229e438eb(@modelcontextprotocol/sdk@1.25.2(zod@4.3.5))':
+  '@angular/ng-dev@https://codeload.github.com/angular/dev-infra-private-ng-dev-builds/tar.gz/c503215089b76bf804da6569c8127f8e23061fef(@modelcontextprotocol/sdk@1.25.2(zod@4.3.6))':
     dependencies:
       '@actions/core': 3.0.0
       '@google-cloud/spanner': 8.0.0(supports-color@10.2.2)
-      '@google/genai': 1.38.0(@modelcontextprotocol/sdk@1.25.2(zod@4.3.5))(bufferutil@4.1.0)(supports-color@10.2.2)(utf-8-validate@6.0.6)
+      '@google/genai': 1.38.0(@modelcontextprotocol/sdk@1.25.2(zod@4.3.6))(bufferutil@4.1.0)(supports-color@10.2.2)(utf-8-validate@6.0.6)
       '@inquirer/prompts': 8.2.0(@types/node@24.10.9)
       '@inquirer/type': 4.0.3(@types/node@24.10.9)
       '@octokit/auth-app': 8.1.2
@@ -9451,6 +9454,7 @@ snapshots:
       which: 6.0.0
       yaml: 2.8.2
       yargs: 18.0.0
+      zod: 4.3.6
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
       - '@react-native-async-storage/async-storage'
@@ -10779,13 +10783,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@google/genai@1.38.0(@modelcontextprotocol/sdk@1.25.2(zod@4.3.5))(bufferutil@4.1.0)(supports-color@10.2.2)(utf-8-validate@6.0.6)':
+  '@google/genai@1.38.0(@modelcontextprotocol/sdk@1.25.2(zod@4.3.6))(bufferutil@4.1.0)(supports-color@10.2.2)(utf-8-validate@6.0.6)':
     dependencies:
       google-auth-library: 10.5.0(supports-color@10.2.2)
       protobufjs: 7.5.4
       ws: 8.19.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     optionalDependencies:
-      '@modelcontextprotocol/sdk': 1.25.2(zod@4.3.5)
+      '@modelcontextprotocol/sdk': 1.25.2(zod@4.3.6)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -11217,6 +11221,29 @@ snapshots:
       - hono
       - supports-color
 
+  '@modelcontextprotocol/sdk@1.25.2(zod@4.3.6)':
+    dependencies:
+      '@hono/node-server': 1.19.9
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
+      content-type: 1.0.5
+      cors: 2.8.5
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.0.6
+      express: 5.2.1
+      express-rate-limit: 7.5.1(express@5.2.1)
+      jose: 6.1.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.1
+      raw-body: 3.0.2
+      zod: 4.3.6
+      zod-to-json-schema: 3.25.1(zod@4.3.6)
+    transitivePeerDependencies:
+      - hono
+      - supports-color
+    optional: true
+
   '@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.3':
     optional: true
 
@@ -18943,8 +18970,15 @@ snapshots:
     dependencies:
       zod: 4.3.5
 
+  zod-to-json-schema@3.25.1(zod@4.3.6):
+    dependencies:
+      zod: 4.3.6
+    optional: true
+
   zod@3.25.76: {}
 
   zod@4.3.5: {}
 
+  zod@4.3.6: {}
+
   zone.js@0.16.0: {}