The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Send file attachments when answering an AI chat question (#24017)
Raphaël Bosi724fa6437055
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 12085b6c3de..d56765c5d64 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -3639,7 +3639,7 @@ type Mutation {createChatThread: AgentChatThread!sendChatMessage(threadId: UUID!, text: String!, messageId: UUID!, browsingContext: JSON, modelId: String, fileAttachments: [FileAttachmentInput!]): SendChatMessageResult!retryChatMessage(threadId: UUID!, modelId: String): SendChatMessageResult!- answerAgentChatQuestion(threadId: UUID!, messageId: UUID!, answers: [AgentChatQuestionAnswerInput!]!, modelId: String): SendChatMessageResult!+ answerAgentChatQuestion(threadId: UUID!, messageId: UUID!, answers: [AgentChatQuestionAnswerInput!]!, modelId: String, fileAttachments: [FileAttachmentInput!]): SendChatMessageResult!stopAgentChatStream(threadId: UUID!): Boolean!renameChatThread(id: UUID!, title: String!): AgentChatThread!archiveChatThread(id: UUID!): AgentChatThread!diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 1d2260da2b1..978db6b8f55 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -6548,7 +6548,7 @@ export interface MutationGenqlSelection{createChatThread?: AgentChatThreadGenqlSelectionsendChatMessage?: (SendChatMessageResultGenqlSelection & { __args: {threadId: Scalars['UUID'], text: Scalars['String'], messageId: Scalars['UUID'], browsingContext?: (Scalars['JSON'] | null), modelId?: (Scalars['String'] | null), fileAttachments?: (FileAttachmentInput[] | null)} })retryChatMessage?: (SendChatMessageResultGenqlSelection & { __args: {threadId: Scalars['UUID'], modelId?: (Scalars['String'] | null)} })- answerAgentChatQuestion?: (SendChatMessageResultGenqlSelection & { __args: {threadId: Scalars['UUID'], messageId: Scalars['UUID'], answers: AgentChatQuestionAnswerInput[], modelId?: (Scalars['String'] | null)} })+ answerAgentChatQuestion?: (SendChatMessageResultGenqlSelection & { __args: {threadId: Scalars['UUID'], messageId: Scalars['UUID'], answers: AgentChatQuestionAnswerInput[], modelId?: (Scalars['String'] | null), fileAttachments?: (FileAttachmentInput[] | null)} })stopAgentChatStream?: { __args: {threadId: Scalars['UUID']} }renameChatThread?: (AgentChatThreadGenqlSelection & { __args: {id: Scalars['UUID'], title: Scalars['String']} })archiveChatThread?: (AgentChatThreadGenqlSelection & { __args: {id: Scalars['UUID']} })diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.tsindex 578a4f06602..3c503869bdc 100644--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts@@ -9066,6 +9066,10 @@ export default {],"modelId": [1+ ],+ "fileAttachments": [+ 505,+ "[FileAttachmentInput!]"]}],diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 5cf94220395..009ab7f9410 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -2862,6 +2862,7 @@ export type MutationAddQueryToEventStreamArgs = {export type MutationAnswerAgentChatQuestionArgs = {answers: Array<AgentChatQuestionAnswerInput>;+ fileAttachments?: InputMaybe<Array<FileAttachmentInput>>;messageId: Scalars['UUID']['input'];modelId?: InputMaybe<Scalars['String']['input']>;threadId: Scalars['UUID']['input'];@@ -6840,6 +6841,7 @@ export type AnswerAgentChatQuestionMutationVariables = Exact<{messageId: Scalars['UUID']['input'];answers: Array<AgentChatQuestionAnswerInput> | AgentChatQuestionAnswerInput;modelId?: InputMaybe<Scalars['String']['input']>;+ fileAttachments?: InputMaybe<Array<FileAttachmentInput> | FileAttachmentInput>;}>;@@ -9431,7 +9433,7 @@ export const SendEmailDocument = {"kind":"Document","definitions":[{"kind":"Operexport const SendMessageCampaignDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaign"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaign"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"campaignId"}},{"kind":"Field","name":{"kind":"Name","value":"queuedCount"}},{"kind":"Field","name":{"kind":"Name","value":"skipped"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"noEmail"}},{"kind":"Field","name":{"kind":"Name","value":"deduped"}},{"kind":"Field","name":{"kind":"Name","value":"overCap"}}]}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignMutation, SendMessageCampaignMutationVariables>;export const SendMessageCampaignTestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendMessageCampaignTest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendMessageCampaignTestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"sendMessageCampaignTest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}}]}}]}}]} as unknown as DocumentNode<SendMessageCampaignTestMutation, SendMessageCampaignTestMutationVariables>;export const ActivateSkillDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ActivateSkill"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activateSkill"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"SkillFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"SkillFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Skill"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"content"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ActivateSkillMutation, ActivateSkillMutationVariables>;-export const AnswerAgentChatQuestionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AnswerAgentChatQuestion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"answers"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatQuestionAnswerInput"}}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"answerAgentChatQuestion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"answers"},"value":{"kind":"Variable","name":{"kind":"Name","value":"answers"}}},{"kind":"Argument","name":{"kind":"Name","value":"modelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}},{"kind":"Field","name":{"kind":"Name","value":"queued"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}}]}}]}}]} as unknown as DocumentNode<AnswerAgentChatQuestionMutation, AnswerAgentChatQuestionMutationVariables>;+export const AnswerAgentChatQuestionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AnswerAgentChatQuestion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"answers"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AgentChatQuestionAnswerInput"}}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fileAttachments"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"FileAttachmentInput"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"answerAgentChatQuestion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}},{"kind":"Argument","name":{"kind":"Name","value":"messageId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"messageId"}}},{"kind":"Argument","name":{"kind":"Name","value":"answers"},"value":{"kind":"Variable","name":{"kind":"Name","value":"answers"}}},{"kind":"Argument","name":{"kind":"Name","value":"modelId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"modelId"}}},{"kind":"Argument","name":{"kind":"Name","value":"fileAttachments"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fileAttachments"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"messageId"}},{"kind":"Field","name":{"kind":"Name","value":"queued"}},{"kind":"Field","name":{"kind":"Name","value":"streamId"}}]}}]}}]} as unknown as DocumentNode<AnswerAgentChatQuestionMutation, AnswerAgentChatQuestionMutationVariables>;export const ArchiveChatThreadDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ArchiveChatThread"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"archiveChatThread"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<ArchiveChatThreadMutation, ArchiveChatThreadMutationVariables>;export const AssignRoleToAgentDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AssignRoleToAgent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"roleId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignRoleToAgent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"agentId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"roleId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"roleId"}}}]}]}}]} as unknown as DocumentNode<AssignRoleToAgentMutation, AssignRoleToAgentMutationVariables>;export const CreateChatThreadDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateChatThread"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createChatThread"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<CreateChatThreadMutation, CreateChatThreadMutationVariables>;diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/answerAgentChatQuestion.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/answerAgentChatQuestion.tsindex 42d55f63030..22e01b16e41 100644--- a/packages/twenty-front/src/modules/ai/graphql/mutations/answerAgentChatQuestion.ts+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/answerAgentChatQuestion.ts@@ -6,12 +6,14 @@ export const ANSWER_AGENT_CHAT_QUESTION = gql`$messageId: UUID!$answers: [AgentChatQuestionAnswerInput!]!$modelId: String+ $fileAttachments: [FileAttachmentInput!]) {answerAgentChatQuestion(threadId: $threadIdmessageId: $messageIdanswers: $answersmodelId: $modelId+ fileAttachments: $fileAttachments) {messageIdqueueddiff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.tsindex 7f4f5851e86..5830441284e 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts@@ -219,7 +219,10 @@ export const useAgentChat = (? { [AGENT_CHAT_NEW_THREAD_DRAFT_KEY]: '' }: {}),}));- setAgentChatUploadedFiles(uploadedFilesSnapshot);+ setAgentChatUploadedFiles((currentUploadedFiles) => [+ ...uploadedFilesSnapshot,+ ...currentUploadedFiles,+ ]);const latestMessages = store.get(messagesAtom);diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts b/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.tsindex 6b47621bf48..78a96f6809c 100644--- a/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useAiChatFileUpload.ts@@ -2,9 +2,9 @@ import { agentChatSelectedFilesState } from '@/ai/states/agentChatSelectedFilesSimport { agentChatUploadedFilesState } from '@/ai/states/agentChatUploadedFilesState';import { useDirectFileUpload } from '@/file/hooks/useDirectFileUpload';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { type AgentChatFileUIPart } from '@/ai/types/agent-chat-file-ui-part.type';import { FileFolder } from '~/generated-metadata/graphql';@@ -13,10 +13,10 @@ export const useAiChatFileUpload = () => {const { uploadFile: directUploadFile } = useDirectFileUpload();const { t } = useLingui();const { enqueueErrorSnackBar } = useSnackBar();- const [agentChatSelectedFiles, setAgentChatSelectedFiles] = useAtomState(+ const setAgentChatSelectedFiles = useSetAtomState(agentChatSelectedFilesState,);- const [agentChatUploadedFiles, setAgentChatUploadedFiles] = useAtomState(+ const setAgentChatUploadedFiles = useSetAtomState(agentChatUploadedFilesState,);@@ -26,9 +26,6 @@ export const useAiChatFileUpload = () => {fileFolder: FileFolder.AgentChat,});- setAgentChatSelectedFiles(- agentChatSelectedFiles.filter((f) => f.name !== file.name),- );return {filename: file.name,mediaType: file.type,@@ -42,6 +39,12 @@ export const useAiChatFileUpload = () => {message: t`Failed to upload file: ${fileName}`,});return null;+ } finally {+ setAgentChatSelectedFiles((previousSelectedFiles) =>+ previousSelectedFiles.filter(+ (selectedFile) => selectedFile.name !== file.name,+ ),+ );}};@@ -60,9 +63,9 @@ export const useAiChatFileUpload = () => {[],);- if (successfulUploads.length > 0) {- setAgentChatUploadedFiles([- ...agentChatUploadedFiles,+ if (isNonEmptyArray(successfulUploads)) {+ setAgentChatUploadedFiles((previousUploadedFiles) => [+ ...previousUploadedFiles,...successfulUploads,]);}diff --git a/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts b/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.tsindex 5aa0cce92e3..e505f923b43 100644--- a/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts+++ b/packages/twenty-front/src/modules/ai/hooks/useSubmitQuestionAnswer.ts@@ -1,9 +1,10 @@import { CombinedGraphQLErrors } from '@apollo/client/errors';import { useApolloClient } from '@apollo/client/react';+import { t } from '@lingui/core/macro';import { useStore } from 'jotai';import { useCallback } from 'react';import { type AskQuestionAnswer } from 'twenty-shared/ai';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { AGENT_CHAT_INSTANCE_ID } from '@/ai/constants/AgentChatInstanceId';import { AGENT_CHAT_REFETCH_MESSAGES_EVENT_NAME } from '@/ai/constants/AgentChatRefetchMessagesEventName';@@ -12,6 +13,8 @@ import { useAgentChatModelId } from '@/ai/hooks/useAgentChatModelId';import { agentChatDisplayedThreadState } from '@/ai/states/agentChatDisplayedThreadState';import { agentChatIsAwaitingFirstChunkComponentFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkComponentFamilyState';import { agentChatMessagesComponentFamilyState } from '@/ai/states/agentChatMessagesComponentFamilyState';+import { agentChatSelectedFilesState } from '@/ai/states/agentChatSelectedFilesState';+import { agentChatUploadedFilesState } from '@/ai/states/agentChatUploadedFilesState';import { markQuestionAnswered } from '@/ai/utils/markQuestionAnswered';import { markQuestionPending } from '@/ai/utils/markQuestionPending';import { dispatchBrowserEvent } from '@/browser-event/utils/dispatchBrowserEvent';@@ -20,7 +23,7 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';export const useSubmitQuestionAnswer = () => {const apolloClient = useApolloClient();const store = useStore();- const { enqueueErrorSnackBar } = useSnackBar();+ const { enqueueErrorSnackBar, enqueueInfoSnackBar } = useSnackBar();const { modelIdForRequest } = useAgentChatModelId();const submitAnswer = useCallback(@@ -39,6 +42,18 @@ export const useSubmitQuestionAnswer = () => {return;}+ const agentChatSelectedFiles = store.get(+ agentChatSelectedFilesState.atom,+ );++ if (isNonEmptyArray(agentChatSelectedFiles)) {+ enqueueInfoSnackBar({+ message: t`Wait for files to finish uploading before answering.`,+ });++ return;+ }+const messagesAtom = agentChatMessagesComponentFamilyState.atomFamily({instanceId: AGENT_CHAT_INSTANCE_ID,familyKey: { threadId },@@ -50,11 +65,18 @@ export const useSubmitQuestionAnswer = () => {});const previousMessages = store.get(messagesAtom);+ const uploadedFiles = store.get(agentChatUploadedFilesState.atom);+ const fileAttachments = uploadedFiles.map((file) => ({+ id: file.fileId,+ filename: file.filename,+ }));+store.set(messagesAtom,markQuestionAnswered(previousMessages, messageId, toolCallId, answers),);store.set(isAwaitingFirstChunkAtom, true);+ store.set(agentChatUploadedFilesState.atom, []);try {await apolloClient.mutate({@@ -64,6 +86,9 @@ export const useSubmitQuestionAnswer = () => {messageId,answers,modelId: modelIdForRequest,+ fileAttachments: isNonEmptyArray(fileAttachments)+ ? fileAttachments+ : undefined,},});@@ -76,13 +101,23 @@ export const useSubmitQuestionAnswer = () => {messagesAtom,markQuestionPending(currentMessages, messageId, toolCallId),);+ store.set(agentChatUploadedFilesState.atom, (currentUploadedFiles) => [+ ...uploadedFiles,+ ...currentUploadedFiles,+ ]);enqueueErrorSnackBar({apolloError: CombinedGraphQLErrors.is(error) ? error : undefined,});}},- [apolloClient, store, enqueueErrorSnackBar, modelIdForRequest],+ [+ apolloClient,+ store,+ enqueueErrorSnackBar,+ enqueueInfoSnackBar,+ modelIdForRequest,+ ],);return { submitAnswer };diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.tsindex 31de99a8b1a..ece8f3b2d0d 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts@@ -321,6 +321,11 @@ export class AgentChatResolver {answers: AgentChatQuestionAnswerInput[],@Args('modelId', { type: () => String, nullable: true })modelId: string | undefined,+ @Args('fileAttachments', {+ type: () => [FileAttachmentInput],+ nullable: true,+ })+ fileAttachments: FileAttachmentInput[] | null,@AuthUserWorkspaceId() userWorkspaceId: string,@AuthWorkspace() workspace: WorkspaceEntity,): Promise<SendChatMessageResultDTO> {@@ -360,6 +365,7 @@ export class AgentChatResolver {userWorkspaceId,workspace,modelId,+ fileAttachments: fileAttachments ?? undefined,},);diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.tsindex aafa4807ebd..4ab88e694de 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-streaming.service.answer.spec.ts@@ -1,4 +1,5 @@import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';+import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-agent-execution/entities/agent-message.entity';import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () => {@@ -21,6 +22,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>update: jest.fn().mockResolvedValue({ affected: 1 }),};const messageQueueService = { add: jest.fn().mockResolvedValue(undefined) };+ const fileRepository = { find: jest.fn().mockResolvedValue([]) };const agentChatService = {resolvePendingQuestion: jest.fn().mockResolvedValue({turnId: 'turn-id',@@ -28,6 +30,8 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>}),restorePendingQuestion: jest.fn().mockResolvedValue(undefined),getMessagesForThread: jest.fn().mockResolvedValue([]),+ addMessage: jest.fn().mockResolvedValue({ id: 'file-message-id' }),+ deleteMessage: jest.fn().mockResolvedValue(undefined),};const eventPublisherService = {publish: jest.fn().mockImplementation(({ event }) => {@@ -45,7 +49,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>const service = new AgentChatStreamingService(threadRepository as never,- { find: jest.fn().mockResolvedValue([]) } as never,+ fileRepository as never,messageQueueService as never,agentChatService as never,eventPublisherService as never,@@ -57,6 +61,7 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>return {service,threadRepository,+ fileRepository,messageQueueService,agentChatService,eventPublisherService,@@ -139,6 +144,92 @@ describe('AgentChatStreamingService answerPendingQuestionAndResumeStream', () =>expect(publishedEvents).toHaveLength(0);});+ it('persists attached files as a user message on the question turn before enqueueing', async () => {+ const { service, agentChatService, fileRepository, messageQueueService } =+ buildService();++ fileRepository.find.mockResolvedValue([+ { id: 'file-id', mimeType: 'text/csv' },+ ]);++ await service.answerPendingQuestionAndResumeStream({+ ...answerArguments,+ fileAttachments: [{ id: 'file-id', filename: 'contacts.csv' }],+ });++ expect(agentChatService.addMessage).toHaveBeenCalledWith({+ threadId: 'thread-id',+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: [+ {+ type: 'file',+ mediaType: 'text/csv',+ filename: 'contacts.csv',+ url: '',+ fileId: 'file-id',+ },+ ],+ },+ turnId: 'turn-id',+ workspaceId: 'workspace-id',+ });+ expect(+ agentChatService.addMessage.mock.invocationCallOrder[0],+ ).toBeLessThan(messageQueueService.add.mock.invocationCallOrder[0]);+ });++ it('does not persist a user message when there are no attachments', async () => {+ const { service, agentChatService } = buildService();++ await service.answerPendingQuestionAndResumeStream(answerArguments);++ expect(agentChatService.addMessage).not.toHaveBeenCalled();+ });++ it('restores the question when persisting attachments fails', async () => {+ const { service, agentChatService, fileRepository, messageQueueService } =+ buildService();++ fileRepository.find.mockResolvedValue([+ { id: 'file-id', mimeType: 'text/csv' },+ ]);+ agentChatService.addMessage.mockRejectedValue(new Error('insert failed'));++ await expect(+ service.answerPendingQuestionAndResumeStream({+ ...answerArguments,+ fileAttachments: [{ id: 'file-id', filename: 'contacts.csv' }],+ }),+ ).rejects.toThrow('insert failed');++ expect(agentChatService.restorePendingQuestion).toHaveBeenCalled();+ expect(messageQueueService.add).not.toHaveBeenCalled();+ });++ it('deletes the persisted attachment message when enqueueing fails', async () => {+ const { service, agentChatService, fileRepository, messageQueueService } =+ buildService();++ fileRepository.find.mockResolvedValue([+ { id: 'file-id', mimeType: 'text/csv' },+ ]);+ messageQueueService.add.mockRejectedValue(new Error('redis down'));++ await expect(+ service.answerPendingQuestionAndResumeStream({+ ...answerArguments,+ fileAttachments: [{ id: 'file-id', filename: 'contacts.csv' }],+ }),+ ).rejects.toThrow('redis down');++ expect(agentChatService.deleteMessage).toHaveBeenCalledWith({+ messageId: 'file-message-id',+ workspaceId: 'workspace-id',+ });+ expect(agentChatService.restorePendingQuestion).toHaveBeenCalled();+ });+it('restores the question and clears the heartbeat when enqueueing fails', async () => {const {service,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.tsindex 8ccbfe241cb..28f1ceb4414 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts@@ -536,6 +536,7 @@ export class AgentChatStreamingService {userWorkspaceId,workspace,modelId,+ fileAttachments,}: {threadId: string;messageId: string;@@ -543,6 +544,7 @@ export class AgentChatStreamingService {userWorkspaceId: string;workspace: WorkspaceEntity;modelId?: string;+ fileAttachments?: AiChatFileAttachment[];}): Promise<{ streamId: string; turnId: string | null }> {const streamId = generateId();@@ -566,7 +568,28 @@ export class AgentChatStreamingService {throw error;}+ let attachmentMessageId: string | null = null;+try {+ const fileParts = await this.buildFilePartsFromAttachments(+ fileAttachments,+ workspace.id,+ );++ if (isNonEmptyArray(fileParts)) {+ const attachmentMessage = await this.agentChatService.addMessage({+ threadId,+ uiMessage: {+ role: AgentMessageRole.USER,+ parts: fileParts,+ },+ turnId: resolved.turnId ?? undefined,+ workspaceId: workspace.id,+ });++ attachmentMessageId = attachmentMessage.id;+ }+await this.enqueueResumeStream({threadId,userWorkspaceId,@@ -576,6 +599,14 @@ export class AgentChatStreamingService {modelId,});} catch (error) {+ if (isDefined(attachmentMessageId)) {+ await this.agentChatService+ .deleteMessage({+ messageId: attachmentMessageId,+ workspaceId: workspace.id,+ })+ .catch(() => {});+ }await this.agentChatService.restorePendingQuestion({threadId,messageId,diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.tsindex aa004902b07..5b6b084c854 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts@@ -613,6 +613,16 @@ export class AgentChatService {return (result.affected ?? 0) > 0;}+ async deleteMessage({+ messageId,+ workspaceId,+ }: {+ messageId: string;+ workspaceId: string;+ }): Promise<void> {+ await this.messageRepository.delete(workspaceId, { id: messageId });+ }+async promoteQueuedMessage({messageId,threadId,