fix: populate env cache before folder add in test; re-instantiate provider after mock change

Agent-Logs-Url: https://github.com/advanced-security/codeql-development-mcp-server/sessions/a42c54f5-5445-42e7-bad8-f86e1aa717f7

Co-authored-by: data-douser <70299490+data-douser@users.noreply.github.com>

Author: Copilot

extensions/vscode/test/server/mcp-provider.test.ts

@@ -117,8 +117,12 @@ describe('McpProvider', () => {
     // the definition must still carry a concrete version string so that
     // VS Code has a baseline for version comparison. An undefined initial
     // version prevents VS Code from detecting changes after requestRestart().
+    //
+    // NOTE: McpProvider caches getExtensionVersion() in its constructor, so the
+    // mock must be configured before constructing the provider.
     serverManager.getVersion.mockReturnValue(undefined);
     serverManager.getExtensionVersion.mockReturnValue('2.25.1');
+    provider = new McpProvider(serverManager, envBuilder, logger);
 
     const token = { isCancellationRequested: false, onCancellationRequested: vi.fn() };
     const definitions = await provider.provideMcpServerDefinitions(token as any);

extensions/vscode/test/suite/workspace-folder-change.integration.test.ts

@@ -92,18 +92,27 @@ suite('Workspace Folder Change Tests', () => {
     const envBuilder = api.environmentBuilder;
     const tempDir = createTempDir('ql-mcp-env-');
 
+    // Populate the environment cache before mutating workspace folders.
+    const envBefore = await envBuilder.build();
+    const beforeFoldersEnv =
+      envBefore.CODEQL_MCP_WORKSPACE_FOLDERS?.split(path.delimiter) ?? [];
+    assert.ok(
+      !beforeFoldersEnv.includes(tempDir),
+      `Precondition failed: tempDir ${tempDir} unexpectedly present in CODEQL_MCP_WORKSPACE_FOLDERS before add`,
+    );
+
     await addWorkspaceFolder(vscode.Uri.file(tempDir));
 
     try {
-      const env = await envBuilder.build();
+      const envAfter = await envBuilder.build();
       assert.ok(
-        env.CODEQL_MCP_WORKSPACE_FOLDERS,
+        envAfter.CODEQL_MCP_WORKSPACE_FOLDERS,
         'CODEQL_MCP_WORKSPACE_FOLDERS should be set',
       );
-      const workspaceFoldersEnv = env.CODEQL_MCP_WORKSPACE_FOLDERS.split(path.delimiter);
+      const workspaceFoldersEnv = envAfter.CODEQL_MCP_WORKSPACE_FOLDERS.split(path.delimiter);
       assert.ok(
         workspaceFoldersEnv.includes(tempDir),
-        `CODEQL_MCP_WORKSPACE_FOLDERS should include ${tempDir}: ${env.CODEQL_MCP_WORKSPACE_FOLDERS}`,
+        `CODEQL_MCP_WORKSPACE_FOLDERS should include ${tempDir}: ${envAfter.CODEQL_MCP_WORKSPACE_FOLDERS}`,
       );
     } finally {
       await removeWorkspaceFolder(tempDir);