chore: clean up atlas resource handling

Author: kmruiz

src/common/connectionManager.ts

@@ -143,12 +143,11 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
             } finally {
                 this.changeState("connection-closed", {
                     tag: "disconnected",
-                    connectedAtlasCluster: this.state.connectedAtlasCluster,
                 });
             }
         }
 
-        return { tag: "disconnected", connectedAtlasCluster: this.state.connectedAtlasCluster };
+        return { tag: "disconnected" };
     }
 
     get currentConnectionState(): AnyConnectionState {

src/tools/atlas/connect/connectCluster.ts

@@ -135,14 +135,6 @@ export class ConnectClusterTool extends AtlasToolBase {
 
         // try to connect for about 5 minutes
         for (let i = 0; i < 600; i++) {
-            if (
-                !this.session.connectedAtlasCluster ||
-                this.session.connectedAtlasCluster.projectId !== atlas.projectId ||
-                this.session.connectedAtlasCluster.clusterName !== atlas.clusterName
-            ) {
-                throw new Error("Cluster connection aborted");
-            }
-
             try {
                 lastError = undefined;
 
@@ -161,6 +153,14 @@ export class ConnectClusterTool extends AtlasToolBase {
 
                 await sleep(500); // wait for 500ms before retrying
             }
+
+            if (
+                !this.session.connectedAtlasCluster ||
+                this.session.connectedAtlasCluster.projectId !== atlas.projectId ||
+                this.session.connectedAtlasCluster.clusterName !== atlas.clusterName
+            ) {
+                throw new Error("Cluster connection aborted");
+            }
         }
 
         if (lastError) {