fix: remove duplicate assertion, add try/finally for spy, cache extension version

Agent-Logs-Url: https://github.com/advanced-security/codeql-development-mcp-server/sessions/28160745-507f-46aa-b350-6fd6d19315ba

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

Author: Copilot

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

@@ -27,12 +27,19 @@ export class McpProvider
    */
   private _revision = 0;
 
+  /**
+   * Cached extension version to avoid repeated synchronous `readFileSync`
+   * calls on every `getEffectiveVersion()` invocation.
+   */
+  private readonly _extensionVersion: string;
+
   constructor(
     private readonly serverManager: ServerManager,
     private readonly envBuilder: EnvironmentBuilder,
     private readonly logger: Logger,
   ) {
     super();
+    this._extensionVersion = serverManager.getExtensionVersion();
     this.push(this._onDidChange);
   }
 
@@ -117,9 +124,7 @@ export class McpProvider
    * cycle.
    */
   private getEffectiveVersion(): string {
-    const base =
-      this.serverManager.getVersion() ??
-      this.serverManager.getExtensionVersion();
+    const base = this.serverManager.getVersion() ?? this._extensionVersion;
     if (this._revision === 0) {
       return base;
     }

extensions/vscode/test/extension.test.ts

@@ -193,15 +193,17 @@ describe('Extension', () => {
     mcpProviderInstance.requestRestart.mockClear();
     envBuilderInstance.invalidate.mockClear();
 
-    // Simulate workspace folder change
-    workspaceFolderChangeCallback!();
-
-    // Cache invalidated immediately; no VS Code notification.
-    // VS Code manages MCP server lifecycle (stop/restart) when roots change.
-    expect(envBuilderInstance.invalidate).toHaveBeenCalledTimes(1);
-    expect(mcpProviderInstance.fireDidChange).not.toHaveBeenCalled();
-    expect(mcpProviderInstance.requestRestart).not.toHaveBeenCalled();
-
-    spy.mockRestore();
+    try {
+      // Simulate workspace folder change
+      workspaceFolderChangeCallback!();
+
+      // Cache invalidated immediately; no VS Code notification.
+      // VS Code manages MCP server lifecycle (stop/restart) when roots change.
+      expect(envBuilderInstance.invalidate).toHaveBeenCalledTimes(1);
+      expect(mcpProviderInstance.fireDidChange).not.toHaveBeenCalled();
+      expect(mcpProviderInstance.requestRestart).not.toHaveBeenCalled();
+    } finally {
+      spy.mockRestore();
+    }
   });
 });

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

@@ -63,7 +63,6 @@ async function removeWorkspaceFolder(fsPath: string): Promise<void> {
   const changePromise = waitForWorkspaceFolderChange();
   const ok = vscode.workspace.updateWorkspaceFolders(idx, 1);
   assert.ok(ok, 'updateWorkspaceFolders (remove) returned false');
-  assert.ok(ok, 'updateWorkspaceFolders (remove) returned false');
   await changePromise;
 }