Refactor tool interfaces, improve error handling, and update tool references

Co-authored-by: web <web@cameroncooke.com>

Author: cursoragent

src/mcp/tools/device/test_device.ts

@@ -69,6 +69,9 @@ async function parseXcresultBundle(
     if (!result.success) {
       throw new Error(result.error ?? 'Failed to execute xcresulttool');
     }
+    if (!result.output || result.output.trim().length === 0) {
+      throw new Error('xcresulttool returned no output');
+    }
 
     // Parse JSON response and format as human-readable
     const summaryData = JSON.parse(result.output) as Record<string, unknown>;
@@ -163,9 +166,19 @@ export async function testDeviceLogic(
     `Starting test run for scheme ${params.scheme} on platform ${params.platform ?? 'iOS'} (internal)`,
   );
 
+  let tempDir: string | undefined;
+  const cleanup = async (): Promise<void> => {
+    if (!tempDir) return;
+    try {
+      await fileSystemExecutor.rm(tempDir, { recursive: true, force: true });
+    } catch (cleanupError) {
+      log('warn', `Failed to clean up temporary directory: ${cleanupError}`);
+    }
+  };
+
   try {
     // Create temporary directory for xcresult bundle
-    const tempDir = await fileSystemExecutor.mkdtemp(
+    tempDir = await fileSystemExecutor.mkdtemp(
       join(fileSystemExecutor.tmpdir(), 'xcodebuild-test-'),
     );
     const resultBundlePath = join(tempDir, 'TestResults.xcresult');
@@ -214,7 +227,7 @@ export async function testDeviceLogic(
       log('info', 'Successfully parsed xcresult bundle');
 
       // Clean up temporary directory
-      await fileSystemExecutor.rm(tempDir, { recursive: true, force: true });
+      await cleanup();
 
       // Return combined result - preserve isError from testResult (test failures should be marked as errors)
       return {
@@ -231,19 +244,16 @@ export async function testDeviceLogic(
       // If parsing fails, return original test result
       log('warn', `Failed to parse xcresult bundle: ${parseError}`);
 
-      // Clean up temporary directory even if parsing fails
-      try {
-        await fileSystemExecutor.rm(tempDir, { recursive: true, force: true });
-      } catch (cleanupError) {
-        log('warn', `Failed to clean up temporary directory: ${cleanupError}`);
-      }
+      await cleanup();
 
       return testResult;
     }
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     log('error', `Error during test run: ${errorMessage}`);
     return createTextResponse(`Error during test run: ${errorMessage}`, true);
+  } finally {
+    await cleanup();
   }
 }
 
@@ -254,13 +264,13 @@ export default {
   schema: baseSchemaObject.shape,
   handler: createTypedTool<TestDeviceParams>(
     testDeviceSchema as z.ZodType<TestDeviceParams>,
-    (params: TestDeviceParams) => {
+    (params: TestDeviceParams, executor: CommandExecutor) => {
       return testDeviceLogic(
         {
           ...params,
           platform: params.platform ?? 'iOS',
         },
-        getDefaultCommandExecutor(),
+        executor,
         getDefaultFileSystemExecutor(),
       );
     },

src/mcp/tools/macos/build_run_macos.ts

@@ -52,7 +52,7 @@ export type BuildRunMacOSParams = z.infer<typeof buildRunMacOSSchema>;
  */
 async function _handleMacOSBuildLogic(
   params: BuildRunMacOSParams,
-  executor: CommandExecutor = getDefaultCommandExecutor(),
+  executor: CommandExecutor,
 ): Promise<ToolResponse> {
   log('info', `Starting macOS build for scheme ${params.scheme} (internal)`);
 
@@ -66,16 +66,16 @@ async function _handleMacOSBuildLogic(
       arch: params.arch,
       logPrefix: 'macOS Build',
     },
-    params.preferXcodebuild,
+    params.preferXcodebuild ?? false,
     'build',
     executor,
   );
 }
 
 async function _getAppPathFromBuildSettings(
   params: BuildRunMacOSParams,
-  executor: CommandExecutor = getDefaultCommandExecutor(),
-): Promise<{ success: boolean; appPath?: string; error?: string }> {
+  executor: CommandExecutor,
+): Promise<{ success: true; appPath: string } | { success: false; error: string }> {
   try {
     // Create the command array for xcodebuild
     const command = ['xcodebuild', '-showBuildSettings'];
@@ -163,11 +163,11 @@ export async function buildRunMacOSLogic(
       return response;
     }
 
-    const appPath = appPathResult.appPath; // We know this is a valid string now
+    const appPath = appPathResult.appPath; // success === true narrows to string
     log('info', `App path determined as: ${appPath}`);
 
     // 4. Launch the app using CommandExecutor
-    const launchResult = await executor(['open', appPath!], 'Launch macOS App', true);
+    const launchResult = await executor(['open', appPath], 'Launch macOS App', true);
 
     if (!launchResult.success) {
       log('error', `Build succeeded, but failed to launch app ${appPath}: ${launchResult.error}`);
@@ -211,14 +211,14 @@ export default {
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<BuildRunMacOSParams>(
     buildRunMacOSSchema as z.ZodType<BuildRunMacOSParams>,
-    (params: BuildRunMacOSParams) =>
+    (params: BuildRunMacOSParams, executor) =>
       buildRunMacOSLogic(
         {
           ...params,
           configuration: params.configuration ?? 'Debug',
           preferXcodebuild: params.preferXcodebuild ?? false,
         },
-        getDefaultCommandExecutor(),
+        executor,
       ),
     getDefaultCommandExecutor,
   ),

src/mcp/tools/macos/get_macos_app_path.ts

@@ -81,22 +81,19 @@ export async function get_macos_app_pathLogic(
     command.push('-scheme', params.scheme);
     command.push('-configuration', configuration);
 
-    // Add optional derived data path (only for projects)
-    if (params.derivedDataPath && params.projectPath) {
+    // Add optional derived data path
+    if (params.derivedDataPath) {
       command.push('-derivedDataPath', params.derivedDataPath);
     }
 
-    // Handle destination for macOS (only for workspaces)
-    if (params.workspacePath) {
-      let destinationString = 'platform=macOS';
-      if (params.arch) {
-        destinationString += `,arch=${params.arch}`;
-      }
+    // Handle destination for macOS when arch is specified
+    if (params.arch) {
+      const destinationString = `platform=macOS,arch=${params.arch}`;
       command.push('-destination', destinationString);
     }
 
-    // Add extra arguments if provided (only for projects)
-    if (params.extraArgs && Array.isArray(params.extraArgs) && params.projectPath) {
+    // Add extra arguments if provided
+    if (params.extraArgs && Array.isArray(params.extraArgs)) {
       command.push(...params.extraArgs);
     }
 

src/mcp/tools/project-discovery/__tests__/list_schemes.test.ts

@@ -78,7 +78,7 @@ describe('list_schemes plugin', () => {
             type: 'text',
             text: `Next Steps:
 1. Build the app: build_macos({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyProject" })
-   or for iOS: build_simulator_name({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyProject", simulatorName: "iPhone 16" })
+   or for iOS: build_simulator({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyProject", simulatorName: "iPhone 16" })
 2. Show build settings: show_build_settings({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyProject" })`,
           },
         ],
@@ -295,7 +295,7 @@ describe('list_schemes plugin', () => {
             type: 'text',
             text: `Next Steps:
 1. Build the app: build_macos({ workspacePath: "/path/to/MyProject.xcworkspace", scheme: "MyApp" })
-   or for iOS: build_simulator_name({ workspacePath: "/path/to/MyProject.xcworkspace", scheme: "MyApp", simulatorName: "iPhone 16" })
+   or for iOS: build_simulator({ workspacePath: "/path/to/MyProject.xcworkspace", scheme: "MyApp", simulatorName: "iPhone 16" })
 2. Show build settings: show_build_settings({ workspacePath: "/path/to/MyProject.xcworkspace", scheme: "MyApp" })`,
           },
         ],

src/mcp/tools/project-discovery/list_schemes.ts

@@ -80,7 +80,7 @@ export async function listSchemesLogic(
       // Note: After Phase 2, these will be unified tool names too
       nextStepsText = `Next Steps:
 1. Build the app: build_macos({ ${projectOrWorkspace}Path: "${path}", scheme: "${firstScheme}" })
-   or for iOS: build_simulator_name({ ${projectOrWorkspace}Path: "${path}", scheme: "${firstScheme}", simulatorName: "iPhone 16" })
+   or for iOS: build_simulator({ ${projectOrWorkspace}Path: "${path}", scheme: "${firstScheme}", simulatorName: "iPhone 16" })
 2. Show build settings: show_build_settings({ ${projectOrWorkspace}Path: "${path}", scheme: "${firstScheme}" })`;
     }
 

src/mcp/tools/project-scaffolding/__tests__/scaffold_macos_project.test.ts

@@ -249,7 +249,7 @@ describe('scaffold_macos_project plugin', () => {
                 nextSteps: [
                   'Important: Before working on the project make sure to read the README.md file in the workspace root directory.',
                   'Build for macOS: build_macos({ workspacePath: "/tmp/test-projects/MyProject.xcworkspace", scheme: "MyProject" })',
-                  'Run and run on macOS: build_run_mac_ws --workspace-path "/tmp/test-projects/MyProject.xcworkspace" --scheme "MyProject"',
+                  'Build & Run on macOS: build_run_macos({ workspacePath: "/tmp/test-projects/MyProject.xcworkspace", scheme: "MyProject" })',
                 ],
               },
               null,
@@ -289,7 +289,7 @@ describe('scaffold_macos_project plugin', () => {
                 nextSteps: [
                   'Important: Before working on the project make sure to read the README.md file in the workspace root directory.',
                   'Build for macOS: build_macos({ workspacePath: "/tmp/test-projects/MyProject.xcworkspace", scheme: "MyProject" })',
-                  'Run and run on macOS: build_run_mac_ws --workspace-path "/tmp/test-projects/MyProject.xcworkspace" --scheme "MyProject"',
+                  'Build & Run on macOS: build_run_macos({ workspacePath: "/tmp/test-projects/MyProject.xcworkspace", scheme: "MyProject" })',
                 ],
               },
               null,

src/mcp/tools/project-scaffolding/scaffold_macos_project.ts

@@ -365,7 +365,7 @@ export async function scaffold_macos_projectLogic(
       nextSteps: [
         `Important: Before working on the project make sure to read the README.md file in the workspace root directory.`,
         `Build for macOS: build_macos({ workspacePath: "${projectPath}/${params.customizeNames ? params.projectName : 'MyProject'}.xcworkspace", scheme: "${params.customizeNames ? params.projectName : 'MyProject'}" })`,
-        `Run and run on macOS: build_run_mac_ws --workspace-path "${projectPath}/${params.customizeNames ? params.projectName : 'MyProject'}.xcworkspace" --scheme "${params.customizeNames ? params.projectName : 'MyProject'}"`,
+        `Build & Run on macOS: build_run_macos({ workspacePath: "${projectPath}/${params.customizeNames ? params.projectName : 'MyProject'}.xcworkspace", scheme: "${params.customizeNames ? params.projectName : 'MyProject'}" })`,
       ],
     };