chore: no more generics

Author: himanshusinghs

src/mcp/mcpController.ts

@@ -1,18 +1,15 @@
 import * as vscode from 'vscode';
 import { defaultUserConfig, StreamableHttpRunner } from 'mongodb-mcp-server';
 import type ConnectionController from '../connectionController';
-import {
-  VSCodeMCPConnectionManager,
-  type VSCodeMCPConnectParams,
-} from './vsCodeMCPConnectionManager';
+import { VSCodeMCPConnectionManager } from './vsCodeMCPConnectionManager';
 import type { CreateConnectionManagerFn, UserConfig } from 'mongodb-mcp-server';
 
 type mcpServerStartupConfig = 'ask' | 'enabled' | 'disabled';
 
 export class MCPController {
   private didChangeEmitter = new vscode.EventEmitter<void>();
   private server?: {
-    runner: StreamableHttpRunner<VSCodeMCPConnectParams>;
+    runner: StreamableHttpRunner;
     headers: Record<string, string>;
   };
   private mcpConnectionManager?: VSCodeMCPConnectionManager;
@@ -57,9 +54,9 @@ export class MCPController {
       disabledTools: ['connect'],
     };
 
-    const createConnectionManager: CreateConnectionManagerFn<
-      VSCodeMCPConnectParams
-    > = async ({ logger }) => {
+    const createConnectionManager: CreateConnectionManagerFn = async ({
+      logger,
+    }) => {
       const connectionManager = (this.mcpConnectionManager =
         new VSCodeMCPConnectionManager(logger));
       await this.switchConnectionManagerToCurrentConnection();
@@ -146,7 +143,7 @@ ${jsonConfig}`,
 
     return new vscode.McpHttpServerDefinition(
       'MongoDB MCP Server',
-      vscode.Uri.parse(`${this.server.runner.address}/mcp`),
+      vscode.Uri.parse(`${this.server.runner.serverAddress}/mcp`),
       this.server.headers,
     );
   }

src/mcp/vsCodeMCPConnectionManager.ts

@@ -2,7 +2,6 @@ import {
   ConnectionManager,
   type AnyConnectionState,
   type CompositeLogger,
-  type MCPConnectParams,
   type ConnectionStateDisconnected,
 } from 'mongodb-mcp-server';
 import {
@@ -13,20 +12,32 @@ import type { ServiceProvider } from '@mongosh/service-provider-core';
 import { isAtlasStream } from 'mongodb-build-info';
 import { MCPLogIds } from './mcpLogIds';
 
-export interface VSCodeMCPConnectParams extends MCPConnectParams {
+export interface VSCodeMCPConnectParams {
   connectionId: string;
+  connectionString: string;
   connectOptions: DevtoolsConnectOptions;
 }
 
-export class VSCodeMCPConnectionManager extends ConnectionManager<VSCodeMCPConnectParams> {
+export class VSCodeMCPConnectionManager extends ConnectionManager {
   private activeConnectionId: string | null = null;
   private activeConnectionProvider: ServiceProvider | null = null;
 
   constructor(private readonly logger: CompositeLogger) {
     super();
   }
 
-  async connect(
+  connect(): Promise<AnyConnectionState> {
+    return Promise.reject(
+      new Error(
+        [
+          'MongoDB MCP Server in MongoDB VSCode extension makes use of the connection that the MongoDB VSCode extension is connected to.',
+          "To connect, choose a connection from MongoDB VSCode extensions's sidepanel - https://www.mongodb.com/docs/mongodb-vscode/connect/#connect-to-your-mongodb-deployment",
+        ].join(' '),
+      ),
+    );
+  }
+
+  async connectToVSCodeConnection(
     connectParams: VSCodeMCPConnectParams,
   ): Promise<AnyConnectionState> {
     try {
@@ -35,6 +46,7 @@ export class VSCodeMCPConnectionManager extends ConnectionManager<VSCodeMCPConne
           connectParams.connectionString,
           connectParams.connectOptions,
         ));
+      await serviceProvider.runCommand('admin', { hello: 1 });
       this.activeConnectionId = connectParams.connectionId;
       return this.changeState('connection-succeeded', {
         tag: 'connected',
@@ -106,7 +118,7 @@ export class VSCodeMCPConnectionManager extends ConnectionManager<VSCodeMCPConne
         return;
       }
 
-      await this.connect({
+      await this.connectToVSCodeConnection({
         connectionString,
         connectOptions,
         connectionId,