Merge branch 'browserstack:main' into main

Author: pushkarbw

README.md

@@ -35,9 +35,12 @@ Manage, execute, debug tests, and even fix code using plain English prompts.
 #### Reduced context switching:
 Stay in flow—keep all project context in one place and trigger actions directly from your IDE or LLM.
 
-## ⚡️ One Click MCP Setup
+## ⚡️ One Click MCP Setup  
+
+Click on the buttons below to install MCP in your respective IDE:
+
+<a href="http://mcp.browserstack.com/one-click-setup?client=vscode"><img src="assets/one-click-vs-code.png" alt="Install in VS Code" width="160" height="80"></a>&nbsp;&nbsp;&nbsp;<a href="http://mcp.browserstack.com/one-click-setup?client=cursor"><img src="assets/one-click-cursor.png" alt="Install in Cursor" width="150" height="70"></a>
 
-[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](http://mcp.browserstack.com/one-click-setup?client=vscode) &nbsp; [![Install in Cursor](https://img.shields.io/badge/Cursor-Install_Server-24bfa5?style=flat-square&color=000000&logo=visualstudiocode&logoColor=white)](http://mcp.browserstack.com/one-click-setup?client=cursor)
 #### Note : Ensure you are using Node version >= `18.0` 
 - Check your node version using `node --version`. Recommended version: `v22.15.0` (LTS)
 - To Upgrade Node :
@@ -156,8 +159,9 @@ Generate test cases from PRDs, convert manual tests to low-code automation, and
    
 ### **One Click MCP Setup**
 
-[![Install in VS Code](https://img.shields.io/badge/VS_Code-Install_Server-0098FF?style=flat-square&logo=visualstudiocode&logoColor=white)](http://mcp.browserstack.com/one-click-setup?client=vscode) &nbsp; [![Install in Cursor](https://img.shields.io/badge/Cursor-Install_Server-24bfa5?style=flat-square&color=000000&logo=visualstudiocode&logoColor=white)](http://mcp.browserstack.com/one-click-setup?client=cursor)
+Click on the buttons below to install MCP in your respective IDE:
 
+<a href="http://mcp.browserstack.com/one-click-setup?client=vscode"><img src="assets/one-click-vs-code.png" alt="Install in VS Code" width="160" height="80"></a>&nbsp;&nbsp;&nbsp;<a href="http://mcp.browserstack.com/one-click-setup?client=cursor"><img src="assets/one-click-cursor.png" alt="Install in Cursor" width="150" height="70"></a>
 
 ### **Alternate ways to Setup MCP server**
 

assets/one-click-cursor.png

@@ -1,7 +1,8 @@
 {
   "name": "@browserstack/mcp-server",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "BrowserStack's Official MCP Server",
+  "mcpName": "io.github.browserstack/mcp-server",
   "main": "dist/index.js",
   "repository": {
     "type": "git",

assets/one-click-vs-code.png

@@ -2,6 +2,9 @@ import sharp from "sharp";
 import type { ApiResponse } from "./apiClient.js";
 import { BrowserStackConfig } from "./types.js";
 import { getBrowserStackAuth } from "./get-auth.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import { trackMCP } from "../index.js";
 
 export function sanitizeUrlParam(param: string): string {
   // Remove any characters that could be used for command injection
@@ -62,3 +65,27 @@ export async function fetchFromBrowserStackAPI(
 
   return res.json();
 }
+
+function errorContent(message: string): CallToolResult {
+  return {
+    content: [{ type: "text", text: message }],
+    isError: true,
+  };
+}
+
+export function handleMCPError(
+  toolName: string,
+  server: McpServer,
+  config: BrowserStackConfig,
+  error: unknown,
+) {
+  trackMCP(toolName, server.server.getClientVersion()!, error, config);
+
+  const errorMessage = error instanceof Error ? error.message : "Unknown error";
+
+  const readableToolName = toolName.replace(/([A-Z])/g, " $1").toLowerCase();
+
+  return errorContent(
+    `Failed to ${readableToolName}: ${errorMessage}. Please open an issue on GitHub if the problem persists`,
+  );
+}

package-lock.json

@@ -60,15 +60,8 @@ export interface AppSDKInstruction {
 export const SUPPORTED_CONFIGURATIONS = {
   appium: {
     ruby: ["cucumberRuby"],
-    java: [
-      "junit5",
-      "junit4",
-      "testng",
-      "cucumberTestng",
-      "selenide",
-      "jbehave",
-    ],
-    csharp: ["nunit", "xunit", "mstest", "specflow", "reqnroll"],
+    java: [],
+    csharp: [],
     python: ["pytest", "robot", "behave", "lettuce"],
     nodejs: ["jest", "mocha", "cucumberJs", "webdriverio", "nightwatch"],
   },

package.json

@@ -96,7 +96,15 @@ export function validateSupportforAppAutomate(
     );
   }
 
-  const testingFrameworks = SUPPORTED_CONFIGURATIONS[framework][language];
+  const testingFrameworks = SUPPORTED_CONFIGURATIONS[framework][
+    language
+  ] as string[];
+
+  if (testingFrameworks.length === 0) {
+    throw new Error(
+      `No testing frameworks are supported for language '${language}' and framework '${framework}'.`,
+    );
+  }
   if (!testingFrameworks.includes(testingFramework)) {
     throw new Error(
       `Unsupported testing framework '${testingFramework}' for language '${language}' and framework '${framework}'. Supported testing frameworks: ${testingFrameworks.join(", ")}`,

src/lib/utils.ts

@@ -3,6 +3,8 @@ import { BrowserStackConfig } from "../lib/types.js";
 import { RunTestsOnBrowserStackParamsShape } from "./sdk-utils/common/schema.js";
 import { runTestsOnBrowserStackHandler } from "./sdk-utils/handler.js";
 import { RUN_ON_BROWSERSTACK_DESCRIPTION } from "./sdk-utils/common/constants.js";
+import { handleMCPError } from "../lib/utils.js";
+import { trackMCP } from "../lib/instrumentation.js";
 
 export function registerRunBrowserStackTestsTool(
   server: McpServer,
@@ -15,7 +17,16 @@ export function registerRunBrowserStackTestsTool(
     RUN_ON_BROWSERSTACK_DESCRIPTION,
     RunTestsOnBrowserStackParamsShape,
     async (args) => {
-      return runTestsOnBrowserStackHandler(args, config);
+      try {
+        trackMCP(
+          "runTestsOnBrowserStack",
+          server.server.getClientVersion()!,
+          config,
+        );
+        return await runTestsOnBrowserStackHandler(args, config);
+      } catch (error) {
+        return handleMCPError("runTestsOnBrowserStack", server, config, error);
+      }
     },
   );
 

src/tools/appautomate-utils/appium-sdk/types.ts

@@ -3,7 +3,8 @@ import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import logger from "../logger.js";
 import { BrowserStackConfig } from "../lib/types.js";
-import { fetchFromBrowserStackAPI } from "../lib/utils.js";
+import { fetchFromBrowserStackAPI, handleMCPError } from "../lib/utils.js";
+import { trackMCP } from "../lib/instrumentation.js";
 
 // Tool function that fetches build insights from two APIs
 export async function fetchBuildInsightsTool(
@@ -78,18 +79,14 @@ export default function addBuildInsightsTools(
     },
     async (args) => {
       try {
+        trackMCP(
+          "fetchBuildInsights",
+          server.server.getClientVersion()!,
+          config,
+        );
         return await fetchBuildInsightsTool(args, config);
       } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : "Unknown error";
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Error during fetching build insights: ${errorMessage}`,
-            },
-          ],
-        };
+        return handleMCPError("fetchBuildInsights", server, config, error);
       }
     },
   );