WIP

cameroncooke · cameroncooke · commit f11261201f21 · 2025-05-01T16:42:23.000+01:00
diff --git a/example_projects/iOS/MCPTest.xcodeproj/xcshareddata/xcschemes/MCPTest.xcscheme b/example_projects/iOS/MCPTest.xcodeproj/xcshareddata/xcschemes/MCPTest.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1630"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8BA9F7E92D62A14300C22D5D"
+               BuildableName = "MCPTest.app"
+               BlueprintName = "MCPTest"
+               ReferencedContainer = "container:MCPTest.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8BA9F7F92D62A14500C22D5D"
+               BuildableName = "MCPTestTests.xctest"
+               BlueprintName = "MCPTestTests"
+               ReferencedContainer = "container:MCPTest.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8BA9F8032D62A14500C22D5D"
+               BuildableName = "MCPTestUITests.xctest"
+               BlueprintName = "MCPTestUITests"
+               ReferencedContainer = "container:MCPTest.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8BA9F7E92D62A14300C22D5D"
+            BuildableName = "MCPTest.app"
+            BlueprintName = "MCPTest"
+            ReferencedContainer = "container:MCPTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8BA9F7E92D62A14300C22D5D"
+            BuildableName = "MCPTest.app"
+            BlueprintName = "MCPTest"
+            ReferencedContainer = "container:MCPTest.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "lint": "eslint 'src/**/*.{js,ts}'",
     "lint:fix": "eslint 'src/**/*.{js,ts}' --fix",
     "format": "prettier --write 'src/**/*.{js,ts}'",
