Merge branch 'main' into compass-collection-redux-integrates-mock-data-schema

Author: kpamaran

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Fri Aug 29 2025.
+This document was automatically generated on Tue Sep 02 2025.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -6,7 +6,7 @@
 > the tracking plan for the specific Compass version you can use the following
 > URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
 
-Generated on Fri, Aug 29, 2025
+Generated on Tue, Sep 2, 2025
 
 ## Table of Contents
 
@@ -1283,6 +1283,8 @@ This event is fired when user executes a query
   - Indicates whether the query includes a skip operation.
 - **has_sort** (required): `boolean`
   - Indicates whether the query includes a sort operation.
+- **default_sort** (required): `"none" | "natural" | "_id"`
+  - Indicates which default sort was set in settings
 - **has_limit** (required): `boolean`
   - Indicates whether the query includes a limit operation.
 - **has_collation** (required): `boolean`

package-lock.json

@@ -60,6 +60,7 @@
     "@mongodb-js/atlas-service": "^0.56.0",
     "@mongodb-js/compass-app-registry": "^9.4.20",
     "@mongodb-js/compass-app-stores": "^7.57.0",
+    "@mongodb-js/compass-assistant": "^1.2.0",
     "@mongodb-js/compass-collection": "^4.70.0",
     "@mongodb-js/compass-components": "^1.49.0",
     "@mongodb-js/compass-connections": "^1.71.0",

packages/compass-aggregations/package.json

@@ -50,6 +50,7 @@ describe('PipelineActions', function () {
           onUpdateView={() => {}}
           onCollectionScanInsightActionButtonClick={() => {}}
           onShowAIInputClick={() => {}}
+          stages={[]}
         />
       );
     });
@@ -115,6 +116,7 @@ describe('PipelineActions', function () {
           onExplainAggregation={() => {}}
           onCollectionScanInsightActionButtonClick={() => {}}
           onShowAIInputClick={() => {}}
+          stages={[]}
         />
       );
     });
@@ -158,6 +160,7 @@ describe('PipelineActions', function () {
             onExplainAggregation={() => {}}
             onCollectionScanInsightActionButtonClick={() => {}}
             onShowAIInputClick={() => {}}
+            stages={[]}
           />
         </PreferencesProvider>
       );
@@ -195,6 +198,7 @@ describe('PipelineActions', function () {
           onUpdateView={() => {}}
           onCollectionScanInsightActionButtonClick={() => {}}
           onShowAIInputClick={() => {}}
+          stages={[]}
         />
       );
     });

packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/pipeline-actions.spec.tsx

@@ -27,6 +27,7 @@ import {
   useIsAIFeatureEnabled,
 } from 'compass-preferences-model/provider';
 import { showInput as showAIInput } from '../../../modules/pipeline-builder/pipeline-ai';
