diff --git a/.github/workflows/cjs.yml b/.github/workflows/cjs.yml
index c5e1b3bd362..1b19e8e92ff 100644
--- a/.github/workflows/cjs.yml
+++ b/.github/workflows/cjs.yml
@@ -14,13 +14,48 @@ on:
   workflow_dispatch:
 
 jobs:
-  js:
+  js-typecheck:
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 10
+    permissions:
+      contents: read
+    concurrency:
+      group: ci-${{ github.ref }}-js-typecheck
+      cancel-in-progress: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Set up Node.js
+        id: setup-node
+        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+        with:
+          node-version: "24"
+          cache: npm
+          cache-dependency-path: actions/setup/js/package-lock.json
+      - name: Report Node cache status
+        run: |
+          if [ "${{ steps.setup-node.outputs.cache-hit }}" == "true" ]; then
+            echo "✅ Node cache hit" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "⚠️ Node cache miss" >> $GITHUB_STEP_SUMMARY
+          fi
+      - name: Install npm dependencies
+        run: cd actions/setup/js && npm ci
+
+      - name: Run typecheck
+        run: cd actions/setup/js && npm run typecheck
+
+  js-tests:
+    name: JS Tests (shard ${{ matrix.shard }}/4)
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
     permissions:
       contents: read
+    strategy:
+      matrix:
+        shard: [1, 2, 3, 4]
     concurrency:
-      group: ci-${{ github.ref }}-js
+      group: ci-${{ github.ref }}-js-tests-${{ matrix.shard }}
       cancel-in-progress: true
     steps:
       - name: Checkout code
@@ -46,7 +81,8 @@ jobs:
           mkdir -p ${{ runner.temp }}/gh-aw/prompts
           cp actions/setup/md/*.md ${{ runner.temp }}/gh-aw/prompts/
       - name: Run tests
-        run: cd actions/setup/js && npm test
+        # Keep no-file-parallelism so Vitest sharding has deterministic test scheduling per shard.
+        run: cd actions/setup/js && npm run test:js -- --no-file-parallelism --shard=${{ matrix.shard }}/4
 
   lint-js:
     runs-on: ubuntu-latest