diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index a86ab74f7..98c48d6b0 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -41,16 +41,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyzer_and_format; linux; Dart dev; PKGS: frontend_server_client, frontend_server_common, test_common; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    name: "analyzer_and_format; linux; Dart dev; PKG: dwds; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_version_test.dart`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:frontend_server_client-frontend_server_common-test_common;commands:format-analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds;commands:format-analyze_0-test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:frontend_server_client-frontend_server_common-test_common
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -61,6 +61,70 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+      - name: dwds; dart test test/build/ensure_version_test.dart
+        run: dart test test/build/ensure_version_test.dart
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+  job_003:
+    name: "analyzer_and_format; linux; Dart dev; PKGS: example, fixtures/_webdevSoundSmoke, frontend_server_client, frontend_server_common, test_common; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:example-fixtures/_webdevSoundSmoke-frontend_server_client-frontend_server_common-test_common;commands:format-analyze_0"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:example-fixtures/_webdevSoundSmoke-frontend_server_client-frontend_server_common-test_common
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: example_pub_upgrade
+        name: example; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: example
+      - name: "example; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
+        working-directory: example
+      - name: "example; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
+        working-directory: example
+      - id: fixtures__webdevSoundSmoke_pub_upgrade
+        name: fixtures/_webdevSoundSmoke; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: fixtures/_webdevSoundSmoke
+      - name: "fixtures/_webdevSoundSmoke; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.fixtures__webdevSoundSmoke_pub_upgrade.conclusion == 'success'"
+        working-directory: fixtures/_webdevSoundSmoke
+      - name: "fixtures/_webdevSoundSmoke; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.fixtures__webdevSoundSmoke_pub_upgrade.conclusion == 'success'"
+        working-directory: fixtures/_webdevSoundSmoke
       - id: frontend_server_client_pub_upgrade
         name: frontend_server_client; dart pub upgrade
         run: dart pub upgrade
@@ -100,24 +164,62 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.test_common_pub_upgrade.conclusion == 'success'"
         working-directory: test_common
-  job_003:
-    name: "analyzer_and_format; linux; Dart main; PKG: dwds; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_version_test.dart`"
+  job_004:
+    name: "analyzer_and_format; linux; Dart dev; PKG: webdev; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_build_test.dart`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:dwds;commands:format-analyze_0-test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:webdev;commands:format-analyze_0-test_7"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:dwds
-            os:ubuntu-latest;pub-cache-hosted;sdk:main
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:webdev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
         with:
-          sdk: main
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: webdev_pub_upgrade
+        name: webdev; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: webdev
+      - name: "webdev; dart format --output=none --set-exit-if-changed ."
+        run: "dart format --output=none --set-exit-if-changed ."
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+      - name: "webdev; dart analyze --fatal-infos ."
+        run: dart analyze --fatal-infos .
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+      - name: webdev; dart test test/build/ensure_build_test.dart
+        run: dart test test/build/ensure_build_test.dart
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+  job_005:
+    name: "unit_test; linux; Dart dev; PKG: dwds; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --tags=extension`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds;commands:command-test_1"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
@@ -126,104 +228,125 @@ jobs:
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
         working-directory: dwds
-      - name: "dwds; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
-        working-directory: dwds
-      - name: "dwds; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
+      - name: "dwds; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+        run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
         if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
         working-directory: dwds
-      - name: dwds; dart test test/build/ensure_version_test.dart
-        run: dart test test/build/ensure_version_test.dart
+      - name: "dwds; dart test --tags=extension"
+        run: "dart test --tags=extension"
         if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
         working-directory: dwds
-  job_004:
-    name: "analyzer_and_format; linux; Dart main; PKGS: example, fixtures/_webdevSoundSmoke; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_006:
+    name: "unit_test; linux; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 0 --exclude-tags=extension`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:example-fixtures/_webdevSoundSmoke;commands:format-analyze_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds;commands:test_2"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:example-fixtures/_webdevSoundSmoke
-            os:ubuntu-latest;pub-cache-hosted;sdk:main
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
         with:
