Merge branch 'release/7.2.1'

Author: furey

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules/
 repomix*
+DEMO.md
 CLAUDE.md
 ROADMAP.md
 .mongodb-lens*.json*

mongodb-lens.js

@@ -202,7 +202,7 @@ const extractDbNameFromConnectionString = (uri) => {
 }
 
 const resolveMongoUri = (uriOrAlias) => {
-  if (uriOrAlias.includes('://') || uriOrAlias.includes('/') || uriOrAlias.includes('@')) {
+  if (uriOrAlias.includes('://') || uriOrAlias.includes('@')) {
     return uriOrAlias
   }
 
@@ -213,7 +213,7 @@ const resolveMongoUri = (uriOrAlias) => {
     return uri
   }
 
-  return uriOrAlias
+  throw new Error(`"${uriOrAlias}" is not a valid MongoDB URI or connection alias.`)
 }
 
 const obfuscateMongoUri = (uri) => {
@@ -1293,6 +1293,17 @@ const registerTools = (server) => {
       async ({ uri, validateConnection }) => {
         return withErrorHandling(async () => {
           try {
+            if (!uri.includes('://') && !uri.includes('@') && !mongoUriMap.has(uri.toLowerCase())) {
+              if (await isDatabaseName(uri)) {
+                return {
+                  content: [{
+                    type: 'text',
+                    text: `It seems you're trying to switch to database "${uri}" rather than connect to a new MongoDB instance. Please use the "use-database" tool instead.`
+                  }]
+                }
+              }
+            }
+
             const resolvedUri = resolveMongoUri(uri)
             await changeConnection(resolvedUri, validateConnection === 'true')
             return {
@@ -3160,6 +3171,29 @@ const withErrorHandling = async (operation, errorMessage, defaultValue = null) =
   }
 }
 
+const isDatabaseName = async (name) => {
+  try {
+    const dbs = await listDatabases()
+    if (dbs.some(db => db.name === name)) return true
+
+    if (name.length > 0 && name.length < 64 &&
+        !name.includes('/') && !name.includes(':')) {
+      const dbPatterns = [
+        /^sample_/,
+        /^test/,
+        /^db/,
+        /^admin$|^local$|^config$/
+      ]
+
+      if (dbPatterns.some(pattern => pattern.test(name))) return true
+    }
+
+    return false
+  } catch (error) {
+    return false
+  }
+}
+
 const listDatabases = async () => {
   log('DB Operation: Listing databases…')
   const adminDb = mongoClient.db('admin')

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-lens",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "author": "James Furey (https://about.me/jamesfurey)",
   "description": "MongoDB Lens: Full Featured MCP Server for MongoDB Databases",
   "license": "MIT",