-    "format:check": "prettier --check 'src/**/*.{js,ts}'"
+    "format:check": "prettier --check 'src/**/*.{js,ts}'",
+    "inspect": "npx @modelcontextprotocol/inspector node build/index.js"
   },
   "files": [
     "build"
diff --git a/src/types/common.ts b/src/types/common.ts
@@ -64,14 +64,19 @@ export interface ValidationResult {
 }
 
 /**
- * XcodeCommandResponse - Result of xcodebuild command execution
+ * CommandResponse - Generic result of command execution
  */
-export interface XcodeCommandResponse {
+export interface CommandResponse {
   success: boolean;
   output: string;
   error?: string;
 }
 
+/**
+ * XcodeCommandResponse - Result of xcodebuild command execution
+ */
+export type XcodeCommandResponse = CommandResponse;
+
 /**
  * Interface for shared build parameters
  */
diff --git a/src/utils/build-utils.ts b/src/utils/build-utils.ts
@@ -11,6 +11,7 @@
  * - Standardizing response formatting for build results
  * - Managing build-specific error handling and reporting
  * - Supporting various build actions (build, clean, showBuildSettings, etc.)
+ * - Supporting xcodemake as an alternative build strategy for faster incremental builds
  *
  * This file depends on the lower-level utilities in xcode.ts for command execution
  * while adding build-specific behavior, formatting, and error handling.
@@ -20,6 +21,14 @@ import { log } from './logger.js';
 import { executeXcodeCommand, XcodePlatform, constructDestinationString } from './xcode.js';
 import { ToolResponse, SharedBuildParams, PlatformBuildOptions } from '../types/common.js';
 import { createTextResponse } from './validation.js';
+import {
+  isXcodemakeEnabled,
+  isXcodemakeAvailable,
+  executeXcodemakeCommand,
+  executeMakeCommand,
+  doesMakefileExist,
+} from './xcodemake.js';
+import path from 'path';
 
 /**
  * Common function to execute an Xcode build command across platforms
@@ -48,6 +57,27 @@ export async function executeXcodeBuild(
 
   log('info', `Starting ${platformOptions.logPrefix} ${buildAction} for scheme ${params.scheme}`);
 
+  // Check if xcodemake is enabled and available
+  const useXcodemake = isXcodemakeEnabled();
+  let xcodemakeAvailable = false;
+
+  if (useXcodemake && buildAction === 'build') {
+    xcodemakeAvailable = await isXcodemakeAvailable();
+    if (!xcodemakeAvailable) {
+      log('warning', 'xcodemake is enabled but not available. Falling back to xcodebuild.');
+      buildMessages.push({
+        type: 'text',
+        text: '⚠️ xcodemake is enabled but not found in PATH. Falling back to xcodebuild.',
+      });
+    } else {
+      log('info', 'Using xcodemake for faster incremental builds.');
+      buildMessages.push({
+        type: 'text',
+        text: 'ℹ️ Using xcodemake for faster incremental builds.',
+      });
+    }
+  }
+
   try {
     const command = ['xcodebuild'];
 
@@ -116,13 +146,48 @@ export async function executeXcodeBuild(
       command.push('-derivedDataPath', params.derivedDataPath);
     }
 
-    if (params.extraArgs) {
+    if (params.extraArgs && params.extraArgs.length > 0) {
       command.push(...params.extraArgs);
     }
 
     command.push(buildAction);
 
-    const result = await executeXcodeCommand(command, platformOptions.logPrefix);
+    // Determine project directory for xcodemake
+    let projectDir = '';
+    if (params.workspacePath) {
+      projectDir = path.dirname(params.workspacePath);
+    } else if (params.projectPath) {
+      projectDir = path.dirname(params.projectPath);
+    }
+
+    // Execute the command using xcodemake or xcodebuild
+    let result;
+    if (useXcodemake && xcodemakeAvailable && buildAction === 'build') {
+      // Check if Makefile already exists
+      const makefileExists = doesMakefileExist(projectDir);
+
+      if (makefileExists) {
+        // Use make for incremental builds
+        log('info', 'Makefile exists, using make for incremental build');
+        buildMessages.push({
+          type: 'text',
+          text: 'ℹ️ Using make for incremental build',
+        });
+        result = await executeMakeCommand(projectDir, platformOptions.logPrefix);
+      } else {
+        // Generate Makefile using xcodemake
+        log('info', 'Generating Makefile with xcodemake');
+        buildMessages.push({
+          type: 'text',
+          text: 'ℹ️ Generating Makefile with xcodemake (first build may take longer)',
+        });
+        // Remove 'xcodebuild' from the command array before passing to executeXcodemakeCommand
+        result = await executeXcodemakeCommand(command.slice(1), platformOptions.logPrefix);
+      }
+    } else {
+      // Use standard xcodebuild
+      result = await executeXcodeCommand(command, platformOptions.logPrefix);
+    }
 
     // Grep warnings and errors from stdout (build output)
     const warningOrErrorLines = grepWarningsAndErrors(result.output);
@@ -163,6 +228,14 @@ export async function executeXcodeBuild(
     // Create additional info based on platform and action
     let additionalInfo = '';
 
+    // Add xcodemake info if relevant
+    if (useXcodemake && xcodemakeAvailable && buildAction === 'build') {
+      additionalInfo += `xcodemake: Using faster incremental builds with xcodemake. 
+Future builds will use the generated Makefile for improved performance.
+
+`;
+    }
+
     // Only show next steps for 'build' action
     if (buildAction === 'build') {
       if (platformOptions.platform === XcodePlatform.macOS) {
diff --git a/src/utils/command.ts b/src/utils/command.ts
@@ -0,0 +1,63 @@
+/**
+ * Command Utilities - Generic command execution utilities
+ *
+ * This utility module provides functions for executing shell commands.
+ * It serves as a foundation for other utility modules that need to execute commands.
+ *
+ * Responsibilities:
+ * - Executing shell commands with proper argument handling
+ * - Managing process spawning, output capture, and error handling
+ */
+
+import { spawn } from 'child_process';
+import { log } from './logger.js';
+
+/**
+ * Command execution response interface
+ */
+export interface CommandResponse {
+  success: boolean;
+  output: string;
+  error?: string;
+}
+
+/**
+ * Execute a shell command
+ * @param command Command string to execute
+ * @returns Promise resolving to command response
+ */
+export async function executeCommand(command: string): Promise<CommandResponse> {
+  log('info', `Executing command: ${command}`);
+
+  return new Promise((resolve, reject) => {
+    const process = spawn('sh', ['-c', command], {
+      stdio: ['ignore', 'pipe', 'pipe'], // ignore stdin, pipe stdout/stderr
+    });
+
+    let stdout = '';
+    let stderr = '';
+
+    process.stdout.on('data', (data) => {
+      stdout += data.toString();
+    });
+
+    process.stderr.on('data', (data) => {
+      stderr += data.toString();
+    });
+
+    process.on('close', (code) => {
+      const success = code === 0;
+      const response: CommandResponse = {
+        success,
+        output: stdout,
+        error: success ? undefined : stderr,
+      };
+
+      resolve(response);
+    });
+
+    process.on('error', (err) => {
+      reject(err);
+    });
+  });
+}
diff --git a/src/utils/xcodemake.ts b/src/utils/xcodemake.ts
