fix: update mcp.json for trusted folder changes

src/snyk/cli/mcp/mcp.ts

@@ -57,7 +57,7 @@
             const cliPath = await configuration.getCliPath();
             /* eslint-disable @typescript-eslint/no-unsafe-return */
             const args = ['mcp', '-t', 'stdio'];
-            const snykEnv = await getSnykMcpEnv(configuration);
+            const snykEnv = getSnykMcpEnv(configuration);
             const processEnv: Env = {};
             Object.entries(process.env).forEach(([key, value]) => {
               processEnv[key] = value ?? '';
@@ -105,7 +105,7 @@
         Logger.debug(`Windsurf base directory not found at ${baseDir}, skipping MCP configuration.`);
       } else {
         const cliPath = await configuration.getCliPath();
-        const env = await getSnykMcpEnv(configuration);
+        const env = getSnykMcpEnv(configuration);
         await ensureMcpServerInJson(configPath, SERVER_KEY, cliPath, ['mcp', '-t', 'stdio'], env);
         Logger.debug(`Ensured Windsurf MCP config at ${configPath}`);
       }
@@ -136,7 +136,7 @@
     if (autoConfigureMcpServer) {
       const configPath = path.join(os.homedir(), '.cursor', 'mcp.json');
       const cliPath = await configuration.getCliPath();
-      const env = await getSnykMcpEnv(configuration);
+      const env = getSnykMcpEnv(configuration);
 
       await ensureMcpServerInJson(configPath, SERVER_KEY, cliPath, ['mcp', '-t', 'stdio'], env);
       Logger.debug(`Ensured Cursor MCP config at ${configPath}`);
@@ -198,13 +198,13 @@
   const existing = config.mcpServers[keyToUse];
   const desired: McpServer = { command, args, env };
 
-  // Merge env: keep existing keys; override Snyk keys only if already present
+  // Merge env: keep existing keys; add or override Snyk keys
   let resultingEnv: Env;
   if (existing && existing.env) {
     resultingEnv = { ...existing.env };
-    const overrideKeys: (keyof Env)[] = ['SNYK_TOKEN', 'SNYK_CFG_ORG', 'SNYK_API'];
+    const overrideKeys: (keyof Env)[] = ['SNYK_CFG_ORG', 'SNYK_API', 'IDE_CONFIG_PATH', 'TRUSTED_FOLDERS'];
     for (const k of overrideKeys) {
-      if (Object.hasOwn(existing.env, k) && typeof env[k] !== 'undefined') {
+      if (typeof env[k] !== 'undefined') {
         resultingEnv[k] = env[k];
       }
     }
@@ -239,15 +239,15 @@
   for (const folder of folders) {
     const root = folder.uri.fsPath;
     const rulesPath = path.join(root, relativeRulesPath);
     await fs.promises.mkdir(path.dirname(rulesPath), { recursive: true });
     let existing = '';
     try {
       existing = await fs.promises.readFile(rulesPath, 'utf8');
     } catch {
       // ignore
     }
     if (existing !== rulesContent) {
       await fs.promises.writeFile(rulesPath, rulesContent, 'utf8');
       Logger.debug(`Wrote local rules to ${rulesPath}`);
     } else {
       Logger.debug(`Local rules already up to date at ${rulesPath}.`);
@@ -265,7 +265,7 @@
     const rulesPath = path.join(root, relativeRulesPath);
     try {
       if (fs.existsSync(rulesPath)) {
         await fs.promises.unlink(rulesPath);
         Logger.debug(`Deleted local rules from ${rulesPath}`);
       }
     } catch (err) {
@@ -309,7 +309,7 @@
   );
 }
 
-async function getSnykMcpEnv(configuration: IConfiguration): Promise<Env> {
+function getSnykMcpEnv(configuration: IConfiguration): Env {
   const env: Env = {};
   if (configuration.organization) {
     env.SNYK_CFG_ORG = configuration.organization;
@@ -321,11 +321,7 @@
   if (trustedFolders.length > 0) {
     env.TRUSTED_FOLDERS = trustedFolders.join(';');
   }
-  const token = await configuration.getToken();
-  const authMethod = configuration.getAuthenticationMethod();
-  if ((authMethod === 'pat' || authMethod === 'token') && token) {
-    env.SNYK_TOKEN = token;
-  }
+  env.IDE_CONFIG_PATH = vscode.env.appName;
 
   return env;
 }