From de2dfd755966ff44b8126b499b77681be63a9dce Mon Sep 17 00:00:00 2001
From: mkorwel <matt.korwel@gmail.com>
Date: Tue, 14 Apr 2026 19:38:50 -0700
Subject: [PATCH] feat(ci): refine trial to measure both unit speed and bundle
 integrity

---
 .github/workflows/ci-bundling-trial.yml | 22 +++++++++++++++++++---
 packages/cli/vitest.config.ts           |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-bundling-trial.yml b/.github/workflows/ci-bundling-trial.yml
index 9b9e725acd..f0ca4f097c 100644
--- a/.github/workflows/ci-bundling-trial.yml
+++ b/.github/workflows/ci-bundling-trial.yml
@@ -30,8 +30,24 @@ jobs:
           name: 'gemini-bundle'
           path: 'bundle/'
 
+  test_cli_unit:
+    name: 'Test (Linux) - CLI Unit Tests'
+    runs-on: 'gemini-cli-ubuntu-16-core'
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8'
+
+      - name: 'Setup Source'
+        uses: './.github/actions/setup-gemini'
+        with:
+          mode: 'source'
+
+      - name: 'Run CLI Unit Tests'
+        run: 'npx vitest run packages/cli'
+        shell: 'bash'
+
   test_with_bundle:
-    name: 'Test (Linux) - Bundled Trial'
+    name: 'Test (Linux) - Bundled Integration'
     needs: 'build_bundle'
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
@@ -44,6 +60,6 @@ jobs:
           mode: 'bundle'
           bundle-artifact: 'gemini-bundle'
 
-      - name: 'Run CLI Unit Tests'
-        run: 'npx vitest run packages/cli'
+      - name: 'Run Integration Tests'
+        run: 'npm run test:integration:sandbox:none'
         shell: 'bash'
diff --git a/packages/cli/vitest.config.ts b/packages/cli/vitest.config.ts
index bf6ddf2309..64d201dd18 100644
--- a/packages/cli/vitest.config.ts
+++ b/packages/cli/vitest.config.ts
@@ -17,7 +17,6 @@ export default defineConfig({
   },
   test: {
     include: ['**/*.{test,spec}.{js,ts,jsx,tsx}', 'config.test.ts'],
-    exclude: ['**/node_modules/**', '**/dist/**', '**/cypress/**'],
     environment: 'node',
     globals: true,
     reporters: ['default', 'junit'],
@@ -35,6 +34,7 @@ export default defineConfig({
     exclude: [
       '**/node_modules/**',
       '**/dist/**',
+      '**/cypress/**',
       '**/src/ui/components/messages/ToolStickyHeaderRegression.test.tsx',
       '**/src/ui/components/views/McpStatus.test.tsx',
       '**/src/ui/components/messages/SubagentHistoryMessage.test.tsx',