diff --git a/apps/api/src/onboarding-intake.ts b/apps/api/src/onboarding-intake.ts
index d67381a..1ed62a6 100644
--- a/apps/api/src/onboarding-intake.ts
+++ b/apps/api/src/onboarding-intake.ts
@@ -3,13 +3,8 @@ import { COACH_KEYS, coachCron, setCoachRhythm } from "@rakazo/adapters";
 import type { CoachRhythm, MessageBlock, OnboardingStep, QuietHours } from "@rakazo/contracts";
 import { CHOICE_TEXT_ANSWER_ID } from "@rakazo/contracts";
 import { knownTimeZone, nextCronDateAcross } from "@rakazo/core";
-import {
-  createGoal,
-  type Prisma,
-  type PrismaClient,
-  updateNotificationSettings,
-  updateUserProfile,
-} from "@rakazo/db";
+import type { Prisma, PrismaClient } from "@rakazo/db";
+import { createGoal, updateNotificationSettings, updateUserProfile } from "@rakazo/db";
 
 /**
  * The questions the main bot asks a new user in the main conversation, one card at a time.
diff --git a/apps/api/src/onboarding.ts b/apps/api/src/onboarding.ts
index 868acb4..123ae0f 100644
--- a/apps/api/src/onboarding.ts
+++ b/apps/api/src/onboarding.ts
@@ -1,6 +1,7 @@
 import { ORPCError } from "@orpc/server";
 import type { JobPublisher } from "@rakazo/adapter-kit";
-import { type ConnectorRegistry, getCoachRhythm } from "@rakazo/adapters";
+import type { ConnectorRegistry } from "@rakazo/adapters";
+import { getCoachRhythm } from "@rakazo/adapters";
 import type { Actor, MessageBlock, OnboardingStep } from "@rakazo/contracts";
 import { CHOICE_TEXT_ANSWER_ID } from "@rakazo/contracts";
 import { featuredConnectorProvidersMatch } from "@rakazo/core";
@@ -13,14 +14,11 @@ import {
   type PrismaClient,
   type ThreadEvents,
 } from "@rakazo/db";
+import type { ChoiceBlock, FocusOption, IntakeAnswer, IntakeContext } from "./onboarding-intake.js";
 import {
-  type ChoiceBlock,
   closingNote,
   FOCUS_OPTIONS,
-  type FocusOption,
   focusCard,
-  type IntakeAnswer,
-  type IntakeContext,
   intakeContext,
   intakeStep,
   nextIntakeStep,
diff --git a/apps/web/e2e/notification-settings.spec.ts b/apps/web/e2e/notification-settings.spec.ts
index 27e1571..b21a36c 100644
--- a/apps/web/e2e/notification-settings.spec.ts
+++ b/apps/web/e2e/notification-settings.spec.ts
@@ -3,7 +3,8 @@
  * Chromium has no push service), sets quiet hours and switches nudges off; all of it survives a
  * reload.
  */