-          sdk: main
+          sdk: dev
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-      - id: example_pub_upgrade
-        name: example; dart pub upgrade
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: example
-      - name: "example; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
-        working-directory: example
-      - name: "example; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.example_pub_upgrade.conclusion == 'success'"
-        working-directory: example
-      - id: fixtures__webdevSoundSmoke_pub_upgrade
-        name: fixtures/_webdevSoundSmoke; dart pub upgrade
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 0 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 0 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_007:
+    name: "unit_test; linux; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 1 --exclude-tags=extension`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds;commands:test_3"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: fixtures/_webdevSoundSmoke
-      - name: "fixtures/_webdevSoundSmoke; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.fixtures__webdevSoundSmoke_pub_upgrade.conclusion == 'success'"
-        working-directory: fixtures/_webdevSoundSmoke
-      - name: "fixtures/_webdevSoundSmoke; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.fixtures__webdevSoundSmoke_pub_upgrade.conclusion == 'success'"
-        working-directory: fixtures/_webdevSoundSmoke
-  job_005:
-    name: "analyzer_and_format; linux; Dart main; PKG: webdev; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_build_test.dart`"
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 1 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 1 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_008:
+    name: "unit_test; linux; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 2 --exclude-tags=extension`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:webdev;commands:format-analyze_0-test_7"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds;commands:test_4"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:main;packages:webdev
-            os:ubuntu-latest;pub-cache-hosted;sdk:main
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:dwds
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
         with:
-          sdk: main
+          sdk: dev
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-      - id: webdev_pub_upgrade
-        name: webdev; dart pub upgrade
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
         run: dart pub upgrade
         if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: webdev
-      - name: "webdev; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
-        working-directory: webdev
-      - name: "webdev; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
-        working-directory: webdev
-      - name: webdev; dart test test/build/ensure_build_test.dart
-        run: dart test test/build/ensure_build_test.dart
-        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
-        working-directory: webdev
-  job_006:
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 2 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 2 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_009:
     name: "unit_test; linux; Dart dev; PKG: frontend_server_client; `dart test -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -258,8 +381,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_007:
+  job_010:
     name: "unit_test; linux; Dart dev; PKG: test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
     runs-on: ubuntu-latest
     steps:
@@ -298,8 +420,46 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_008:
+  job_011:
+    name: "unit_test; linux; Dart dev; PKG: webdev; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache Pub hosted dependencies
+        uses: actions/cache@4723a57e26efda3a62cbde1812113b730952852d
+        with:
+          path: "~/.pub-cache/hosted"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:webdev;commands:command-test_5"
+          restore-keys: |
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:webdev
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev
+            os:ubuntu-latest;pub-cache-hosted
+            os:ubuntu-latest
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: webdev_pub_upgrade
+        name: webdev; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: webdev
+      - name: "webdev; Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+        run: "Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &"
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+      - name: "webdev; dart test -j 1"
+        run: dart test -j 1
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_012:
     name: "unit_test; linux; Dart main; PKG: dwds; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --tags=extension`"
     runs-on: ubuntu-latest
     steps:
@@ -338,8 +498,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_009:
+  job_013:
     name: "unit_test; linux; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 0 --exclude-tags=extension`"
     runs-on: ubuntu-latest
     steps:
@@ -374,8 +533,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_010:
+  job_014:
     name: "unit_test; linux; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 1 --exclude-tags=extension`"
     runs-on: ubuntu-latest
     steps:
@@ -410,8 +568,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_011:
+  job_015:
     name: "unit_test; linux; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 2 --exclude-tags=extension`"
     runs-on: ubuntu-latest
     steps:
@@ -446,8 +603,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_012:
+  job_016:
     name: "unit_test; linux; Dart main; PKG: frontend_server_client; `dart test -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -482,8 +638,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_013:
+  job_017:
     name: "unit_test; linux; Dart main; PKG: test_common; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test --exclude-tags=release`"
     runs-on: ubuntu-latest
     steps:
@@ -522,8 +677,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_014:
+  job_018:
     name: "unit_test; linux; Dart main; PKG: webdev; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
     runs-on: ubuntu-latest
     steps:
