diff --git a/mise-tasks/build/worktree-types b/mise-tasks/build/worktree-types
new file mode 100755
index 00000000000..90a1df61b2f
--- /dev/null
+++ b/mise-tasks/build/worktree-types
@@ -0,0 +1,12 @@
+#!/bin/sh
+#MISE description="Build type declarations needed for lint in fresh git worktrees"
+
+set -eu
+
+echo "Building @cardstack/boxel-icons..."
+pnpm --dir packages/boxel-icons build
+
+echo "Building @cardstack/boxel-ui type declarations..."
+pnpm --dir packages/boxel-ui/addon build:types
+
+echo "Done — worktree type declarations are ready for pnpm lint"
diff --git a/package.json b/package.json
index 807fc673df5..ffeae43256c 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "deploy:boxel-ui:preview-staging": "pnpm run build-common-deps && cd packages/boxel-ui/test-app && pnpm exec ember deploy s3-preview-staging --verbose",
     "lint": "pnpm run --filter './packages/**' --if-present -r lint",
     "lint:fix": "pnpm run --filter './packages/**' --if-present -r lint:fix",
-    "openrouter:sync": "OPENROUTER_REALM_URL=${OPENROUTER_REALM_URL:-http://localhost:4201/openrouter/} pnpm --filter @cardstack/realm-server sync-openrouter-models"
+    "openrouter:sync": "OPENROUTER_REALM_URL=${OPENROUTER_REALM_URL:-http://localhost:4201/openrouter/} pnpm --filter @cardstack/realm-server sync-openrouter-models",
+    "prepare-worktree-types": "pnpm --filter @cardstack/boxel-icons build && pnpm --filter @cardstack/boxel-ui build:types"
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
diff --git a/packages/realm-server/prerender/prerender-app.ts b/packages/realm-server/prerender/prerender-app.ts
index a3b7b7b5ff8..d2cd539603b 100644
--- a/packages/realm-server/prerender/prerender-app.ts
+++ b/packages/realm-server/prerender/prerender-app.ts
@@ -886,7 +886,7 @@ export function createPrerenderHttpServer(options?: {
     } catch (e: any) {
       log.warn('Error closing server during fatal shutdown:', e);
     }
-    setTimeout(() => process.exit(1), 100).unref();
+    setTimeout(() => process.exit(1), 100);
   }
 
   const uncaughtExceptionHandler = (err: unknown) =>