Merge branch 'main' into assistant-errors

lerouxb · lerouxb · commit 3161165d7316 · 2025-08-27T11:43:23.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-assistant/package.json b/packages/compass-assistant/package.json
@@ -53,6 +53,8 @@
     "@mongodb-js/atlas-service": "^0.56.0",
     "@mongodb-js/compass-app-registry": "^9.4.20",
     "@mongodb-js/compass-components": "^1.49.0",
+    "@mongodb-js/connection-info": "^0.17.1",
+    "mongodb-connection-string-url": "^3.0.1",
     "ai": "^5.0.26",
     "compass-preferences-model": "^2.51.0",
     "react": "^17.0.2",
diff --git a/packages/compass-assistant/src/compass-assistant-drawer.tsx b/packages/compass-assistant/src/compass-assistant-drawer.tsx
@@ -33,6 +33,7 @@ export const CompassAssistantDrawer: React.FunctionComponent<{
         'The current chat will be cleared, and chat history will not be retrievable.',
       buttonText: 'Clear chat',
       variant: 'danger',
+      'data-testid': 'assistant-confirm-clear-chat-modal',
     });
     if (confirmed) {
       clearChat();
diff --git a/packages/compass-assistant/src/compass-assistant-provider.spec.tsx b/packages/compass-assistant/src/compass-assistant-provider.spec.tsx
@@ -202,19 +202,20 @@ describe('AssistantProvider', function () {
         userEvent.click(clearButton);
 
         await waitFor(() => {
-          expect(screen.getByTestId('confirmation-modal')).to.exist;
+          expect(screen.getByTestId('assistant-confirm-clear-chat-modal')).to
+            .exist;
         });
 
         // There should be messages in the chat
         expect(screen.getByTestId('assistant-message-1')).to.exist;
         expect(screen.getByTestId('assistant-message-2')).to.exist;
 
-        const modal = screen.getByTestId('confirmation-modal');
+        const modal = screen.getByTestId('assistant-confirm-clear-chat-modal');
         const confirmButton = within(modal).getByText('Clear chat');
         userEvent.click(confirmButton);
 
         await waitForElementToBeRemoved(() =>
-          screen.getByTestId('confirmation-modal')
+          screen.getByTestId('assistant-confirm-clear-chat-modal')
         );
 
         expect(mockChat.messages).to.be.empty;
@@ -231,19 +232,20 @@ describe('AssistantProvider', function () {
         userEvent.click(clearButton);
 
         await waitFor(() => {
-          expect(screen.getByTestId('confirmation-modal')).to.exist;
+          expect(screen.getByTestId('assistant-confirm-clear-chat-modal')).to
+            .exist;
         });
 
         // There should be messages in the chat
         expect(screen.getByTestId('assistant-message-1')).to.exist;
         expect(screen.getByTestId('assistant-message-2')).to.exist;
 
-        const modal = screen.getByTestId('confirmation-modal');
+        const modal = screen.getByTestId('assistant-confirm-clear-chat-modal');
         const cancelButton = within(modal).getByText('Cancel');
         userEvent.click(cancelButton);
 
         await waitForElementToBeRemoved(() =>
-          screen.getByTestId('confirmation-modal')
+          screen.getByTestId('assistant-confirm-clear-chat-modal')
         );
 
         expect(mockChat.messages).to.deep.equal(mockMessages);
diff --git a/packages/compass-assistant/src/compass-assistant-provider.tsx b/packages/compass-assistant/src/compass-assistant-provider.tsx
@@ -2,13 +2,18 @@ import React, { type PropsWithChildren, useRef } from 'react';
 import { type UIMessage } from './@ai-sdk/react/use-chat';
 import { Chat } from './@ai-sdk/react/chat-react';
 import { createContext, useContext } from 'react';
-import { registerCompassPlugin } from '@mongodb-js/compass-app-registry';
+import {
+  createServiceLocator,
+  registerCompassPlugin,
+} from '@mongodb-js/compass-app-registry';
 import { atlasServiceLocator } from '@mongodb-js/atlas-service/provider';
 import { DocsProviderTransport } from './docs-provider-transport';
 import { useDrawerActions } from '@mongodb-js/compass-components';
-import { buildExplainPlanPrompt } from './prompts';
+import { buildConnectionErrorPrompt, buildExplainPlanPrompt } from './prompts';
 import { usePreference } from 'compass-preferences-model/provider';
 import { createLoggerLocator } from '@mongodb-js/compass-logging/provider';
+import type { ConnectionInfo } from '@mongodb-js/connection-info';
+import { redactConnectionString } from 'mongodb-connection-string-url';
 
 export const ASSISTANT_DRAWER_ID = 'compass-assistant-drawer';
 
@@ -33,11 +38,19 @@ type AssistantActionsContextType = {
     namespace: string;
     explainPlan: string;
   }) => void;
+  interpretConnectionError: ({
+    connectionInfo,
+    error,
+  }: {
+    connectionInfo: ConnectionInfo;
+    error: Error;
+  }) => void;
   clearChat: () => void;
 };
 export const AssistantActionsContext =
   createContext<AssistantActionsContextType>({
     interpretExplainPlan: () => {},
+    interpretConnectionError: () => {},
     clearChat: () => {},
   });
 
@@ -52,6 +65,24 @@ export function useAssistantActions(): AssistantActionsContextType & {
   };
 }
 
+export const compassAssistantServiceLocator = createServiceLocator(function () {
+  const { isAssistantEnabled, ...actions } = useAssistantActions();
+
+  const assistantEnabledRef = useRef(isAssistantEnabled);
+  assistantEnabledRef.current = isAssistantEnabled;
+
+  return {
+    ...actions,
+    getIsAssistantEnabled() {
+      return assistantEnabledRef.current;
+    },
+  };
+}, 'compassAssistantLocator');
+
+export type CompassAssistantService = ReturnType<
+  typeof compassAssistantServiceLocator
+>;
+
 export const AssistantProvider: React.FunctionComponent<
   PropsWithChildren<{
     chat: Chat<AssistantMessage>;
@@ -73,6 +104,25 @@ export const AssistantProvider: React.FunctionComponent<
         {}
       );
     },
+    interpretConnectionError: ({ connectionInfo, error }) => {
+      openDrawer(ASSISTANT_DRAWER_ID);
+
+      const connectionString = redactConnectionString(
+        connectionInfo.connectionOptions.connectionString
+      );
+      const connectionError = error.toString();
+
+      const { prompt } = buildConnectionErrorPrompt({
+        connectionString,
+        connectionError,
+      });
+      void chat.sendMessage(
+        {
+          text: prompt,
+        },
+        {}
+      );
+    },
     clearChat: () => {
       chat.messages = [];
     },
diff --git a/packages/compass-assistant/src/index.tsx b/packages/compass-assistant/src/index.tsx
@@ -1,3 +1,7 @@
 export { CompassAssistantProvider } from './compass-assistant-provider';
 export { CompassAssistantDrawer } from './compass-assistant-drawer';
-export { useAssistantActions } from './compass-assistant-provider';
+export {
+  useAssistantActions,
+  compassAssistantServiceLocator,
+} from './compass-assistant-provider';
+export type { CompassAssistantService } from './compass-assistant-provider';
diff --git a/packages/compass-assistant/src/prompts.ts b/packages/compass-assistant/src/prompts.ts
@@ -11,3 +11,21 @@ ${explainPlan}`,
     displayText: 'Provide an explanation of this explain plan.',
   };
 };
+
+export const buildConnectionErrorPrompt = ({
+  connectionString,
+  connectionError,
+}: {
+  connectionString: string;
+  connectionError: string;
+}) => {
+  return {
+    prompt: `Given the error message below, please provide clear instructions to guide the user to debug their connection attempt from MongoDB Compass. If no auth mechanism is specified in the connection string, the default (username/password) is being used:
+
+Connection string (password redacted):
+${connectionString}
+
+Error message:
+${connectionError}`,
+  };
+};
diff --git a/packages/compass-connections/package.json b/packages/compass-connections/package.json
@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@mongodb-js/compass-app-registry": "^9.4.20",
+    "@mongodb-js/compass-assistant": "^1.2.0",
     "@mongodb-js/compass-components": "^1.49.0",
     "@mongodb-js/compass-logging": "^1.7.12",
     "@mongodb-js/compass-telemetry": "^1.14.0",
diff --git a/packages/compass-connections/src/components/connection-status-notifications.tsx b/packages/compass-connections/src/components/connection-status-notifications.tsx
@@ -83,6 +83,33 @@ function ConnectionErrorToastBody({
   );
 }
 
+type ConnectionDebugToastBodyProps = {
+  onDebug: () => void;
+};
+
+function ConnectionDebugToastBody({
+  onDebug,
+}: ConnectionDebugToastBodyProps): React.ReactElement {
+  return (
+    <span className={connectionErrorToastBodyStyles}>
+      <span
+        data-testid="connection-debug-text"
+        className={connectionErrorTextStyles}
+      >
+        Diagnose the issue and explore solutions with the assistant
+      </span>
+      <Link
+        className={connectionErrorToastActionMessageStyles}
+        hideExternalIcon={true}
+        onClick={onDebug}
+        data-testid="connection-error-debug"
+      >
+        DEBUG FOR ME
+      </Link>
+    </span>
+  );
+}
+
 const deviceAuthModalContentStyles = css({
   textAlign: 'center',
   '& > *:not(:last-child)': {
@@ -134,6 +161,8 @@ const openConnectionFailedToast = (
 ) => {
   const failedToastId = connectionInfo?.id ?? 'failed';
 
+  // TODO(COMPASS-9746): close the existing connection toast and make a new one
+  // for the failure so that the debug toast will appear below the failure one
   openToast(`connection-status--${failedToastId}`, {
     title: error.message,
     description: (
@@ -150,6 +179,25 @@ const openConnectionFailedToast = (
   });
 };
 
+const openDebugConnectionErrorToast = (
+  connectionInfo: ConnectionInfo,
+  error: Error,
+  onDebugClick: () => void
+) => {
+  openToast(`debug-connection-error--${connectionInfo.id}`, {
+    title: 'Need help debugging your connection error?',
+    description: (
+      <ConnectionDebugToastBody
+        onDebug={() => {
+          closeToast(`debug-connection-error--${connectionInfo.id}`);
+          onDebugClick();
+        }}
+      />
+    ),
+    variant: 'note',
+  });
+};
+
 const openMaximumConnectionsReachedToast = (
   maxConcurrentConnections: number
 ) => {
@@ -214,6 +262,7 @@ export function getNotificationTriggers() {
     openConnectionStartedToast,
     openConnectionSucceededToast,
     openConnectionFailedToast,
+    openDebugConnectionErrorToast,
     openMaximumConnectionsReachedToast,
     closeConnectionStatusToast: (connectionId: string) => {
       return closeToast(`connection-status--${connectionId}`);
diff --git a/packages/compass-connections/src/index.tsx b/packages/compass-connections/src/index.tsx
@@ -24,6 +24,7 @@ import {
 } from './stores/store-context';
 export type { ConnectionFeature } from './utils/connection-supports';
 export { connectionSupports, connectable } from './utils/connection-supports';
+import { compassAssistantServiceLocator } from '@mongodb-js/compass-assistant';
 
 const ConnectionsComponent: React.FunctionComponent<{
   /**
@@ -82,7 +83,14 @@ const CompassConnectionsPlugin = registerCompassPlugin(
     component: ConnectionsComponent,
     activate(
       initialProps,
-      { logger, preferences, connectionStorage, track, globalAppRegistry },
+      {
+        logger,
+        preferences,
+        connectionStorage,
+        track,
+        globalAppRegistry,
+        compassAssistant,
+      },
       { addCleanup, cleanup }
     ) {
       const store = configureStore(initialProps.preloadStorageConnectionInfos, {
@@ -95,6 +103,7 @@ const CompassConnectionsPlugin = registerCompassPlugin(
         connectFn: initialProps.connectFn,
         globalAppRegistry,
         onFailToLoadConnections: initialProps.onFailToLoadConnections,
+        compassAssistant,
       });
 
       setTimeout(() => {
@@ -128,6 +137,7 @@ const CompassConnectionsPlugin = registerCompassPlugin(
     preferences: preferencesLocator,
     connectionStorage: connectionStorageLocator,
     track: telemetryLocator,
+    compassAssistant: compassAssistantServiceLocator,
   }
 );
 
diff --git a/packages/compass-connections/src/stores/connections-store-redux.spec.tsx b/packages/compass-connections/src/stores/connections-store-redux.spec.tsx
@@ -150,6 +150,30 @@ describe('CompassConnections store', function () {
       }
     });
 
+    it('should show debug toast in addition to the connection error toast if connection fails and the assistant is enabled', async function () {
+      const { connectionsStore } = renderCompassConnections({
+        preferences: {
+          enableAIAssistant: true,
+        },
+        connectFn: sinon
+          .stub()
+          .rejects(new Error('Failed to connect to cluster')),
+      });
+
+      const connectionInfo = createDefaultConnectionInfo();
+
+      void connectionsStore.actions.connect(connectionInfo);
+
+      await waitFor(() => {
+        expect(screen.getByText('Failed to connect to cluster')).to.exist;
+      });
+
+      await waitFor(() => {
+        expect(screen.getByText('Need help debugging your connection error?'))
+          .to.exist;
+      });
+    });
+
     it('should show non-genuine modal at the end of connection if non genuine mongodb detected', async function () {
       const { connectionsStore } = renderCompassConnections({});
 
diff --git a/packages/compass-connections/src/stores/connections-store-redux.ts b/packages/compass-connections/src/stores/connections-store-redux.ts
diff --git a/packages/compass-e2e-tests/helpers/selectors.ts b/packages/compass-e2e-tests/helpers/selectors.ts
diff --git a/packages/compass-e2e-tests/tests/connection.test.ts b/packages/compass-e2e-tests/tests/connection.test.ts
diff --git a/packages/compass/src/app/components/home.tsx b/packages/compass/src/app/components/home.tsx