@@ -562,8 +716,107 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_015:
+  job_019:
+    name: "unit_test; windows; Dart dev; PKG: dwds; `dart test --tags=extension`"
+    runs-on: windows-latest
+    steps:
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart test --tags=extension"
+        run: "dart test --tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_020:
+    name: "unit_test; windows; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 0 --exclude-tags=extension`"
+    runs-on: windows-latest
+    steps:
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 0 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 0 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_021:
+    name: "unit_test; windows; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 1 --exclude-tags=extension`"
+    runs-on: windows-latest
+    steps:
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 1 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 1 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_022:
+    name: "unit_test; windows; Dart dev; PKG: dwds; `dart test --total-shards 3 --shard-index 2 --exclude-tags=extension`"
+    runs-on: windows-latest
+    steps:
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: dwds_pub_upgrade
+        name: dwds; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: dwds
+      - name: "dwds; dart test --total-shards 3 --shard-index 2 --exclude-tags=extension"
+        run: "dart test --total-shards 3 --shard-index 2 --exclude-tags=extension"
+        if: "always() && steps.dwds_pub_upgrade.conclusion == 'success'"
+        working-directory: dwds
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_023:
     name: "unit_test; windows; Dart dev; PKG: frontend_server_client; `dart test -j 1`"
     runs-on: windows-latest
     steps:
@@ -588,8 +841,32 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_016:
+  job_024:
+    name: "unit_test; windows; Dart dev; PKG: webdev; `dart test -j 1`"
+    runs-on: windows-latest
+    steps:
+      - name: Setup Dart SDK
+        uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d
+        with:
+          sdk: dev
+      - id: checkout
+        name: Checkout repository
+        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
+      - id: webdev_pub_upgrade
+        name: webdev; dart pub upgrade
+        run: dart pub upgrade
+        if: "always() && steps.checkout.conclusion == 'success'"
+        working-directory: webdev
+      - name: "webdev; dart test -j 1"
+        run: dart test -j 1
+        if: "always() && steps.webdev_pub_upgrade.conclusion == 'success'"
+        working-directory: webdev
+    needs:
+      - job_001
+      - job_002
+      - job_003
+      - job_004
+  job_025:
     name: "unit_test; windows; Dart dev; PKG: test_common; `dart test --exclude-tags=release`"
     runs-on: windows-latest
     steps:
@@ -614,8 +891,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_017:
+  job_026:
     name: "unit_test; windows; Dart main; PKG: dwds; `dart test --tags=extension`"
     runs-on: windows-latest
     steps:
@@ -640,8 +916,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_018:
+  job_027:
     name: "unit_test; windows; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 0 --exclude-tags=extension`"
     runs-on: windows-latest
     steps:
@@ -666,8 +941,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_019:
+  job_028:
     name: "unit_test; windows; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 1 --exclude-tags=extension`"
     runs-on: windows-latest
     steps:
@@ -692,8 +966,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_020:
+  job_029:
     name: "unit_test; windows; Dart main; PKG: dwds; `dart test --total-shards 3 --shard-index 2 --exclude-tags=extension`"
     runs-on: windows-latest
     steps:
@@ -718,8 +991,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_021:
+  job_030:
     name: "unit_test; windows; Dart main; PKG: frontend_server_client; `dart test -j 1`"
     runs-on: windows-latest
     steps:
@@ -744,8 +1016,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_022:
+  job_031:
     name: "unit_test; windows; Dart main; PKG: webdev; `dart test -j 1`"
     runs-on: windows-latest
     steps:
@@ -770,8 +1041,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_023:
+  job_032:
     name: "unit_test; windows; Dart main; PKG: test_common; `dart test --exclude-tags=release`"
     runs-on: windows-latest
     steps:
@@ -796,8 +1066,7 @@ jobs:
       - job_002
       - job_003
       - job_004
-      - job_005
-  job_024:
+  job_033:
     name: "beta_cron; linux; Dart beta; PKG: dwds; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
     runs-on: ubuntu-latest
     if: "github.event_name == 'schedule'"
@@ -856,7 +1125,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_025:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_034:
     name: "beta_cron; linux; Dart beta; PKG: webdev; `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &`, `dart test -j 1`"
     runs-on: ubuntu-latest
     if: "github.event_name == 'schedule'"
@@ -915,7 +1193,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_026:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_035:
     name: "beta_cron; linux; Dart beta; PKG: dwds; `dart analyze .`"
     runs-on: ubuntu-latest
     if: "github.event_name == 'schedule'"
@@ -970,7 +1257,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_027:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_036:
     name: "beta_cron; linux; Dart beta; PKG: webdev; `dart analyze .`"
     runs-on: ubuntu-latest
     if: "github.event_name == 'schedule'"
