diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d1b46a4f..7932dccad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,8 +35,12 @@ jobs:
           node-version: 20
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: pnpm build
-      - run: pnpm typecheck
+      # Build all non-web packages
+      - run: pnpm -r --filter '!@agent-orchestrator/web' build
+      # Typecheck all non-web packages
+      - run: pnpm -r --filter '!@agent-orchestrator/web' typecheck
+      # Build web (Next.js build includes its own typecheck)
+      - run: pnpm --filter @agent-orchestrator/web build
 
   test:
     name: Test
@@ -49,5 +53,5 @@ jobs:
           node-version: 20
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: pnpm build
+      - run: pnpm -r --filter '!@agent-orchestrator/web' build
       - run: pnpm test
diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json
index 4df6fe12c..8d8f525eb 100644
--- a/packages/web/tsconfig.json
+++ b/packages/web/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src",
+    "rootDir": ".",
     "jsx": "preserve",
     "module": "ESNext",
     "moduleResolution": "Bundler",
@@ -11,6 +11,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src", "next-env.d.ts"],
+  "include": ["src", "next-env.d.ts", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]
 }