diff --git a/apps/server/src/terminalManager.test.ts b/apps/server/src/terminalManager.test.ts
index 59e8cae453074f71902de5b31b1e32bafdee221e..bf7da6199fb567f07fc05896a8e177fdf9051b65 100644
--- a/apps/server/src/terminalManager.test.ts
+++ b/apps/server/src/terminalManager.test.ts
@@ -151,8 +151,10 @@ describe("TerminalManager", () => {
       ptyAdapter,
       historyLineLimit,
       shellResolver: options.shellResolver ?? (() => "/bin/bash"),
-      subprocessChecker: options.subprocessChecker,
-      subprocessPollIntervalMs: options.subprocessPollIntervalMs,
+      ...(options.subprocessChecker ? { subprocessChecker: options.subprocessChecker } : {}),
+      ...(options.subprocessPollIntervalMs
+        ? { subprocessPollIntervalMs: options.subprocessPollIntervalMs }
+        : {}),
     });
     return { logsDir, ptyAdapter, manager };
   }
diff --git a/apps/web/src/store.test.ts b/apps/web/src/store.test.ts
index 3294cef5030a350594031c8847eb8631b1720155..7497e46badedd407eac84bcca59695b40e187a9a 100644
--- a/apps/web/src/store.test.ts
+++ b/apps/web/src/store.test.ts
@@ -5,6 +5,9 @@ import { type AppState, reducer } from "./store";
 import { DEFAULT_THREAD_TERMINAL_HEIGHT, DEFAULT_THREAD_TERMINAL_ID } from "./types";
 import type { Thread } from "./types";
 
+type TerminalStartedEvent = Extract<TerminalEvent, { type: "started" }>;
+type TerminalActivityEvent = Extract<TerminalEvent, { type: "activity" }>;
+
 function makeSession(overrides: Partial<ProviderSession> = {}): ProviderSession {
   return {
     sessionId: "sess-1",
@@ -76,7 +79,9 @@ function makeState(thread: Thread): AppState {
   };
 }
 
-function makeTerminalStartedEvent(overrides: Partial<TerminalEvent> = {}): TerminalEvent {
+function makeTerminalStartedEvent(
+  overrides: Partial<TerminalStartedEvent> = {},
+): TerminalStartedEvent {
   return {
     type: "started",
     threadId: "thread-local-1",
@@ -97,7 +102,9 @@ function makeTerminalStartedEvent(overrides: Partial<TerminalEvent> = {}): Termi
   };
 }
 
-function makeTerminalActivityEvent(overrides: Partial<TerminalEvent> = {}): TerminalEvent {
+function makeTerminalActivityEvent(
+  overrides: Partial<TerminalActivityEvent> = {},
+): TerminalActivityEvent {
   return {
     type: "activity",
     threadId: "thread-local-1",