@@ -1025,7 +1321,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_028:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_037:
     name: "beta_cron; windows; Dart beta; PKG: dwds; `dart test -j 1`"
     runs-on: windows-latest
     if: "github.event_name == 'schedule'"
@@ -1070,7 +1375,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_029:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_038:
     name: "beta_cron; windows; Dart beta; PKG: webdev; `dart test -j 1`"
     runs-on: windows-latest
     if: "github.event_name == 'schedule'"
@@ -1115,7 +1429,16 @@ jobs:
       - job_021
       - job_022
       - job_023
-  job_030:
+      - job_024
+      - job_025
+      - job_026
+      - job_027
+      - job_028
+      - job_029
+      - job_030
+      - job_031
+      - job_032
+  job_039:
     name: Notify failure
     runs-on: ubuntu-latest
     if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()"
@@ -1156,3 +1479,12 @@ jobs:
       - job_027
       - job_028
       - job_029
+      - job_030
+      - job_031
+      - job_032
+      - job_033
+      - job_034
+      - job_035
+      - job_036
+      - job_037
+      - job_038
diff --git a/dwds/mono_pkg.yaml b/dwds/mono_pkg.yaml
index e3ae564ea..15b55041f 100644
--- a/dwds/mono_pkg.yaml
+++ b/dwds/mono_pkg.yaml
@@ -5,8 +5,7 @@ stages:
       - format
       - analyze: --fatal-infos .
       - test: test/build/ensure_version_test.dart
-      # sdk: dev
-      sdk: main
+      sdk: dev
   - unit_test:
     # Linux extension tests:
     # Note: `Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &` must be
@@ -15,7 +14,7 @@ stages:
       - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
       - test: --tags=extension
       sdk:
-      # -dev
+        - dev
         - main
       os:
         - linux
@@ -23,7 +22,7 @@ stages:
     - group:
       - test: --tags=extension
       sdk:
-        # -dev
+        - dev
         - main
       os:
         - windows
@@ -31,7 +30,7 @@ stages:
     - group:
       - test: --total-shards 3 --shard-index 0 --exclude-tags=extension
       sdk:
-        # -dev
+        - dev
         - main
       os: 
         - linux
@@ -40,7 +39,7 @@ stages:
     - group:
       - test: --total-shards 3 --shard-index 1 --exclude-tags=extension
       sdk:
-        # -dev
+        - dev
         - main
       os: 
         - linux
@@ -49,7 +48,7 @@ stages:
     - group:
       - test: --total-shards 3 --shard-index 2 --exclude-tags=extension
       sdk:
-        # -dev
+        - dev
         - main
       os: 
         - linux
diff --git a/example/mono_pkg.yaml b/example/mono_pkg.yaml
index 19f6ef916..12cfc8524 100644
--- a/example/mono_pkg.yaml
+++ b/example/mono_pkg.yaml
@@ -4,8 +4,7 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      # sdk: dev
-      sdk: main
+      sdk: dev
 
 cache:
   directories:
diff --git a/fixtures/_webdevSoundSmoke/mono_pkg.yaml b/fixtures/_webdevSoundSmoke/mono_pkg.yaml
index 19f6ef916..12cfc8524 100644
--- a/fixtures/_webdevSoundSmoke/mono_pkg.yaml
+++ b/fixtures/_webdevSoundSmoke/mono_pkg.yaml
@@ -4,8 +4,7 @@ stages:
     - group:
       - format
       - analyze: --fatal-infos .
-      # sdk: dev
-      sdk: main
+      sdk: dev
 
 cache:
   directories:
diff --git a/webdev/mono_pkg.yaml b/webdev/mono_pkg.yaml
index d526dcc0a..8fd305797 100644
--- a/webdev/mono_pkg.yaml
+++ b/webdev/mono_pkg.yaml
@@ -5,19 +5,18 @@ stages:
       - format
       - analyze: --fatal-infos .
       - test: test/build/ensure_build_test.dart
-      # sdk: dev
-      sdk: main
+      sdk: dev
   - unit_test:
     - group:
       - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
       - test: -j 1
       sdk:
-      # - dev
+        - dev
         - main
     - test: -j 1
       os: windows
       sdk:
-      # - dev
+        - dev
         - main
   - beta_cron:
     - analyze: .