Fix doctor and DAP tests

Author: cameroncooke

docs/TOOLS.md

@@ -122,4 +122,4 @@ XcodeBuildMCP provides 71 tools organized into 13 workflow groups for comprehens
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` using static analysis. Last updated: 2026-01-04*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` using static analysis. Last updated: 2026-01-08*

src/mcp/tools/doctor/__tests__/doctor.test.ts

@@ -7,9 +7,11 @@
 import { describe, it, expect, beforeEach } from 'vitest';
 import * as z from 'zod';
 import doctor, { runDoctor, type DoctorDependencies } from '../doctor.ts';
+import { createMockExecutor } from '../../../../test-utils/mock-executors.ts';
 
 function createDeps(overrides?: Partial<DoctorDependencies>): DoctorDependencies {
   const base: DoctorDependencies = {
+    commandExecutor: createMockExecutor({ output: 'lldb-dap' }),
     binaryChecker: {
       async checkBinaryAvailability(binary: string) {
         // default: all available with generic version

src/utils/debugger/dap/__tests__/transport-framing.test.ts

@@ -1,11 +1,18 @@
+import type { ChildProcess } from 'node:child_process';
+import { EventEmitter } from 'node:events';
+import { PassThrough } from 'node:stream';
+import type { InteractiveProcess, InteractiveSpawner } from '../../../execution/index.ts';
 import { describe, expect, it } from 'vitest';
 
 import { DapTransport } from '../transport.ts';
 import type { DapEvent, DapResponse } from '../types.ts';
-import {
-  createMockInteractiveSpawner,
-  type MockInteractiveSession,
-} from '../../../../test-utils/mock-executors.ts';
+type TestSession = {
+  stdout: PassThrough;
+  stderr: PassThrough;
+  stdin: PassThrough;
+  emitExit: (code?: number | null, signal?: NodeJS.Signals | null) => void;
+  emitError: (error: Error) => void;
+};
 
 function encodeMessage(message: Record<string, unknown>): string {
   const payload = JSON.stringify(message);
@@ -27,14 +34,73 @@ function buildResponse(
   };
 }
 
+function createTestSpawner(): { spawner: InteractiveSpawner; session: TestSession } {
+  const stdout = new PassThrough();
+  const stderr = new PassThrough();
+  const stdin = new PassThrough();
+  const emitter = new EventEmitter();
+  const mockProcess = emitter as unknown as ChildProcess;
+  const mutableProcess = mockProcess as unknown as {
+    stdout: PassThrough | null;
+    stderr: PassThrough | null;
+    stdin: PassThrough | null;
+    killed: boolean;
+    exitCode: number | null;
+    signalCode: NodeJS.Signals | null;
+    spawnargs: string[];
+    spawnfile: string;
+    pid: number;
+  };
+
+  mutableProcess.stdout = stdout;
+  mutableProcess.stderr = stderr;
+  mutableProcess.stdin = stdin;
+  mutableProcess.killed = false;
+  mutableProcess.exitCode = null;
+  mutableProcess.signalCode = null;
+  mutableProcess.spawnargs = [];
+  mutableProcess.spawnfile = 'mock';
+  mutableProcess.pid = 12345;
+  mockProcess.kill = ((signal?: NodeJS.Signals): boolean => {
+    mutableProcess.killed = true;
+    emitter.emit('exit', 0, signal ?? null);
+    return true;
+  }) as ChildProcess['kill'];
+
+  const session: TestSession = {
+    stdout,
+    stderr,
+    stdin,
+    emitExit: (code = 0, signal = null) => {
+      emitter.emit('exit', code, signal);
+    },
+    emitError: (error) => {
+      emitter.emit('error', error);
+    },
+  };
+
+  const spawner: InteractiveSpawner = (): InteractiveProcess => ({
+    process: mockProcess,
+    write(data: string): void {
+      stdin.write(data);
+    },
+    kill(signal?: NodeJS.Signals): void {
+      mockProcess.kill?.(signal);
+    },
+    dispose(): void {
+      stdout.end();
+      stderr.end();
+      stdin.end();
+      emitter.removeAllListeners();
+    },
+  });
+
+  return { spawner, session };
+}
+
 describe('DapTransport framing', () => {
   it('parses responses across chunk boundaries', async () => {
-    let session: MockInteractiveSession | null = null;
-    const spawner = createMockInteractiveSpawner({
-      onSpawn: (spawned) => {
-        session = spawned;
-      },
-    });
+    const { spawner, session } = createTestSpawner();
 
     const transport = new DapTransport({ spawner, adapterCommand: ['lldb-dap'] });
 
@@ -45,20 +111,15 @@ describe('DapTransport framing', () => {
     );
 
     const response = encodeMessage(buildResponse(1, 'initialize', { ok: true }));
-    session?.stdout.write(response.slice(0, 12));
-    session?.stdout.write(response.slice(12));
+    session.stdout.write(response.slice(0, 12));
+    session.stdout.write(response.slice(12));
 
     await expect(responsePromise).resolves.toEqual({ ok: true });
     transport.dispose();
   });
 
   it('handles multiple messages in a single chunk', async () => {
-    let session: MockInteractiveSession | null = null;
-    const spawner = createMockInteractiveSpawner({
-      onSpawn: (spawned) => {
-        session = spawned;
-      },
-    });
+    const { spawner, session } = createTestSpawner();
 
     const transport = new DapTransport({ spawner, adapterCommand: ['lldb-dap'] });
     const events: DapEvent[] = [];
@@ -78,7 +139,7 @@ describe('DapTransport framing', () => {
     });
     const responseMessage = encodeMessage(buildResponse(1, 'threads', { ok: true }));
 
-    session?.stdout.write(`${eventMessage}${responseMessage}`);
+    session.stdout.write(`${eventMessage}${responseMessage}`);
 
     await expect(responsePromise).resolves.toEqual({ ok: true });
     expect(events).toHaveLength(1);
@@ -87,12 +148,7 @@ describe('DapTransport framing', () => {
   });
 
   it('continues after invalid headers', async () => {
-    let session: MockInteractiveSession | null = null;
-    const spawner = createMockInteractiveSpawner({
-      onSpawn: (spawned) => {
-        session = spawned;
-      },
-    });
+    const { spawner, session } = createTestSpawner();
 
     const transport = new DapTransport({ spawner, adapterCommand: ['lldb-dap'] });
 
@@ -102,9 +158,9 @@ describe('DapTransport framing', () => {
       { timeoutMs: 1_000 },
     );
 
-    session?.stdout.write('Content-Length: nope\r\n\r\n');
+    session.stdout.write('Content-Length: nope\r\n\r\n');
     const responseMessage = encodeMessage(buildResponse(1, 'stackTrace', { ok: true }));
-    session?.stdout.write(responseMessage);
+    session.stdout.write(responseMessage);
 
     await expect(responsePromise).resolves.toEqual({ ok: true });
     transport.dispose();