The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Hide thinking steps on agent messages sent before any user message (#27379)
Félix Malfait8f9a3e2e8cee
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx b/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsxindex 3db988fb06e..c48546bc2eb 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatAssistantMessageRenderer.tsx@@ -112,10 +112,12 @@ export const AiChatAssistantMessageRenderer = ({messageParts,isLastMessageStreaming,hasError,+ shouldHideThinkingSteps = false,}: {messageParts: ExtendedUIMessagePart[];isLastMessageStreaming: boolean;hasError?: boolean;+ shouldHideThinkingSteps?: boolean;}) => {const frontComponentIdByToolName = useFrontComponentIdByToolName();@@ -136,7 +138,7 @@ export const AiChatAssistantMessageRenderer = ({getEffectiveToolName(part) === 'code_interpreter'),);- const renderItems = groupContiguousThinkingStepParts(+ const groupedRenderItems = groupContiguousThinkingStepParts(filteredParts,(part) =>isToolUIPart(part) &&@@ -145,6 +147,15 @@ export const AiChatAssistantMessageRenderer = ({frontComponentIdByToolName.get(getEffectiveToolName(part)),),);+ const renderItemsWithoutThinkingSteps = groupedRenderItems.filter(+ (renderItem) => renderItem.type !== 'thinking-steps',+ );+ // Falling back to the steps keeps a finished message from rendering as an empty entry+ const renderItems =+ shouldHideThinkingSteps &&+ (isLastMessageStreaming || renderItemsWithoutThinkingSteps.length > 0)+ ? renderItemsWithoutThinkingSteps+ : groupedRenderItems;const lastRenderItemIndex = renderItems.length - 1;diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsxindex a70959ce8ad..01958a6744e 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx@@ -11,6 +11,7 @@ import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';import { AiChatAssistantMessageRenderer } from '@/ai/components/AiChatAssistantMessageRenderer';import { AiChatErrorRenderer } from '@/ai/components/AiChatErrorRenderer';import { agentChatFirstUnreadMessageIdComponentSelector } from '@/ai/states/selectors/agentChatFirstUnreadMessageIdComponentSelector';+import { agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector';import { agentChatMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatMessageComponentFamilySelector';import { getAgentChatSenderLabel } from '@/ai/utils/getAgentChatSenderLabel';import { type AiChatError } from '@/ai/types/AiChatError';@@ -190,6 +191,11 @@ export const AiChatMessage = ({{ messageId },);+ const isMessageBeforeFirstUserMessage = useAtomComponentFamilySelectorValue(+ agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector,+ { messageId },+ );+const { localeCatalog } = useAtomStateValue(dateLocaleState);const firstUnreadMessageId = useAtomComponentSelectorValue(agentChatFirstUnreadMessageIdComponentSelector,@@ -218,6 +224,7 @@ export const AiChatMessage = ({isLastMessageStreaming={isLastMessageStreaming}messageParts={agentChatMessage.parts}hasError={shouldShowError}+ shouldHideThinkingSteps={isMessageBeforeFirstUserMessage}/>);diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatAssistantMessageRenderer.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatAssistantMessageRenderer.test.tsxindex 4a6fb61d6bf..4757e69f69e 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/AiChatAssistantMessageRenderer.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AiChatAssistantMessageRenderer.test.tsx@@ -48,13 +48,20 @@ jest.mock('@/ai/hooks/useFrontComponentIdByToolName', () => ({const renderAssistantRenderer = (messageParts: ExtendedUIMessagePart[],- { isLastMessageStreaming = false }: { isLastMessageStreaming?: boolean } = {},+ {+ isLastMessageStreaming = false,+ shouldHideThinkingSteps = false,+ }: {+ isLastMessageStreaming?: boolean;+ shouldHideThinkingSteps?: boolean;+ } = {},) => {return render(<ThemeProvider colorScheme="light"><AiChatAssistantMessageRenderermessageParts={messageParts}isLastMessageStreaming={isLastMessageStreaming}+ shouldHideThinkingSteps={shouldHideThinkingSteps}/></ThemeProvider>,);@@ -552,4 +559,61 @@ describe('AiChatAssistantMessageRenderer', () => {expect(container).not.toBeEmptyDOMElement();});++ it('should hide thinking steps but keep the answer when asked to', () => {+ renderAssistantRenderer(+ [+ {+ type: 'reasoning',+ text: 'Reasoning content',+ state: 'done',+ },+ {+ type: 'text',+ text: 'Welcome',+ },+ ] as ExtendedUIMessagePart[],+ { shouldHideThinkingSteps: true },+ );++ expect(+ screen.queryByTestId('thinking-steps-display'),+ ).not.toBeInTheDocument();+ expect(screen.getByTestId('markdown-renderer')).toHaveTextContent(+ 'Welcome',+ );+ });++ it('should show the loading indicator instead of hidden thinking steps while streaming', () => {+ const { container } = renderAssistantRenderer(+ [+ {+ type: 'reasoning',+ text: 'Reasoning content',+ state: 'streaming',+ },+ ] as ExtendedUIMessagePart[],+ { isLastMessageStreaming: true, shouldHideThinkingSteps: true },+ );++ expect(+ screen.queryByTestId('thinking-steps-display'),+ ).not.toBeInTheDocument();+ expect(container).not.toBeEmptyDOMElement();+ });++ it('should still show thinking steps on a finished message that has nothing else to render', () => {+ renderAssistantRenderer(+ [+ {+ type: 'reasoning',+ text: 'Reasoning content',+ state: 'done',+ },+ ] as ExtendedUIMessagePart[],+ { shouldHideThinkingSteps: true },+ );++ expect(screen.getByTestId('thinking-steps-display')).toBeInTheDocument();+ });});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsx b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsxnew file mode 100644index 00000000000..e934dd71c71--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/__tests__/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.test.tsx@@ -0,0 +1,65 @@+import { renderHook } from '@testing-library/react';+import { Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';++import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';+import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';+import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector';+import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';++const INSTANCE_ID = 'agentChatIsMessageBeforeFirstUserMessageTest';+const THREAD_ID = 'thread';++const MESSAGES = [+ { id: 'system-message', role: 'system' as const, parts: [] },+ { id: 'opening-message', role: 'assistant' as const, parts: [] },+ { id: 'user-message', role: 'user' as const, parts: [] },+ { id: 'reply-message', role: 'assistant' as const, parts: [] },+];++const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={jotaiStore}>+ <AgentChatComponentInstanceContext.Provider+ value={{ instanceId: INSTANCE_ID }}+ >+ {children}+ </AgentChatComponentInstanceContext.Provider>+ </JotaiProvider>+);++describe('agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector', () => {+ beforeEach(() => {+ resetJotaiStore();+ jotaiStore.set(agentChatDisplayedThreadState.atom, THREAD_ID);+ jotaiStore.set(+ agentChatMessagesComponentFamilyState.atomFamily({+ instanceId: INSTANCE_ID,+ familyKey: { threadId: THREAD_ID },+ }),+ MESSAGES,+ );+ });++ it.each([+ { messageId: 'opening-message', expected: true },+ { messageId: 'user-message', expected: false },+ { messageId: 'reply-message', expected: false },+ { messageId: 'unknown-message', expected: false },+ ])('returns $expected for $messageId', ({ messageId, expected }) => {+ const { result } = renderHook(+ () =>+ useAtomComponentFamilySelectorValue(+ agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector,+ { messageId },+ ),+ { wrapper: Wrapper },+ );++ expect(result.current).toBe(expected);+ });+});diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.tsnew file mode 100644index 00000000000..6c0f01b49c3--- /dev/null+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector.ts@@ -0,0 +1,32 @@+import { AGENT_MESSAGE_ROLE } from '@/ai/constants/AgentMessageRole';+import { AgentChatComponentInstanceContext } from '@/ai/contexts/AgentChatComponentInstanceContext';+import { agentChatDisplayedThreadMessagesComponentSelector } from '@/ai/states/selectors/agentChatDisplayedThreadMessagesComponentSelector';+import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';++export const agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector =+ createAtomComponentFamilySelector<boolean, { messageId: string }>({+ key: 'agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector',+ get:+ ({ instanceId, familyKey: { messageId } }) =>+ ({ get }) => {+ const messages = get(+ agentChatDisplayedThreadMessagesComponentSelector,+ {+ instanceId,+ },+ );++ for (const message of messages) {+ if (message.id === messageId) {+ return message.role !== AGENT_MESSAGE_ROLE.USER;+ }++ if (message.role === AGENT_MESSAGE_ROLE.USER) {+ return false;+ }+ }++ return false;+ },+ componentInstanceContext: AgentChatComponentInstanceContext,+ });