refactor: standardize platform naming and improve device validation logic

Author: tech-sushant

src/tools/sdk-utils/bstack/sdkHandler.ts

@@ -32,7 +32,7 @@ export async function runBstackSDKOnly(
         device.browser,
         device.browserVersion || "latest",
       ];
-    } else if (device.platform === "mac" || device.platform === "macos") {
+    } else if (device.platform === "macos") {
       return [
         "macos",
         device.osVersion,

src/tools/sdk-utils/common/device-validator.ts

@@ -230,19 +230,10 @@ export async function validateDevices(
   }
 
   // Determine what data we need to fetch
-  // Normalize "mac" to "macos" for consistency
-  const normalizedDevices = devices.map((env) => {
-    const platform = (env[0] || "").toLowerCase();
-    if (platform === "mac") {
-      return ["macos", ...env.slice(1)];
-    }
-    return env;
-  });
-  
-  const needsDesktop = normalizedDevices.some((env) =>
+  const needsDesktop = devices.some((env) =>
     ["windows", "macos"].includes((env[0] || "").toLowerCase()),
   );
-  const needsMobile = normalizedDevices.some((env) =>
+  const needsMobile = devices.some((env) =>
     ["android", "ios"].includes((env[0] || "").toLowerCase()),
   );
 
@@ -284,7 +275,7 @@ export async function validateDevices(
     iosIndex = createMobileIndex(iosEntries);
   }
 
-  for (const env of normalizedDevices) {
+  for (const env of devices) {
     const discriminator = (env[0] || "").toLowerCase();
     let validatedEnv: ValidatedEnvironment;
 

src/tools/sdk-utils/common/schema.ts

@@ -67,25 +67,41 @@ const DeviceSchema = z.discriminatedUnion("platform", [
     platform: z.literal("windows"),
     osVersion: z.string().describe("Windows version, e.g. '10', '11'"),
     browser: z.string().describe("Browser name, e.g. 'chrome', 'firefox', 'edge'"),
-    browserVersion: z.string().describe("Browser version, e.g. '132', 'latest', 'oldest'"),
+    browserVersion: z
+      .string()
+      .optional()
+      .describe("Browser version, e.g. '132', 'latest', 'oldest'"),
   }),
   z.object({
     platform: z.literal("android"),
-    deviceName: z.string().describe("Device name, e.g. 'Samsung Galaxy S24'"),
+    deviceName: z
+      .string()
+      .describe("Device name, e.g. 'Samsung Galaxy S24', 'Google Pixel 8'"),
     osVersion: z.string().describe("Android version, e.g. '14', '16', 'latest'"),
-    browser: z.string().describe("Browser name, e.g. 'chrome', 'samsung browser'"),
+    browser: z
+      .string()
+      .optional()
+      .describe("Browser name, e.g. 'chrome', 'samsung browser'"),
   }),
   z.object({
     platform: z.literal("ios"),
-    deviceName: z.string().describe("Device name, e.g. 'iPhone 12 Pro'"),
+    deviceName: z
+      .string()
+      .describe("Device name, e.g. 'iPhone 15', 'iPhone 14 Pro'"),
     osVersion: z.string().describe("iOS version, e.g. '17', 'latest'"),
-    browser: z.string().describe("Browser name, typically 'safari'"),
+    browser: z
+      .string()
+      .optional()
+      .describe("Browser name, typically 'safari'"),
   }),
   z.object({
-    platform: z.enum(["mac", "macos"]),
+    platform: z.literal("macos"),
     osVersion: z.string().describe("macOS version name, e.g. 'Sequoia', 'Ventura'"),
     browser: z.string().describe("Browser name, e.g. 'safari', 'chrome'"),
-    browserVersion: z.string().describe("Browser version, e.g. 'latest'"),
+    browserVersion: z
+      .string()
+      .optional()
+      .describe("Browser version, e.g. 'latest'"),
   }),
 ]);