-import { expect, type Page, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 import { captureScreenshot, completeOnboarding, openUserSettings, rpc, signup } from "./helpers";
 
 const ENDPOINT = "https://push.example.test/e2e-device";
diff --git a/apps/web/e2e/onboarding-discovery.spec.ts b/apps/web/e2e/onboarding-discovery.spec.ts
index 0f639bc..d953085 100644
--- a/apps/web/e2e/onboarding-discovery.spec.ts
+++ b/apps/web/e2e/onboarding-discovery.spec.ts
@@ -2,7 +2,8 @@
  * E2E: the deployment owner's onboarding asks before scanning the fixture home folder the
  * harness configures, then adds only the projects and facts the user picks.
  */
-import { expect, type Page, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 import type { SpaceNavigation, UserProfileState } from "@rakazo/contracts";
 import { captureScreenshot, rpc, signup } from "./helpers";
 
diff --git a/apps/web/e2e/onboarding-intake.spec.ts b/apps/web/e2e/onboarding-intake.spec.ts
index fdcac51..ae8967a 100644
--- a/apps/web/e2e/onboarding-intake.spec.ts
+++ b/apps/web/e2e/onboarding-intake.spec.ts
@@ -2,7 +2,8 @@
  * E2E: after the wizard the main bot gets to know the user in the main conversation, one card
  * after each answer, without ever blocking the composer.
  */
-import { expect, type Page, test } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
 import { captureScreenshot, completeOnboarding, rpc, signup } from "./helpers";
 
 function card(page: Page, step: string) {
diff --git a/packages/adapters/src/executor.ts b/packages/adapters/src/executor.ts
index 0dadc70..ebc5905 100644
--- a/packages/adapters/src/executor.ts
+++ b/packages/adapters/src/executor.ts
@@ -85,6 +85,7 @@ import {
   stableJsonValue,
   toolEffectIdempotencyKey,
 } from "@rakazo/core/node/approval-effect-key";
+import type { McpServer, Prisma, PrismaClient, ThreadEvents } from "@rakazo/db";
 import {
   appendEventInTransaction,
   createSpaceForMember,
@@ -99,12 +100,8 @@ import {
   loadCoachSummary,
   loadRunHistoryMessages,
   loadUserContext,
-  type McpServer,
-  type Prisma,
-  type PrismaClient,
   parseComputerMode,
   SpaceLimitError,
-  type ThreadEvents,
 } from "@rakazo/db";
 import { getLogger } from "@rakazo/logging";
 import {
diff --git a/packages/adapters/src/notify-user.postgres.test.ts b/packages/adapters/src/notify-user.postgres.test.ts
index e5e63d2..632fc8d 100644
--- a/packages/adapters/src/notify-user.postgres.test.ts
+++ b/packages/adapters/src/notify-user.postgres.test.ts
@@ -9,11 +9,8 @@ import {
 } from "@rakazo/db";
 import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
 import { notifyUserFromTool } from "./notify-user-tool.js";
-import {
-  PushNotificationProvider,
-  type PushPayload,
-  type PushSender,
-} from "./push-notifications.js";
+import type { PushPayload, PushSender } from "./push-notifications.js";
+import { PushNotificationProvider } from "./push-notifications.js";
 
 const databaseUrl = process.env.DATABASE_URL;
 const describePostgres =
diff --git a/packages/adapters/src/push-notifications.test.ts b/packages/adapters/src/push-notifications.test.ts
index e457023..b368799 100644
--- a/packages/adapters/src/push-notifications.test.ts
+++ b/packages/adapters/src/push-notifications.test.ts
@@ -1,12 +1,8 @@
 import type { NotificationMessage } from "@rakazo/adapter-kit";
 import type { PrismaClient } from "@rakazo/db";
 import { describe, expect, it, vi } from "vitest";
-import {
-  PushNotificationProvider,
-  type PushOutcome,
-  type PushPayload,
-  type PushSender,
-} from "./push-notifications.js";
+import type { PushOutcome, PushPayload, PushSender } from "./push-notifications.js";
+import { PushNotificationProvider } from "./push-notifications.js";
 
 const context = {
   operationId: "notify",
diff --git a/packages/adapters/src/web-push.ts b/packages/adapters/src/web-push.ts
index e851d9e..9381523 100644
--- a/packages/adapters/src/web-push.ts
+++ b/packages/adapters/src/web-push.ts
@@ -4,7 +4,8 @@ import { getLogger } from "@rakazo/logging";
 import { Agent } from "undici";
 import webPush from "web-push";
 import { combineSignals } from "./connector-safety.js";
-import { createAddressCheckedLookup, type ResolveHostname } from "./network-address.js";
+import type { ResolveHostname } from "./network-address.js";
+import { createAddressCheckedLookup } from "./network-address.js";
 import type { PushOutcome, PushPayload, PushTarget } from "./push-notifications.js";
 import type { EncryptedSecretStore } from "./secrets.js";
 import { dispatcherFetch } from "./undici-fetch.js";