chore: make sure prompts about connectivity are exclusive

We were concerned that with the previous prompt configuration we could
mislead the LLM. With this change, OIDC messages are exclusiver and
won't be added with the connectivity suggestions.

Author: kmruiz

src/tools/mongodb/mongodbTool.ts

@@ -69,13 +69,20 @@ export abstract class MongoDBToolBase extends ToolBase {
 
             const connectToolsNames = connectTools?.map((t) => `"${t.name}"`).join(", ");
             const connectionStatus = this.session.connectionManager.currentConnectionState;
-            const additionalPromptForOidc: { type: "text"; text: string }[] = [];
+            const additionalPromptForConnectivity: { type: "text"; text: string }[] = [];
 
-            if (connectionStatus.tag === "connecting" && connectionStatus.oidcConnectionType === "oidc-device-flow") {
-                additionalPromptForOidc.push({
+            if (connectionStatus.tag === "connecting" && connectionStatus.oidcConnectionType) {
+                additionalPromptForConnectivity.push({
                     type: "text",
                     text: `The user needs to finish their OIDC connection by opening '${connectionStatus.oidcLoginUrl}' in the browser and use the following user code: '${connectionStatus.oidcUserCode}'`,
                 });
+            } else {
+                additionalPromptForConnectivity.push({
+                    type: "text",
+                    text: connectToolsNames
+                        ? `Please use one of the following tools: ${connectToolsNames} to connect to a MongoDB instance or update the MCP server configuration to include a connection string. ${llmConnectHint}`
+                        : "There are no tools available to connect. Please update the configuration to include a connection string and restart the server.",
+                });
             }
 
             switch (error.code) {
@@ -86,13 +93,7 @@ export abstract class MongoDBToolBase extends ToolBase {
                                 type: "text",
                                 text: "You need to connect to a MongoDB instance before you can access its data.",
                             },
-                            ...additionalPromptForOidc,
-                            {
-                                type: "text",
-                                text: connectToolsNames
-                                    ? `Please use one of the following tools: ${connectToolsNames} to connect to a MongoDB instance or update the MCP server configuration to include a connection string. ${llmConnectHint}`
-                                    : "There are no tools available to connect. Please update the configuration to include a connection string and restart the server.",
-                            },
+                            ...additionalPromptForConnectivity,
                         ],
                         isError: true,
                     };

tests/integration/common/connectionManager.oidc.test.ts

@@ -231,6 +231,8 @@ describe.skipIf(process.platform !== "linux")("ConnectionManager OIDC Tests", as
                     expect(response).toContain("The user needs to finish their OIDC connection by opening");
                     expect(response).toContain(state.oidcLoginUrl);
                     expect(response).toContain(state.oidcUserCode);
+                    expect(response).not.toContain("Please use one of the following tools");
+                    expect(response).not.toContain("There are no tools available to connect.");
 
                     await waitUntil<ConnectionStateConnected>(
                         "connected",