+import { useAssistantActions } from '@mongodb-js/compass-assistant';
 
 const containerStyles = css({
   display: 'flex',
@@ -59,6 +60,8 @@ type PipelineActionsProps = {
 
   showCollectionScanInsight?: boolean;
   onCollectionScanInsightActionButtonClick: () => void;
+
+  stages: string[];
 };
 
 export const PipelineActions: React.FunctionComponent<PipelineActionsProps> = ({
@@ -80,12 +83,14 @@ export const PipelineActions: React.FunctionComponent<PipelineActionsProps> = ({
   onExplainAggregation,
   showCollectionScanInsight,
   onCollectionScanInsightActionButtonClick,
+  stages,
 }) => {
   const enableAggregationBuilderExtraOptions = usePreference(
     'enableAggregationBuilderExtraOptions'
   );
   const showInsights = usePreference('showInsights');
   const isAIFeatureEnabled = useIsAIFeatureEnabled();
+  const { tellMoreAboutInsight } = useAssistantActions();
 
   return (
     <div className={containerStyles}>
@@ -99,6 +104,14 @@ export const PipelineActions: React.FunctionComponent<PipelineActionsProps> = ({
               ...PerformanceSignals.get('aggregation-executed-without-index'),
               onPrimaryActionButtonClick:
                 onCollectionScanInsightActionButtonClick,
+              onAssistantButtonClick:
+                tellMoreAboutInsight &&
+                (() => {
+                  tellMoreAboutInsight({
+                    id: 'aggregation-executed-without-index',
+                    stages,
+                  });
+                }),
             }}
           ></SignalPopover>
         </div>
@@ -185,6 +198,7 @@ const mapState = (state: RootState) => {
     isUpdateViewButtonDisabled:
       !state.isModified || hasSyntaxErrors || isAIFetching,
     showCollectionScanInsight: state.insights.isCollectionScan,
+    stages: resultPipeline,
   };
 };
 

packages/compass-aggregations/src/components/pipeline-toolbar/pipeline-header/pipeline-actions.tsx

@@ -29,8 +29,15 @@ describe('AssistantChat', function () {
     },
   ];
 
-  function renderWithChat(messages: AssistantMessage[]) {
-    const chat = createMockChat({ messages });
+  function renderWithChat(
+    messages: AssistantMessage[],
+    {
+      status,
+    }: {
+      status?: 'submitted' | 'streaming';
+    } = {}
+  ) {
+    const chat = createMockChat({ messages, status });
     const result = render(<AssistantChat chat={chat} />);
     return {
       result,
@@ -63,6 +70,34 @@ describe('AssistantChat', function () {
     expect(inputField.value).to.equal('What is MongoDB?');
   });
 
+  it('displays the disclaimer and welcome text', function () {
+    renderWithChat([]);
+    expect(screen.getByText(/This feature is powered by generative AI/)).to
+      .exist;
+    expect(screen.getByText(/Please review the outputs carefully/)).to.exist;
+  });
+
+  it('displays the welcome text when there are no messages', function () {
+    renderWithChat([]);
+    expect(screen.getByText(/Welcome to your MongoDB Assistant./)).to.exist;
+  });
+
+  it('does not display the welcome text when there are messages', function () {
+    renderWithChat(mockMessages);
+    expect(screen.queryByText(/Welcome to your MongoDB Assistant./)).to.not
+      .exist;
+  });
+
+  it('displays loading state when chat status is submitted', function () {
+    renderWithChat([], { status: 'submitted' });
+    expect(screen.getByText(/MongoDB Assistant is thinking/)).to.exist;
+  });
+
+  it('does not display loading in all other cases', function () {
+    renderWithChat(mockMessages, { status: 'streaming' });
+    expect(screen.queryByText(/MongoDB Assistant is thinking/)).to.not.exist;
+  });
+
   it('send button is disabled when input is empty', function () {
     renderWithChat([]);
 

packages/compass-assistant/src/assistant-chat.spec.tsx

@@ -16,16 +16,21 @@ import {
   fontFamilies,
   palette,
   useDarkMode,
+  LgChatChatDisclaimer,
+  Link,
 } from '@mongodb-js/compass-components';
 import { useTelemetry } from '@mongodb-js/compass-telemetry/provider';
 
+const { DisclaimerText } = LgChatChatDisclaimer;
 const { ChatWindow } = LgChatChatWindow;
 const { LeafyGreenChatProvider, Variant } = LgChatLeafygreenChatProvider;
 const { Message } = LgChatMessage;
 const { MessageFeed } = LgChatMessageFeed;
 const { MessageActions } = LgChatMessageActions;
 const { InputBar } = LgChatInputBar;
 
+const GEN_AI_FAQ_LINK = 'https://www.mongodb.com/docs/generative-ai-faq/';
+
 interface AssistantChatProps {
   chat: Chat<AssistantMessage>;
 }
@@ -54,6 +59,9 @@ const headerStyleLightModeFixes = css({
 
 // TODO(COMPASS-9751): These are temporary patches to make the Assistant chat take the entire
 // width and height of the drawer since Leafygreen doesn't support this yet.
+const inputBarFixesStyles = css({
+  marginBottom: -spacing[400],
+});
 const assistantChatFixesStyles = css({
   // Negative margin to patch the padding of the drawer.
   marginTop: -spacing[400],
@@ -95,6 +103,9 @@ const messageFeedFixesStyles = css({ height: '100%' });
 const chatWindowFixesStyles = css({
   height: '100%',
 });
+const welcomeMessageStyles = css({
+  padding: spacing[400],
+});
 
 function makeErrorMessage(message: string) {
   message = message || 'An error occurred';
@@ -191,6 +202,17 @@ export const AssistantChat: React.FunctionComponent<AssistantChatProps> = ({
             data-testid="assistant-chat-messages"
             className={messageFeedFixesStyles}
           >
+            <DisclaimerText>
+              This feature is powered by generative AI. See our{' '}
+              <Link
+                hideExternalIcon={false}
+                href={GEN_AI_FAQ_LINK}
+                target="_blank"
+              >
+                FAQ
+              </Link>{' '}
+              for more information. Please review the outputs carefully.
+            </DisclaimerText>
             {lgMessages.map((messageFields) => (
               <Message
                 key={messageFields.id}
@@ -206,13 +228,6 @@ export const AssistantChat: React.FunctionComponent<AssistantChatProps> = ({
                 )}
               </Message>
             ))}
-            {status === 'submitted' && (
-              <Message
-                id="loading"
-                messageBody="Thinking..."
-                isSender={false}
-              />
-            )}
           </MessageFeed>
           {error && (
             <div className={errorBannerWrapperStyles}>
@@ -221,9 +236,18 @@ export const AssistantChat: React.FunctionComponent<AssistantChatProps> = ({
               </Banner>
             </div>
           )}
+          {lgMessages.length === 0 && (
+            <div className={welcomeMessageStyles}>
+              <h4>Welcome to your MongoDB Assistant.</h4>
+              Ask any question about MongoDB to receive expert guidance and
+              documentation right in your window.
+            </div>
+          )}
           <InputBar
             data-testid="assistant-chat-input"
             onMessageSend={handleMessageSend}
+            className={inputBarFixesStyles}
+            state={status === 'submitted' ? 'loading' : undefined}
             textareaProps={{
               placeholder: 'Ask MongoDB Assistant a question',
             }}