addressed review comments

Author: AakashHotchandani

bin/accessibility-automation/constants.js

@@ -1 +1,16 @@
 exports.API_URL = 'https://accessibility.browserstack.com/api';
+
+exports.ACCESSIBILITY_ENV_VARS = [
+  "BROWSERSTACK_TEST_ACCESSIBILITY",
+  "ACCESSIBILITY_AUTH",
+  "ACCESSIBILITY_SCANNERVERSION", 
+  "ACCESSIBILITY_COMMANDS_TO_WRAP",
+  "ACCESSIBILITY_BUILD_END_ONLY",
+  "ACCESSIBILITY_SCRIPTS_TO_RUN",
+  "ACCESSIBILITY_EXTENSION_PATH",
+  "ACCESSIBILITY_INCLUDETAGSINTESTINGSCOPE",
+  "ACCESSIBILITY_EXCLUDETAGSINTESTINGSCOPE",
+  "BS_A11Y_JWT",
+  "BS_A11Y_TEST_RUN_ID",
+  "BROWSERSTACK_ACCESSIBILITY_DEBUG"
+];

bin/accessibility-automation/cypress/index.js

@@ -129,13 +129,12 @@ new Promise(async (resolve, reject) => {
 
         win.addEventListener("A11Y_SCAN_FINISHED", onScanComplete);
 
-        // Enhanced event with mode information and server scripts
+        // Enhanced event with mode information
         const scanEvent = new CustomEvent("A11Y_SCAN", { 
           detail: {
             ...payloadToSend,
             scanMode: isBuildEndOnlyMode ? "comprehensive-build-end" : "incremental",
-            timestamp: Date.now(),
-            serverScripts: Cypress.env('ACCESSIBILITY_SCRIPTS') || null
+            timestamp: Date.now()
           }
         });
 

bin/accessibility-automation/helper.js

@@ -325,9 +325,6 @@ exports.processServerAccessibilityConfig = (responseData) => {
         scriptsMap[script.name] = script.command;
       });
 
-      // Store server scripts for Cypress to read
-      process.env.ACCESSIBILITY_SCRIPTS = JSON.stringify(scriptsMap);
-      
       logger.debug(`[A11Y] Server provided accessibility scripts: ${Object.keys(scriptsMap).join(', ')}`, { scriptsMap });
     } else {
       logger.debug('[A11Y] No server scripts provided, using default scripts');
@@ -410,35 +407,5 @@ exports.shouldWrapCommand = (commandName) => {
   }
 };
 
-// Get accessibility script by name
-exports.getAccessibilityScript = (scriptName) => {
-  try {
-    // Try to get script from Scripts class first
-    const script = scripts.getScript(scriptName);
-    
-    if (script) {
-      logger.debug(`[A11Y] Retrieved script '${scriptName}' from Scripts class`, { scriptName, source: 'scripts-class' });
-      return script;
-    }
-    
-    // Fallback to environment variable
-    if (process.env.ACCESSIBILITY_SCRIPTS) {
-      const serverScripts = JSON.parse(process.env.ACCESSIBILITY_SCRIPTS);
-      const envScript = serverScripts[scriptName] || serverScripts[scriptName.toLowerCase()];
-      
-      if (envScript) {
-        logger.debug(`[A11Y] Retrieved script '${scriptName}' from environment`, { scriptName, source: 'environment' });
-        return envScript;
-      }
-    }
-    
-    logger.debug(`[A11Y] Script '${scriptName}' not found`, { scriptName });
-    return null;
-  } catch (error) {
-    logger.error(`[A11Y] Error retrieving script '${scriptName}': ${error.message}`);
-    return null;
-  }
-};
-
 // Export the Scripts instance for direct access
 exports.scripts = scripts;

bin/helpers/utils.js

@@ -24,7 +24,8 @@ const usageReporting = require("./usageReporting"),
   pkg = require('../../package.json'),
   transports = require('./logger').transports,
   o11yHelpers = require('../testObservability/helper/helper'),
-  { OBSERVABILITY_ENV_VARS, TEST_OBSERVABILITY_REPORTER } = require('../testObservability/helper/constants');
+  { OBSERVABILITY_ENV_VARS, TEST_OBSERVABILITY_REPORTER } = require('../testObservability/helper/constants'),
+  { ACCESSIBILITY_ENV_VARS } = require('../accessibility-automation/constants');
 
 const { default: axios } = require("axios");
 const { shouldProcessEventForTesthub } = require("../testhub/utils");
@@ -603,6 +604,12 @@ exports.setSystemEnvs = (bsConfig) => {
     }
   } catch(e){}
 
+  try {
+    ACCESSIBILITY_ENV_VARS.forEach(key => {
+      envKeys[key] = process.env[key];
+    });
+  } catch(e){}
+
   if (Object.keys(envKeys).length === 0) {
     bsConfig.run_settings.system_env_vars = null;
   } else {