Improve Xcode build path parsing and add workspace build test

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

Author: cursoragent

src/mcp/tools/device/__tests__/build_device.test.ts

@@ -135,6 +135,58 @@ describe('build_device plugin', () => {
       expect(result.content[0].text).toContain('✅ iOS Device Build build succeeded');
     });
 
+    it('should verify workspace command generation with mock executor', async () => {
+      const commandCalls: Array<{
+        args: string[];
+        logPrefix: string;
+        silent: boolean;
+        timeout: number | undefined;
+      }> = [];
+
+      const stubExecutor = async (
+        args: string[],
+        logPrefix: string,
+        silent: boolean,
+        timeout?: number,
+      ) => {
+        commandCalls.push({ args, logPrefix, silent, timeout });
+        return {
+          success: true,
+          output: 'Build succeeded',
+          error: undefined,
+          process: { pid: 12345 },
+        };
+      };
+
+      await buildDeviceLogic(
+        {
+          workspacePath: '/path/to/MyProject.xcworkspace',
+          scheme: 'MyScheme',
+        },
+        stubExecutor,
+      );
+
+      expect(commandCalls).toHaveLength(1);
+      expect(commandCalls[0]).toEqual({
+        args: [
+          'xcodebuild',
+          '-workspace',
+          '/path/to/MyProject.xcworkspace',
+          '-scheme',
+          'MyScheme',
+          '-configuration',
+          'Debug',
+          '-skipMacroValidation',
+          '-destination',
+          'generic/platform=iOS',
+          'build',
+        ],
+        logPrefix: 'iOS Device Build',
+        silent: true,
+        timeout: undefined,
+      });
+    });
+
     it('should verify command generation with mock executor', async () => {
       const commandCalls: Array<{
         args: string[];

src/mcp/tools/device/get_device_app_path.ts

@@ -6,7 +6,7 @@
  */
 
 import { z } from 'zod';
-import { ToolResponse } from '../../../types/common.js';
+import { ToolResponse, XcodePlatform } from '../../../types/common.js';
 import { log } from '../../../utils/index.js';
 import { createTextResponse } from '../../../utils/index.js';
 import { CommandExecutor, getDefaultCommandExecutor } from '../../../utils/index.js';
@@ -42,18 +42,6 @@ const getDeviceAppPathSchema = baseSchema
 // Use z.infer for type safety
 type GetDeviceAppPathParams = z.infer<typeof getDeviceAppPathSchema>;
 
-const XcodePlatform = {
-  iOS: 'iOS',
-  watchOS: 'watchOS',
-  tvOS: 'tvOS',
-  visionOS: 'visionOS',
-  iOSSimulator: 'iOS Simulator',
-  watchOSSimulator: 'watchOS Simulator',
-  tvOSSimulator: 'tvOS Simulator',
-  visionOSSimulator: 'visionOS Simulator',
-  macOS: 'macOS',
-};
-
 export async function get_device_app_pathLogic(
   params: GetDeviceAppPathParams,
   executor: CommandExecutor,
@@ -81,7 +69,7 @@ export async function get_device_app_pathLogic(
       command.push('-workspace', params.workspacePath);
     } else {
       // This should never happen due to schema validation
-      throw new Error('Neither projectPath nor workspacePath provided');
+      throw new Error('Either projectPath or workspacePath is required.');
     }
 
     // Add the scheme and configuration
@@ -117,8 +105,8 @@ export async function get_device_app_pathLogic(
     }
 
     const buildSettingsOutput = result.output;
-    const builtProductsDirMatch = buildSettingsOutput.match(/BUILT_PRODUCTS_DIR = (.+)$/m);
-    const fullProductNameMatch = buildSettingsOutput.match(/FULL_PRODUCT_NAME = (.+)$/m);
+    const builtProductsDirMatch = buildSettingsOutput.match(/^\s*BUILT_PRODUCTS_DIR\s*=\s*(.+)$/m);
+    const fullProductNameMatch = buildSettingsOutput.match(/^\s*FULL_PRODUCT_NAME\s*=\s*(.+)$/m);
 
     if (!builtProductsDirMatch || !fullProductNameMatch) {
       return createTextResponse(

src/mcp/tools/macos/get_macos_app_path.ts

@@ -74,7 +74,7 @@ export async function get_macos_app_pathLogic(
       command.push('-workspace', params.workspacePath);
     } else {
       // This should never happen due to schema validation
-      throw new Error('Neither projectPath nor workspacePath provided');
+      throw new Error('Either projectPath or workspacePath is required.');
     }
 
     // Add the scheme and configuration
@@ -125,8 +125,8 @@ export async function get_macos_app_pathLogic(
     }
 
     const buildSettingsOutput = result.output;
-    const builtProductsDirMatch = buildSettingsOutput.match(/BUILT_PRODUCTS_DIR = (.+)$/m);
-    const fullProductNameMatch = buildSettingsOutput.match(/FULL_PRODUCT_NAME = (.+)$/m);
+    const builtProductsDirMatch = buildSettingsOutput.match(/^\s*BUILT_PRODUCTS_DIR\s*=\s*(.+)$/m);
+    const fullProductNameMatch = buildSettingsOutput.match(/^\s*FULL_PRODUCT_NAME\s*=\s*(.+)$/m);
 
     if (!builtProductsDirMatch || !fullProductNameMatch) {
       return {