Feat: Enhance MCP event tracking

Author: tech-sushant

src/index.ts

@@ -12,7 +12,6 @@ import addBrowserLiveTools from "./tools/live";
 import addAccessibilityTools from "./tools/accessibility";
 import addAutomateTools from "./tools/automate";
 import addTestManagementTools from "./tools/testmanagement";
-import { createCustomInitializeHandler } from "./lib/utils";
 
 function registerTools(server: McpServer) {
   addSDKTools(server);
@@ -32,18 +31,6 @@ const server: McpServer = new McpServer({
 
 registerTools(server);
 
-let clientName: string | undefined;
-
-function setClientName(name: string) {
-  clientName = name;
-}
-
-const origInitializeHandler =
-  server.server["_requestHandlers"].get("initialize");
-server.server["_requestHandlers"].set(
-  "initialize",
-  createCustomInitializeHandler(origInitializeHandler, logger, setClientName),
-);
 
 async function main() {
   logger.info(
@@ -65,4 +52,3 @@ process.on("exit", () => {
   logger.flush();
 });
 
-export { clientName };

src/lib/instrumentation.ts

@@ -2,7 +2,6 @@ import logger from "../logger";
 import config from "../config";
 import packageJson from "../../package.json";
 import axios from "axios";
-import { clientName } from "../index";
 
 interface MCPEventPayload {
   event_type: string;
@@ -13,9 +12,20 @@ interface MCPEventPayload {
   };
 }
 
-export function trackMCPEvent(toolName: string): void {
+export function trackMCPEvent(
+  toolName: string,
+  clientInfo: { name?: string; version?: string },
+): void {
   const instrumentationEndpoint = "https://api.browserstack.com/sdk/v1/event";
-  const mcpClient = clientName || "unknown";
+
+  const mcpClient = clientInfo?.name || "unknown";
+  if (clientInfo?.name) {
+    logger.info(
+      `Client connected: ${clientInfo.name} (version: ${clientInfo.version})`,
+    );
+  } else {
+    logger.info("Client connected: unknown client");
+  }
 
   const event: MCPEventPayload = {
     event_type: "MCPInstrumentation",

src/tools/accessibility.ts

@@ -56,7 +56,8 @@ export default function addAccessibilityTools(server: McpServer) {
       pageURL: z.string().describe("The URL to scan for accessibility issues"),
     },
     async (args) => {
-      trackMCPEvent("startAccessibilityScan");
+      const clientInfo = server.server.getClientVersion();
+      trackMCPEvent("startAccessibilityScan", clientInfo!);
       return runAccessibilityScan(args.name, args.pageURL);
     },
   );

src/tools/applive.ts

@@ -90,7 +90,8 @@ export default function addAppLiveTools(server: McpServer) {
     },
     async (args) => {
       try {
-        trackMCPEvent("runAppLiveSession");
+        const clientInfo = server.server.getClientVersion();
+        trackMCPEvent("runAppLiveSession", clientInfo!);
         return startAppLiveSession(args);
       } catch (error) {
         return {

src/tools/automate.ts

@@ -59,7 +59,8 @@ export default function addAutomateTools(server: McpServer) {
       sessionId: z.string().describe("The Automate session ID."),
     },
     async (args) => {
-      trackMCPEvent("getNetworkFailures");
+      const clientInfo = server.server.getClientVersion();
+      trackMCPEvent("startAccessibilityScan", clientInfo!);
       return getNetworkFailures(args);
     },
   );

src/tools/bstack-sdk.ts

@@ -81,7 +81,8 @@ export default function addSDKTools(server: McpServer) {
       const desiredPlatforms = args.desiredPlatforms;
 
       try {
-        trackMCPEvent("runTestsOnBrowserStack");
+        const clientInfo = server.server.getClientVersion();
+        trackMCPEvent("runTestsOnBrowserStack", clientInfo!);
         return bootstrapProjectWithSDK({
           detectedBrowserAutomationFramework,
           detectedTestingFramework,

src/tools/live.ts

@@ -119,7 +119,8 @@ export default function addBrowserLiveTools(server: McpServer) {
     LiveArgsShape,
     async (args) => {
       try {
-        trackMCPEvent("runBrowserLiveSession");
+        const clientInfo = server.server.getClientVersion();
+        trackMCPEvent("runBrowserLiveSession", clientInfo!);
         const result = await runBrowserSession(args);
         return result;
       } catch (error: any) {

src/tools/observability.ts

@@ -58,7 +58,8 @@ export default function addObservabilityTools(server: McpServer) {
     },
     async (args) => {
       try {
-        trackMCPEvent("getFailuresInLastRun");
+        const clientInfo = server.server.getClientVersion();
+        trackMCPEvent("getFailuresInLastRun", clientInfo!);
         return getFailuresInLastRun(args.buildName, args.projectName);
       } catch (error) {
         return {

src/tools/testmanagement.ts

@@ -13,14 +13,17 @@ import {
   CreateTestCaseSchema,
 } from "./testmanagement-utils/create-testcase";
 
+let serverInstance: McpServer;
+
 /**
  * Wrapper to call createProjectOrFolder util.
  */
 export async function createProjectOrFolderTool(
   args: z.infer<typeof CreateProjFoldSchema>,
 ): Promise<CallToolResult> {
   try {
-    trackMCPEvent("createProjectOrFolder");
+    const clientInfo = serverInstance.server.getClientVersion();
+    trackMCPEvent("createProjectOrFolder", clientInfo!);
     return await createProjectOrFolder(args);
   } catch (err) {
     return {
@@ -47,7 +50,8 @@ export async function createTestCaseTool(
   // Sanitize input arguments
   const cleanedArgs = sanitizeArgs(args);
   try {
-    trackMCPEvent("createTestCase");
+    const clientInfo = serverInstance.server.getClientVersion();
+    trackMCPEvent("createTestCase", clientInfo!);
     return await createTestCaseAPI(cleanedArgs);
   } catch (err) {
     return {
@@ -69,6 +73,7 @@ export async function createTestCaseTool(
  * Registers both project/folder and test-case tools.
  */
 export default function addTestManagementTools(server: McpServer) {
+  serverInstance = server;
   server.tool(
     "createProjectOrFolder",
     "Create a project and/or folder in BrowserStack Test Management.",