ref(simulator): Use shared destination string construction

Route simulator destination string creation through constructDestinationString in\nget_sim_app_path and build_run_sim to keep formatting and behavior\nconsistent across tools and reduce drift risk.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: cameroncooke

src/mcp/tools/simulator/build_run_sim.ts

@@ -21,6 +21,7 @@ import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { determineSimulatorUuid } from '../../../utils/simulator-utils.ts';
 import { nullifyEmptyStrings } from '../../../utils/schema-helpers.ts';
 import { inferPlatform } from '../../../utils/infer-platform.ts';
+import { constructDestinationString } from '../../../utils/xcode.ts';
 
 // Unified schema: XOR between projectPath and workspacePath, and XOR between simulatorId and simulatorName
 const baseOptions = {
@@ -185,12 +186,21 @@ export async function build_run_simLogic(
     // Handle destination for simulator
     let destinationString: string;
     if (params.simulatorId) {
-      destinationString = `platform=${detectedPlatform},id=${params.simulatorId}`;
+      destinationString = constructDestinationString(
+        detectedPlatform,
+        undefined,
+        params.simulatorId,
+      );
     } else if (params.simulatorName) {
-      destinationString = `platform=${detectedPlatform},name=${params.simulatorName}${(params.useLatestOS ?? true) ? ',OS=latest' : ''}`;
+      destinationString = constructDestinationString(
+        detectedPlatform,
+        params.simulatorName,
+        undefined,
+        params.useLatestOS ?? true,
+      );
     } else {
       // This shouldn't happen due to validation, but handle it
-      destinationString = `platform=${detectedPlatform}`;
+      destinationString = constructDestinationString(detectedPlatform);
     }
     command.push('-destination', destinationString);
 

src/mcp/tools/simulator/get_sim_app_path.ts

@@ -13,6 +13,7 @@ import type { CommandExecutor } from '../../../utils/execution/index.ts';
 import { getDefaultCommandExecutor } from '../../../utils/execution/index.ts';
 import type { ToolResponse } from '../../../types/common.ts';
 import { XcodePlatform } from '../../../types/common.ts';
+import { constructDestinationString } from '../../../utils/xcode.ts';
 import {
   createSessionAwareTool,
   getSessionAwareToolSchemaShape,
@@ -125,9 +126,14 @@ export async function get_sim_app_pathLogic(
     let destinationString = '';
 
     if (simulatorId) {
-      destinationString = `platform=${platform},id=${simulatorId}`;
+      destinationString = constructDestinationString(platform, undefined, simulatorId);
     } else if (simulatorName) {
-      destinationString = `platform=${platform},name=${simulatorName}${useLatestOS ? ',OS=latest' : ''}`;
+      destinationString = constructDestinationString(
+        platform,
+        simulatorName,
+        undefined,
+        useLatestOS,
+      );
     } else {
       return createTextResponse(
         `For ${platform} platform, either simulatorId or simulatorName must be provided`,