diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bb98f659d18..35864756d74 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,14 +60,14 @@ jobs:
         run: |
           if [ "$GENERAL" != "true" ]; then
             echo 'general=false' >> "$GITHUB_OUTPUT"
-            echo 'settings=[{"name":"linux","host":"blacksmith-4vcpu-ubuntu-2404","run":false,"shard":"","packages":false}]' >> "$GITHUB_OUTPUT"
+            echo 'settings=[{"os":"linux","index":1,"total":1,"host":"blacksmith-4vcpu-ubuntu-2404","run":false,"packages":false}]' >> "$GITHUB_OUTPUT"
             exit 0
           fi
           echo 'general=true' >> "$GITHUB_OUTPUT"
-          echo 'settings=[{"name":"linux-1","host":"blacksmith-4vcpu-ubuntu-2404","run":true,"shard":"1/2","packages":true},{"name":"linux-2","host":"blacksmith-4vcpu-ubuntu-2404","run":true,"shard":"2/2","packages":false},{"name":"macos-1","host":"macos-15","run":true,"shard":"1/3","packages":true},{"name":"macos-2","host":"macos-15","run":true,"shard":"2/3","packages":false},{"name":"macos-3","host":"macos-15","run":true,"shard":"3/3","packages":false},{"name":"windows-1","host":"blacksmith-4vcpu-windows-2025","run":true,"shard":"1/4","packages":true},{"name":"windows-2","host":"blacksmith-4vcpu-windows-2025","run":true,"shard":"2/4","packages":false},{"name":"windows-3","host":"blacksmith-4vcpu-windows-2025","run":true,"shard":"3/4","packages":false},{"name":"windows-4","host":"blacksmith-4vcpu-windows-2025","run":true,"shard":"4/4","packages":false}]' >> "$GITHUB_OUTPUT"
+          echo 'settings=[{"os":"linux","index":1,"total":2,"host":"blacksmith-4vcpu-ubuntu-2404","run":true,"packages":true},{"os":"linux","index":2,"total":2,"host":"blacksmith-4vcpu-ubuntu-2404","run":true,"packages":false},{"os":"macos","index":1,"total":3,"host":"macos-15","run":true,"packages":true},{"os":"macos","index":2,"total":3,"host":"macos-15","run":true,"packages":false},{"os":"macos","index":3,"total":3,"host":"macos-15","run":true,"packages":false},{"os":"windows","index":1,"total":4,"host":"blacksmith-4vcpu-windows-2025","run":true,"packages":true},{"os":"windows","index":2,"total":4,"host":"blacksmith-4vcpu-windows-2025","run":true,"packages":false},{"os":"windows","index":3,"total":4,"host":"blacksmith-4vcpu-windows-2025","run":true,"packages":false},{"os":"windows","index":4,"total":4,"host":"blacksmith-4vcpu-windows-2025","run":true,"packages":false}]' >> "$GITHUB_OUTPUT"
 
   unit:
-    name: unit (${{ matrix.settings.name }})
+    name: unit (${{ matrix.settings.os }}, ${{ matrix.settings.index }}/${{ matrix.settings.total }})
     needs: changes
     strategy:
       fail-fast: false
@@ -125,9 +125,9 @@ jobs:
         uses: actions/cache@v5 # kilocode_change
         with:
           path: .turbo/cache # kilocode_change
-          key: turbo-${{ runner.os }}-${{ hashFiles('turbo.json', 'bun.lock') }}-${{ matrix.settings.name }}-${{ github.sha }}
+          key: turbo-${{ runner.os }}-${{ hashFiles('turbo.json', 'bun.lock') }}-${{ matrix.settings.os }}-${{ matrix.settings.index }}-${{ github.sha }}
           restore-keys: |
-            turbo-${{ runner.os }}-${{ hashFiles('turbo.json', 'bun.lock') }}-${{ matrix.settings.name }}-
+            turbo-${{ runner.os }}-${{ hashFiles('turbo.json', 'bun.lock') }}-${{ matrix.settings.os }}-${{ matrix.settings.index }}-
             turbo-${{ runner.os }}-${{ hashFiles('turbo.json', 'bun.lock') }}-
             turbo-${{ runner.os }}-
 
@@ -140,14 +140,14 @@ jobs:
         run: bun turbo test:ci --filter='@kilocode/cli'
         env:
           KILO_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}
-          KILO_TEST_SHARD: ${{ matrix.settings.shard }}
+          KILO_TEST_SHARD: ${{ format('{0}/{1}', matrix.settings.index, matrix.settings.total) }}
 
       - name: Publish unit reports # kilocode_change
         if: always() && matrix.settings.run
         uses: mikepenz/action-junit-report@bccf2e31636835cf0874589931c4116687171386 # v6.4.0
         with:
           report_paths: packages/*/.artifacts/unit/junit.xml
-          check_name: "unit results (${{ matrix.settings.name }})"
+          annotate_only: true
           detailed_summary: true
           include_time_in_summary: true
           fail_on_failure: false
@@ -156,7 +156,7 @@ jobs:
         if: always() && matrix.settings.run
         uses: actions/upload-artifact@v7 # kilocode_change
         with:
-          name: unit-${{ matrix.settings.name }}-${{ github.run_attempt }}
+          name: unit-${{ matrix.settings.os }}-${{ matrix.settings.index }}-${{ github.run_attempt }}
           include-hidden-files: true
           if-no-files-found: ignore
           retention-days: 7
diff --git a/turbo.json b/turbo.json
index 56851a2f8ad..fbf4207c9f4 100644
--- a/turbo.json
+++ b/turbo.json
@@ -26,6 +26,7 @@
     "@kilocode/cli#test:ci": {
       "dependsOn": ["^build"],
       "env": ["KILO_TEST_PROFILE", "KILO_TEST_SHARD"],
+      "inputs": ["$TURBO_DEFAULT$", "$TURBO_ROOT$/.github/workflows/test.yml"],
       "outputs": [".artifacts/unit/junit.xml"],
       "passThroughEnv": ["*"]
     },